From 68a46e15cb3a50dc572db8645c333529144e8cf8 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Nov 2020 23:34:06 -0500 Subject: [PATCH] begin d_save_HIO, some m_Do_main functions ok --- asm/J2DGraph/J2DManage.s | 2 +- asm/JAudio2/JASBNKParser.s | 4 +- asm/JAudio2/JASWSParser.s | 8 +- asm/JAudio2/JAUInitializer.s | 4 +- asm/JAudio2/JAUSectionHeap.s | 14 +- asm/JKernel/JKRArchivePri.s | 2 +- asm/JKernel/JKRExpHeap.s | 4 +- asm/JKernel/JKRFileCache.s | 4 +- asm/JKernel/JKRFileLoader.s | 4 +- asm/JKernel/JKRHeap.s | 6 +- asm/JKernel/JKRSolidHeap.s | 2 +- asm/JParticle/JPAResourceManager.s | 2 +- asm/JUtility/JUTException.s | 2 +- asm/JUtility/JUTNameTab.s | 2 +- asm/Z2AudioLib/Z2SceneMgr.s | 2 +- asm/Z2AudioLib/Z2SoundObjMgr.s | 2 +- asm/Z2AudioLib/Z2StatusMgr.s | 36 ++-- asm/c/c_dylink.s | 2 +- asm/clib.s | 4 +- asm/d/a/d_a_alink.s | 30 ++-- asm/d/a/d_a_npc.s | 2 +- asm/d/com/d_com_static.s | 2 +- asm/d/com/inf/d_com_inf_game.s | 120 ++++++------- asm/d/d_attention.s | 2 +- asm/d/d_camera.s | 18 +- asm/d/d_demo.s | 2 +- asm/d/d_gameover.s | 2 +- asm/d/d_kankyo.s | 194 +++++++++++----------- asm/d/d_kyeff.s | 4 +- asm/d/d_map.s | 2 +- asm/d/d_meter2.s | 8 +- asm/d/d_stage.s | 10 +- asm/d/d_timer.s | 2 +- asm/d/ev/d_ev_camera.s | 4 +- asm/d/event/d_event_data.s | 6 +- asm/d/event/d_event_manager.s | 20 +-- asm/d/eye/d_eye_hl.s | 2 +- asm/d/kankyo/d_kankyo_rain.s | 110 ++++++------ asm/d/kankyo/d_kankyo_wether.s | 80 ++++----- asm/d/ky/d_ky_thunder.s | 4 +- asm/d/map/path/d_map_path_fmap.s | 8 +- asm/d/menu/d_menu_dmap.s | 2 +- asm/d/menu/d_menu_fmap.s | 16 +- asm/d/menu/d_menu_fmap2D.s | 2 +- asm/d/menu/fmap/d_menu_fmap_map.s | 2 +- asm/d/meter/d_meter_button.s | 14 +- asm/d/meter/d_meter_hakusha.s | 6 +- asm/d/meter/d_meter_map.s | 2 +- asm/d/meter2/d_meter2_draw.s | 2 +- asm/d/meter2/d_meter2_info.s | 4 +- asm/d/msg/d_msg_flow.s | 4 +- asm/d/msg/d_msg_unit.s | 2 +- asm/d/s/d_s_play.s | 40 ++--- asm/d/s/d_s_room.s | 8 +- asm/d/save/d_save_HIO.s | 52 +----- asm/d/select/d_select_cursor.s | 8 +- asm/d/shop/d_shop_system.s | 2 +- asm/f/op/actor/f_op_actor_mng.s | 10 +- asm/m/Do/m_Do_ext.s | 2 +- asm/m/Do/m_Do_graphic.s | 8 +- asm/m/Do/m_Do_machine.s | 4 +- asm/m/Do/m_Do_main.s | 179 ++------------------ asm/m/Do/machine/m_Do_machine_exception.s | 6 +- include/d_save_HIO.h | 19 +++ include/func_8000578C.s | 50 ++++++ include/func_80005848.s | 24 +++ include/func_8000585C.s | 24 +++ include/func_8025BB78.s | 14 ++ include/func_8025BBAC.s | 27 +++ include/functions.h | 9 +- include/m_Do_main.h | 30 ++++ include/variables.h | 5 + obj_files.mk | 2 + src/d/d_save/d_save_HIO.cpp | 25 ++- src/m_Do/m_Do_main.cpp | 83 ++++++++- 75 files changed, 761 insertions(+), 664 deletions(-) create mode 100644 include/d_save_HIO.h create mode 100644 include/func_8000578C.s create mode 100644 include/func_80005848.s create mode 100644 include/func_8000585C.s create mode 100644 include/func_8025BB78.s create mode 100644 include/func_8025BBAC.s create mode 100644 include/m_Do_main.h diff --git a/asm/J2DGraph/J2DManage.s b/asm/J2DGraph/J2DManage.s index b61b2b3295e..4ed20573d58 100644 --- a/asm/J2DGraph/J2DManage.s +++ b/asm/J2DGraph/J2DManage.s @@ -16,7 +16,7 @@ J2DDataManage_NS_get: lbl_8030CE38: /* 8030CE38 00309D78 80 7F 00 04 */ lwz r3, 4(r31) /* 8030CE3C 00309D7C 7F C4 F3 78 */ mr r4, r30 -/* 8030CE40 00309D80 48 05 BB 55 */ bl func_80368994 +/* 8030CE40 00309D80 48 05 BB 55 */ bl strcmp /* 8030CE44 00309D84 2C 03 00 00 */ cmpwi r3, 0 /* 8030CE48 00309D88 40 82 00 0C */ bne lbl_8030CE54 /* 8030CE4C 00309D8C 80 7F 00 00 */ lwz r3, 0(r31) diff --git a/asm/JAudio2/JASBNKParser.s b/asm/JAudio2/JASBNKParser.s index 60de498dac3..3280fb0d498 100644 --- a/asm/JAudio2/JASBNKParser.s +++ b/asm/JAudio2/JASBNKParser.s @@ -27,7 +27,7 @@ JASBNKParser_NS_createBasicBank: /* 80299578 002964B8 83 AD 8C 90 */ lwz r29, lbl_80451210-_SDA_BASE_(r13) lbl_8029957C: /* 8029957C 002964BC 7F A3 EB 78 */ mr r3, r29 -/* 80299580 002964C0 48 03 51 AD */ bl JKRHeap_NS_getFreeSize +/* 80299580 002964C0 48 03 51 AD */ bl getFreeSize__7JKRHeapFv /* 80299584 002964C4 7C 7F 1B 78 */ mr r31, r3 /* 80299588 002964C8 3B C0 00 00 */ li r30, 0 /* 8029958C 002964CC 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -50,7 +50,7 @@ lbl_802995BC: /* 802995C8 00296508 7C 7E 1B 78 */ mr r30, r3 lbl_802995CC: /* 802995CC 0029650C 7F A3 EB 78 */ mr r3, r29 -/* 802995D0 00296510 48 03 51 5D */ bl JKRHeap_NS_getFreeSize +/* 802995D0 00296510 48 03 51 5D */ bl getFreeSize__7JKRHeapFv /* 802995D4 00296514 7C 63 F8 50 */ subf r3, r3, r31 /* 802995D8 00296518 80 0D 8D 08 */ lwz r0, lbl_80451288-_SDA_BASE_(r13) /* 802995DC 0029651C 7C 00 1A 14 */ add r0, r0, r3 diff --git a/asm/JAudio2/JASWSParser.s b/asm/JAudio2/JASWSParser.s index df68ff4d597..4e146192c72 100644 --- a/asm/JAudio2/JASWSParser.s +++ b/asm/JAudio2/JASWSParser.s @@ -57,7 +57,7 @@ JASWSParser_NS_createBasicWaveBank: /* 80299054 00295F94 82 CD 8C 90 */ lwz r22, lbl_80451210-_SDA_BASE_(r13) lbl_80299058: /* 80299058 00295F98 7E C3 B3 78 */ mr r3, r22 -/* 8029905C 00295F9C 48 03 56 D1 */ bl JKRHeap_NS_getFreeSize +/* 8029905C 00295F9C 48 03 56 D1 */ bl getFreeSize__7JKRHeapFv /* 80299060 00295FA0 7C 7D 1B 78 */ mr r29, r3 /* 80299064 00295FA4 7E 9A A3 78 */ mr r26, r20 /* 80299068 00295FA8 38 60 00 28 */ li r3, 0x28 @@ -181,7 +181,7 @@ lbl_80299224: /* 80299228 00296168 7C 19 00 40 */ cmplw r25, r0 /* 8029922C 0029616C 41 80 FE A8 */ blt lbl_802990D4 /* 80299230 00296170 7E C3 B3 78 */ mr r3, r22 -/* 80299234 00296174 48 03 54 F9 */ bl JKRHeap_NS_getFreeSize +/* 80299234 00296174 48 03 54 F9 */ bl getFreeSize__7JKRHeapFv /* 80299238 00296178 7C 63 E8 50 */ subf r3, r3, r29 /* 8029923C 0029617C 80 0D 8D 00 */ lwz r0, lbl_80451280-_SDA_BASE_(r13) /* 80299240 00296180 7C 00 1A 14 */ add r0, r0, r3 @@ -208,7 +208,7 @@ JASWSParser_NS_createSimpleWaveBank: /* 80299284 002961C4 83 2D 8C 90 */ lwz r25, lbl_80451210-_SDA_BASE_(r13) lbl_80299288: /* 80299288 002961C8 7F 23 CB 78 */ mr r3, r25 -/* 8029928C 002961CC 48 03 54 A1 */ bl JKRHeap_NS_getFreeSize +/* 8029928C 002961CC 48 03 54 A1 */ bl getFreeSize__7JKRHeapFv /* 80299290 002961D0 7C 7E 1B 78 */ mr r30, r3 /* 80299294 002961D4 7E FB BB 78 */ mr r27, r23 /* 80299298 002961D8 7E E3 BB 78 */ mr r3, r23 @@ -333,7 +333,7 @@ lbl_80299444: /* 80299454 00296394 7F 84 E3 78 */ mr r4, r28 /* 80299458 00296398 48 00 12 B5 */ bl JASWaveArc_NS_setFileName /* 8029945C 0029639C 7F 23 CB 78 */ mr r3, r25 -/* 80299460 002963A0 48 03 52 CD */ bl JKRHeap_NS_getFreeSize +/* 80299460 002963A0 48 03 52 CD */ bl getFreeSize__7JKRHeapFv /* 80299464 002963A4 7C 63 F0 50 */ subf r3, r3, r30 /* 80299468 002963A8 80 0D 8D 00 */ lwz r0, lbl_80451280-_SDA_BASE_(r13) /* 8029946C 002963AC 7C 00 1A 14 */ add r0, r0, r3 diff --git a/asm/JAudio2/JAUInitializer.s b/asm/JAudio2/JAUInitializer.s index 9d102c6034e..40d8d58f1cb 100644 --- a/asm/JAudio2/JAUInitializer.s +++ b/asm/JAudio2/JAUInitializer.s @@ -203,7 +203,7 @@ JAU_JAIInitializer_NS_initJAInterface: /* 802A4D78 002A1CB8 3C 60 80 43 */ lis r3, lbl_80434110@ha /* 802A4D7C 002A1CBC 3B E3 41 10 */ addi r31, r3, lbl_80434110@l /* 802A4D80 002A1CC0 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13) -/* 802A4D84 002A1CC4 48 02 99 A9 */ bl JKRHeap_NS_getFreeSize +/* 802A4D84 002A1CC4 48 02 99 A9 */ bl getFreeSize__7JKRHeapFv /* 802A4D88 002A1CC8 83 BE 00 08 */ lwz r29, 8(r30) /* 802A4D8C 002A1CCC 88 0D 8D A8 */ lbz r0, lbl_80451328-_SDA_BASE_(r13) /* 802A4D90 002A1CD0 7C 00 07 75 */ extsb. r0, r0 @@ -297,7 +297,7 @@ lbl_802A4EB4: /* 802A4EC0 002A1E00 7F A5 EB 78 */ mr r5, r29 /* 802A4EC4 002A1E04 4B FE BA 05 */ bl JASGenericMemPool_NS_newMemPool /* 802A4EC8 002A1E08 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13) -/* 802A4ECC 002A1E0C 48 02 98 61 */ bl JKRHeap_NS_getFreeSize +/* 802A4ECC 002A1E0C 48 02 98 61 */ bl getFreeSize__7JKRHeapFv /* 802A4ED0 002A1E10 39 61 00 20 */ addi r11, r1, 0x20 /* 802A4ED4 002A1E14 48 0B D3 55 */ bl _restgpr_29 /* 802A4ED8 002A1E18 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/asm/JAudio2/JAUSectionHeap.s b/asm/JAudio2/JAUSectionHeap.s index da2dcdd7fd0..6bb18421df5 100644 --- a/asm/JAudio2/JAUSectionHeap.s +++ b/asm/JAudio2/JAUSectionHeap.s @@ -166,7 +166,7 @@ JAUSection_NS_finishBuild: /* 802A511C 002A205C 48 02 93 1D */ bl JKRHeap_NS_becomeCurrentHeap /* 802A5120 002A2060 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A5124 002A2064 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5128 002A2068 48 02 96 05 */ bl JKRHeap_NS_getFreeSize +/* 802A5128 002A2068 48 02 96 05 */ bl getFreeSize__7JKRHeapFv /* 802A512C 002A206C 80 1F 00 D0 */ lwz r0, 0xd0(r31) /* 802A5130 002A2070 7C 03 00 50 */ subf r0, r3, r0 /* 802A5134 002A2074 90 1F 00 D0 */ stw r0, 0xd0(r31) @@ -698,7 +698,7 @@ JAUSection_NS_newWaveBank: /* 802A5880 002A27C0 90 61 00 08 */ stw r3, 8(r1) /* 802A5884 002A27C4 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A5888 002A27C8 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A588C 002A27CC 48 02 8E A1 */ bl JKRHeap_NS_getFreeSize +/* 802A588C 002A27CC 48 02 8E A1 */ bl getFreeSize__7JKRHeapFv /* 802A5890 002A27D0 7C 7E 1B 78 */ mr r30, r3 /* 802A5894 002A27D4 7F A3 EB 78 */ mr r3, r29 /* 802A5898 002A27D8 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -728,7 +728,7 @@ lbl_802A58E8: /* 802A58F4 002A2834 48 00 0C E1 */ bl set__Q23std16__bitset_base /* 802A58F8 002A2838 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A58FC 002A283C 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5900 002A2840 48 02 8E 2D */ bl JKRHeap_NS_getFreeSize +/* 802A5900 002A2840 48 02 8E 2D */ bl getFreeSize__7JKRHeapFv /* 802A5904 002A2844 7C 63 F0 50 */ subf r3, r3, r30 /* 802A5908 002A2848 80 1F 00 D8 */ lwz r0, 0xd8(r31) /* 802A590C 002A284C 7C 00 1A 14 */ add r0, r0, r3 @@ -852,7 +852,7 @@ lbl_802A5A90: /* 802A5A9C 002A29DC 83 7F 00 08 */ lwz r27, 8(r31) /* 802A5AA0 002A29E0 80 7E 00 30 */ lwz r3, 0x30(r30) /* 802A5AA4 002A29E4 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5AA8 002A29E8 48 02 8C 85 */ bl JKRHeap_NS_getFreeSize +/* 802A5AA8 002A29E8 48 02 8C 85 */ bl getFreeSize__7JKRHeapFv /* 802A5AAC 002A29EC 7C 7D 1B 78 */ mr r29, r3 /* 802A5AB0 002A29F0 7F E3 FB 78 */ mr r3, r31 /* 802A5AB4 002A29F4 80 9E 00 30 */ lwz r4, 0x30(r30) @@ -892,7 +892,7 @@ lbl_802A5B30: /* 802A5B30 002A2A70 93 9F 00 04 */ stw r28, 4(r31) /* 802A5B34 002A2A74 80 7E 00 30 */ lwz r3, 0x30(r30) /* 802A5B38 002A2A78 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 802A5B3C 002A2A7C 48 02 8B F1 */ bl JKRHeap_NS_getFreeSize +/* 802A5B3C 002A2A7C 48 02 8B F1 */ bl getFreeSize__7JKRHeapFv /* 802A5B40 002A2A80 7C 63 E8 50 */ subf r3, r3, r29 /* 802A5B44 002A2A84 80 1E 00 D4 */ lwz r0, 0xd4(r30) /* 802A5B48 002A2A88 7C 00 1A 14 */ add r0, r0, r3 @@ -1192,7 +1192,7 @@ JAUNewSectionHeap: /* 802A5F40 002A2E80 48 02 84 F9 */ bl JKRHeap_NS_becomeCurrentHeap /* 802A5F44 002A2E84 90 61 00 08 */ stw r3, 8(r1) /* 802A5F48 002A2E88 7F 83 E3 78 */ mr r3, r28 -/* 802A5F4C 002A2E8C 48 02 87 E1 */ bl JKRHeap_NS_getFreeSize +/* 802A5F4C 002A2E8C 48 02 87 E1 */ bl getFreeSize__7JKRHeapFv /* 802A5F50 002A2E90 7C 7E 1B 78 */ mr r30, r3 /* 802A5F54 002A2E94 38 60 05 34 */ li r3, 0x534 /* 802A5F58 002A2E98 48 02 8C F5 */ bl __nw @@ -1222,7 +1222,7 @@ JAUNewSectionHeap_X1_: /* 802A5FA8 002A2EE8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A5FAC 002A2EEC 7C 7F 1B 78 */ mr r31, r3 /* 802A5FB0 002A2EF0 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13) -/* 802A5FB4 002A2EF4 48 02 87 79 */ bl JKRHeap_NS_getFreeSize +/* 802A5FB4 002A2EF4 48 02 87 79 */ bl getFreeSize__7JKRHeapFv /* 802A5FB8 002A2EF8 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 802A5FBC 002A2EFC 38 A0 00 01 */ li r5, 1 /* 802A5FC0 002A2F00 48 02 AA 65 */ bl JKRSolidHeap_NS_create diff --git a/asm/JKernel/JKRArchivePri.s b/asm/JKernel/JKRArchivePri.s index 62aea70821f..d2a2a68c1a0 100644 --- a/asm/JKernel/JKRArchivePri.s +++ b/asm/JKernel/JKRArchivePri.s @@ -91,7 +91,7 @@ lbl_802D63B8: /* 802D63B8 002D32F8 80 03 00 54 */ lwz r0, 0x54(r3) /* 802D63BC 002D32FC 7C 60 2A 14 */ add r3, r0, r5 /* 802D63C0 002D3300 38 84 00 04 */ addi r4, r4, 4 -/* 802D63C4 002D3304 48 09 25 D1 */ bl func_80368994 +/* 802D63C4 002D3304 48 09 25 D1 */ bl strcmp /* 802D63C8 002D3308 7C 60 00 34 */ cntlzw r0, r3 /* 802D63CC 002D330C 54 03 D9 7E */ srwi r3, r0, 5 lbl_802D63D0: diff --git a/asm/JKernel/JKRExpHeap.s b/asm/JKernel/JKRExpHeap.s index 7705abdacd0..7760c4518b9 100644 --- a/asm/JKernel/JKRExpHeap.s +++ b/asm/JKernel/JKRExpHeap.s @@ -1127,8 +1127,8 @@ lbl_802CFD38: /* 802CFD5C 002CCC9C 38 21 00 20 */ addi r1, r1, 0x20 /* 802CFD60 002CCCA0 4E 80 00 20 */ blr -.global JKRExpHeap_NS_getTotalUsedSize -JKRExpHeap_NS_getTotalUsedSize: +.global getTotalUsedSize__10JKRExpHeapCFv +getTotalUsedSize__10JKRExpHeapCFv: /* 802CFD64 002CCCA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802CFD68 002CCCA8 7C 08 02 A6 */ mflr r0 /* 802CFD6C 002CCCAC 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JKernel/JKRFileCache.s b/asm/JKernel/JKRFileCache.s index 37c0e085704..c45ac302852 100644 --- a/asm/JKernel/JKRFileCache.s +++ b/asm/JKernel/JKRFileCache.s @@ -45,7 +45,7 @@ lbl_802D4A1C: /* 802D4A38 002D1978 28 03 00 00 */ cmplwi r3, 0 /* 802D4A3C 002D197C 41 82 00 28 */ beq lbl_802D4A64 /* 802D4A40 002D1980 7F C4 F3 78 */ mr r4, r30 -/* 802D4A44 002D1984 48 09 3F 51 */ bl func_80368994 +/* 802D4A44 002D1984 48 09 3F 51 */ bl strcmp /* 802D4A48 002D1988 2C 03 00 00 */ cmpwi r3, 0 /* 802D4A4C 002D198C 40 82 00 18 */ bne lbl_802D4A64 /* 802D4A50 002D1990 80 7C 00 34 */ lwz r3, 0x34(r28) @@ -776,7 +776,7 @@ lbl_802D5460: lbl_802D54A8: /* 802D54A8 002D23E8 7F 83 E3 78 */ mr r3, r28 /* 802D54AC 002D23EC 80 81 00 10 */ lwz r4, 0x10(r1) -/* 802D54B0 002D23F0 48 09 34 E5 */ bl func_80368994 +/* 802D54B0 002D23F0 48 09 34 E5 */ bl strcmp /* 802D54B4 002D23F4 7C 60 00 34 */ cntlzw r0, r3 /* 802D54B8 002D23F8 54 1D D9 7E */ srwi r29, r0, 5 /* 802D54BC 002D23FC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f diff --git a/asm/JKernel/JKRFileLoader.s b/asm/JKernel/JKRFileLoader.s index ae64b0eb41d..cd6e681757b 100644 --- a/asm/JKernel/JKRFileLoader.s +++ b/asm/JKernel/JKRFileLoader.s @@ -276,7 +276,7 @@ lbl_802D4480: /* 802D4480 002D13C0 80 9F 00 00 */ lwz r4, 0(r31) /* 802D4484 002D13C4 38 61 00 08 */ addi r3, r1, 8 /* 802D4488 002D13C8 80 84 00 28 */ lwz r4, 0x28(r4) -/* 802D448C 002D13CC 48 09 45 09 */ bl func_80368994 +/* 802D448C 002D13CC 48 09 45 09 */ bl strcmp /* 802D4490 002D13D0 2C 03 00 00 */ cmpwi r3, 0 /* 802D4494 002D13D4 40 82 00 0C */ bne lbl_802D44A0 /* 802D4498 002D13D8 80 7F 00 00 */ lwz r3, 0(r31) @@ -307,7 +307,7 @@ JKRFileLoader_NS_fetchVolumeName: /* 802D44E4 002D1424 7F E3 FB 78 */ mr r3, r31 /* 802D44E8 002D1428 3C 80 80 3A */ lis r4, lbl_8039D150@ha /* 802D44EC 002D142C 38 84 D1 50 */ addi r4, r4, lbl_8039D150@l -/* 802D44F0 002D1430 48 09 44 A5 */ bl func_80368994 +/* 802D44F0 002D1430 48 09 44 A5 */ bl strcmp /* 802D44F4 002D1434 2C 03 00 00 */ cmpwi r3, 0 /* 802D44F8 002D1438 40 82 00 18 */ bne lbl_802D4510 /* 802D44FC 002D143C 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/JKernel/JKRHeap.s b/asm/JKernel/JKRHeap.s index 8c09aa20e2d..8c0a74fe57f 100644 --- a/asm/JKernel/JKRHeap.s +++ b/asm/JKernel/JKRHeap.s @@ -467,8 +467,8 @@ JKRHeap_NS_getSize_X1_: /* 802CE724 002CB664 38 21 00 10 */ addi r1, r1, 0x10 /* 802CE728 002CB668 4E 80 00 20 */ blr -.global JKRHeap_NS_getFreeSize -JKRHeap_NS_getFreeSize: +.global getFreeSize__7JKRHeapFv +getFreeSize__7JKRHeapFv: /* 802CE72C 002CB66C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802CE730 002CB670 7C 08 02 A6 */ mflr r0 /* 802CE734 002CB674 90 01 00 14 */ stw r0, 0x14(r1) @@ -535,7 +535,7 @@ JKRHeap_NS_getMaxAllocatableSize: /* 802CE7F8 002CB738 4B FF FF 61 */ bl JKRHeap_NS_getMaxFreeBlock /* 802CE7FC 002CB73C 7C 7F 1B 78 */ mr r31, r3 /* 802CE800 002CB740 7F A3 EB 78 */ mr r3, r29 -/* 802CE804 002CB744 4B FF FF 29 */ bl JKRHeap_NS_getFreeSize +/* 802CE804 002CB744 4B FF FF 29 */ bl getFreeSize__7JKRHeapFv /* 802CE808 002CB748 38 9E FF FF */ addi r4, r30, -1 /* 802CE80C 002CB74C 57 E0 07 3E */ clrlwi r0, r31, 0x1c /* 802CE810 002CB750 7C 00 F0 50 */ subf r0, r0, r30 diff --git a/asm/JKernel/JKRSolidHeap.s b/asm/JKernel/JKRSolidHeap.s index 06d872506da..6e2222e0add 100644 --- a/asm/JKernel/JKRSolidHeap.s +++ b/asm/JKernel/JKRSolidHeap.s @@ -589,7 +589,7 @@ lbl_802D1270: /* 802D12A4 002CE1E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802D12A8 002CE1E8 7C 08 02 A6 */ mflr r0 /* 802D12AC 002CE1EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D12B0 002CE1F0 4B FF D4 7D */ bl JKRHeap_NS_getFreeSize +/* 802D12B0 002CE1F0 4B FF D4 7D */ bl getFreeSize__7JKRHeapFv /* 802D12B4 002CE1F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D12B8 002CE1F8 7C 08 03 A6 */ mtlr r0 /* 802D12BC 002CE1FC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JParticle/JPAResourceManager.s b/asm/JParticle/JPAResourceManager.s index 4a84c74db9c..9c7570fd84e 100644 --- a/asm/JParticle/JPAResourceManager.s +++ b/asm/JParticle/JPAResourceManager.s @@ -92,7 +92,7 @@ lbl_80273F1C: /* 80273F24 00270E64 80 63 00 44 */ lwz r3, 0x44(r3) /* 80273F28 00270E68 38 83 00 0C */ addi r4, r3, 0xc /* 80273F2C 00270E6C 7F 83 E3 78 */ mr r3, r28 -/* 80273F30 00270E70 48 0F 4A 65 */ bl func_80368994 +/* 80273F30 00270E70 48 0F 4A 65 */ bl strcmp /* 80273F34 00270E74 2C 03 00 00 */ cmpwi r3, 0 /* 80273F38 00270E78 40 82 00 24 */ bne lbl_80273F5C /* 80273F3C 00270E7C 80 7A 00 08 */ lwz r3, 8(r26) diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index 4c1792f53ba..6d4423db4fb 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -2172,7 +2172,7 @@ lbl_802E3B34: /* 802E3B34 002E0A74 80 9F 00 00 */ lwz r4, 0(r31) /* 802E3B38 002E0A78 7F C3 F3 78 */ mr r3, r30 /* 802E3B3C 002E0A7C 80 84 00 00 */ lwz r4, 0(r4) -/* 802E3B40 002E0A80 48 08 4E 55 */ bl func_80368994 +/* 802E3B40 002E0A80 48 08 4E 55 */ bl strcmp /* 802E3B44 002E0A84 2C 03 00 00 */ cmpwi r3, 0 /* 802E3B48 002E0A88 41 82 00 40 */ beq lbl_802E3B88 /* 802E3B4C 002E0A8C 83 FF 00 0C */ lwz r31, 0xc(r31) diff --git a/asm/JUtility/JUTNameTab.s b/asm/JUtility/JUTNameTab.s index 87cf9222d14..e38b1cf9cc4 100644 --- a/asm/JUtility/JUTNameTab.s +++ b/asm/JUtility/JUTNameTab.s @@ -85,7 +85,7 @@ lbl_802DEA94: /* 802DEAA8 002DB9E8 7C 1D 02 2E */ lhzx r0, r29, r0 /* 802DEAAC 002DB9EC 7C 7D 02 14 */ add r3, r29, r0 /* 802DEAB0 002DB9F0 7F 44 D3 78 */ mr r4, r26 -/* 802DEAB4 002DB9F4 48 08 9E E1 */ bl func_80368994 +/* 802DEAB4 002DB9F4 48 08 9E E1 */ bl strcmp /* 802DEAB8 002DB9F8 2C 03 00 00 */ cmpwi r3, 0 /* 802DEABC 002DB9FC 40 82 00 0C */ bne lbl_802DEAC8 /* 802DEAC0 002DBA00 57 63 04 3E */ clrlwi r3, r27, 0x10 diff --git a/asm/Z2AudioLib/Z2SceneMgr.s b/asm/Z2AudioLib/Z2SceneMgr.s index eaf548aad6a..dcd4b2468d5 100644 --- a/asm/Z2AudioLib/Z2SceneMgr.s +++ b/asm/Z2AudioLib/Z2SceneMgr.s @@ -263,7 +263,7 @@ lbl_802B6BC4: lbl_802B6BDC: /* 802B6BDC 002B3B1C 7E 43 93 78 */ mr r3, r18 /* 802B6BE0 002B3B20 7C 90 88 2E */ lwzx r4, r16, r17 -/* 802B6BE4 002B3B24 48 0B 1D B1 */ bl func_80368994 +/* 802B6BE4 002B3B24 48 0B 1D B1 */ bl strcmp /* 802B6BE8 002B3B28 2C 03 00 00 */ cmpwi r3, 0 /* 802B6BEC 002B3B2C 41 82 00 14 */ beq lbl_802B6C00 /* 802B6BF0 002B3B30 3A F7 00 01 */ addi r23, r23, 1 diff --git a/asm/Z2AudioLib/Z2SoundObjMgr.s b/asm/Z2AudioLib/Z2SoundObjMgr.s index ca1e0540edf..628b80e4b33 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr.s @@ -545,7 +545,7 @@ lbl_802C00A8: /* 802C00A8 002BCFE8 7F 83 E3 78 */ mr r3, r28 /* 802C00AC 002BCFEC 57 C0 25 36 */ rlwinm r0, r30, 4, 0x14, 0x1b /* 802C00B0 002BCFF0 7C 9F 02 14 */ add r4, r31, r0 -/* 802C00B4 002BCFF4 48 0A 88 E1 */ bl func_80368994 +/* 802C00B4 002BCFF4 48 0A 88 E1 */ bl strcmp /* 802C00B8 002BCFF8 2C 03 00 00 */ cmpwi r3, 0 /* 802C00BC 002BCFFC 40 82 00 18 */ bne lbl_802C00D4 /* 802C00C0 002BD000 7F 63 DB 78 */ mr r3, r27 diff --git a/asm/Z2AudioLib/Z2StatusMgr.s b/asm/Z2AudioLib/Z2StatusMgr.s index ec554d86165..b7e316432b1 100644 --- a/asm/Z2AudioLib/Z2StatusMgr.s +++ b/asm/Z2AudioLib/Z2StatusMgr.s @@ -307,7 +307,7 @@ lbl_802B6310: /* 802B6324 002B3264 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6328 002B3268 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B632C 002B326C 38 84 02 6A */ addi r4, r4, 0x26a -/* 802B6330 002B3270 48 0B 26 65 */ bl func_80368994 +/* 802B6330 002B3270 48 0B 26 65 */ bl strcmp /* 802B6334 002B3274 2C 03 00 00 */ cmpwi r3, 0 /* 802B6338 002B3278 40 82 03 CC */ bne lbl_802B6704 /* 802B633C 002B327C 38 00 00 00 */ li r0, 0 @@ -318,14 +318,14 @@ lbl_802B6348: /* 802B634C 002B328C 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6350 002B3290 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6354 002B3294 38 84 02 74 */ addi r4, r4, 0x274 -/* 802B6358 002B3298 48 0B 26 3D */ bl func_80368994 +/* 802B6358 002B3298 48 0B 26 3D */ bl strcmp /* 802B635C 002B329C 2C 03 00 00 */ cmpwi r3, 0 /* 802B6360 002B32A0 41 82 00 20 */ beq lbl_802B6380 /* 802B6364 002B32A4 7F C3 F3 78 */ mr r3, r30 /* 802B6368 002B32A8 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B636C 002B32AC 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6370 002B32B0 38 84 02 7C */ addi r4, r4, 0x27c -/* 802B6374 002B32B4 48 0B 26 21 */ bl func_80368994 +/* 802B6374 002B32B4 48 0B 26 21 */ bl strcmp /* 802B6378 002B32B8 2C 03 00 00 */ cmpwi r3, 0 /* 802B637C 002B32BC 40 82 00 10 */ bne lbl_802B638C lbl_802B6380: @@ -337,14 +337,14 @@ lbl_802B638C: /* 802B6390 002B32D0 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6394 002B32D4 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6398 002B32D8 38 84 02 84 */ addi r4, r4, 0x284 -/* 802B639C 002B32DC 48 0B 25 F9 */ bl func_80368994 +/* 802B639C 002B32DC 48 0B 25 F9 */ bl strcmp /* 802B63A0 002B32E0 2C 03 00 00 */ cmpwi r3, 0 /* 802B63A4 002B32E4 41 82 00 20 */ beq lbl_802B63C4 /* 802B63A8 002B32E8 7F C3 F3 78 */ mr r3, r30 /* 802B63AC 002B32EC 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B63B0 002B32F0 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B63B4 002B32F4 38 84 02 8E */ addi r4, r4, 0x28e -/* 802B63B8 002B32F8 48 0B 25 DD */ bl func_80368994 +/* 802B63B8 002B32F8 48 0B 25 DD */ bl strcmp /* 802B63BC 002B32FC 2C 03 00 00 */ cmpwi r3, 0 /* 802B63C0 002B3300 40 82 00 50 */ bne lbl_802B6410 lbl_802B63C4: @@ -372,7 +372,7 @@ lbl_802B6410: /* 802B6414 002B3354 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6418 002B3358 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B641C 002B335C 38 84 02 98 */ addi r4, r4, 0x298 -/* 802B6420 002B3360 48 0B 25 75 */ bl func_80368994 +/* 802B6420 002B3360 48 0B 25 75 */ bl strcmp /* 802B6424 002B3364 2C 03 00 00 */ cmpwi r3, 0 /* 802B6428 002B3368 40 82 00 24 */ bne lbl_802B644C /* 802B642C 002B336C 38 00 00 0C */ li r0, 0xc @@ -416,7 +416,7 @@ lbl_802B64B4: /* 802B64B8 002B33F8 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B64BC 002B33FC 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B64C0 002B3400 38 84 02 AE */ addi r4, r4, 0x2ae -/* 802B64C4 002B3404 48 0B 24 D1 */ bl func_80368994 +/* 802B64C4 002B3404 48 0B 24 D1 */ bl strcmp /* 802B64C8 002B3408 2C 03 00 00 */ cmpwi r3, 0 /* 802B64CC 002B340C 40 82 00 10 */ bne lbl_802B64DC /* 802B64D0 002B3410 38 00 00 08 */ li r0, 8 @@ -427,7 +427,7 @@ lbl_802B64DC: /* 802B64E0 002B3420 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B64E4 002B3424 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B64E8 002B3428 38 84 02 6A */ addi r4, r4, 0x26a -/* 802B64EC 002B342C 48 0B 24 A9 */ bl func_80368994 +/* 802B64EC 002B342C 48 0B 24 A9 */ bl strcmp /* 802B64F0 002B3430 2C 03 00 00 */ cmpwi r3, 0 /* 802B64F4 002B3434 40 82 00 10 */ bne lbl_802B6504 /* 802B64F8 002B3438 38 00 00 00 */ li r0, 0 @@ -438,7 +438,7 @@ lbl_802B6504: /* 802B6508 002B3448 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B650C 002B344C 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6510 002B3450 38 84 02 BA */ addi r4, r4, 0x2ba -/* 802B6514 002B3454 48 0B 24 81 */ bl func_80368994 +/* 802B6514 002B3454 48 0B 24 81 */ bl strcmp /* 802B6518 002B3458 2C 03 00 00 */ cmpwi r3, 0 /* 802B651C 002B345C 40 82 00 10 */ bne lbl_802B652C /* 802B6520 002B3460 38 00 00 06 */ li r0, 6 @@ -449,7 +449,7 @@ lbl_802B652C: /* 802B6530 002B3470 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6534 002B3474 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6538 002B3478 38 84 02 C6 */ addi r4, r4, 0x2c6 -/* 802B653C 002B347C 48 0B 24 59 */ bl func_80368994 +/* 802B653C 002B347C 48 0B 24 59 */ bl strcmp /* 802B6540 002B3480 2C 03 00 00 */ cmpwi r3, 0 /* 802B6544 002B3484 40 82 00 10 */ bne lbl_802B6554 /* 802B6548 002B3488 38 00 00 07 */ li r0, 7 @@ -460,7 +460,7 @@ lbl_802B6554: /* 802B6558 002B3498 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B655C 002B349C 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6560 002B34A0 38 84 02 D0 */ addi r4, r4, 0x2d0 -/* 802B6564 002B34A4 48 0B 24 31 */ bl func_80368994 +/* 802B6564 002B34A4 48 0B 24 31 */ bl strcmp /* 802B6568 002B34A8 2C 03 00 00 */ cmpwi r3, 0 /* 802B656C 002B34AC 40 82 00 10 */ bne lbl_802B657C /* 802B6570 002B34B0 38 00 00 0A */ li r0, 0xa @@ -482,7 +482,7 @@ lbl_802B657C: /* 802B65AC 002B34EC 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B65B0 002B34F0 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B65B4 002B34F4 38 84 02 D9 */ addi r4, r4, 0x2d9 -/* 802B65B8 002B34F8 48 0B 23 DD */ bl func_80368994 +/* 802B65B8 002B34F8 48 0B 23 DD */ bl strcmp /* 802B65BC 002B34FC 2C 03 00 00 */ cmpwi r3, 0 /* 802B65C0 002B3500 40 82 01 10 */ bne lbl_802B66D0 /* 802B65C4 002B3504 38 00 00 05 */ li r0, 5 @@ -496,7 +496,7 @@ lbl_802B657C: /* 802B65E4 002B3524 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B65E8 002B3528 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B65EC 002B352C 38 84 02 E3 */ addi r4, r4, 0x2e3 -/* 802B65F0 002B3530 48 0B 23 A5 */ bl func_80368994 +/* 802B65F0 002B3530 48 0B 23 A5 */ bl strcmp /* 802B65F4 002B3534 2C 03 00 00 */ cmpwi r3, 0 /* 802B65F8 002B3538 40 82 00 D8 */ bne lbl_802B66D0 /* 802B65FC 002B353C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) @@ -512,7 +512,7 @@ lbl_802B657C: /* 802B6624 002B3564 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6628 002B3568 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B662C 002B356C 38 84 02 ED */ addi r4, r4, 0x2ed -/* 802B6630 002B3570 48 0B 23 65 */ bl func_80368994 +/* 802B6630 002B3570 48 0B 23 65 */ bl strcmp /* 802B6634 002B3574 2C 03 00 00 */ cmpwi r3, 0 /* 802B6638 002B3578 40 82 00 98 */ bne lbl_802B66D0 /* 802B663C 002B357C 3B E0 00 01 */ li r31, 1 @@ -521,7 +521,7 @@ lbl_802B657C: /* 802B6648 002B3588 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B664C 002B358C 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6650 002B3590 38 84 02 FA */ addi r4, r4, 0x2fa -/* 802B6654 002B3594 48 0B 23 41 */ bl func_80368994 +/* 802B6654 002B3594 48 0B 23 41 */ bl strcmp /* 802B6658 002B3598 2C 03 00 00 */ cmpwi r3, 0 /* 802B665C 002B359C 40 82 00 74 */ bne lbl_802B66D0 /* 802B6660 002B35A0 3B E0 00 01 */ li r31, 1 @@ -530,7 +530,7 @@ lbl_802B657C: /* 802B666C 002B35AC 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6670 002B35B0 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6674 002B35B4 38 84 03 06 */ addi r4, r4, 0x306 -/* 802B6678 002B35B8 48 0B 23 1D */ bl func_80368994 +/* 802B6678 002B35B8 48 0B 23 1D */ bl strcmp /* 802B667C 002B35BC 2C 03 00 00 */ cmpwi r3, 0 /* 802B6680 002B35C0 40 82 00 50 */ bne lbl_802B66D0 /* 802B6684 002B35C4 3B E0 00 01 */ li r31, 1 @@ -539,7 +539,7 @@ lbl_802B657C: /* 802B6690 002B35D0 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B6694 002B35D4 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B6698 002B35D8 38 84 03 10 */ addi r4, r4, 0x310 -/* 802B669C 002B35DC 48 0B 22 F9 */ bl func_80368994 +/* 802B669C 002B35DC 48 0B 22 F9 */ bl strcmp /* 802B66A0 002B35E0 2C 03 00 00 */ cmpwi r3, 0 /* 802B66A4 002B35E4 40 82 00 2C */ bne lbl_802B66D0 /* 802B66A8 002B35E8 3B E0 00 01 */ li r31, 1 @@ -548,7 +548,7 @@ lbl_802B657C: /* 802B66B4 002B35F4 3C 80 80 3A */ lis r4, lbl_8039BC88@ha /* 802B66B8 002B35F8 38 84 BC 88 */ addi r4, r4, lbl_8039BC88@l /* 802B66BC 002B35FC 38 84 02 D9 */ addi r4, r4, 0x2d9 -/* 802B66C0 002B3600 48 0B 22 D5 */ bl func_80368994 +/* 802B66C0 002B3600 48 0B 22 D5 */ bl strcmp /* 802B66C4 002B3604 2C 03 00 00 */ cmpwi r3, 0 /* 802B66C8 002B3608 40 82 00 08 */ bne lbl_802B66D0 /* 802B66CC 002B360C 3B E0 00 01 */ li r31, 1 diff --git a/asm/c/c_dylink.s b/asm/c/c_dylink.s index ea392cfa62b..8b4d4d3a6be 100644 --- a/asm/c/c_dylink.s +++ b/asm/c/c_dylink.s @@ -47,7 +47,7 @@ lbl_80018458: /* 80018470 000153B0 4E 80 04 21 */ bctrl /* 80018474 000153B4 7C 64 1B 78 */ mr r4, r3 /* 80018478 000153B8 80 7B 00 04 */ lwz r3, 4(r27) -/* 8001847C 000153BC 48 35 05 19 */ bl func_80368994 +/* 8001847C 000153BC 48 35 05 19 */ bl strcmp /* 80018480 000153C0 2C 03 00 00 */ cmpwi r3, 0 /* 80018484 000153C4 40 82 00 20 */ bne lbl_800184A4 /* 80018488 000153C8 7C 98 C8 2E */ lwzx r4, r24, r25 diff --git a/asm/clib.s b/asm/clib.s index 87e02366079..0c5b74ddb08 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -8323,8 +8323,8 @@ lbl_8036898C: /* 8036898C 003658CC 38 60 00 00 */ li r3, 0 /* 80368990 003658D0 4E 80 00 20 */ blr -.global func_80368994 -func_80368994: +.global strcmp +strcmp: /* 80368994 003658D4 88 A3 00 00 */ lbz r5, 0(r3) /* 80368998 003658D8 88 04 00 00 */ lbz r0, 0(r4) /* 8036899C 003658DC 7C 00 28 51 */ subf. r0, r0, r5 diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index 4da224b96e5..3dadbe7eea0 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -149,7 +149,7 @@ daAlink_c_NS_checkStageName: /* 8009DA70 0009A9B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8009DA74 0009A9B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009DA78 0009A9B8 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8009DA7C 0009A9BC 48 2C AF 19 */ bl func_80368994 +/* 8009DA7C 0009A9BC 48 2C AF 19 */ bl strcmp /* 8009DA80 0009A9C0 7C 60 00 34 */ cntlzw r0, r3 /* 8009DA84 0009A9C4 54 03 D9 7E */ srwi r3, r0, 5 /* 8009DA88 0009A9C8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -14536,7 +14536,7 @@ daAlink_c_NS_checkNoCollisionCorret: /* 800AA648 000A7588 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800AA64C 000A758C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800AA650 000A7590 38 84 04 65 */ addi r4, r4, 0x465 -/* 800AA654 000A7594 48 2B E3 41 */ bl func_80368994 +/* 800AA654 000A7594 48 2B E3 41 */ bl strcmp /* 800AA658 000A7598 2C 03 00 00 */ cmpwi r3, 0 /* 800AA65C 000A759C 41 82 00 34 */ beq lbl_800AA690 /* 800AA660 000A75A0 7F C3 F3 78 */ mr r3, r30 @@ -32236,7 +32236,7 @@ lbl_800B9C90: /* 800B9CB0 000B6BF0 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800B9CB4 000B6BF4 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800B9CB8 000B6BF8 38 84 04 87 */ addi r4, r4, 0x487 -/* 800B9CBC 000B6BFC 48 2A EC D9 */ bl func_80368994 +/* 800B9CBC 000B6BFC 48 2A EC D9 */ bl strcmp /* 800B9CC0 000B6C00 2C 03 00 00 */ cmpwi r3, 0 /* 800B9CC4 000B6C04 41 82 00 4C */ beq lbl_800B9D10 lbl_800B9CC8: @@ -32247,7 +32247,7 @@ lbl_800B9CC8: /* 800B9CD8 000B6C18 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800B9CDC 000B6C1C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800B9CE0 000B6C20 38 84 04 8D */ addi r4, r4, 0x48d -/* 800B9CE4 000B6C24 48 2A EC B1 */ bl func_80368994 +/* 800B9CE4 000B6C24 48 2A EC B1 */ bl strcmp /* 800B9CE8 000B6C28 2C 03 00 00 */ cmpwi r3, 0 /* 800B9CEC 000B6C2C 41 82 00 24 */ beq lbl_800B9D10 /* 800B9CF0 000B6C30 7F C3 F3 78 */ mr r3, r30 @@ -49481,14 +49481,14 @@ lbl_800C9018: /* 800C9024 000C5F64 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C9028 000C5F68 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C902C 000C5F6C 38 84 05 43 */ addi r4, r4, 0x543 -/* 800C9030 000C5F70 48 29 F9 65 */ bl func_80368994 +/* 800C9030 000C5F70 48 29 F9 65 */ bl strcmp /* 800C9034 000C5F74 2C 03 00 00 */ cmpwi r3, 0 /* 800C9038 000C5F78 41 82 01 2C */ beq lbl_800C9164 /* 800C903C 000C5F7C 7F 83 E3 78 */ mr r3, r28 /* 800C9040 000C5F80 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C9044 000C5F84 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C9048 000C5F88 38 84 05 4D */ addi r4, r4, 0x54d -/* 800C904C 000C5F8C 48 29 F9 49 */ bl func_80368994 +/* 800C904C 000C5F8C 48 29 F9 49 */ bl strcmp /* 800C9050 000C5F90 2C 03 00 00 */ cmpwi r3, 0 /* 800C9054 000C5F94 41 82 01 10 */ beq lbl_800C9164 /* 800C9058 000C5F98 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -49501,14 +49501,14 @@ lbl_800C9018: /* 800C9074 000C5FB4 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C9078 000C5FB8 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C907C 000C5FBC 38 84 05 59 */ addi r4, r4, 0x559 -/* 800C9080 000C5FC0 48 29 F9 15 */ bl func_80368994 +/* 800C9080 000C5FC0 48 29 F9 15 */ bl strcmp /* 800C9084 000C5FC4 2C 03 00 00 */ cmpwi r3, 0 /* 800C9088 000C5FC8 41 82 00 DC */ beq lbl_800C9164 /* 800C908C 000C5FCC 7F 83 E3 78 */ mr r3, r28 /* 800C9090 000C5FD0 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C9094 000C5FD4 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C9098 000C5FD8 38 84 05 69 */ addi r4, r4, 0x569 -/* 800C909C 000C5FDC 48 29 F8 F9 */ bl func_80368994 +/* 800C909C 000C5FDC 48 29 F8 F9 */ bl strcmp /* 800C90A0 000C5FE0 2C 03 00 00 */ cmpwi r3, 0 /* 800C90A4 000C5FE4 41 82 00 C0 */ beq lbl_800C9164 lbl_800C90A8: @@ -49522,28 +49522,28 @@ lbl_800C90A8: /* 800C90C4 000C6004 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C90C8 000C6008 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C90CC 000C600C 38 84 05 7A */ addi r4, r4, 0x57a -/* 800C90D0 000C6010 48 29 F8 C5 */ bl func_80368994 +/* 800C90D0 000C6010 48 29 F8 C5 */ bl strcmp /* 800C90D4 000C6014 2C 03 00 00 */ cmpwi r3, 0 /* 800C90D8 000C6018 41 82 00 8C */ beq lbl_800C9164 /* 800C90DC 000C601C 7F 83 E3 78 */ mr r3, r28 /* 800C90E0 000C6020 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C90E4 000C6024 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C90E8 000C6028 38 84 05 89 */ addi r4, r4, 0x589 -/* 800C90EC 000C602C 48 29 F8 A9 */ bl func_80368994 +/* 800C90EC 000C602C 48 29 F8 A9 */ bl strcmp /* 800C90F0 000C6030 2C 03 00 00 */ cmpwi r3, 0 /* 800C90F4 000C6034 41 82 00 70 */ beq lbl_800C9164 /* 800C90F8 000C6038 7F 83 E3 78 */ mr r3, r28 /* 800C90FC 000C603C 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C9100 000C6040 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C9104 000C6044 38 84 05 59 */ addi r4, r4, 0x559 -/* 800C9108 000C6048 48 29 F8 8D */ bl func_80368994 +/* 800C9108 000C6048 48 29 F8 8D */ bl strcmp /* 800C910C 000C604C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9110 000C6050 41 82 00 54 */ beq lbl_800C9164 /* 800C9114 000C6054 7F 83 E3 78 */ mr r3, r28 /* 800C9118 000C6058 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C911C 000C605C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C9120 000C6060 38 84 05 4D */ addi r4, r4, 0x54d -/* 800C9124 000C6064 48 29 F8 71 */ bl func_80368994 +/* 800C9124 000C6064 48 29 F8 71 */ bl strcmp /* 800C9128 000C6068 2C 03 00 00 */ cmpwi r3, 0 /* 800C912C 000C606C 41 82 00 38 */ beq lbl_800C9164 lbl_800C9130: @@ -49557,7 +49557,7 @@ lbl_800C9130: /* 800C914C 000C608C 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800C9150 000C6090 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800C9154 000C6094 38 84 05 98 */ addi r4, r4, 0x598 -/* 800C9158 000C6098 48 29 F8 3D */ bl func_80368994 +/* 800C9158 000C6098 48 29 F8 3D */ bl strcmp /* 800C915C 000C609C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9160 000C60A0 40 82 00 18 */ bne lbl_800C9178 lbl_800C9164: @@ -49610,7 +49610,7 @@ lbl_800C9210: /* 800C9210 000C6150 48 07 81 3D */ bl dComIfGp_getEventManager /* 800C9214 000C6154 4B F7 F1 D5 */ bl dEvent_manager_c_NS_getRunEventName /* 800C9218 000C6158 38 9E 23 E0 */ addi r4, r30, 0x23e0 -/* 800C921C 000C615C 48 29 F7 79 */ bl func_80368994 +/* 800C921C 000C615C 48 29 F7 79 */ bl strcmp /* 800C9220 000C6160 2C 03 00 00 */ cmpwi r3, 0 /* 800C9224 000C6164 40 82 00 14 */ bne lbl_800C9238 lbl_800C9228: @@ -147968,7 +147968,7 @@ lbl_8011FFB0: /* 8011FFD8 0011CF18 4B F0 F2 D5 */ bl dComIfGs_getWarpStageName /* 8011FFDC 0011CF1C 7C 64 1B 78 */ mr r4, r3 /* 8011FFE0 0011CF20 38 61 00 08 */ addi r3, r1, 8 -/* 8011FFE4 0011CF24 48 24 89 B1 */ bl func_80368994 +/* 8011FFE4 0011CF24 48 24 89 B1 */ bl strcmp /* 8011FFE8 0011CF28 2C 03 00 00 */ cmpwi r3, 0 /* 8011FFEC 0011CF2C 40 82 00 2C */ bne lbl_80120018 lbl_8011FFF0: diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index bd927d0460a..05fc816e992 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -4643,7 +4643,7 @@ lbl_80149A38: /* 80149A3C 0014697C 4B EF E9 AD */ bl dEvent_manager_c_NS_getRunEventName /* 80149A40 00146980 3C 80 80 39 */ lis r4, lbl_80392710@ha /* 80149A44 00146984 38 84 27 10 */ addi r4, r4, lbl_80392710@l -/* 80149A48 00146988 48 21 EF 4D */ bl func_80368994 +/* 80149A48 00146988 48 21 EF 4D */ bl strcmp /* 80149A4C 0014698C 2C 03 00 00 */ cmpwi r3, 0 /* 80149A50 00146990 40 82 00 38 */ bne lbl_80149A88 /* 80149A54 00146994 80 7E 0D 90 */ lwz r3, 0xd90(r30) diff --git a/asm/d/com/d_com_static.s b/asm/d/com/d_com_static.s index 9e811d0489d..37ebb34fb59 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -544,7 +544,7 @@ lbl_800315E8: /* 80031664 0002E5A4 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 80031668 0002E5A8 3C 80 80 38 */ lis r4, lbl_803790B0@ha /* 8003166C 0002E5AC 38 84 90 B0 */ addi r4, r4, lbl_803790B0@l -/* 80031670 0002E5B0 48 33 73 25 */ bl func_80368994 +/* 80031670 0002E5B0 48 33 73 25 */ bl strcmp /* 80031674 0002E5B4 2C 03 00 00 */ cmpwi r3, 0 /* 80031678 0002E5B8 40 82 00 18 */ bne lbl_80031690 /* 8003167C 0002E5BC 38 60 00 00 */ li r3, 0 diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index 168a36e1905..fbcf81329bf 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -218,14 +218,14 @@ lbl_8002B47C: /* 8002B488 000283C8 7F E3 FB 78 */ mr r3, r31 /* 8002B48C 000283CC 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B490 000283D0 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l -/* 8002B494 000283D4 48 33 D5 01 */ bl func_80368994 +/* 8002B494 000283D4 48 33 D5 01 */ bl strcmp /* 8002B498 000283D8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B49C 000283DC 41 82 00 20 */ beq lbl_8002B4BC /* 8002B4A0 000283E0 7F E3 FB 78 */ mr r3, r31 /* 8002B4A4 000283E4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B4A8 000283E8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B4AC 000283EC 38 84 00 07 */ addi r4, r4, 7 -/* 8002B4B0 000283F0 48 33 D4 E5 */ bl func_80368994 +/* 8002B4B0 000283F0 48 33 D4 E5 */ bl strcmp /* 8002B4B4 000283F4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B4B8 000283F8 40 82 00 88 */ bne lbl_8002B540 lbl_8002B4BC: @@ -269,7 +269,7 @@ lbl_8002B540: /* 8002B544 00028484 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B548 00028488 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B54C 0002848C 38 84 00 0F */ addi r4, r4, 0xf -/* 8002B550 00028490 48 33 D4 45 */ bl func_80368994 +/* 8002B550 00028490 48 33 D4 45 */ bl strcmp /* 8002B554 00028494 2C 03 00 00 */ cmpwi r3, 0 /* 8002B558 00028498 40 82 00 90 */ bne lbl_8002B5E8 /* 8002B55C 0002849C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -315,7 +315,7 @@ lbl_8002B5E8: /* 8002B5EC 0002852C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B5F0 00028530 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B5F4 00028534 38 84 00 17 */ addi r4, r4, 0x17 -/* 8002B5F8 00028538 48 33 D3 9D */ bl func_80368994 +/* 8002B5F8 00028538 48 33 D3 9D */ bl strcmp /* 8002B5FC 0002853C 2C 03 00 00 */ cmpwi r3, 0 /* 8002B600 00028540 40 82 00 58 */ bne lbl_8002B658 /* 8002B604 00028544 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -345,14 +345,14 @@ lbl_8002B658: /* 8002B65C 0002859C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B660 000285A0 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B664 000285A4 38 84 00 1F */ addi r4, r4, 0x1f -/* 8002B668 000285A8 48 33 D3 2D */ bl func_80368994 +/* 8002B668 000285A8 48 33 D3 2D */ bl strcmp /* 8002B66C 000285AC 2C 03 00 00 */ cmpwi r3, 0 /* 8002B670 000285B0 41 82 00 20 */ beq lbl_8002B690 /* 8002B674 000285B4 7F E3 FB 78 */ mr r3, r31 /* 8002B678 000285B8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B67C 000285BC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B680 000285C0 38 84 00 27 */ addi r4, r4, 0x27 -/* 8002B684 000285C4 48 33 D3 11 */ bl func_80368994 +/* 8002B684 000285C4 48 33 D3 11 */ bl strcmp /* 8002B688 000285C8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B68C 000285CC 40 82 00 E8 */ bne lbl_8002B774 lbl_8002B690: @@ -423,14 +423,14 @@ lbl_8002B774: /* 8002B778 000286B8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B77C 000286BC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B780 000286C0 38 84 00 2F */ addi r4, r4, 0x2f -/* 8002B784 000286C4 48 33 D2 11 */ bl func_80368994 +/* 8002B784 000286C4 48 33 D2 11 */ bl strcmp /* 8002B788 000286C8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B78C 000286CC 41 82 00 20 */ beq lbl_8002B7AC /* 8002B790 000286D0 7F E3 FB 78 */ mr r3, r31 /* 8002B794 000286D4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B798 000286D8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B79C 000286DC 38 84 00 37 */ addi r4, r4, 0x37 -/* 8002B7A0 000286E0 48 33 D1 F5 */ bl func_80368994 +/* 8002B7A0 000286E0 48 33 D1 F5 */ bl strcmp /* 8002B7A4 000286E4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B7A8 000286E8 40 82 00 BC */ bne lbl_8002B864 lbl_8002B7AC: @@ -438,7 +438,7 @@ lbl_8002B7AC: /* 8002B7B0 000286F0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B7B4 000286F4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B7B8 000286F8 38 84 00 2F */ addi r4, r4, 0x2f -/* 8002B7BC 000286FC 48 33 D1 D9 */ bl func_80368994 +/* 8002B7BC 000286FC 48 33 D1 D9 */ bl strcmp /* 8002B7C0 00028700 2C 03 00 00 */ cmpwi r3, 0 /* 8002B7C4 00028704 40 82 00 3C */ bne lbl_8002B800 /* 8002B7C8 00028708 2C 1E 00 01 */ cmpwi r30, 1 @@ -487,7 +487,7 @@ lbl_8002B864: /* 8002B868 000287A8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B86C 000287AC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B870 000287B0 38 84 00 3F */ addi r4, r4, 0x3f -/* 8002B874 000287B4 48 33 D1 21 */ bl func_80368994 +/* 8002B874 000287B4 48 33 D1 21 */ bl strcmp /* 8002B878 000287B8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B87C 000287BC 40 82 00 34 */ bne lbl_8002B8B0 /* 8002B880 000287C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -507,7 +507,7 @@ lbl_8002B8B0: /* 8002B8B4 000287F4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B8B8 000287F8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B8BC 000287FC 38 84 00 47 */ addi r4, r4, 0x47 -/* 8002B8C0 00028800 48 33 D0 D5 */ bl func_80368994 +/* 8002B8C0 00028800 48 33 D0 D5 */ bl strcmp /* 8002B8C4 00028804 2C 03 00 00 */ cmpwi r3, 0 /* 8002B8C8 00028808 40 82 00 90 */ bne lbl_8002B958 /* 8002B8CC 0002880C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -553,21 +553,21 @@ lbl_8002B958: /* 8002B95C 0002889C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B960 000288A0 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B964 000288A4 38 84 00 4F */ addi r4, r4, 0x4f -/* 8002B968 000288A8 48 33 D0 2D */ bl func_80368994 +/* 8002B968 000288A8 48 33 D0 2D */ bl strcmp /* 8002B96C 000288AC 2C 03 00 00 */ cmpwi r3, 0 /* 8002B970 000288B0 41 82 00 60 */ beq lbl_8002B9D0 /* 8002B974 000288B4 7F E3 FB 78 */ mr r3, r31 /* 8002B978 000288B8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B97C 000288BC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B980 000288C0 38 84 00 57 */ addi r4, r4, 0x57 -/* 8002B984 000288C4 48 33 D0 11 */ bl func_80368994 +/* 8002B984 000288C4 48 33 D0 11 */ bl strcmp /* 8002B988 000288C8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B98C 000288CC 41 82 00 44 */ beq lbl_8002B9D0 /* 8002B990 000288D0 7F E3 FB 78 */ mr r3, r31 /* 8002B994 000288D4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B998 000288D8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B99C 000288DC 38 84 00 5F */ addi r4, r4, 0x5f -/* 8002B9A0 000288E0 48 33 CF F5 */ bl func_80368994 +/* 8002B9A0 000288E0 48 33 CF F5 */ bl strcmp /* 8002B9A4 000288E4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B9A8 000288E8 40 82 00 0C */ bne lbl_8002B9B4 /* 8002B9AC 000288EC 2C 1E 00 05 */ cmpwi r30, 5 @@ -577,7 +577,7 @@ lbl_8002B9B4: /* 8002B9B8 000288F8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B9BC 000288FC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B9C0 00028900 38 84 00 67 */ addi r4, r4, 0x67 -/* 8002B9C4 00028904 48 33 CF D1 */ bl func_80368994 +/* 8002B9C4 00028904 48 33 CF D1 */ bl strcmp /* 8002B9C8 00028908 2C 03 00 00 */ cmpwi r3, 0 /* 8002B9CC 0002890C 40 82 01 FC */ bne lbl_8002BBC8 lbl_8002B9D0: @@ -585,7 +585,7 @@ lbl_8002B9D0: /* 8002B9D4 00028914 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002B9D8 00028918 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002B9DC 0002891C 38 84 00 4F */ addi r4, r4, 0x4f -/* 8002B9E0 00028920 48 33 CF B5 */ bl func_80368994 +/* 8002B9E0 00028920 48 33 CF B5 */ bl strcmp /* 8002B9E4 00028924 2C 03 00 00 */ cmpwi r3, 0 /* 8002B9E8 00028928 40 82 00 78 */ bne lbl_8002BA60 /* 8002B9EC 0002892C 2C 1E 00 00 */ cmpwi r30, 0 @@ -624,7 +624,7 @@ lbl_8002BA60: /* 8002BA64 000289A4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BA68 000289A8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BA6C 000289AC 38 84 00 5F */ addi r4, r4, 0x5f -/* 8002BA70 000289B0 48 33 CF 25 */ bl func_80368994 +/* 8002BA70 000289B0 48 33 CF 25 */ bl strcmp /* 8002BA74 000289B4 2C 03 00 00 */ cmpwi r3, 0 /* 8002BA78 000289B8 40 82 00 34 */ bne lbl_8002BAAC /* 8002BA7C 000289BC 2C 1E 00 05 */ cmpwi r30, 5 @@ -652,7 +652,7 @@ lbl_8002BAAC: /* 8002BAD0 00028A10 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BAD4 00028A14 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BAD8 00028A18 38 84 00 57 */ addi r4, r4, 0x57 -/* 8002BADC 00028A1C 48 33 CE B9 */ bl func_80368994 +/* 8002BADC 00028A1C 48 33 CE B9 */ bl strcmp /* 8002BAE0 00028A20 2C 03 00 00 */ cmpwi r3, 0 /* 8002BAE4 00028A24 40 82 00 34 */ bne lbl_8002BB18 /* 8002BAE8 00028A28 2C 1E 00 04 */ cmpwi r30, 4 @@ -678,7 +678,7 @@ lbl_8002BB18: /* 8002BB30 00028A70 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BB34 00028A74 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BB38 00028A78 38 84 00 4F */ addi r4, r4, 0x4f -/* 8002BB3C 00028A7C 48 33 CE 59 */ bl func_80368994 +/* 8002BB3C 00028A7C 48 33 CE 59 */ bl strcmp /* 8002BB40 00028A80 2C 03 00 00 */ cmpwi r3, 0 /* 8002BB44 00028A84 40 82 00 2C */ bne lbl_8002BB70 /* 8002BB48 00028A88 2C 1E 00 01 */ cmpwi r30, 1 @@ -700,7 +700,7 @@ lbl_8002BB7C: /* 8002BB80 00028AC0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BB84 00028AC4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BB88 00028AC8 38 84 00 57 */ addi r4, r4, 0x57 -/* 8002BB8C 00028ACC 48 33 CE 09 */ bl func_80368994 +/* 8002BB8C 00028ACC 48 33 CE 09 */ bl strcmp /* 8002BB90 00028AD0 2C 03 00 00 */ cmpwi r3, 0 /* 8002BB94 00028AD4 40 82 0B 98 */ bne lbl_8002C72C /* 8002BB98 00028AD8 2C 1E 00 03 */ cmpwi r30, 3 @@ -720,7 +720,7 @@ lbl_8002BBC8: /* 8002BBCC 00028B0C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BBD0 00028B10 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BBD4 00028B14 38 84 00 6F */ addi r4, r4, 0x6f -/* 8002BBD8 00028B18 48 33 CD BD */ bl func_80368994 +/* 8002BBD8 00028B18 48 33 CD BD */ bl strcmp /* 8002BBDC 00028B1C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BBE0 00028B20 40 82 00 2C */ bne lbl_8002BC0C /* 8002BBE4 00028B24 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -738,7 +738,7 @@ lbl_8002BC0C: /* 8002BC10 00028B50 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BC14 00028B54 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BC18 00028B58 38 84 00 77 */ addi r4, r4, 0x77 -/* 8002BC1C 00028B5C 48 33 CD 79 */ bl func_80368994 +/* 8002BC1C 00028B5C 48 33 CD 79 */ bl strcmp /* 8002BC20 00028B60 2C 03 00 00 */ cmpwi r3, 0 /* 8002BC24 00028B64 40 82 00 34 */ bne lbl_8002BC58 /* 8002BC28 00028B68 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -758,7 +758,7 @@ lbl_8002BC58: /* 8002BC5C 00028B9C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BC60 00028BA0 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BC64 00028BA4 38 84 00 7F */ addi r4, r4, 0x7f -/* 8002BC68 00028BA8 48 33 CD 2D */ bl func_80368994 +/* 8002BC68 00028BA8 48 33 CD 2D */ bl strcmp /* 8002BC6C 00028BAC 2C 03 00 00 */ cmpwi r3, 0 /* 8002BC70 00028BB0 40 82 00 3C */ bne lbl_8002BCAC /* 8002BC74 00028BB4 2C 1E 00 00 */ cmpwi r30, 0 @@ -780,7 +780,7 @@ lbl_8002BCAC: /* 8002BCB0 00028BF0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BCB4 00028BF4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BCB8 00028BF8 38 84 00 87 */ addi r4, r4, 0x87 -/* 8002BCBC 00028BFC 48 33 CC D9 */ bl func_80368994 +/* 8002BCBC 00028BFC 48 33 CC D9 */ bl strcmp /* 8002BCC0 00028C00 2C 03 00 00 */ cmpwi r3, 0 /* 8002BCC4 00028C04 40 82 00 50 */ bne lbl_8002BD14 /* 8002BCC8 00028C08 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -808,7 +808,7 @@ lbl_8002BD14: /* 8002BD18 00028C58 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BD1C 00028C5C 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BD20 00028C60 38 84 00 8F */ addi r4, r4, 0x8f -/* 8002BD24 00028C64 48 33 CC 71 */ bl func_80368994 +/* 8002BD24 00028C64 48 33 CC 71 */ bl strcmp /* 8002BD28 00028C68 2C 03 00 00 */ cmpwi r3, 0 /* 8002BD2C 00028C6C 40 82 01 9C */ bne lbl_8002BEC8 /* 8002BD30 00028C70 2C 1E 00 00 */ cmpwi r30, 0 @@ -928,7 +928,7 @@ lbl_8002BEC8: /* 8002BECC 00028E0C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BED0 00028E10 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BED4 00028E14 38 84 00 97 */ addi r4, r4, 0x97 -/* 8002BED8 00028E18 48 33 CA BD */ bl func_80368994 +/* 8002BED8 00028E18 48 33 CA BD */ bl strcmp /* 8002BEDC 00028E1C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BEE0 00028E20 40 82 01 10 */ bne lbl_8002BFF0 /* 8002BEE4 00028E24 2C 1E 00 01 */ cmpwi r30, 1 @@ -1008,7 +1008,7 @@ lbl_8002BFF0: /* 8002BFF4 00028F34 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002BFF8 00028F38 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002BFFC 00028F3C 38 84 00 9E */ addi r4, r4, 0x9e -/* 8002C000 00028F40 48 33 C9 95 */ bl func_80368994 +/* 8002C000 00028F40 48 33 C9 95 */ bl strcmp /* 8002C004 00028F44 2C 03 00 00 */ cmpwi r3, 0 /* 8002C008 00028F48 40 82 01 0C */ bne lbl_8002C114 /* 8002C00C 00028F4C 2C 1E 00 01 */ cmpwi r30, 1 @@ -1088,7 +1088,7 @@ lbl_8002C114: /* 8002C118 00029058 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C11C 0002905C 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C120 00029060 38 84 00 A6 */ addi r4, r4, 0xa6 -/* 8002C124 00029064 48 33 C8 71 */ bl func_80368994 +/* 8002C124 00029064 48 33 C8 71 */ bl strcmp /* 8002C128 00029068 2C 03 00 00 */ cmpwi r3, 0 /* 8002C12C 0002906C 40 82 00 DC */ bne lbl_8002C208 /* 8002C130 00029070 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1155,7 +1155,7 @@ lbl_8002C208: /* 8002C20C 0002914C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C210 00029150 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C214 00029154 38 84 00 AD */ addi r4, r4, 0xad -/* 8002C218 00029158 48 33 C7 7D */ bl func_80368994 +/* 8002C218 00029158 48 33 C7 7D */ bl strcmp /* 8002C21C 0002915C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C220 00029160 40 82 00 C4 */ bne lbl_8002C2E4 /* 8002C224 00029164 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1215,7 +1215,7 @@ lbl_8002C2E4: /* 8002C2E8 00029228 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C2EC 0002922C 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C2F0 00029230 38 84 00 B5 */ addi r4, r4, 0xb5 -/* 8002C2F4 00029234 48 33 C6 A1 */ bl func_80368994 +/* 8002C2F4 00029234 48 33 C6 A1 */ bl strcmp /* 8002C2F8 00029238 2C 03 00 00 */ cmpwi r3, 0 /* 8002C2FC 0002923C 40 82 01 40 */ bne lbl_8002C43C /* 8002C300 00029240 2C 1E 00 08 */ cmpwi r30, 8 @@ -1309,7 +1309,7 @@ lbl_8002C43C: /* 8002C440 00029380 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C444 00029384 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C448 00029388 38 84 00 BD */ addi r4, r4, 0xbd -/* 8002C44C 0002938C 48 33 C5 49 */ bl func_80368994 +/* 8002C44C 0002938C 48 33 C5 49 */ bl strcmp /* 8002C450 00029390 2C 03 00 00 */ cmpwi r3, 0 /* 8002C454 00029394 40 82 00 2C */ bne lbl_8002C480 /* 8002C458 00029398 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1327,7 +1327,7 @@ lbl_8002C480: /* 8002C484 000293C4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C488 000293C8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C48C 000293CC 38 84 00 C5 */ addi r4, r4, 0xc5 -/* 8002C490 000293D0 48 33 C5 05 */ bl func_80368994 +/* 8002C490 000293D0 48 33 C5 05 */ bl strcmp /* 8002C494 000293D4 2C 03 00 00 */ cmpwi r3, 0 /* 8002C498 000293D8 40 82 00 68 */ bne lbl_8002C500 /* 8002C49C 000293DC 2C 1E 00 05 */ cmpwi r30, 5 @@ -1362,7 +1362,7 @@ lbl_8002C500: /* 8002C504 00029444 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C508 00029448 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C50C 0002944C 38 84 00 CD */ addi r4, r4, 0xcd -/* 8002C510 00029450 48 33 C4 85 */ bl func_80368994 +/* 8002C510 00029450 48 33 C4 85 */ bl strcmp /* 8002C514 00029454 2C 03 00 00 */ cmpwi r3, 0 /* 8002C518 00029458 40 82 00 2C */ bne lbl_8002C544 /* 8002C51C 0002945C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1380,7 +1380,7 @@ lbl_8002C544: /* 8002C548 00029488 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C54C 0002948C 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C550 00029490 38 84 00 D5 */ addi r4, r4, 0xd5 -/* 8002C554 00029494 48 33 C4 41 */ bl func_80368994 +/* 8002C554 00029494 48 33 C4 41 */ bl strcmp /* 8002C558 00029498 2C 03 00 00 */ cmpwi r3, 0 /* 8002C55C 0002949C 40 82 00 70 */ bne lbl_8002C5CC /* 8002C560 000294A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1417,7 +1417,7 @@ lbl_8002C5CC: /* 8002C5D0 00029510 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C5D4 00029514 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C5D8 00029518 38 84 00 DD */ addi r4, r4, 0xdd -/* 8002C5DC 0002951C 48 33 C3 B9 */ bl func_80368994 +/* 8002C5DC 0002951C 48 33 C3 B9 */ bl strcmp /* 8002C5E0 00029520 2C 03 00 00 */ cmpwi r3, 0 /* 8002C5E4 00029524 40 82 00 2C */ bne lbl_8002C610 /* 8002C5E8 00029528 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1435,7 +1435,7 @@ lbl_8002C610: /* 8002C614 00029554 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C618 00029558 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C61C 0002955C 38 84 00 E4 */ addi r4, r4, 0xe4 -/* 8002C620 00029560 48 33 C3 75 */ bl func_80368994 +/* 8002C620 00029560 48 33 C3 75 */ bl strcmp /* 8002C624 00029564 2C 03 00 00 */ cmpwi r3, 0 /* 8002C628 00029568 40 82 00 2C */ bne lbl_8002C654 /* 8002C62C 0002956C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1453,7 +1453,7 @@ lbl_8002C654: /* 8002C658 00029598 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C65C 0002959C 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C660 000295A0 38 84 00 EC */ addi r4, r4, 0xec -/* 8002C664 000295A4 48 33 C3 31 */ bl func_80368994 +/* 8002C664 000295A4 48 33 C3 31 */ bl strcmp /* 8002C668 000295A8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C66C 000295AC 40 82 00 28 */ bne lbl_8002C694 /* 8002C670 000295B0 2C 1E 00 0B */ cmpwi r30, 0xb @@ -1470,14 +1470,14 @@ lbl_8002C694: /* 8002C698 000295D8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C69C 000295DC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C6A0 000295E0 38 84 00 F3 */ addi r4, r4, 0xf3 -/* 8002C6A4 000295E4 48 33 C2 F1 */ bl func_80368994 +/* 8002C6A4 000295E4 48 33 C2 F1 */ bl strcmp /* 8002C6A8 000295E8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C6AC 000295EC 41 82 00 20 */ beq lbl_8002C6CC /* 8002C6B0 000295F0 7F E3 FB 78 */ mr r3, r31 /* 8002C6B4 000295F4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C6B8 000295F8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C6BC 000295FC 38 84 00 FB */ addi r4, r4, 0xfb -/* 8002C6C0 00029600 48 33 C2 D5 */ bl func_80368994 +/* 8002C6C0 00029600 48 33 C2 D5 */ bl strcmp /* 8002C6C4 00029604 2C 03 00 00 */ cmpwi r3, 0 /* 8002C6C8 00029608 40 82 00 64 */ bne lbl_8002C72C lbl_8002C6CC: @@ -1528,35 +1528,35 @@ lbl_8002C72C: /* 8002C764 000296A4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C768 000296A8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C76C 000296AC 38 84 00 87 */ addi r4, r4, 0x87 -/* 8002C770 000296B0 48 33 C2 25 */ bl func_80368994 +/* 8002C770 000296B0 48 33 C2 25 */ bl strcmp /* 8002C774 000296B4 2C 03 00 00 */ cmpwi r3, 0 /* 8002C778 000296B8 41 82 00 EC */ beq lbl_8002C864 /* 8002C77C 000296BC 7F E3 FB 78 */ mr r3, r31 /* 8002C780 000296C0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C784 000296C4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C788 000296C8 38 84 00 6F */ addi r4, r4, 0x6f -/* 8002C78C 000296CC 48 33 C2 09 */ bl func_80368994 +/* 8002C78C 000296CC 48 33 C2 09 */ bl strcmp /* 8002C790 000296D0 2C 03 00 00 */ cmpwi r3, 0 /* 8002C794 000296D4 41 82 00 D0 */ beq lbl_8002C864 /* 8002C798 000296D8 7F E3 FB 78 */ mr r3, r31 /* 8002C79C 000296DC 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C7A0 000296E0 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C7A4 000296E4 38 84 00 4F */ addi r4, r4, 0x4f -/* 8002C7A8 000296E8 48 33 C1 ED */ bl func_80368994 +/* 8002C7A8 000296E8 48 33 C1 ED */ bl strcmp /* 8002C7AC 000296EC 2C 03 00 00 */ cmpwi r3, 0 /* 8002C7B0 000296F0 41 82 00 B4 */ beq lbl_8002C864 /* 8002C7B4 000296F4 7F E3 FB 78 */ mr r3, r31 /* 8002C7B8 000296F8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C7BC 000296FC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C7C0 00029700 38 84 00 57 */ addi r4, r4, 0x57 -/* 8002C7C4 00029704 48 33 C1 D1 */ bl func_80368994 +/* 8002C7C4 00029704 48 33 C1 D1 */ bl strcmp /* 8002C7C8 00029708 2C 03 00 00 */ cmpwi r3, 0 /* 8002C7CC 0002970C 41 82 00 98 */ beq lbl_8002C864 /* 8002C7D0 00029710 7F E3 FB 78 */ mr r3, r31 /* 8002C7D4 00029714 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C7D8 00029718 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C7DC 0002971C 38 84 00 5F */ addi r4, r4, 0x5f -/* 8002C7E0 00029720 48 33 C1 B5 */ bl func_80368994 +/* 8002C7E0 00029720 48 33 C1 B5 */ bl strcmp /* 8002C7E4 00029724 2C 03 00 00 */ cmpwi r3, 0 /* 8002C7E8 00029728 40 82 00 0C */ bne lbl_8002C7F4 /* 8002C7EC 0002972C 2C 1E 00 05 */ cmpwi r30, 5 @@ -1566,28 +1566,28 @@ lbl_8002C7F4: /* 8002C7F8 00029738 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C7FC 0002973C 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C800 00029740 38 84 00 67 */ addi r4, r4, 0x67 -/* 8002C804 00029744 48 33 C1 91 */ bl func_80368994 +/* 8002C804 00029744 48 33 C1 91 */ bl strcmp /* 8002C808 00029748 2C 03 00 00 */ cmpwi r3, 0 /* 8002C80C 0002974C 41 82 00 58 */ beq lbl_8002C864 /* 8002C810 00029750 7F E3 FB 78 */ mr r3, r31 /* 8002C814 00029754 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C818 00029758 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C81C 0002975C 38 84 00 AD */ addi r4, r4, 0xad -/* 8002C820 00029760 48 33 C1 75 */ bl func_80368994 +/* 8002C820 00029760 48 33 C1 75 */ bl strcmp /* 8002C824 00029764 2C 03 00 00 */ cmpwi r3, 0 /* 8002C828 00029768 41 82 00 3C */ beq lbl_8002C864 /* 8002C82C 0002976C 7F E3 FB 78 */ mr r3, r31 /* 8002C830 00029770 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C834 00029774 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C838 00029778 38 84 00 77 */ addi r4, r4, 0x77 -/* 8002C83C 0002977C 48 33 C1 59 */ bl func_80368994 +/* 8002C83C 0002977C 48 33 C1 59 */ bl strcmp /* 8002C840 00029780 2C 03 00 00 */ cmpwi r3, 0 /* 8002C844 00029784 41 82 00 20 */ beq lbl_8002C864 /* 8002C848 00029788 7F E3 FB 78 */ mr r3, r31 /* 8002C84C 0002978C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C850 00029790 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C854 00029794 38 84 00 B5 */ addi r4, r4, 0xb5 -/* 8002C858 00029798 48 33 C1 3D */ bl func_80368994 +/* 8002C858 00029798 48 33 C1 3D */ bl strcmp /* 8002C85C 0002979C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C860 000297A0 40 82 00 44 */ bne lbl_8002C8A4 lbl_8002C864: @@ -1595,7 +1595,7 @@ lbl_8002C864: /* 8002C868 000297A8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C86C 000297AC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C870 000297B0 38 84 00 AD */ addi r4, r4, 0xad -/* 8002C874 000297B4 48 33 C1 21 */ bl func_80368994 +/* 8002C874 000297B4 48 33 C1 21 */ bl strcmp /* 8002C878 000297B8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C87C 000297BC 40 82 00 20 */ bne lbl_8002C89C /* 8002C880 000297C0 2C 1E 00 09 */ cmpwi r30, 9 @@ -1613,7 +1613,7 @@ lbl_8002C8A4: /* 8002C8A8 000297E8 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C8AC 000297EC 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C8B0 000297F0 38 84 00 E4 */ addi r4, r4, 0xe4 -/* 8002C8B4 000297F4 48 33 C0 E1 */ bl func_80368994 +/* 8002C8B4 000297F4 48 33 C0 E1 */ bl strcmp /* 8002C8B8 000297F8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C8BC 000297FC 40 82 00 2C */ bne lbl_8002C8E8 /* 8002C8C0 00029800 2C 1E 00 00 */ cmpwi r30, 0 @@ -1631,7 +1631,7 @@ lbl_8002C8E8: /* 8002C8EC 0002982C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002C8F0 00029830 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002C8F4 00029834 38 84 01 03 */ addi r4, r4, 0x103 -/* 8002C8F8 00029838 48 33 C0 9D */ bl func_80368994 +/* 8002C8F8 00029838 48 33 C0 9D */ bl strcmp /* 8002C8FC 0002983C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C900 00029840 40 82 00 34 */ bne lbl_8002C934 /* 8002C904 00029844 2C 1E 00 0A */ cmpwi r30, 0xa @@ -2454,7 +2454,7 @@ lbl_8002D3CC: /* 8002D3D0 0002A310 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002D3D4 0002A314 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002D3D8 0002A318 38 84 00 AD */ addi r4, r4, 0xad -/* 8002D3DC 0002A31C 48 33 B5 B9 */ bl func_80368994 +/* 8002D3DC 0002A31C 48 33 B5 B9 */ bl strcmp /* 8002D3E0 0002A320 2C 03 00 00 */ cmpwi r3, 0 /* 8002D3E4 0002A324 40 82 00 40 */ bne lbl_8002D424 /* 8002D3E8 0002A328 7F 20 07 74 */ extsb r0, r25 @@ -2493,12 +2493,12 @@ lbl_8002D44C: /* 8002D45C 0002A39C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002D460 0002A3A0 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002D464 0002A3A4 38 84 01 51 */ addi r4, r4, 0x151 -/* 8002D468 0002A3A8 48 33 B5 2D */ bl func_80368994 +/* 8002D468 0002A3A8 48 33 B5 2D */ bl strcmp /* 8002D46C 0002A3AC 2C 03 00 00 */ cmpwi r3, 0 /* 8002D470 0002A3B0 41 82 00 30 */ beq lbl_8002D4A0 /* 8002D474 0002A3B4 7E E3 BB 78 */ mr r3, r23 /* 8002D478 0002A3B8 7E A4 AB 78 */ mr r4, r21 -/* 8002D47C 0002A3BC 48 33 B5 19 */ bl func_80368994 +/* 8002D47C 0002A3BC 48 33 B5 19 */ bl strcmp /* 8002D480 0002A3C0 2C 03 00 00 */ cmpwi r3, 0 /* 8002D484 0002A3C4 41 82 00 1C */ beq lbl_8002D4A0 /* 8002D488 0002A3C8 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -4164,7 +4164,7 @@ lbl_8002EA68: /* 8002EAB0 0002B9F0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002EAB4 0002B9F4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002EAB8 0002B9F8 38 84 00 9E */ addi r4, r4, 0x9e -/* 8002EABC 0002B9FC 48 33 9E D9 */ bl func_80368994 +/* 8002EABC 0002B9FC 48 33 9E D9 */ bl strcmp /* 8002EAC0 0002BA00 2C 03 00 00 */ cmpwi r3, 0 /* 8002EAC4 0002BA04 40 82 00 14 */ bne lbl_8002EAD8 /* 8002EAC8 0002BA08 38 60 00 00 */ li r3, 0 @@ -4176,7 +4176,7 @@ lbl_8002EAD8: /* 8002EADC 0002BA1C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002EAE0 0002BA20 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002EAE4 0002BA24 38 84 00 4F */ addi r4, r4, 0x4f -/* 8002EAE8 0002BA28 48 33 9E AD */ bl func_80368994 +/* 8002EAE8 0002BA28 48 33 9E AD */ bl strcmp /* 8002EAEC 0002BA2C 2C 03 00 00 */ cmpwi r3, 0 /* 8002EAF0 0002BA30 40 82 00 60 */ bne lbl_8002EB50 /* 8002EAF4 0002BA34 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4211,7 +4211,7 @@ lbl_8002EB5C: /* 8002EB60 0002BAA0 48 19 7A CD */ bl dMenuFmap_getStartStageName /* 8002EB64 0002BAA4 7F 3C D2 14 */ add r25, r28, r26 /* 8002EB68 0002BAA8 7F 24 CB 78 */ mr r4, r25 -/* 8002EB6C 0002BAAC 48 33 9E 29 */ bl func_80368994 +/* 8002EB6C 0002BAAC 48 33 9E 29 */ bl strcmp /* 8002EB70 0002BAB0 2C 03 00 00 */ cmpwi r3, 0 /* 8002EB74 0002BAB4 40 82 00 68 */ bne lbl_8002EBDC /* 8002EB78 0002BAB8 88 19 00 08 */ lbz r0, 8(r25) @@ -4322,7 +4322,7 @@ lbl_8002ECE0: /* 8002ECE4 0002BC24 48 19 79 49 */ bl dMenuFmap_getStartStageName /* 8002ECE8 0002BC28 7F BB FA 14 */ add r29, r27, r31 /* 8002ECEC 0002BC2C 7F A4 EB 78 */ mr r4, r29 -/* 8002ECF0 0002BC30 48 33 9C A5 */ bl func_80368994 +/* 8002ECF0 0002BC30 48 33 9C A5 */ bl strcmp /* 8002ECF4 0002BC34 2C 03 00 00 */ cmpwi r3, 0 /* 8002ECF8 0002BC38 40 82 00 54 */ bne lbl_8002ED4C /* 8002ECFC 0002BC3C 88 9D 00 08 */ lbz r4, 8(r29) @@ -5237,7 +5237,7 @@ lbl_8002F91C: /* 8002F92C 0002C86C 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002F930 0002C870 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002F934 0002C874 38 84 00 AD */ addi r4, r4, 0xad -/* 8002F938 0002C878 48 33 90 5D */ bl func_80368994 +/* 8002F938 0002C878 48 33 90 5D */ bl strcmp /* 8002F93C 0002C87C 2C 03 00 00 */ cmpwi r3, 0 /* 8002F940 0002C880 40 82 00 40 */ bne lbl_8002F980 /* 8002F944 0002C884 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -5260,7 +5260,7 @@ lbl_8002F980: /* 8002F984 0002C8C4 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002F988 0002C8C8 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002F98C 0002C8CC 38 84 00 AD */ addi r4, r4, 0xad -/* 8002F990 0002C8D0 48 33 90 05 */ bl func_80368994 +/* 8002F990 0002C8D0 48 33 90 05 */ bl strcmp /* 8002F994 0002C8D4 2C 03 00 00 */ cmpwi r3, 0 /* 8002F998 0002C8D8 40 82 00 3C */ bne lbl_8002F9D4 /* 8002F99C 0002C8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/asm/d/d_attention.s b/asm/d/d_attention.s index 808867880df..75c7f9ebc55 100644 --- a/asm/d/d_attention.s +++ b/asm/d/d_attention.s @@ -60,7 +60,7 @@ dAttParam_c: /* 800700DC 0006D01C 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 800700E0 0006D020 3C 80 80 38 */ lis r4, lbl_8037A770@ha /* 800700E4 0006D024 38 84 A7 70 */ addi r4, r4, lbl_8037A770@l -/* 800700E8 0006D028 48 2F 88 AD */ bl func_80368994 +/* 800700E8 0006D028 48 2F 88 AD */ bl strcmp /* 800700EC 0006D02C 7C 60 00 34 */ cntlzw r0, r3 /* 800700F0 0006D030 54 00 D9 7E */ srwi r0, r0, 5 /* 800700F4 0006D034 98 0D 89 D8 */ stb r0, lbl_80450F58-_SDA_BASE_(r13) diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index 6472a7a301a..4b867cafebb 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -786,7 +786,7 @@ dCamera_c_NS_initialize: /* 80160528 0015D468 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 8016052C 0015D46C 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160530 0015D470 38 84 00 0C */ addi r4, r4, 0xc -/* 80160534 0015D474 48 20 84 61 */ bl func_80368994 +/* 80160534 0015D474 48 20 84 61 */ bl strcmp /* 80160538 0015D478 2C 03 00 00 */ cmpwi r3, 0 /* 8016053C 0015D47C 40 82 00 10 */ bne lbl_8016054C /* 80160540 0015D480 38 00 00 68 */ li r0, 0x68 @@ -797,7 +797,7 @@ lbl_8016054C: /* 80160550 0015D490 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160554 0015D494 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160558 0015D498 38 84 00 14 */ addi r4, r4, 0x14 -/* 8016055C 0015D49C 48 20 84 39 */ bl func_80368994 +/* 8016055C 0015D49C 48 20 84 39 */ bl strcmp /* 80160560 0015D4A0 2C 03 00 00 */ cmpwi r3, 0 /* 80160564 0015D4A4 40 82 00 10 */ bne lbl_80160574 /* 80160568 0015D4A8 38 00 00 69 */ li r0, 0x69 @@ -808,7 +808,7 @@ lbl_80160574: /* 80160578 0015D4B8 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 8016057C 0015D4BC 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160580 0015D4C0 38 84 00 1C */ addi r4, r4, 0x1c -/* 80160584 0015D4C4 48 20 84 11 */ bl func_80368994 +/* 80160584 0015D4C4 48 20 84 11 */ bl strcmp /* 80160588 0015D4C8 2C 03 00 00 */ cmpwi r3, 0 /* 8016058C 0015D4CC 40 82 00 10 */ bne lbl_8016059C /* 80160590 0015D4D0 38 00 00 6A */ li r0, 0x6a @@ -819,7 +819,7 @@ lbl_8016059C: /* 801605A0 0015D4E0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801605A4 0015D4E4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801605A8 0015D4E8 38 84 00 24 */ addi r4, r4, 0x24 -/* 801605AC 0015D4EC 48 20 83 E9 */ bl func_80368994 +/* 801605AC 0015D4EC 48 20 83 E9 */ bl strcmp /* 801605B0 0015D4F0 2C 03 00 00 */ cmpwi r3, 0 /* 801605B4 0015D4F4 40 82 00 10 */ bne lbl_801605C4 /* 801605B8 0015D4F8 38 00 00 66 */ li r0, 0x66 @@ -830,7 +830,7 @@ lbl_801605C4: /* 801605C8 0015D508 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801605CC 0015D50C 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801605D0 0015D510 38 84 00 2C */ addi r4, r4, 0x2c -/* 801605D4 0015D514 48 20 83 C1 */ bl func_80368994 +/* 801605D4 0015D514 48 20 83 C1 */ bl strcmp /* 801605D8 0015D518 2C 03 00 00 */ cmpwi r3, 0 /* 801605DC 0015D51C 40 82 00 10 */ bne lbl_801605EC /* 801605E0 0015D520 38 00 00 65 */ li r0, 0x65 @@ -841,7 +841,7 @@ lbl_801605EC: /* 801605F0 0015D530 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801605F4 0015D534 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801605F8 0015D538 38 84 00 34 */ addi r4, r4, 0x34 -/* 801605FC 0015D53C 48 20 83 99 */ bl func_80368994 +/* 801605FC 0015D53C 48 20 83 99 */ bl strcmp /* 80160600 0015D540 2C 03 00 00 */ cmpwi r3, 0 /* 80160604 0015D544 40 82 00 0C */ bne lbl_80160610 /* 80160608 0015D548 38 00 00 6B */ li r0, 0x6b @@ -5595,7 +5595,7 @@ lbl_80164A0C: /* 80164A10 00161950 7C 60 D2 14 */ add r3, r0, r26 /* 80164A14 00161954 80 1C 06 84 */ lwz r0, 0x684(r28) /* 80164A18 00161958 7C 80 DA 14 */ add r4, r0, r27 -/* 80164A1C 0016195C 48 20 3F 79 */ bl func_80368994 +/* 80164A1C 0016195C 48 20 3F 79 */ bl strcmp /* 80164A20 00161960 2C 03 00 00 */ cmpwi r3, 0 /* 80164A24 00161964 41 82 00 18 */ beq lbl_80164A3C /* 80164A28 00161968 3B FF 00 01 */ addi r31, r31, 1 @@ -5700,7 +5700,7 @@ dCamera_c_NS_GetCameraTypeFromCameraName: /* 80164B88 00161AC8 80 1C 06 8C */ lwz r0, 0x68c(r28) /* 80164B8C 00161ACC 1C 00 00 44 */ mulli r0, r0, 0x44 /* 80164B90 00161AD0 7C 84 02 14 */ add r4, r4, r0 -/* 80164B94 00161AD4 48 20 3E 01 */ bl func_80368994 +/* 80164B94 00161AD4 48 20 3E 01 */ bl strcmp /* 80164B98 00161AD8 2C 03 00 00 */ cmpwi r3, 0 /* 80164B9C 00161ADC 40 82 00 0C */ bne lbl_80164BA8 /* 80164BA0 00161AE0 80 7C 06 8C */ lwz r3, 0x68c(r28) @@ -5713,7 +5713,7 @@ lbl_80164BB4: /* 80164BB4 00161AF4 7F A3 EB 78 */ mr r3, r29 /* 80164BB8 00161AF8 80 1C 06 84 */ lwz r0, 0x684(r28) /* 80164BBC 00161AFC 7C 80 FA 14 */ add r4, r0, r31 -/* 80164BC0 00161B00 48 20 3D D5 */ bl func_80368994 +/* 80164BC0 00161B00 48 20 3D D5 */ bl strcmp /* 80164BC4 00161B04 2C 03 00 00 */ cmpwi r3, 0 /* 80164BC8 00161B08 41 82 00 18 */ beq lbl_80164BE0 /* 80164BCC 00161B0C 3B DE 00 01 */ addi r30, r30, 1 diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index ebf7455fac5..d5de83f93ef 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -783,7 +783,7 @@ lbl_80038898: /* 800388A8 000357E8 7F E3 FB 78 */ mr r3, r31 /* 800388AC 000357EC 3C 80 80 38 */ lis r4, lbl_803797F8@ha /* 800388B0 000357F0 38 84 97 F8 */ addi r4, r4, lbl_803797F8@l -/* 800388B4 000357F4 48 33 00 E1 */ bl func_80368994 +/* 800388B4 000357F4 48 33 00 E1 */ bl strcmp /* 800388B8 000357F8 2C 03 00 00 */ cmpwi r3, 0 /* 800388BC 000357FC 41 82 00 4C */ beq lbl_80038908 /* 800388C0 00035800 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index a9cd0c9c0da..6c3d441375d 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -321,7 +321,7 @@ lbl_8019B198: /* 8019B1B4 001980F4 3C 80 80 39 */ lis r4, lbl_80394C28@ha /* 8019B1B8 001980F8 38 84 4C 28 */ addi r4, r4, lbl_80394C28@l /* 8019B1BC 001980FC 38 84 00 06 */ addi r4, r4, 6 -/* 8019B1C0 00198100 48 1C D7 D5 */ bl func_80368994 +/* 8019B1C0 00198100 48 1C D7 D5 */ bl strcmp /* 8019B1C4 00198104 2C 03 00 00 */ cmpwi r3, 0 /* 8019B1C8 00198108 40 82 00 2C */ bne lbl_8019B1F4 /* 8019B1CC 0019810C 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index f8950522a38..52044466612 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -33,7 +33,7 @@ lbl_8019C3CC: /* 8019C3DC 0019931C 7F E3 FB 78 */ mr r3, r31 /* 8019C3E0 00199320 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C3E4 00199324 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l -/* 8019C3E8 00199328 48 1C C5 AD */ bl func_80368994 +/* 8019C3E8 00199328 48 1C C5 AD */ bl strcmp /* 8019C3EC 0019932C 2C 03 00 00 */ cmpwi r3, 0 /* 8019C3F0 00199330 40 82 00 60 */ bne lbl_8019C450 /* 8019C3F4 00199334 3B C0 00 09 */ li r30, 9 @@ -65,7 +65,7 @@ lbl_8019C450: /* 8019C454 00199394 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C458 00199398 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C45C 0019939C 38 84 00 08 */ addi r4, r4, 8 -/* 8019C460 001993A0 48 1C C5 35 */ bl func_80368994 +/* 8019C460 001993A0 48 1C C5 35 */ bl strcmp /* 8019C464 001993A4 2C 03 00 00 */ cmpwi r3, 0 /* 8019C468 001993A8 40 82 00 20 */ bne lbl_8019C488 /* 8019C46C 001993AC 4B E9 14 CD */ bl dComIfGs_sense_type_change_Get @@ -81,7 +81,7 @@ lbl_8019C488: /* 8019C48C 001993CC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C490 001993D0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C494 001993D4 38 84 00 10 */ addi r4, r4, 0x10 -/* 8019C498 001993D8 48 1C C4 FD */ bl func_80368994 +/* 8019C498 001993D8 48 1C C4 FD */ bl strcmp /* 8019C49C 001993DC 2C 03 00 00 */ cmpwi r3, 0 /* 8019C4A0 001993E0 40 82 00 0C */ bne lbl_8019C4AC /* 8019C4A4 001993E4 3B C0 00 01 */ li r30, 1 @@ -91,7 +91,7 @@ lbl_8019C4AC: /* 8019C4B0 001993F0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C4B4 001993F4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C4B8 001993F8 38 84 00 17 */ addi r4, r4, 0x17 -/* 8019C4BC 001993FC 48 1C C4 D9 */ bl func_80368994 +/* 8019C4BC 001993FC 48 1C C4 D9 */ bl strcmp /* 8019C4C0 00199400 2C 03 00 00 */ cmpwi r3, 0 /* 8019C4C4 00199404 40 82 00 0C */ bne lbl_8019C4D0 /* 8019C4C8 00199408 3B C0 00 03 */ li r30, 3 @@ -101,7 +101,7 @@ lbl_8019C4D0: /* 8019C4D4 00199414 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C4D8 00199418 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C4DC 0019941C 38 84 00 1F */ addi r4, r4, 0x1f -/* 8019C4E0 00199420 48 1C C4 B5 */ bl func_80368994 +/* 8019C4E0 00199420 48 1C C4 B5 */ bl strcmp /* 8019C4E4 00199424 2C 03 00 00 */ cmpwi r3, 0 /* 8019C4E8 00199428 40 82 00 0C */ bne lbl_8019C4F4 /* 8019C4EC 0019942C 3B C0 00 06 */ li r30, 6 @@ -111,7 +111,7 @@ lbl_8019C4F4: /* 8019C4F8 00199438 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C4FC 0019943C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C500 00199440 38 84 00 27 */ addi r4, r4, 0x27 -/* 8019C504 00199444 48 1C C4 91 */ bl func_80368994 +/* 8019C504 00199444 48 1C C4 91 */ bl strcmp /* 8019C508 00199448 2C 03 00 00 */ cmpwi r3, 0 /* 8019C50C 0019944C 40 82 00 0C */ bne lbl_8019C518 /* 8019C510 00199450 3B C0 00 04 */ li r30, 4 @@ -189,14 +189,14 @@ lbl_8019C620: /* 8019C624 00199564 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C628 00199568 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C62C 0019956C 38 84 00 67 */ addi r4, r4, 0x67 -/* 8019C630 00199570 48 1C C3 65 */ bl func_80368994 +/* 8019C630 00199570 48 1C C3 65 */ bl strcmp /* 8019C634 00199574 2C 03 00 00 */ cmpwi r3, 0 /* 8019C638 00199578 41 82 00 20 */ beq lbl_8019C658 /* 8019C63C 0019957C 7F E3 FB 78 */ mr r3, r31 /* 8019C640 00199580 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C644 00199584 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C648 00199588 38 84 00 6F */ addi r4, r4, 0x6f -/* 8019C64C 0019958C 48 1C C3 49 */ bl func_80368994 +/* 8019C64C 0019958C 48 1C C3 49 */ bl strcmp /* 8019C650 00199590 2C 03 00 00 */ cmpwi r3, 0 /* 8019C654 00199594 40 82 00 0C */ bne lbl_8019C660 lbl_8019C658: @@ -207,7 +207,7 @@ lbl_8019C660: /* 8019C664 001995A4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C668 001995A8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C66C 001995AC 38 84 00 77 */ addi r4, r4, 0x77 -/* 8019C670 001995B0 48 1C C3 25 */ bl func_80368994 +/* 8019C670 001995B0 48 1C C3 25 */ bl strcmp /* 8019C674 001995B4 2C 03 00 00 */ cmpwi r3, 0 /* 8019C678 001995B8 40 82 00 0C */ bne lbl_8019C684 /* 8019C67C 001995BC 3B C0 00 0F */ li r30, 0xf @@ -217,7 +217,7 @@ lbl_8019C684: /* 8019C688 001995C8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C68C 001995CC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C690 001995D0 38 84 00 7F */ addi r4, r4, 0x7f -/* 8019C694 001995D4 48 1C C3 01 */ bl func_80368994 +/* 8019C694 001995D4 48 1C C3 01 */ bl strcmp /* 8019C698 001995D8 2C 03 00 00 */ cmpwi r3, 0 /* 8019C69C 001995DC 40 82 00 38 */ bne lbl_8019C6D4 /* 8019C6A0 001995E0 3B C0 00 08 */ li r30, 8 @@ -240,7 +240,7 @@ lbl_8019C6D4: /* 8019C6D8 00199618 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C6DC 0019961C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C6E0 00199620 38 84 00 86 */ addi r4, r4, 0x86 -/* 8019C6E4 00199624 48 1C C2 B1 */ bl func_80368994 +/* 8019C6E4 00199624 48 1C C2 B1 */ bl strcmp /* 8019C6E8 00199628 2C 03 00 00 */ cmpwi r3, 0 /* 8019C6EC 0019962C 40 82 00 0C */ bne lbl_8019C6F8 /* 8019C6F0 00199630 3B C0 00 04 */ li r30, 4 @@ -250,14 +250,14 @@ lbl_8019C6F8: /* 8019C6FC 0019963C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C700 00199640 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C704 00199644 38 84 00 8E */ addi r4, r4, 0x8e -/* 8019C708 00199648 48 1C C2 8D */ bl func_80368994 +/* 8019C708 00199648 48 1C C2 8D */ bl strcmp /* 8019C70C 0019964C 2C 03 00 00 */ cmpwi r3, 0 /* 8019C710 00199650 41 82 00 40 */ beq lbl_8019C750 /* 8019C714 00199654 7F E3 FB 78 */ mr r3, r31 /* 8019C718 00199658 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C71C 0019965C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C720 00199660 38 84 00 95 */ addi r4, r4, 0x95 -/* 8019C724 00199664 48 1C C2 71 */ bl func_80368994 +/* 8019C724 00199664 48 1C C2 71 */ bl strcmp /* 8019C728 00199668 2C 03 00 00 */ cmpwi r3, 0 /* 8019C72C 0019966C 41 82 00 24 */ beq lbl_8019C750 /* 8019C730 00199670 7F E3 FB 78 */ mr r3, r31 @@ -274,7 +274,7 @@ lbl_8019C750: /* 8019C758 00199698 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C75C 0019969C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C760 001996A0 38 84 00 8E */ addi r4, r4, 0x8e -/* 8019C764 001996A4 48 1C C2 31 */ bl func_80368994 +/* 8019C764 001996A4 48 1C C2 31 */ bl strcmp /* 8019C768 001996A8 2C 03 00 00 */ cmpwi r3, 0 /* 8019C76C 001996AC 40 82 03 84 */ bne lbl_8019CAF0 /* 8019C770 001996B0 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -287,21 +287,21 @@ lbl_8019C784: /* 8019C788 001996C8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C78C 001996CC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C790 001996D0 38 84 00 A4 */ addi r4, r4, 0xa4 -/* 8019C794 001996D4 48 1C C2 01 */ bl func_80368994 +/* 8019C794 001996D4 48 1C C2 01 */ bl strcmp /* 8019C798 001996D8 2C 03 00 00 */ cmpwi r3, 0 /* 8019C79C 001996DC 41 82 00 3C */ beq lbl_8019C7D8 /* 8019C7A0 001996E0 7F E3 FB 78 */ mr r3, r31 /* 8019C7A4 001996E4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C7A8 001996E8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C7AC 001996EC 38 84 00 AC */ addi r4, r4, 0xac -/* 8019C7B0 001996F0 48 1C C1 E5 */ bl func_80368994 +/* 8019C7B0 001996F0 48 1C C1 E5 */ bl strcmp /* 8019C7B4 001996F4 2C 03 00 00 */ cmpwi r3, 0 /* 8019C7B8 001996F8 41 82 00 20 */ beq lbl_8019C7D8 /* 8019C7BC 001996FC 7F E3 FB 78 */ mr r3, r31 /* 8019C7C0 00199700 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C7C4 00199704 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C7C8 00199708 38 84 00 B4 */ addi r4, r4, 0xb4 -/* 8019C7CC 0019970C 48 1C C1 C9 */ bl func_80368994 +/* 8019C7CC 0019970C 48 1C C1 C9 */ bl strcmp /* 8019C7D0 00199710 2C 03 00 00 */ cmpwi r3, 0 /* 8019C7D4 00199714 40 82 00 0C */ bne lbl_8019C7E0 lbl_8019C7D8: @@ -320,14 +320,14 @@ lbl_8019C7E0: /* 8019C804 00199744 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C808 00199748 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C80C 0019974C 38 84 00 C3 */ addi r4, r4, 0xc3 -/* 8019C810 00199750 48 1C C1 85 */ bl func_80368994 +/* 8019C810 00199750 48 1C C1 85 */ bl strcmp /* 8019C814 00199754 2C 03 00 00 */ cmpwi r3, 0 /* 8019C818 00199758 41 82 00 B0 */ beq lbl_8019C8C8 /* 8019C81C 0019975C 7F E3 FB 78 */ mr r3, r31 /* 8019C820 00199760 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C824 00199764 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C828 00199768 38 84 00 CA */ addi r4, r4, 0xca -/* 8019C82C 0019976C 48 1C C1 69 */ bl func_80368994 +/* 8019C82C 0019976C 48 1C C1 69 */ bl strcmp /* 8019C830 00199770 2C 03 00 00 */ cmpwi r3, 0 /* 8019C834 00199774 41 82 00 94 */ beq lbl_8019C8C8 /* 8019C838 00199778 7F E3 FB 78 */ mr r3, r31 @@ -342,28 +342,28 @@ lbl_8019C7E0: /* 8019C85C 0019979C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C860 001997A0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C864 001997A4 38 84 00 D9 */ addi r4, r4, 0xd9 -/* 8019C868 001997A8 48 1C C1 2D */ bl func_80368994 +/* 8019C868 001997A8 48 1C C1 2D */ bl strcmp /* 8019C86C 001997AC 2C 03 00 00 */ cmpwi r3, 0 /* 8019C870 001997B0 41 82 00 58 */ beq lbl_8019C8C8 /* 8019C874 001997B4 7F E3 FB 78 */ mr r3, r31 /* 8019C878 001997B8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C87C 001997BC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C880 001997C0 38 84 00 E1 */ addi r4, r4, 0xe1 -/* 8019C884 001997C4 48 1C C1 11 */ bl func_80368994 +/* 8019C884 001997C4 48 1C C1 11 */ bl strcmp /* 8019C888 001997C8 2C 03 00 00 */ cmpwi r3, 0 /* 8019C88C 001997CC 41 82 00 3C */ beq lbl_8019C8C8 /* 8019C890 001997D0 7F E3 FB 78 */ mr r3, r31 /* 8019C894 001997D4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C898 001997D8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C89C 001997DC 38 84 00 E9 */ addi r4, r4, 0xe9 -/* 8019C8A0 001997E0 48 1C C0 F5 */ bl func_80368994 +/* 8019C8A0 001997E0 48 1C C0 F5 */ bl strcmp /* 8019C8A4 001997E4 2C 03 00 00 */ cmpwi r3, 0 /* 8019C8A8 001997E8 41 82 00 20 */ beq lbl_8019C8C8 /* 8019C8AC 001997EC 7F E3 FB 78 */ mr r3, r31 /* 8019C8B0 001997F0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C8B4 001997F4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C8B8 001997F8 38 84 00 F0 */ addi r4, r4, 0xf0 -/* 8019C8BC 001997FC 48 1C C0 D9 */ bl func_80368994 +/* 8019C8BC 001997FC 48 1C C0 D9 */ bl strcmp /* 8019C8C0 00199800 2C 03 00 00 */ cmpwi r3, 0 /* 8019C8C4 00199804 40 82 00 0C */ bne lbl_8019C8D0 lbl_8019C8C8: @@ -374,7 +374,7 @@ lbl_8019C8D0: /* 8019C8D4 00199814 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C8D8 00199818 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C8DC 0019981C 38 84 00 F8 */ addi r4, r4, 0xf8 -/* 8019C8E0 00199820 48 1C C0 B5 */ bl func_80368994 +/* 8019C8E0 00199820 48 1C C0 B5 */ bl strcmp /* 8019C8E4 00199824 2C 03 00 00 */ cmpwi r3, 0 /* 8019C8E8 00199828 40 82 00 0C */ bne lbl_8019C8F4 /* 8019C8EC 0019982C 3B C0 00 0E */ li r30, 0xe @@ -415,49 +415,49 @@ lbl_8019C964: /* 8019C968 001998A8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C96C 001998AC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C970 001998B0 38 84 01 15 */ addi r4, r4, 0x115 -/* 8019C974 001998B4 48 1C C0 21 */ bl func_80368994 +/* 8019C974 001998B4 48 1C C0 21 */ bl strcmp /* 8019C978 001998B8 2C 03 00 00 */ cmpwi r3, 0 /* 8019C97C 001998BC 41 82 00 AC */ beq lbl_8019CA28 /* 8019C980 001998C0 7F E3 FB 78 */ mr r3, r31 /* 8019C984 001998C4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C988 001998C8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C98C 001998CC 38 84 01 1C */ addi r4, r4, 0x11c -/* 8019C990 001998D0 48 1C C0 05 */ bl func_80368994 +/* 8019C990 001998D0 48 1C C0 05 */ bl strcmp /* 8019C994 001998D4 2C 03 00 00 */ cmpwi r3, 0 /* 8019C998 001998D8 41 82 00 90 */ beq lbl_8019CA28 /* 8019C99C 001998DC 7F E3 FB 78 */ mr r3, r31 /* 8019C9A0 001998E0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C9A4 001998E4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C9A8 001998E8 38 84 01 24 */ addi r4, r4, 0x124 -/* 8019C9AC 001998EC 48 1C BF E9 */ bl func_80368994 +/* 8019C9AC 001998EC 48 1C BF E9 */ bl strcmp /* 8019C9B0 001998F0 2C 03 00 00 */ cmpwi r3, 0 /* 8019C9B4 001998F4 41 82 00 74 */ beq lbl_8019CA28 /* 8019C9B8 001998F8 7F E3 FB 78 */ mr r3, r31 /* 8019C9BC 001998FC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C9C0 00199900 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C9C4 00199904 38 84 01 2C */ addi r4, r4, 0x12c -/* 8019C9C8 00199908 48 1C BF CD */ bl func_80368994 +/* 8019C9C8 00199908 48 1C BF CD */ bl strcmp /* 8019C9CC 0019990C 2C 03 00 00 */ cmpwi r3, 0 /* 8019C9D0 00199910 41 82 00 58 */ beq lbl_8019CA28 /* 8019C9D4 00199914 7F E3 FB 78 */ mr r3, r31 /* 8019C9D8 00199918 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C9DC 0019991C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C9E0 00199920 38 84 01 34 */ addi r4, r4, 0x134 -/* 8019C9E4 00199924 48 1C BF B1 */ bl func_80368994 +/* 8019C9E4 00199924 48 1C BF B1 */ bl strcmp /* 8019C9E8 00199928 2C 03 00 00 */ cmpwi r3, 0 /* 8019C9EC 0019992C 41 82 00 3C */ beq lbl_8019CA28 /* 8019C9F0 00199930 7F E3 FB 78 */ mr r3, r31 /* 8019C9F4 00199934 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019C9F8 00199938 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C9FC 0019993C 38 84 01 3C */ addi r4, r4, 0x13c -/* 8019CA00 00199940 48 1C BF 95 */ bl func_80368994 +/* 8019CA00 00199940 48 1C BF 95 */ bl strcmp /* 8019CA04 00199944 2C 03 00 00 */ cmpwi r3, 0 /* 8019CA08 00199948 41 82 00 20 */ beq lbl_8019CA28 /* 8019CA0C 0019994C 7F E3 FB 78 */ mr r3, r31 /* 8019CA10 00199950 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019CA14 00199954 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019CA18 00199958 38 84 01 44 */ addi r4, r4, 0x144 -/* 8019CA1C 0019995C 48 1C BF 79 */ bl func_80368994 +/* 8019CA1C 0019995C 48 1C BF 79 */ bl strcmp /* 8019CA20 00199960 2C 03 00 00 */ cmpwi r3, 0 /* 8019CA24 00199964 40 82 00 38 */ bne lbl_8019CA5C lbl_8019CA28: @@ -466,7 +466,7 @@ lbl_8019CA28: /* 8019CA30 00199970 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019CA34 00199974 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019CA38 00199978 38 84 01 15 */ addi r4, r4, 0x115 -/* 8019CA3C 0019997C 48 1C BF 59 */ bl func_80368994 +/* 8019CA3C 0019997C 48 1C BF 59 */ bl strcmp /* 8019CA40 00199980 2C 03 00 00 */ cmpwi r3, 0 /* 8019CA44 00199984 40 82 00 AC */ bne lbl_8019CAF0 /* 8019CA48 00199988 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -479,21 +479,21 @@ lbl_8019CA5C: /* 8019CA60 001999A0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019CA64 001999A4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019CA68 001999A8 38 84 01 4C */ addi r4, r4, 0x14c -/* 8019CA6C 001999AC 48 1C BF 29 */ bl func_80368994 +/* 8019CA6C 001999AC 48 1C BF 29 */ bl strcmp /* 8019CA70 001999B0 2C 03 00 00 */ cmpwi r3, 0 /* 8019CA74 001999B4 41 82 00 3C */ beq lbl_8019CAB0 /* 8019CA78 001999B8 7F E3 FB 78 */ mr r3, r31 /* 8019CA7C 001999BC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019CA80 001999C0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019CA84 001999C4 38 84 01 54 */ addi r4, r4, 0x154 -/* 8019CA88 001999C8 48 1C BF 0D */ bl func_80368994 +/* 8019CA88 001999C8 48 1C BF 0D */ bl strcmp /* 8019CA8C 001999CC 2C 03 00 00 */ cmpwi r3, 0 /* 8019CA90 001999D0 41 82 00 20 */ beq lbl_8019CAB0 /* 8019CA94 001999D4 7F E3 FB 78 */ mr r3, r31 /* 8019CA98 001999D8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019CA9C 001999DC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019CAA0 001999E0 38 84 01 5C */ addi r4, r4, 0x15c -/* 8019CAA4 001999E4 48 1C BE F1 */ bl func_80368994 +/* 8019CAA4 001999E4 48 1C BE F1 */ bl strcmp /* 8019CAA8 001999E8 2C 03 00 00 */ cmpwi r3, 0 /* 8019CAAC 001999EC 40 82 00 0C */ bne lbl_8019CAB8 lbl_8019CAB0: @@ -504,7 +504,7 @@ lbl_8019CAB8: /* 8019CABC 001999FC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019CAC0 00199A00 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019CAC4 00199A04 38 84 01 64 */ addi r4, r4, 0x164 -/* 8019CAC8 00199A08 48 1C BE CD */ bl func_80368994 +/* 8019CAC8 00199A08 48 1C BE CD */ bl strcmp /* 8019CACC 00199A0C 2C 03 00 00 */ cmpwi r3, 0 /* 8019CAD0 00199A10 40 82 00 20 */ bne lbl_8019CAF0 /* 8019CAD4 00199A14 3B C0 00 0C */ li r30, 0xc @@ -1832,7 +1832,7 @@ dKy_light_influence_id: /* 8019DDBC 0019ACFC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019DDC0 0019AD00 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019DDC4 0019AD04 38 84 01 6C */ addi r4, r4, 0x16c -/* 8019DDC8 0019AD08 48 1C AB CD */ bl func_80368994 +/* 8019DDC8 0019AD08 48 1C AB CD */ bl strcmp /* 8019DDCC 0019AD0C 2C 03 00 00 */ cmpwi r3, 0 /* 8019DDD0 0019AD10 40 82 00 08 */ bne lbl_8019DDD8 /* 8019DDD4 0019AD14 C3 C2 A2 78 */ lfs f30, lbl_80453C78-_SDA2_BASE_(r2) @@ -2025,7 +2025,7 @@ lbl_8019E044: /* 8019E058 0019AF98 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019E05C 0019AF9C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019E060 0019AFA0 38 84 00 2F */ addi r4, r4, 0x2f -/* 8019E064 0019AFA4 48 1C A9 31 */ bl func_80368994 +/* 8019E064 0019AFA4 48 1C A9 31 */ bl strcmp /* 8019E068 0019AFA8 2C 03 00 00 */ cmpwi r3, 0 /* 8019E06C 0019AFAC 40 82 00 30 */ bne lbl_8019E09C /* 8019E070 0019AFB0 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -2873,7 +2873,7 @@ dKy_light_size_get: lbl_8019EC08: /* 8019EC08 0019BB48 7F A3 EB 78 */ mr r3, r29 /* 8019EC0C 0019BB4C 80 9F 00 00 */ lwz r4, 0(r31) -/* 8019EC10 0019BB50 48 1C 9D 85 */ bl func_80368994 +/* 8019EC10 0019BB50 48 1C 9D 85 */ bl strcmp /* 8019EC14 0019BB54 2C 03 00 00 */ cmpwi r3, 0 /* 8019EC18 0019BB58 40 82 00 18 */ bne lbl_8019EC30 /* 8019EC1C 0019BB5C 88 1F 00 04 */ lbz r0, 4(r31) @@ -2892,7 +2892,7 @@ lbl_8019EC44: lbl_8019EC48: /* 8019EC48 0019BB88 7F A3 EB 78 */ mr r3, r29 /* 8019EC4C 0019BB8C 80 9E 00 00 */ lwz r4, 0(r30) -/* 8019EC50 0019BB90 48 1C 9D 45 */ bl func_80368994 +/* 8019EC50 0019BB90 48 1C 9D 45 */ bl strcmp /* 8019EC54 0019BB94 2C 03 00 00 */ cmpwi r3, 0 /* 8019EC58 0019BB98 40 82 00 18 */ bne lbl_8019EC70 /* 8019EC5C 0019BB9C 88 1E 00 04 */ lbz r0, 4(r30) @@ -3022,7 +3022,7 @@ envcolor_init: /* 8019EE38 0019BD78 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019EE3C 0019BD7C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019EE40 0019BD80 38 84 01 5C */ addi r4, r4, 0x15c -/* 8019EE44 0019BD84 48 1C 9B 51 */ bl func_80368994 +/* 8019EE44 0019BD84 48 1C 9B 51 */ bl strcmp /* 8019EE48 0019BD88 2C 03 00 00 */ cmpwi r3, 0 /* 8019EE4C 0019BD8C 40 82 00 0C */ bne lbl_8019EE58 /* 8019EE50 0019BD90 C0 02 A2 A0 */ lfs f0, lbl_80453CA0-_SDA2_BASE_(r2) @@ -3089,14 +3089,14 @@ lbl_8019EF00: /* 8019EF38 0019BE78 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019EF3C 0019BE7C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019EF40 0019BE80 38 84 01 7A */ addi r4, r4, 0x17a -/* 8019EF44 0019BE84 48 1C 9A 51 */ bl func_80368994 +/* 8019EF44 0019BE84 48 1C 9A 51 */ bl strcmp /* 8019EF48 0019BE88 2C 03 00 00 */ cmpwi r3, 0 /* 8019EF4C 0019BE8C 41 82 00 20 */ beq lbl_8019EF6C /* 8019EF50 0019BE90 7F E3 FB 78 */ mr r3, r31 /* 8019EF54 0019BE94 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019EF58 0019BE98 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019EF5C 0019BE9C 38 84 01 5C */ addi r4, r4, 0x15c -/* 8019EF60 0019BEA0 48 1C 9A 35 */ bl func_80368994 +/* 8019EF60 0019BEA0 48 1C 9A 35 */ bl strcmp /* 8019EF64 0019BEA4 2C 03 00 00 */ cmpwi r3, 0 /* 8019EF68 0019BEA8 40 82 00 38 */ bne lbl_8019EFA0 lbl_8019EF6C: @@ -3119,7 +3119,7 @@ lbl_8019EFA0: /* 8019EFA4 0019BEE4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019EFA8 0019BEE8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019EFAC 0019BEEC 38 84 00 6F */ addi r4, r4, 0x6f -/* 8019EFB0 0019BEF0 48 1C 99 E5 */ bl func_80368994 +/* 8019EFB0 0019BEF0 48 1C 99 E5 */ bl strcmp /* 8019EFB4 0019BEF4 2C 03 00 00 */ cmpwi r3, 0 /* 8019EFB8 0019BEF8 40 82 00 38 */ bne lbl_8019EFF0 /* 8019EFBC 0019BEFC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -3576,14 +3576,14 @@ lbl_8019F578: /* 8019F5B8 0019C4F8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019F5BC 0019C4FC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019F5C0 0019C500 38 84 01 7A */ addi r4, r4, 0x17a -/* 8019F5C4 0019C504 48 1C 93 D1 */ bl func_80368994 +/* 8019F5C4 0019C504 48 1C 93 D1 */ bl strcmp /* 8019F5C8 0019C508 2C 03 00 00 */ cmpwi r3, 0 /* 8019F5CC 0019C50C 41 82 00 20 */ beq lbl_8019F5EC /* 8019F5D0 0019C510 7F A3 EB 78 */ mr r3, r29 /* 8019F5D4 0019C514 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019F5D8 0019C518 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019F5DC 0019C51C 38 84 01 5C */ addi r4, r4, 0x15c -/* 8019F5E0 0019C520 48 1C 93 B5 */ bl func_80368994 +/* 8019F5E0 0019C520 48 1C 93 B5 */ bl strcmp /* 8019F5E4 0019C524 2C 03 00 00 */ cmpwi r3, 0 /* 8019F5E8 0019C528 40 82 00 78 */ bne lbl_8019F660 lbl_8019F5EC: @@ -3722,7 +3722,7 @@ dScnKy_env_light_c_NS_setSunpos: /* 8019F7C8 0019C708 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019F7CC 0019C70C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019F7D0 0019C710 38 84 01 82 */ addi r4, r4, 0x182 -/* 8019F7D4 0019C714 48 1C 91 C1 */ bl func_80368994 +/* 8019F7D4 0019C714 48 1C 91 C1 */ bl strcmp /* 8019F7D8 0019C718 2C 03 00 00 */ cmpwi r3, 0 /* 8019F7DC 0019C71C 41 82 02 04 */ beq lbl_8019F9E0 /* 8019F7E0 0019C720 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4134,14 +4134,14 @@ lbl_8019FD90: /* 8019FDB4 0019CCF4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019FDB8 0019CCF8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019FDBC 0019CCFC 38 84 01 8A */ addi r4, r4, 0x18a -/* 8019FDC0 0019CD00 48 1C 8B D5 */ bl func_80368994 +/* 8019FDC0 0019CD00 48 1C 8B D5 */ bl strcmp /* 8019FDC4 0019CD04 2C 03 00 00 */ cmpwi r3, 0 /* 8019FDC8 0019CD08 41 82 00 44 */ beq lbl_8019FE0C /* 8019FDCC 0019CD0C 7E 83 A3 78 */ mr r3, r20 /* 8019FDD0 0019CD10 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019FDD4 0019CD14 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019FDD8 0019CD18 38 84 00 F8 */ addi r4, r4, 0xf8 -/* 8019FDDC 0019CD1C 48 1C 8B B9 */ bl func_80368994 +/* 8019FDDC 0019CD1C 48 1C 8B B9 */ bl strcmp /* 8019FDE0 0019CD20 2C 03 00 00 */ cmpwi r3, 0 /* 8019FDE4 0019CD24 41 82 00 28 */ beq lbl_8019FE0C /* 8019FDE8 0019CD28 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4161,7 +4161,7 @@ lbl_8019FE0C: /* 8019FE18 0019CD58 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 8019FE1C 0019CD5C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019FE20 0019CD60 38 84 01 5C */ addi r4, r4, 0x15c -/* 8019FE24 0019CD64 48 1C 8B 71 */ bl func_80368994 +/* 8019FE24 0019CD64 48 1C 8B 71 */ bl strcmp /* 8019FE28 0019CD68 2C 03 00 00 */ cmpwi r3, 0 /* 8019FE2C 0019CD6C 40 82 00 2C */ bne lbl_8019FE58 /* 8019FE30 0019CD70 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4343,7 +4343,7 @@ lbl_801A0084: /* 801A0090 0019CFD0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A0094 0019CFD4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A0098 0019CFD8 38 84 01 92 */ addi r4, r4, 0x192 -/* 801A009C 0019CFDC 48 1C 88 F9 */ bl func_80368994 +/* 801A009C 0019CFDC 48 1C 88 F9 */ bl strcmp /* 801A00A0 0019CFE0 2C 03 00 00 */ cmpwi r3, 0 /* 801A00A4 0019CFE4 40 82 00 24 */ bne lbl_801A00C8 /* 801A00A8 0019CFE8 88 77 00 00 */ lbz r3, 0(r23) @@ -4376,14 +4376,14 @@ lbl_801A00F0: /* 801A010C 0019D04C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A0110 0019D050 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A0114 0019D054 38 84 01 8A */ addi r4, r4, 0x18a -/* 801A0118 0019D058 48 1C 88 7D */ bl func_80368994 +/* 801A0118 0019D058 48 1C 88 7D */ bl strcmp /* 801A011C 0019D05C 2C 03 00 00 */ cmpwi r3, 0 /* 801A0120 0019D060 41 82 00 5C */ beq lbl_801A017C /* 801A0124 0019D064 7E 03 83 78 */ mr r3, r16 /* 801A0128 0019D068 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A012C 0019D06C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A0130 0019D070 38 84 00 F8 */ addi r4, r4, 0xf8 -/* 801A0134 0019D074 48 1C 88 61 */ bl func_80368994 +/* 801A0134 0019D074 48 1C 88 61 */ bl strcmp /* 801A0138 0019D078 2C 03 00 00 */ cmpwi r3, 0 /* 801A013C 0019D07C 41 82 00 40 */ beq lbl_801A017C /* 801A0140 0019D080 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4409,7 +4409,7 @@ lbl_801A017C: /* 801A0188 0019D0C8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A018C 0019D0CC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A0190 0019D0D0 38 84 01 5C */ addi r4, r4, 0x15c -/* 801A0194 0019D0D4 48 1C 88 01 */ bl func_80368994 +/* 801A0194 0019D0D4 48 1C 88 01 */ bl strcmp /* 801A0198 0019D0D8 2C 03 00 00 */ cmpwi r3, 0 /* 801A019C 0019D0DC 40 82 00 38 */ bne lbl_801A01D4 /* 801A01A0 0019D0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4756,14 +4756,14 @@ lbl_801A0660: /* 801A066C 0019D5AC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A0670 0019D5B0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A0674 0019D5B4 38 84 01 5C */ addi r4, r4, 0x15c -/* 801A0678 0019D5B8 48 1C 83 1D */ bl func_80368994 +/* 801A0678 0019D5B8 48 1C 83 1D */ bl strcmp /* 801A067C 0019D5BC 2C 03 00 00 */ cmpwi r3, 0 /* 801A0680 0019D5C0 41 82 00 6C */ beq lbl_801A06EC /* 801A0684 0019D5C4 7D C3 73 78 */ mr r3, r14 /* 801A0688 0019D5C8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A068C 0019D5CC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A0690 0019D5D0 38 84 01 7A */ addi r4, r4, 0x17a -/* 801A0694 0019D5D4 48 1C 83 01 */ bl func_80368994 +/* 801A0694 0019D5D4 48 1C 83 01 */ bl strcmp /* 801A0698 0019D5D8 2C 03 00 00 */ cmpwi r3, 0 /* 801A069C 0019D5DC 41 82 00 50 */ beq lbl_801A06EC lbl_801A06A0: @@ -6760,7 +6760,7 @@ lbl_801A23DC: /* 801A23E8 0019F328 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A23EC 0019F32C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A23F0 0019F330 38 84 00 CA */ addi r4, r4, 0xca -/* 801A23F4 0019F334 48 1C 65 A1 */ bl func_80368994 +/* 801A23F4 0019F334 48 1C 65 A1 */ bl strcmp /* 801A23F8 0019F338 2C 03 00 00 */ cmpwi r3, 0 /* 801A23FC 0019F33C 40 82 04 58 */ bne lbl_801A2854 lbl_801A2400: @@ -6829,7 +6829,7 @@ lbl_801A24C0: /* 801A24F4 0019F434 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A24F8 0019F438 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A24FC 0019F43C 38 84 00 CA */ addi r4, r4, 0xca -/* 801A2500 0019F440 48 1C 64 95 */ bl func_80368994 +/* 801A2500 0019F440 48 1C 64 95 */ bl strcmp /* 801A2504 0019F444 2C 03 00 00 */ cmpwi r3, 0 /* 801A2508 0019F448 40 82 00 98 */ bne lbl_801A25A0 /* 801A250C 0019F44C 38 60 00 00 */ li r3, 0 @@ -8672,7 +8672,7 @@ lbl_801A3F24: /* 801A3F7C 001A0EBC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A3F80 001A0EC0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A3F84 001A0EC4 38 84 01 92 */ addi r4, r4, 0x192 -/* 801A3F88 001A0EC8 48 1C 4A 0D */ bl func_80368994 +/* 801A3F88 001A0EC8 48 1C 4A 0D */ bl strcmp /* 801A3F8C 001A0ECC 2C 03 00 00 */ cmpwi r3, 0 /* 801A3F90 001A0ED0 40 82 00 10 */ bne lbl_801A3FA0 /* 801A3F94 001A0ED4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -10245,7 +10245,7 @@ lbl_801A5630: /* 801A563C 001A257C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A5640 001A2580 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A5644 001A2584 38 84 01 5C */ addi r4, r4, 0x15c -/* 801A5648 001A2588 48 1C 33 4D */ bl func_80368994 +/* 801A5648 001A2588 48 1C 33 4D */ bl strcmp /* 801A564C 001A258C 2C 03 00 00 */ cmpwi r3, 0 /* 801A5650 001A2590 40 82 00 74 */ bne lbl_801A56C4 /* 801A5654 001A2594 4B FD BF ED */ bl dCam_getBody @@ -14312,7 +14312,7 @@ lbl_801A9008: /* 801A900C 001A5F4C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A9010 001A5F50 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A9014 001A5F54 38 84 00 27 */ addi r4, r4, 0x27 -/* 801A9018 001A5F58 48 1B F9 7D */ bl func_80368994 +/* 801A9018 001A5F58 48 1B F9 7D */ bl strcmp /* 801A901C 001A5F5C 2C 03 00 00 */ cmpwi r3, 0 /* 801A9020 001A5F60 40 82 03 B0 */ bne lbl_801A93D0 /* 801A9024 001A5F64 56 60 06 3E */ clrlwi r0, r19, 0x18 @@ -15237,7 +15237,7 @@ dKy_BossLight_set: /* 801A9DC0 001A6D00 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A9DC4 001A6D04 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A9DC8 001A6D08 38 84 02 49 */ addi r4, r4, 0x249 -/* 801A9DCC 001A6D0C 48 1B EB C9 */ bl func_80368994 +/* 801A9DCC 001A6D0C 48 1B EB C9 */ bl strcmp /* 801A9DD0 001A6D10 2C 03 00 00 */ cmpwi r3, 0 /* 801A9DD4 001A6D14 41 82 00 58 */ beq lbl_801A9E2C /* 801A9DD8 001A6D18 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) @@ -15362,7 +15362,7 @@ lbl_801A9F58: /* 801A9F84 001A6EC4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801A9F88 001A6EC8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A9F8C 001A6ECC 38 84 01 0E */ addi r4, r4, 0x10e -/* 801A9F90 001A6ED0 48 1B EA 05 */ bl func_80368994 +/* 801A9F90 001A6ED0 48 1B EA 05 */ bl strcmp /* 801A9F94 001A6ED4 2C 03 00 00 */ cmpwi r3, 0 /* 801A9F98 001A6ED8 40 82 03 10 */ bne lbl_801AA2A8 /* 801A9F9C 001A6EDC C0 1B 00 D8 */ lfs f0, 0xd8(r27) @@ -16373,7 +16373,7 @@ dKy_twilight_camelight_set: /* 801AAD84 001A7CC4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AAD88 001A7CC8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AAD8C 001A7CCC 38 84 01 44 */ addi r4, r4, 0x144 -/* 801AAD90 001A7CD0 48 1B DC 05 */ bl func_80368994 +/* 801AAD90 001A7CD0 48 1B DC 05 */ bl strcmp /* 801AAD94 001A7CD4 2C 03 00 00 */ cmpwi r3, 0 /* 801AAD98 001A7CD8 40 82 00 24 */ bne lbl_801AADBC /* 801AAD9C 001A7CDC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -16571,20 +16571,20 @@ dKy_WaterIn_Light_set: /* 801AB058 001A7F98 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB05C 001A7F9C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB060 001A7FA0 38 84 02 51 */ addi r4, r4, 0x251 -/* 801AB064 001A7FA4 48 1B D9 31 */ bl func_80368994 +/* 801AB064 001A7FA4 48 1B D9 31 */ bl strcmp /* 801AB068 001A7FA8 2C 03 00 00 */ cmpwi r3, 0 /* 801AB06C 001A7FAC 41 82 00 38 */ beq lbl_801AB0A4 /* 801AB070 001A7FB0 7F A3 EB 78 */ mr r3, r29 /* 801AB074 001A7FB4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB078 001A7FB8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l -/* 801AB07C 001A7FBC 48 1B D9 19 */ bl func_80368994 +/* 801AB07C 001A7FBC 48 1B D9 19 */ bl strcmp /* 801AB080 001A7FC0 2C 03 00 00 */ cmpwi r3, 0 /* 801AB084 001A7FC4 41 82 00 20 */ beq lbl_801AB0A4 /* 801AB088 001A7FC8 7F A3 EB 78 */ mr r3, r29 /* 801AB08C 001A7FCC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB090 001A7FD0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB094 001A7FD4 38 84 02 59 */ addi r4, r4, 0x259 -/* 801AB098 001A7FD8 48 1B D8 FD */ bl func_80368994 +/* 801AB098 001A7FD8 48 1B D8 FD */ bl strcmp /* 801AB09C 001A7FDC 2C 03 00 00 */ cmpwi r3, 0 /* 801AB0A0 001A7FE0 40 82 00 08 */ bne lbl_801AB0A8 lbl_801AB0A4: @@ -16638,7 +16638,7 @@ lbl_801AB118: /* 801AB150 001A8090 38 84 00 F8 */ addi r4, r4, 0xf8 /* 801AB154 001A8094 3B DF 0C 28 */ addi r30, r31, 0xc28 /* 801AB158 001A8098 3B BF 0C 30 */ addi r29, r31, 0xc30 -/* 801AB15C 001A809C 48 1B D8 39 */ bl func_80368994 +/* 801AB15C 001A809C 48 1B D8 39 */ bl strcmp /* 801AB160 001A80A0 2C 03 00 00 */ cmpwi r3, 0 /* 801AB164 001A80A4 40 82 00 9C */ bne lbl_801AB200 /* 801AB168 001A80A8 38 61 00 14 */ addi r3, r1, 0x14 @@ -16757,7 +16757,7 @@ lbl_801AB2CC: /* 801AB2E4 001A8224 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB2E8 001A8228 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB2EC 001A822C 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB2F0 001A8230 48 1B D6 A5 */ bl func_80368994 +/* 801AB2F0 001A8230 48 1B D6 A5 */ bl strcmp /* 801AB2F4 001A8234 2C 03 00 00 */ cmpwi r3, 0 /* 801AB2F8 001A8238 40 82 00 28 */ bne lbl_801AB320 /* 801AB2FC 001A823C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -16774,7 +16774,7 @@ lbl_801AB320: /* 801AB324 001A8264 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB328 001A8268 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB32C 001A826C 38 84 02 61 */ addi r4, r4, 0x261 -/* 801AB330 001A8270 48 1B D6 65 */ bl func_80368994 +/* 801AB330 001A8270 48 1B D6 65 */ bl strcmp /* 801AB334 001A8274 2C 03 00 00 */ cmpwi r3, 0 /* 801AB338 001A8278 40 82 00 2C */ bne lbl_801AB364 /* 801AB33C 001A827C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -16836,7 +16836,7 @@ lbl_801AB3E4: /* 801AB3FC 001A833C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB400 001A8340 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB404 001A8344 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB408 001A8348 48 1B D5 8D */ bl func_80368994 +/* 801AB408 001A8348 48 1B D5 8D */ bl strcmp /* 801AB40C 001A834C 2C 03 00 00 */ cmpwi r3, 0 /* 801AB410 001A8350 40 82 00 28 */ bne lbl_801AB438 /* 801AB414 001A8354 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -16853,7 +16853,7 @@ lbl_801AB438: /* 801AB43C 001A837C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB440 001A8380 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB444 001A8384 38 84 02 61 */ addi r4, r4, 0x261 -/* 801AB448 001A8388 48 1B D5 4D */ bl func_80368994 +/* 801AB448 001A8388 48 1B D5 4D */ bl strcmp /* 801AB44C 001A838C 2C 03 00 00 */ cmpwi r3, 0 /* 801AB450 001A8390 40 82 00 2C */ bne lbl_801AB47C /* 801AB454 001A8394 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -16914,7 +16914,7 @@ lbl_801AB4FC: /* 801AB510 001A8450 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB514 001A8454 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB518 001A8458 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB51C 001A845C 48 1B D4 79 */ bl func_80368994 +/* 801AB51C 001A845C 48 1B D4 79 */ bl strcmp /* 801AB520 001A8460 2C 03 00 00 */ cmpwi r3, 0 /* 801AB524 001A8464 40 82 00 24 */ bne lbl_801AB548 /* 801AB528 001A8468 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -16978,7 +16978,7 @@ lbl_801AB5D8: /* 801AB5EC 001A852C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB5F0 001A8530 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB5F4 001A8534 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB5F8 001A8538 48 1B D3 9D */ bl func_80368994 +/* 801AB5F8 001A8538 48 1B D3 9D */ bl strcmp /* 801AB5FC 001A853C 2C 03 00 00 */ cmpwi r3, 0 /* 801AB600 001A8540 40 82 00 24 */ bne lbl_801AB624 /* 801AB604 001A8544 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17041,7 +17041,7 @@ lbl_801AB6B0: /* 801AB6C8 001A8608 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB6CC 001A860C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB6D0 001A8610 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB6D4 001A8614 48 1B D2 C1 */ bl func_80368994 +/* 801AB6D4 001A8614 48 1B D2 C1 */ bl strcmp /* 801AB6D8 001A8618 2C 03 00 00 */ cmpwi r3, 0 /* 801AB6DC 001A861C 40 82 00 28 */ bne lbl_801AB704 /* 801AB6E0 001A8620 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17058,7 +17058,7 @@ lbl_801AB704: /* 801AB708 001A8648 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB70C 001A864C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB710 001A8650 38 84 02 61 */ addi r4, r4, 0x261 -/* 801AB714 001A8654 48 1B D2 81 */ bl func_80368994 +/* 801AB714 001A8654 48 1B D2 81 */ bl strcmp /* 801AB718 001A8658 2C 03 00 00 */ cmpwi r3, 0 /* 801AB71C 001A865C 40 82 00 2C */ bne lbl_801AB748 /* 801AB720 001A8660 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17142,7 +17142,7 @@ lbl_801AB818: /* 801AB830 001A8770 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB834 001A8774 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB838 001A8778 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB83C 001A877C 48 1B D1 59 */ bl func_80368994 +/* 801AB83C 001A877C 48 1B D1 59 */ bl strcmp /* 801AB840 001A8780 2C 03 00 00 */ cmpwi r3, 0 /* 801AB844 001A8784 40 82 00 28 */ bne lbl_801AB86C /* 801AB848 001A8788 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17159,7 +17159,7 @@ lbl_801AB86C: /* 801AB870 001A87B0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB874 001A87B4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB878 001A87B8 38 84 02 61 */ addi r4, r4, 0x261 -/* 801AB87C 001A87BC 48 1B D1 19 */ bl func_80368994 +/* 801AB87C 001A87BC 48 1B D1 19 */ bl strcmp /* 801AB880 001A87C0 2C 03 00 00 */ cmpwi r3, 0 /* 801AB884 001A87C4 40 82 00 2C */ bne lbl_801AB8B0 /* 801AB888 001A87C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17244,7 +17244,7 @@ lbl_801AB984: /* 801AB99C 001A88DC 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB9A0 001A88E0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB9A4 001A88E4 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB9A8 001A88E8 48 1B CF ED */ bl func_80368994 +/* 801AB9A8 001A88E8 48 1B CF ED */ bl strcmp /* 801AB9AC 001A88EC 2C 03 00 00 */ cmpwi r3, 0 /* 801AB9B0 001A88F0 40 82 00 28 */ bne lbl_801AB9D8 /* 801AB9B4 001A88F4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17261,7 +17261,7 @@ lbl_801AB9D8: /* 801AB9DC 001A891C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AB9E0 001A8920 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AB9E4 001A8924 38 84 02 61 */ addi r4, r4, 0x261 -/* 801AB9E8 001A8928 48 1B CF AD */ bl func_80368994 +/* 801AB9E8 001A8928 48 1B CF AD */ bl strcmp /* 801AB9EC 001A892C 2C 03 00 00 */ cmpwi r3, 0 /* 801AB9F0 001A8930 40 82 00 2C */ bne lbl_801ABA1C /* 801AB9F4 001A8934 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17345,7 +17345,7 @@ lbl_801ABAEC: /* 801ABB04 001A8A44 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABB08 001A8A48 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABB0C 001A8A4C 38 84 01 7A */ addi r4, r4, 0x17a -/* 801ABB10 001A8A50 48 1B CE 85 */ bl func_80368994 +/* 801ABB10 001A8A50 48 1B CE 85 */ bl strcmp /* 801ABB14 001A8A54 2C 03 00 00 */ cmpwi r3, 0 /* 801ABB18 001A8A58 40 82 00 28 */ bne lbl_801ABB40 /* 801ABB1C 001A8A5C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17362,7 +17362,7 @@ lbl_801ABB40: /* 801ABB44 001A8A84 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABB48 001A8A88 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABB4C 001A8A8C 38 84 02 61 */ addi r4, r4, 0x261 -/* 801ABB50 001A8A90 48 1B CE 45 */ bl func_80368994 +/* 801ABB50 001A8A90 48 1B CE 45 */ bl strcmp /* 801ABB54 001A8A94 2C 03 00 00 */ cmpwi r3, 0 /* 801ABB58 001A8A98 40 82 00 2C */ bne lbl_801ABB84 /* 801ABB5C 001A8A9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17444,7 +17444,7 @@ lbl_801ABC4C: /* 801ABC64 001A8BA4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABC68 001A8BA8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABC6C 001A8BAC 38 84 01 7A */ addi r4, r4, 0x17a -/* 801ABC70 001A8BB0 48 1B CD 25 */ bl func_80368994 +/* 801ABC70 001A8BB0 48 1B CD 25 */ bl strcmp /* 801ABC74 001A8BB4 2C 03 00 00 */ cmpwi r3, 0 /* 801ABC78 001A8BB8 40 82 00 28 */ bne lbl_801ABCA0 /* 801ABC7C 001A8BBC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17461,7 +17461,7 @@ lbl_801ABCA0: /* 801ABCA4 001A8BE4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABCA8 001A8BE8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABCAC 001A8BEC 38 84 02 61 */ addi r4, r4, 0x261 -/* 801ABCB0 001A8BF0 48 1B CC E5 */ bl func_80368994 +/* 801ABCB0 001A8BF0 48 1B CC E5 */ bl strcmp /* 801ABCB4 001A8BF4 2C 03 00 00 */ cmpwi r3, 0 /* 801ABCB8 001A8BF8 40 82 00 2C */ bne lbl_801ABCE4 /* 801ABCBC 001A8BFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17534,7 +17534,7 @@ lbl_801ABD88: /* 801ABDA0 001A8CE0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABDA4 001A8CE4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABDA8 001A8CE8 38 84 01 7A */ addi r4, r4, 0x17a -/* 801ABDAC 001A8CEC 48 1B CB E9 */ bl func_80368994 +/* 801ABDAC 001A8CEC 48 1B CB E9 */ bl strcmp /* 801ABDB0 001A8CF0 2C 03 00 00 */ cmpwi r3, 0 /* 801ABDB4 001A8CF4 40 82 00 28 */ bne lbl_801ABDDC /* 801ABDB8 001A8CF8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17551,7 +17551,7 @@ lbl_801ABDDC: /* 801ABDE0 001A8D20 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABDE4 001A8D24 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABDE8 001A8D28 38 84 02 61 */ addi r4, r4, 0x261 -/* 801ABDEC 001A8D2C 48 1B CB A9 */ bl func_80368994 +/* 801ABDEC 001A8D2C 48 1B CB A9 */ bl strcmp /* 801ABDF0 001A8D30 2C 03 00 00 */ cmpwi r3, 0 /* 801ABDF4 001A8D34 40 82 00 2C */ bne lbl_801ABE20 /* 801ABDF8 001A8D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17632,7 +17632,7 @@ lbl_801ABEE4: /* 801ABEFC 001A8E3C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABF00 001A8E40 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABF04 001A8E44 38 84 01 7A */ addi r4, r4, 0x17a -/* 801ABF08 001A8E48 48 1B CA 8D */ bl func_80368994 +/* 801ABF08 001A8E48 48 1B CA 8D */ bl strcmp /* 801ABF0C 001A8E4C 2C 03 00 00 */ cmpwi r3, 0 /* 801ABF10 001A8E50 40 82 00 28 */ bne lbl_801ABF38 /* 801ABF14 001A8E54 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17649,7 +17649,7 @@ lbl_801ABF38: /* 801ABF3C 001A8E7C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ABF40 001A8E80 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ABF44 001A8E84 38 84 02 61 */ addi r4, r4, 0x261 -/* 801ABF48 001A8E88 48 1B CA 4D */ bl func_80368994 +/* 801ABF48 001A8E88 48 1B CA 4D */ bl strcmp /* 801ABF4C 001A8E8C 2C 03 00 00 */ cmpwi r3, 0 /* 801ABF50 001A8E90 40 82 00 2C */ bne lbl_801ABF7C /* 801ABF54 001A8E94 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17722,7 +17722,7 @@ lbl_801AC020: /* 801AC038 001A8F78 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AC03C 001A8F7C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC040 001A8F80 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AC044 001A8F84 48 1B C9 51 */ bl func_80368994 +/* 801AC044 001A8F84 48 1B C9 51 */ bl strcmp /* 801AC048 001A8F88 2C 03 00 00 */ cmpwi r3, 0 /* 801AC04C 001A8F8C 40 82 00 28 */ bne lbl_801AC074 /* 801AC050 001A8F90 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -17739,7 +17739,7 @@ lbl_801AC074: /* 801AC078 001A8FB8 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AC07C 001A8FBC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC080 001A8FC0 38 84 02 61 */ addi r4, r4, 0x261 -/* 801AC084 001A8FC4 48 1B C9 11 */ bl func_80368994 +/* 801AC084 001A8FC4 48 1B C9 11 */ bl strcmp /* 801AC088 001A8FC8 2C 03 00 00 */ cmpwi r3, 0 /* 801AC08C 001A8FCC 40 82 00 2C */ bne lbl_801AC0B8 /* 801AC090 001A8FD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17845,7 +17845,7 @@ dKy_SunMoon_Light_Check: /* 801AC1F0 001A9130 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AC1F4 001A9134 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC1F8 001A9138 38 84 01 82 */ addi r4, r4, 0x182 -/* 801AC1FC 001A913C 48 1B C7 99 */ bl func_80368994 +/* 801AC1FC 001A913C 48 1B C7 99 */ bl strcmp /* 801AC200 001A9140 2C 03 00 00 */ cmpwi r3, 0 /* 801AC204 001A9144 41 82 00 08 */ beq lbl_801AC20C /* 801AC208 001A9148 3B C0 00 01 */ li r30, 1 @@ -18141,7 +18141,7 @@ lbl_801AC5FC: /* 801AC600 001A9540 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AC604 001A9544 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC608 001A9548 38 84 01 92 */ addi r4, r4, 0x192 -/* 801AC60C 001A954C 48 1B C3 89 */ bl func_80368994 +/* 801AC60C 001A954C 48 1B C3 89 */ bl strcmp /* 801AC610 001A9550 2C 03 00 00 */ cmpwi r3, 0 /* 801AC614 001A9554 40 82 00 6C */ bne lbl_801AC680 /* 801AC618 001A9558 2C 1B 00 00 */ cmpwi r27, 0 @@ -18181,7 +18181,7 @@ lbl_801AC680: /* 801AC684 001A95C4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AC688 001A95C8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC68C 001A95CC 38 84 02 69 */ addi r4, r4, 0x269 -/* 801AC690 001A95D0 48 1B C3 05 */ bl func_80368994 +/* 801AC690 001A95D0 48 1B C3 05 */ bl strcmp /* 801AC694 001A95D4 2C 03 00 00 */ cmpwi r3, 0 /* 801AC698 001A95D8 40 82 00 24 */ bne lbl_801AC6BC /* 801AC69C 001A95DC 2C 1B 00 01 */ cmpwi r27, 1 @@ -18233,7 +18233,7 @@ lbl_801AC73C: /* 801AC73C 001A967C 7F 23 CB 78 */ mr r3, r25 /* 801AC740 001A9680 7F BE FA 14 */ add r29, r30, r31 /* 801AC744 001A9684 80 9D 00 00 */ lwz r4, 0(r29) -/* 801AC748 001A9688 48 1B C2 4D */ bl func_80368994 +/* 801AC748 001A9688 48 1B C2 4D */ bl strcmp /* 801AC74C 001A968C 2C 03 00 00 */ cmpwi r3, 0 /* 801AC750 001A9690 40 82 00 64 */ bne lbl_801AC7B4 /* 801AC754 001A9694 88 1D 00 04 */ lbz r0, 4(r29) @@ -18292,7 +18292,7 @@ dKy_darkworld_spot_check: lbl_801AC80C: /* 801AC80C 001A974C 7F 63 DB 78 */ mr r3, r27 /* 801AC810 001A9750 80 9F 00 00 */ lwz r4, 0(r31) -/* 801AC814 001A9754 48 1B C1 81 */ bl func_80368994 +/* 801AC814 001A9754 48 1B C1 81 */ bl strcmp /* 801AC818 001A9758 2C 03 00 00 */ cmpwi r3, 0 /* 801AC81C 001A975C 40 82 00 28 */ bne lbl_801AC844 /* 801AC820 001A9760 7F 63 DB 78 */ mr r3, r27 @@ -18334,7 +18334,7 @@ dKy_darkworld_Area_set: lbl_801AC89C: /* 801AC89C 001A97DC 7F 63 DB 78 */ mr r3, r27 /* 801AC8A0 001A97E0 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 801AC8A4 001A97E4 48 1B C0 F1 */ bl func_80368994 +/* 801AC8A4 001A97E4 48 1B C0 F1 */ bl strcmp /* 801AC8A8 001A97E8 2C 03 00 00 */ cmpwi r3, 0 /* 801AC8AC 001A97EC 40 82 00 44 */ bne lbl_801AC8F0 /* 801AC8B0 001A97F0 7F 63 DB 78 */ mr r3, r27 @@ -18465,7 +18465,7 @@ lbl_801ACA74: /* 801ACA80 001A99C0 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ACA84 001A99C4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ACA88 001A99C8 38 84 02 61 */ addi r4, r4, 0x261 -/* 801ACA8C 001A99CC 48 1B BF 09 */ bl func_80368994 +/* 801ACA8C 001A99CC 48 1B BF 09 */ bl strcmp /* 801ACA90 001A99D0 2C 03 00 00 */ cmpwi r3, 0 /* 801ACA94 001A99D4 40 82 01 E0 */ bne lbl_801ACC74 /* 801ACA98 001A99D8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha diff --git a/asm/d/d_kyeff.s b/asm/d/d_kyeff.s index 86e955fba00..2ca785978cf 100644 --- a/asm/d/d_kyeff.s +++ b/asm/d/d_kyeff.s @@ -23,7 +23,7 @@ dKyeff_c_NS_execute: /* 801ADD70 001AACB0 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801ADD74 001AACB4 3C 80 80 39 */ lis r4, lbl_80394F38@ha /* 801ADD78 001AACB8 38 84 4F 38 */ addi r4, r4, lbl_80394F38@l -/* 801ADD7C 001AACBC 48 1B AC 19 */ bl func_80368994 +/* 801ADD7C 001AACBC 48 1B AC 19 */ bl strcmp /* 801ADD80 001AACC0 2C 03 00 00 */ cmpwi r3, 0 /* 801ADD84 001AACC4 41 82 00 08 */ beq lbl_801ADD8C /* 801ADD88 001AACC8 4B EA A5 71 */ bl dKyw_wether_move @@ -66,7 +66,7 @@ lbl_801ADD8C: /* 801ADE18 001AAD58 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801ADE1C 001AAD5C 3C 80 80 39 */ lis r4, lbl_80394F38@ha /* 801ADE20 001AAD60 38 84 4F 38 */ addi r4, r4, lbl_80394F38@l -/* 801ADE24 001AAD64 48 1B AB 71 */ bl func_80368994 +/* 801ADE24 001AAD64 48 1B AB 71 */ bl strcmp /* 801ADE28 001AAD68 2C 03 00 00 */ cmpwi r3, 0 /* 801ADE2C 001AAD6C 40 82 00 60 */ bne lbl_801ADE8C /* 801ADE30 001AAD70 48 19 48 CD */ bl OSGetTime diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 247dde77f66..d37e2457bdd 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -2198,7 +2198,7 @@ lbl_8002A408: /* 8002A440 00027380 3C 80 80 38 */ lis r4, lbl_80378F24@ha /* 8002A444 00027384 38 84 8F 24 */ addi r4, r4, lbl_80378F24@l /* 8002A448 00027388 38 84 00 07 */ addi r4, r4, 7 -/* 8002A44C 0002738C 48 33 E5 49 */ bl func_80368994 +/* 8002A44C 0002738C 48 33 E5 49 */ bl strcmp /* 8002A450 00027390 2C 03 00 00 */ cmpwi r3, 0 /* 8002A454 00027394 40 82 00 6C */ bne lbl_8002A4C0 /* 8002A458 00027398 C0 82 82 E4 */ lfs f4, lbl_80451CE4-_SDA2_BASE_(r2) diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index dbcf2acffef..28040126ef7 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -43,7 +43,7 @@ lbl_8021EA84: /* 8021EA98 0021B9D8 38 7B 4E 00 */ addi r3, r27, 0x4e00 /* 8021EA9C 0021B9DC 3C 80 80 3A */ lis r4, lbl_80399338@ha /* 8021EAA0 0021B9E0 38 84 93 38 */ addi r4, r4, lbl_80399338@l -/* 8021EAA4 0021B9E4 48 14 9E F1 */ bl func_80368994 +/* 8021EAA4 0021B9E4 48 14 9E F1 */ bl strcmp /* 8021EAA8 0021B9E8 2C 03 00 00 */ cmpwi r3, 0 /* 8021EAAC 0021B9EC 40 82 00 18 */ bne lbl_8021EAC4 /* 8021EAB0 0021B9F0 38 00 00 00 */ li r0, 0 @@ -5498,13 +5498,13 @@ lbl_80223838: /* 80223850 00220790 3C 80 80 3A */ lis r4, lbl_80399338@ha /* 80223854 00220794 38 84 93 38 */ addi r4, r4, lbl_80399338@l /* 80223858 00220798 38 84 00 07 */ addi r4, r4, 7 -/* 8022385C 0022079C 48 14 51 39 */ bl func_80368994 +/* 8022385C 0022079C 48 14 51 39 */ bl strcmp /* 80223860 002207A0 2C 03 00 00 */ cmpwi r3, 0 /* 80223864 002207A4 41 82 00 7C */ beq lbl_802238E0 /* 80223868 002207A8 7F C3 F3 78 */ mr r3, r30 /* 8022386C 002207AC 3C 80 80 3A */ lis r4, lbl_80399338@ha /* 80223870 002207B0 38 84 93 38 */ addi r4, r4, lbl_80399338@l -/* 80223874 002207B4 48 14 51 21 */ bl func_80368994 +/* 80223874 002207B4 48 14 51 21 */ bl strcmp /* 80223878 002207B8 2C 03 00 00 */ cmpwi r3, 0 /* 8022387C 002207BC 40 82 00 14 */ bne lbl_80223890 /* 80223880 002207C0 38 60 00 00 */ li r3, 0 @@ -7068,7 +7068,7 @@ lbl_80224E6C: /* 80224E78 00221DB8 3C 80 80 3A */ lis r4, lbl_80399338@ha /* 80224E7C 00221DBC 38 84 93 38 */ addi r4, r4, lbl_80399338@l /* 80224E80 00221DC0 38 84 00 0F */ addi r4, r4, 0xf -/* 80224E84 00221DC4 48 14 3B 11 */ bl func_80368994 +/* 80224E84 00221DC4 48 14 3B 11 */ bl strcmp /* 80224E88 00221DC8 2C 03 00 00 */ cmpwi r3, 0 /* 80224E8C 00221DCC 40 82 00 30 */ bne lbl_80224EBC /* 80224E90 00221DD0 88 1E 4F AD */ lbz r0, 0x4fad(r30) diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index 2aae86cd18a..91dbd88ae3e 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -21,7 +21,7 @@ dStage_nextStage_c_NS_set: /* 80023E5C 00020D9C 7F E3 FB 78 */ mr r3, r31 /* 80023E60 00020DA0 3C 80 80 38 */ lis r4, lbl_80378A50@ha /* 80023E64 00020DA4 38 84 8A 50 */ addi r4, r4, lbl_80378A50@l -/* 80023E68 00020DA8 48 34 4B 2D */ bl func_80368994 +/* 80023E68 00020DA8 48 34 4B 2D */ bl strcmp /* 80023E6C 00020DAC 2C 03 00 00 */ cmpwi r3, 0 /* 80023E70 00020DB0 40 82 00 10 */ bne lbl_80023E80 /* 80023E74 00020DB4 38 00 00 01 */ li r0, 1 @@ -859,7 +859,7 @@ lbl_80024988: /* 8002498C 000218CC 4B FF FF B5 */ bl dStage_roomControl_c_NS_getArcBank /* 80024990 000218D0 7C 7C 1B 78 */ mr r28, r3 /* 80024994 000218D4 38 9F 00 9F */ addi r4, r31, 0x9f -/* 80024998 000218D8 48 34 3F FD */ bl func_80368994 +/* 80024998 000218D8 48 34 3F FD */ bl strcmp /* 8002499C 000218DC 2C 03 00 00 */ cmpwi r3, 0 /* 800249A0 000218E0 41 82 00 6C */ beq lbl_80024A0C /* 800249A4 000218E4 7F 83 E3 78 */ mr r3, r28 @@ -1176,7 +1176,7 @@ dStage_searchName: lbl_80024DE8: /* 80024DE8 00021D28 7F E3 FB 78 */ mr r3, r31 /* 80024DEC 00021D2C 7F A4 EB 78 */ mr r4, r29 -/* 80024DF0 00021D30 48 34 3B A5 */ bl func_80368994 +/* 80024DF0 00021D30 48 34 3B A5 */ bl strcmp /* 80024DF4 00021D34 2C 03 00 00 */ cmpwi r3, 0 /* 80024DF8 00021D38 40 82 00 0C */ bne lbl_80024E04 /* 80024DFC 00021D3C 7F E3 FB 78 */ mr r3, r31 @@ -1503,7 +1503,7 @@ lbl_80025208: /* 80025274 000221B4 3C 80 80 38 */ lis r4, lbl_80378A50@ha /* 80025278 000221B8 38 84 8A 50 */ addi r4, r4, lbl_80378A50@l /* 8002527C 000221BC 38 84 00 DB */ addi r4, r4, 0xdb -/* 80025280 000221C0 48 34 37 15 */ bl func_80368994 +/* 80025280 000221C0 48 34 37 15 */ bl strcmp /* 80025284 000221C4 2C 03 00 00 */ cmpwi r3, 0 /* 80025288 000221C8 41 82 00 14 */ beq lbl_8002529C /* 8002528C 000221CC 38 60 03 16 */ li r3, 0x316 @@ -3452,7 +3452,7 @@ lbl_80026E34: /* 80026E90 00023DD0 41 82 00 18 */ beq lbl_80026EA8 /* 80026E94 00023DD4 38 7F 4E 0E */ addi r3, r31, 0x4e0e /* 80026E98 00023DD8 38 9F 4E 00 */ addi r4, r31, 0x4e00 -/* 80026E9C 00023DDC 48 34 1A F9 */ bl func_80368994 +/* 80026E9C 00023DDC 48 34 1A F9 */ bl strcmp /* 80026EA0 00023DE0 2C 03 00 00 */ cmpwi r3, 0 /* 80026EA4 00023DE4 41 82 00 C4 */ beq lbl_80026F68 lbl_80026EA8: diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 9cc3c406320..6c620d7c437 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -4896,7 +4896,7 @@ lbl_80261080: /* 80261084 0025DFC4 3C 80 80 3A */ lis r4, lbl_8039A3D8@ha /* 80261088 0025DFC8 38 84 A3 D8 */ addi r4, r4, lbl_8039A3D8@l /* 8026108C 0025DFCC 38 84 00 A4 */ addi r4, r4, 0xa4 -/* 80261090 0025DFD0 48 10 79 05 */ bl func_80368994 +/* 80261090 0025DFD0 48 10 79 05 */ bl strcmp /* 80261094 0025DFD4 2C 03 00 00 */ cmpwi r3, 0 /* 80261098 0025DFD8 41 82 00 18 */ beq lbl_802610B0 /* 8026109C 0025DFDC 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 49a436f9ee1..7f8c764fa3e 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -185,7 +185,7 @@ lbl_80088C4C: /* 80088C58 00085B98 41 82 00 30 */ beq lbl_80088C88 /* 80088C5C 00085B9C 38 63 05 14 */ addi r3, r3, 0x514 /* 80088C60 00085BA0 7F 84 E3 78 */ mr r4, r28 -/* 80088C64 00085BA4 48 2D FD 31 */ bl func_80368994 +/* 80088C64 00085BA4 48 2D FD 31 */ bl strcmp /* 80088C68 00085BA8 2C 03 00 00 */ cmpwi r3, 0 /* 80088C6C 00085BAC 40 82 00 0C */ bne lbl_80088C78 /* 80088C70 00085BB0 3B A0 00 01 */ li r29, 1 @@ -14843,7 +14843,7 @@ lbl_800964CC: /* 800964D8 00093418 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 800964DC 0009341C 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 800964E0 00093420 38 84 02 20 */ addi r4, r4, 0x220 -/* 800964E4 00093424 48 2D 24 B1 */ bl func_80368994 +/* 800964E4 00093424 48 2D 24 B1 */ bl strcmp /* 800964E8 00093428 2C 03 00 00 */ cmpwi r3, 0 /* 800964EC 0009342C 40 82 00 0C */ bne lbl_800964F8 /* 800964F0 00093430 38 00 00 00 */ li r0, 0 diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index 6af52b06f81..9bbad7baff0 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -76,7 +76,7 @@ getStartTelopNo: /* 80043810 00040750 3B E3 5F 5C */ addi r31, r3, 0x5f5c /* 80043814 00040754 7F A3 EB 78 */ mr r3, r29 /* 80043818 00040758 7F E4 FB 78 */ mr r4, r31 -/* 8004381C 0004075C 48 32 51 79 */ bl func_80368994 +/* 8004381C 0004075C 48 32 51 79 */ bl strcmp /* 80043820 00040760 2C 03 00 00 */ cmpwi r3, 0 /* 80043824 00040764 40 82 00 10 */ bne lbl_80043834 /* 80043828 00040768 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -1934,7 +1934,7 @@ lbl_80045204: /* 80045208 00042148 3C 80 80 38 */ lis r4, lbl_80379DD0@ha /* 8004520C 0004214C 38 84 9D D0 */ addi r4, r4, lbl_80379DD0@l /* 80045210 00042150 38 84 00 EC */ addi r4, r4, 0xec -/* 80045214 00042154 48 32 37 81 */ bl func_80368994 +/* 80045214 00042154 48 32 37 81 */ bl strcmp /* 80045218 00042158 2C 03 00 00 */ cmpwi r3, 0 /* 8004521C 0004215C 40 82 00 14 */ bne lbl_80045230 /* 80045220 00042160 80 19 05 70 */ lwz r0, 0x570(r25) @@ -1946,7 +1946,7 @@ lbl_80045230: /* 80045234 00042174 3C 80 80 38 */ lis r4, lbl_80379DD0@ha /* 80045238 00042178 38 84 9D D0 */ addi r4, r4, lbl_80379DD0@l /* 8004523C 0004217C 38 84 00 FA */ addi r4, r4, 0xfa -/* 80045240 00042180 48 32 37 55 */ bl func_80368994 +/* 80045240 00042180 48 32 37 55 */ bl strcmp /* 80045244 00042184 2C 03 00 00 */ cmpwi r3, 0 /* 80045248 00042188 40 82 04 5C */ bne lbl_800456A4 /* 8004524C 0004218C 80 19 05 70 */ lwz r0, 0x570(r25) diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index 32554ee3404..efaf8a0afc2 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -1361,7 +1361,7 @@ lbl_80047628: /* 80047628 00044568 80 1A 00 04 */ lwz r0, 4(r26) /* 8004762C 0004456C 7C 80 DA 14 */ add r4, r0, r27 /* 80047630 00044570 7F C3 F3 78 */ mr r3, r30 -/* 80047634 00044574 48 32 13 61 */ bl func_80368994 +/* 80047634 00044574 48 32 13 61 */ bl strcmp /* 80047638 00044578 2C 03 00 00 */ cmpwi r3, 0 /* 8004763C 0004457C 40 82 00 18 */ bne lbl_80047654 /* 80047640 00044580 7F 23 07 34 */ extsh r3, r25 @@ -1547,7 +1547,7 @@ lbl_800478C0: /* 800478C0 00044800 80 16 00 04 */ lwz r0, 4(r22) /* 800478C4 00044804 7C 80 C2 14 */ add r4, r0, r24 /* 800478C8 00044808 7F 83 E3 78 */ mr r3, r28 -/* 800478CC 0004480C 48 32 10 C9 */ bl func_80368994 +/* 800478CC 0004480C 48 32 10 C9 */ bl strcmp /* 800478D0 00044810 2C 03 00 00 */ cmpwi r3, 0 /* 800478D4 00044814 40 82 00 18 */ bne lbl_800478EC /* 800478D8 00044818 7E E3 07 34 */ extsh r3, r23 @@ -1807,7 +1807,7 @@ lbl_80047BD4: lbl_80047C3C: /* 80047C3C 00044B7C 7E C3 B3 78 */ mr r3, r22 /* 80047C40 00044B80 38 81 00 08 */ addi r4, r1, 8 -/* 80047C44 00044B84 48 32 0D 51 */ bl func_80368994 +/* 80047C44 00044B84 48 32 0D 51 */ bl strcmp /* 80047C48 00044B88 2C 03 00 00 */ cmpwi r3, 0 /* 80047C4C 00044B8C 40 82 00 88 */ bne lbl_80047CD4 /* 80047C50 00044B90 2C 17 00 00 */ cmpwi r23, 0 @@ -1856,14 +1856,14 @@ lbl_80047CD4: /* 80047CD8 00044C18 3C 80 80 38 */ lis r4, lbl_80379F60@ha /* 80047CDC 00044C1C 38 84 9F 60 */ addi r4, r4, lbl_80379F60@l /* 80047CE0 00044C20 38 84 01 5F */ addi r4, r4, 0x15f -/* 80047CE4 00044C24 48 32 0C B1 */ bl func_80368994 +/* 80047CE4 00044C24 48 32 0C B1 */ bl strcmp /* 80047CE8 00044C28 2C 03 00 00 */ cmpwi r3, 0 /* 80047CEC 00044C2C 40 82 00 34 */ bne lbl_80047D20 /* 80047CF0 00044C30 3C 60 80 38 */ lis r3, lbl_80379F60@ha /* 80047CF4 00044C34 38 63 9F 60 */ addi r3, r3, lbl_80379F60@l /* 80047CF8 00044C38 38 63 01 65 */ addi r3, r3, 0x165 /* 80047CFC 00044C3C 38 81 00 08 */ addi r4, r1, 8 -/* 80047D00 00044C40 48 32 0C 95 */ bl func_80368994 +/* 80047D00 00044C40 48 32 0C 95 */ bl strcmp /* 80047D04 00044C44 2C 03 00 00 */ cmpwi r3, 0 /* 80047D08 00044C48 40 82 00 18 */ bne lbl_80047D20 /* 80047D0C 00044C4C 80 1C 00 20 */ lwz r0, 0x20(r28) @@ -2024,7 +2024,7 @@ lbl_80047EE0: lbl_80047F08: /* 80047F08 00044E48 7C 7D E0 2E */ lwzx r3, r29, r28 /* 80047F0C 00044E4C 7F 24 CB 78 */ mr r4, r25 -/* 80047F10 00044E50 48 32 0A 85 */ bl func_80368994 +/* 80047F10 00044E50 48 32 0A 85 */ bl strcmp /* 80047F14 00044E54 2C 03 00 00 */ cmpwi r3, 0 /* 80047F18 00044E58 40 82 00 10 */ bne lbl_80047F28 /* 80047F1C 00044E5C 93 5B 00 3C */ stw r26, 0x3c(r27) @@ -2146,7 +2146,7 @@ lbl_80048090: /* 800480A4 00044FE4 7F A3 02 14 */ add r29, r3, r0 /* 800480A8 00044FE8 7F E3 FB 78 */ mr r3, r31 /* 800480AC 00044FEC 7F A4 EB 78 */ mr r4, r29 -/* 800480B0 00044FF0 48 32 08 E5 */ bl func_80368994 +/* 800480B0 00044FF0 48 32 08 E5 */ bl strcmp /* 800480B4 00044FF4 2C 03 00 00 */ cmpwi r3, 0 /* 800480B8 00044FF8 40 82 00 0C */ bne lbl_800480C4 /* 800480BC 00044FFC 7F A3 EB 78 */ mr r3, r29 @@ -2317,7 +2317,7 @@ dEvent_manager_c_NS_issueStaff: /* 800482E4 00045224 3C 80 80 38 */ lis r4, lbl_80379F60@ha /* 800482E8 00045228 38 84 9F 60 */ addi r4, r4, lbl_80379F60@l /* 800482EC 0004522C 38 84 01 4B */ addi r4, r4, 0x14b -/* 800482F0 00045230 48 32 06 A5 */ bl func_80368994 +/* 800482F0 00045230 48 32 06 A5 */ bl strcmp /* 800482F4 00045234 2C 03 00 00 */ cmpwi r3, 0 /* 800482F8 00045238 40 82 00 18 */ bne lbl_80048310 .global extraOnObjectCallBack @@ -2355,7 +2355,7 @@ dEvent_manager_c_NS_cancelStaff: /* 80048360 000452A0 3C 80 80 38 */ lis r4, lbl_80379F60@ha /* 80048364 000452A4 38 84 9F 60 */ addi r4, r4, lbl_80379F60@l /* 80048368 000452A8 38 84 01 4B */ addi r4, r4, 0x14b -/* 8004836C 000452AC 48 32 06 29 */ bl func_80368994 +/* 8004836C 000452AC 48 32 06 29 */ bl strcmp /* 80048370 000452B0 2C 03 00 00 */ cmpwi r3, 0 /* 80048374 000452B4 40 82 00 18 */ bne lbl_8004838C .global extraOffObjectCallBack @@ -2574,7 +2574,7 @@ lbl_80048648: /* 8004864C 0004558C 3C 80 80 38 */ lis r4, lbl_80379F60@ha /* 80048650 00045590 38 84 9F 60 */ addi r4, r4, lbl_80379F60@l /* 80048654 00045594 38 84 01 7E */ addi r4, r4, 0x17e -/* 80048658 00045598 48 32 03 3D */ bl func_80368994 +/* 80048658 00045598 48 32 03 3D */ bl strcmp /* 8004865C 0004559C 2C 03 00 00 */ cmpwi r3, 0 /* 80048660 000455A0 40 82 00 A0 */ bne lbl_80048700 /* 80048664 000455A4 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/d/eye/d_eye_hl.s b/asm/d/eye/d_eye_hl.s index d69a9bc5006..39f8c128ff9 100644 --- a/asm/d/eye/d_eye_hl.s +++ b/asm/d/eye/d_eye_hl.s @@ -27,7 +27,7 @@ lbl_8009C9A0: /* 8009C9AC 000998EC 28 03 00 00 */ cmplwi r3, 0 /* 8009C9B0 000998F0 41 82 00 3C */ beq lbl_8009C9EC /* 8009C9B4 000998F4 7F 84 E3 78 */ mr r4, r28 -/* 8009C9B8 000998F8 48 2C BF DD */ bl func_80368994 +/* 8009C9B8 000998F8 48 2C BF DD */ bl strcmp /* 8009C9BC 000998FC 2C 03 00 00 */ cmpwi r3, 0 /* 8009C9C0 00099900 40 82 00 2C */ bne lbl_8009C9EC /* 8009C9C4 00099904 80 7F 00 04 */ lwz r3, 4(r31) diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index ca11d006a54..f22275f3414 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -747,14 +747,14 @@ lbl_8005C0B8: /* 8005C0F4 00059034 7E 23 8B 78 */ mr r3, r17 /* 8005C0F8 00059038 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005C0FC 0005903C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 8005C100 00059040 48 30 C8 95 */ bl func_80368994 +/* 8005C100 00059040 48 30 C8 95 */ bl strcmp /* 8005C104 00059044 2C 03 00 00 */ cmpwi r3, 0 /* 8005C108 00059048 41 82 03 04 */ beq lbl_8005C40C /* 8005C10C 0005904C 7E 23 8B 78 */ mr r3, r17 /* 8005C110 00059050 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005C114 00059054 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005C118 00059058 38 84 00 08 */ addi r4, r4, 8 -/* 8005C11C 0005905C 48 30 C8 79 */ bl func_80368994 +/* 8005C11C 0005905C 48 30 C8 79 */ bl strcmp /* 8005C120 00059060 2C 03 00 00 */ cmpwi r3, 0 /* 8005C124 00059064 41 82 02 E8 */ beq lbl_8005C40C /* 8005C128 00059068 C3 82 87 B8 */ lfs f28, lbl_804521B8-_SDA2_BASE_(r2) @@ -1687,7 +1687,7 @@ overhead_bg_chk: /* 8005CEC0 00059E00 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005CEC4 00059E04 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005CEC8 00059E08 38 84 00 17 */ addi r4, r4, 0x17 -/* 8005CECC 00059E0C 48 30 BA C9 */ bl func_80368994 +/* 8005CECC 00059E0C 48 30 BA C9 */ bl strcmp /* 8005CED0 00059E10 2C 03 00 00 */ cmpwi r3, 0 /* 8005CED4 00059E14 40 82 00 30 */ bne lbl_8005CF04 /* 8005CED8 00059E18 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -1824,7 +1824,7 @@ forward_overhead_bg_chk: /* 8005D0CC 0005A00C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005D0D0 0005A010 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005D0D4 0005A014 38 84 00 17 */ addi r4, r4, 0x17 -/* 8005D0D8 0005A018 48 30 B8 BD */ bl func_80368994 +/* 8005D0D8 0005A018 48 30 B8 BD */ bl strcmp /* 8005D0DC 0005A01C 2C 03 00 00 */ cmpwi r3, 0 /* 8005D0E0 0005A020 40 82 00 30 */ bne lbl_8005D110 /* 8005D0E4 0005A024 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -2247,7 +2247,7 @@ lbl_8005D614: /* 8005D6C8 0005A608 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005D6CC 0005A60C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005D6D0 0005A610 38 84 00 1F */ addi r4, r4, 0x1f -/* 8005D6D4 0005A614 48 30 B2 C1 */ bl func_80368994 +/* 8005D6D4 0005A614 48 30 B2 C1 */ bl strcmp /* 8005D6D8 0005A618 2C 03 00 00 */ cmpwi r3, 0 /* 8005D6DC 0005A61C 40 82 00 20 */ bne lbl_8005D6FC /* 8005D6E0 0005A620 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -2263,7 +2263,7 @@ lbl_8005D6FC: /* 8005D700 0005A640 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005D704 0005A644 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005D708 0005A648 38 84 00 26 */ addi r4, r4, 0x26 -/* 8005D70C 0005A64C 48 30 B2 89 */ bl func_80368994 +/* 8005D70C 0005A64C 48 30 B2 89 */ bl strcmp /* 8005D710 0005A650 2C 03 00 00 */ cmpwi r3, 0 /* 8005D714 0005A654 40 82 00 18 */ bne lbl_8005D72C /* 8005D718 0005A658 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -2276,7 +2276,7 @@ lbl_8005D72C: /* 8005D730 0005A670 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005D734 0005A674 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005D738 0005A678 38 84 00 2E */ addi r4, r4, 0x2e -/* 8005D73C 0005A67C 48 30 B2 59 */ bl func_80368994 +/* 8005D73C 0005A67C 48 30 B2 59 */ bl strcmp /* 8005D740 0005A680 2C 03 00 00 */ cmpwi r3, 0 /* 8005D744 0005A684 40 82 00 08 */ bne lbl_8005D74C /* 8005D748 0005A688 3A 80 00 03 */ li r20, 3 @@ -3032,7 +3032,7 @@ lbl_8005E1DC: /* 8005E1E8 0005B128 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005E1EC 0005B12C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005E1F0 0005B130 38 84 00 1F */ addi r4, r4, 0x1f -/* 8005E1F4 0005B134 48 30 A7 A1 */ bl func_80368994 +/* 8005E1F4 0005B134 48 30 A7 A1 */ bl strcmp /* 8005E1F8 0005B138 2C 03 00 00 */ cmpwi r3, 0 /* 8005E1FC 0005B13C 40 82 00 58 */ bne lbl_8005E254 /* 8005E200 0005B140 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -3398,7 +3398,7 @@ lbl_8005E6EC: /* 8005E6F0 0005B630 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005E6F4 0005B634 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005E6F8 0005B638 38 84 00 36 */ addi r4, r4, 0x36 -/* 8005E6FC 0005B63C 48 30 A2 99 */ bl func_80368994 +/* 8005E6FC 0005B63C 48 30 A2 99 */ bl strcmp /* 8005E700 0005B640 2C 03 00 00 */ cmpwi r3, 0 /* 8005E704 0005B644 40 82 00 6C */ bne lbl_8005E770 /* 8005E708 0005B648 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -3434,7 +3434,7 @@ lbl_8005E770: /* 8005E774 0005B6B4 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005E778 0005B6B8 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005E77C 0005B6BC 38 84 00 3E */ addi r4, r4, 0x3e -/* 8005E780 0005B6C0 48 30 A2 15 */ bl func_80368994 +/* 8005E780 0005B6C0 48 30 A2 15 */ bl strcmp /* 8005E784 0005B6C4 2C 03 00 00 */ cmpwi r3, 0 /* 8005E788 0005B6C8 40 82 00 8C */ bne lbl_8005E814 /* 8005E78C 0005B6CC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -3477,7 +3477,7 @@ lbl_8005E814: /* 8005E818 0005B758 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005E81C 0005B75C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005E820 0005B760 38 84 00 26 */ addi r4, r4, 0x26 -/* 8005E824 0005B764 48 30 A1 71 */ bl func_80368994 +/* 8005E824 0005B764 48 30 A1 71 */ bl strcmp /* 8005E828 0005B768 2C 03 00 00 */ cmpwi r3, 0 /* 8005E82C 0005B76C 40 82 00 30 */ bne lbl_8005E85C /* 8005E830 0005B770 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -3593,7 +3593,7 @@ dKyr_housi_move: /* 8005E9C0 0005B900 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8005E9C4 0005B904 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8005E9C8 0005B908 38 84 00 45 */ addi r4, r4, 0x45 -/* 8005E9CC 0005B90C 48 30 9F C9 */ bl func_80368994 +/* 8005E9CC 0005B90C 48 30 9F C9 */ bl strcmp /* 8005E9D0 0005B910 2C 03 00 00 */ cmpwi r3, 0 /* 8005E9D4 0005B914 40 82 00 08 */ bne lbl_8005E9DC /* 8005E9D8 0005B918 3B 00 00 01 */ li r24, 1 @@ -5201,7 +5201,7 @@ lbl_8006008C: /* 80060094 0005CFD4 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80060098 0005CFD8 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006009C 0005CFDC 38 84 00 2E */ addi r4, r4, 0x2e -/* 800600A0 0005CFE0 48 30 88 F5 */ bl func_80368994 +/* 800600A0 0005CFE0 48 30 88 F5 */ bl strcmp /* 800600A4 0005CFE4 2C 03 00 00 */ cmpwi r3, 0 /* 800600A8 0005CFE8 40 82 00 1C */ bne lbl_800600C4 /* 800600AC 0005CFEC C0 22 88 44 */ lfs f1, lbl_80452244-_SDA2_BASE_(r2) @@ -6238,7 +6238,7 @@ lbl_80060F2C: lbl_80060F60: /* 80060F60 0005DEA0 7F 83 E3 78 */ mr r3, r28 /* 80060F64 0005DEA4 38 9F 00 2E */ addi r4, r31, 0x2e -/* 80060F68 0005DEA8 48 30 7A 2D */ bl func_80368994 +/* 80060F68 0005DEA8 48 30 7A 2D */ bl strcmp /* 80060F6C 0005DEAC 2C 03 00 00 */ cmpwi r3, 0 /* 80060F70 0005DEB0 40 82 00 20 */ bne lbl_80060F90 /* 80060F74 0005DEB4 C0 21 00 84 */ lfs f1, 0x84(r1) @@ -6253,7 +6253,7 @@ lbl_80060F90: /* 80060F94 0005DED4 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80060F98 0005DED8 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80060F9C 0005DEDC 38 84 00 4C */ addi r4, r4, 0x4c -/* 80060FA0 0005DEE0 48 30 79 F5 */ bl func_80368994 +/* 80060FA0 0005DEE0 48 30 79 F5 */ bl strcmp /* 80060FA4 0005DEE4 2C 03 00 00 */ cmpwi r3, 0 /* 80060FA8 0005DEE8 40 82 00 1C */ bne lbl_80060FC4 /* 80060FAC 0005DEEC C0 21 00 84 */ lfs f1, 0x84(r1) @@ -6440,7 +6440,7 @@ lbl_80061220: lbl_80061224: /* 80061224 0005E164 7F 83 E3 78 */ mr r3, r28 /* 80061228 0005E168 38 9F 00 2E */ addi r4, r31, 0x2e -/* 8006122C 0005E16C 48 30 77 69 */ bl func_80368994 +/* 8006122C 0005E16C 48 30 77 69 */ bl strcmp /* 80061230 0005E170 2C 03 00 00 */ cmpwi r3, 0 /* 80061234 0005E174 40 82 00 20 */ bne lbl_80061254 /* 80061238 0005E178 C0 21 00 84 */ lfs f1, 0x84(r1) @@ -6455,7 +6455,7 @@ lbl_80061254: /* 80061258 0005E198 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006125C 0005E19C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80061260 0005E1A0 38 84 00 4C */ addi r4, r4, 0x4c -/* 80061264 0005E1A4 48 30 77 31 */ bl func_80368994 +/* 80061264 0005E1A4 48 30 77 31 */ bl strcmp /* 80061268 0005E1A8 2C 03 00 00 */ cmpwi r3, 0 /* 8006126C 0005E1AC 40 82 00 1C */ bne lbl_80061288 /* 80061270 0005E1B0 C0 21 00 84 */ lfs f1, 0x84(r1) @@ -7415,7 +7415,7 @@ lbl_80061FA0: lbl_80061FF0: /* 80061FF0 0005EF30 7F 83 E3 78 */ mr r3, r28 /* 80061FF4 0005EF34 38 94 00 54 */ addi r4, r20, 0x54 -/* 80061FF8 0005EF38 48 30 69 9D */ bl func_80368994 +/* 80061FF8 0005EF38 48 30 69 9D */ bl strcmp /* 80061FFC 0005EF3C 2C 03 00 00 */ cmpwi r3, 0 /* 80062000 0005EF40 40 82 00 18 */ bne lbl_80062018 /* 80062004 0005EF44 80 7F 10 4C */ lwz r3, 0x104c(r31) @@ -7536,7 +7536,7 @@ lbl_800621A0: /* 800621B0 0005F0F0 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800621B4 0005F0F4 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 800621B8 0005F0F8 38 84 00 5C */ addi r4, r4, 0x5c -/* 800621BC 0005F0FC 48 30 67 D9 */ bl func_80368994 +/* 800621BC 0005F0FC 48 30 67 D9 */ bl strcmp /* 800621C0 0005F100 2C 03 00 00 */ cmpwi r3, 0 /* 800621C4 0005F104 40 82 00 0C */ bne lbl_800621D0 /* 800621C8 0005F108 C2 A2 87 D4 */ lfs f21, lbl_804521D4-_SDA2_BASE_(r2) @@ -7938,7 +7938,7 @@ lbl_8006275C: /* 80062760 0005F6A0 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80062764 0005F6A4 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80062768 0005F6A8 38 84 00 5C */ addi r4, r4, 0x5c -/* 8006276C 0005F6AC 48 30 62 29 */ bl func_80368994 +/* 8006276C 0005F6AC 48 30 62 29 */ bl strcmp /* 80062770 0005F6B0 2C 03 00 00 */ cmpwi r3, 0 /* 80062774 0005F6B4 40 82 00 18 */ bne lbl_8006278C /* 80062778 0005F6B8 C0 02 8A 4C */ lfs f0, lbl_8045244C-_SDA2_BASE_(r2) @@ -7951,7 +7951,7 @@ lbl_8006278C: /* 80062790 0005F6D0 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80062794 0005F6D4 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80062798 0005F6D8 38 84 00 1F */ addi r4, r4, 0x1f -/* 8006279C 0005F6DC 48 30 61 F9 */ bl func_80368994 +/* 8006279C 0005F6DC 48 30 61 F9 */ bl strcmp /* 800627A0 0005F6E0 2C 03 00 00 */ cmpwi r3, 0 /* 800627A4 0005F6E4 40 82 00 3C */ bne lbl_800627E0 /* 800627A8 0005F6E8 C0 62 88 44 */ lfs f3, lbl_80452244-_SDA2_BASE_(r2) @@ -8637,7 +8637,7 @@ lbl_80063138: /* 800631C4 00060104 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800631C8 00060108 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 800631CC 0006010C 38 84 00 4C */ addi r4, r4, 0x4c -/* 800631D0 00060110 48 30 57 C5 */ bl func_80368994 +/* 800631D0 00060110 48 30 57 C5 */ bl strcmp /* 800631D4 00060114 2C 03 00 00 */ cmpwi r3, 0 /* 800631D8 00060118 40 82 00 08 */ bne lbl_800631E0 /* 800631DC 0006011C C2 E2 8A 64 */ lfs f23, lbl_80452464-_SDA2_BASE_(r2) @@ -8990,7 +8990,7 @@ dKyr_drawSun: /* 80063714 00060654 7F E3 FB 78 */ mr r3, r31 /* 80063718 00060658 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006371C 0006065C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 80063720 00060660 48 30 52 75 */ bl func_80368994 +/* 80063720 00060660 48 30 52 75 */ bl strcmp /* 80063724 00060664 2C 03 00 00 */ cmpwi r3, 0 /* 80063728 00060668 40 82 00 14 */ bne lbl_8006373C /* 8006372C 0006066C C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) @@ -9055,7 +9055,7 @@ lbl_80063800: /* 80063800 00060740 7F E3 FB 78 */ mr r3, r31 /* 80063804 00060744 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063808 00060748 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 8006380C 0006074C 48 30 51 89 */ bl func_80368994 +/* 8006380C 0006074C 48 30 51 89 */ bl strcmp /* 80063810 00060750 2C 03 00 00 */ cmpwi r3, 0 /* 80063814 00060754 40 82 00 3C */ bne lbl_80063850 /* 80063818 00060758 38 60 00 00 */ li r3, 0 @@ -9097,7 +9097,7 @@ lbl_8006389C: /* 800638A0 000607E0 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800638A4 000607E4 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 800638A8 000607E8 38 84 00 64 */ addi r4, r4, 0x64 -/* 800638AC 000607EC 48 30 50 E9 */ bl func_80368994 +/* 800638AC 000607EC 48 30 50 E9 */ bl strcmp /* 800638B0 000607F0 2C 03 00 00 */ cmpwi r3, 0 /* 800638B4 000607F4 40 82 00 58 */ bne lbl_8006390C /* 800638B8 000607F8 48 13 C2 01 */ bl dKy_daynight_check @@ -9144,7 +9144,7 @@ lbl_80063950: /* 80063950 00060890 7F E3 FB 78 */ mr r3, r31 /* 80063954 00060894 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063958 00060898 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 8006395C 0006089C 48 30 50 39 */ bl func_80368994 +/* 8006395C 0006089C 48 30 50 39 */ bl strcmp /* 80063960 000608A0 2C 03 00 00 */ cmpwi r3, 0 /* 80063964 000608A4 40 82 00 38 */ bne lbl_8006399C /* 80063968 000608A8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -9450,7 +9450,7 @@ lbl_80063DE4: /* 80063DF8 00060D38 7F E3 FB 78 */ mr r3, r31 /* 80063DFC 00060D3C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063E00 00060D40 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 80063E04 00060D44 48 30 4B 91 */ bl func_80368994 +/* 80063E04 00060D44 48 30 4B 91 */ bl strcmp /* 80063E08 00060D48 2C 03 00 00 */ cmpwi r3, 0 /* 80063E0C 00060D4C 41 82 00 A8 */ beq lbl_80063EB4 /* 80063E10 00060D50 38 77 00 D8 */ addi r3, r23, 0xd8 @@ -9520,7 +9520,7 @@ lbl_80063EB4: /* 80063F04 00060E44 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063F08 00060E48 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80063F0C 00060E4C 38 84 00 4C */ addi r4, r4, 0x4c -/* 80063F10 00060E50 48 30 4A 85 */ bl func_80368994 +/* 80063F10 00060E50 48 30 4A 85 */ bl strcmp /* 80063F14 00060E54 2C 03 00 00 */ cmpwi r3, 0 /* 80063F18 00060E58 40 82 00 0C */ bne lbl_80063F24 /* 80063F1C 00060E5C C2 E2 8A 64 */ lfs f23, lbl_80452464-_SDA2_BASE_(r2) @@ -9529,7 +9529,7 @@ lbl_80063F24: /* 80063F24 00060E64 7F E3 FB 78 */ mr r3, r31 /* 80063F28 00060E68 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063F2C 00060E6C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 80063F30 00060E70 48 30 4A 65 */ bl func_80368994 +/* 80063F30 00060E70 48 30 4A 65 */ bl strcmp /* 80063F34 00060E74 2C 03 00 00 */ cmpwi r3, 0 /* 80063F38 00060E78 40 82 00 08 */ bne lbl_80063F40 /* 80063F3C 00060E7C C2 E2 88 80 */ lfs f23, lbl_80452280-_SDA2_BASE_(r2) @@ -9538,7 +9538,7 @@ lbl_80063F40: /* 80063F44 00060E84 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063F48 00060E88 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80063F4C 00060E8C 38 84 00 64 */ addi r4, r4, 0x64 -/* 80063F50 00060E90 48 30 4A 45 */ bl func_80368994 +/* 80063F50 00060E90 48 30 4A 45 */ bl strcmp /* 80063F54 00060E94 2C 03 00 00 */ cmpwi r3, 0 /* 80063F58 00060E98 40 82 00 3C */ bne lbl_80063F94 /* 80063F5C 00060E9C 48 13 BB 5D */ bl dKy_daynight_check @@ -9551,7 +9551,7 @@ lbl_80063F40: /* 80063F78 00060EB8 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063F7C 00060EBC 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80063F80 00060EC0 38 84 00 6C */ addi r4, r4, 0x6c -/* 80063F84 00060EC4 48 30 4A 11 */ bl func_80368994 +/* 80063F84 00060EC4 48 30 4A 11 */ bl strcmp /* 80063F88 00060EC8 2C 03 00 00 */ cmpwi r3, 0 /* 80063F8C 00060ECC 40 82 00 08 */ bne lbl_80063F94 /* 80063F90 00060ED0 C2 E2 8A 78 */ lfs f23, lbl_80452478-_SDA2_BASE_(r2) @@ -9829,7 +9829,7 @@ lbl_8006436C: lbl_800643B0: /* 800643B0 000612F0 7F E3 FB 78 */ mr r3, r31 /* 800643B4 000612F4 38 95 00 4C */ addi r4, r21, 0x4c -/* 800643B8 000612F8 48 30 45 DD */ bl func_80368994 +/* 800643B8 000612F8 48 30 45 DD */ bl strcmp /* 800643BC 000612FC 2C 03 00 00 */ cmpwi r3, 0 /* 800643C0 00061300 40 82 00 10 */ bne lbl_800643D0 /* 800643C4 00061304 7F 63 DB 78 */ mr r3, r27 @@ -11289,7 +11289,7 @@ lbl_8006597C: /* 80065980 000628C0 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80065984 000628C4 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80065988 000628C8 38 84 00 5C */ addi r4, r4, 0x5c -/* 8006598C 000628CC 48 30 30 09 */ bl func_80368994 +/* 8006598C 000628CC 48 30 30 09 */ bl strcmp /* 80065990 000628D0 2C 03 00 00 */ cmpwi r3, 0 /* 80065994 000628D4 40 82 00 24 */ bne lbl_800659B8 /* 80065998 000628D8 C0 22 89 84 */ lfs f1, lbl_80452384-_SDA2_BASE_(r2) @@ -11784,7 +11784,7 @@ lbl_800660DC: /* 800660E8 00063028 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800660EC 0006302C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 800660F0 00063030 38 84 00 36 */ addi r4, r4, 0x36 -/* 800660F4 00063034 48 30 28 A1 */ bl func_80368994 +/* 800660F4 00063034 48 30 28 A1 */ bl strcmp /* 800660F8 00063038 2C 03 00 00 */ cmpwi r3, 0 /* 800660FC 0006303C 40 82 00 5C */ bne lbl_80066158 /* 80066100 00063040 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -12117,7 +12117,7 @@ lbl_800665C0: /* 800665E0 00063520 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800665E4 00063524 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 800665E8 00063528 38 84 00 45 */ addi r4, r4, 0x45 -/* 800665EC 0006352C 48 30 23 A9 */ bl func_80368994 +/* 800665EC 0006352C 48 30 23 A9 */ bl strcmp /* 800665F0 00063530 2C 03 00 00 */ cmpwi r3, 0 /* 800665F4 00063534 40 82 00 08 */ bne lbl_800665FC /* 800665F8 00063538 3B 80 00 01 */ li r28, 1 @@ -12126,7 +12126,7 @@ lbl_800665FC: /* 80066600 00063540 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80066604 00063544 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80066608 00063548 38 84 00 45 */ addi r4, r4, 0x45 -/* 8006660C 0006354C 48 30 23 89 */ bl func_80368994 +/* 8006660C 0006354C 48 30 23 89 */ bl strcmp /* 80066610 00063550 2C 03 00 00 */ cmpwi r3, 0 /* 80066614 00063554 40 82 00 18 */ bne lbl_8006662C /* 80066618 00063558 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -12326,7 +12326,7 @@ lbl_800667F4: /* 800668F8 00063838 48 2F 8A 1D */ bl GXSetTevAlphaOp /* 800668FC 0006383C 7E C3 B3 78 */ mr r3, r22 /* 80066900 00063840 38 91 00 7A */ addi r4, r17, 0x7a -/* 80066904 00063844 48 30 20 91 */ bl func_80368994 +/* 80066904 00063844 48 30 20 91 */ bl strcmp /* 80066908 00063848 2C 03 00 00 */ cmpwi r3, 0 /* 8006690C 0006384C 41 82 00 10 */ beq lbl_8006691C /* 80066910 00063850 88 1F 0E A9 */ lbz r0, 0xea9(r31) @@ -13634,7 +13634,7 @@ lbl_80067C8C: /* 80067C90 00064BD0 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80067C94 00064BD4 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80067C98 00064BD8 38 84 00 81 */ addi r4, r4, 0x81 -/* 80067C9C 00064BDC 48 30 0C F9 */ bl func_80368994 +/* 80067C9C 00064BDC 48 30 0C F9 */ bl strcmp /* 80067CA0 00064BE0 2C 03 00 00 */ cmpwi r3, 0 /* 80067CA4 00064BE4 40 82 00 B8 */ bne lbl_80067D5C /* 80067CA8 00064BE8 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -14543,7 +14543,7 @@ lbl_800689C0: /* 800689D8 00065918 7E E3 BB 78 */ mr r3, r23 /* 800689DC 0006591C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 800689E0 00065920 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 800689E4 00065924 48 2F FF B1 */ bl func_80368994 +/* 800689E4 00065924 48 2F FF B1 */ bl strcmp /* 800689E8 00065928 2C 03 00 00 */ cmpwi r3, 0 /* 800689EC 0006592C 40 82 00 1C */ bne lbl_80068A08 /* 800689F0 00065930 38 60 00 00 */ li r3, 0 @@ -14557,14 +14557,14 @@ lbl_80068A08: /* 80068A0C 0006594C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80068A10 00065950 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80068A14 00065954 38 84 00 4C */ addi r4, r4, 0x4c -/* 80068A18 00065958 48 2F FF 7D */ bl func_80368994 +/* 80068A18 00065958 48 2F FF 7D */ bl strcmp /* 80068A1C 0006595C 2C 03 00 00 */ cmpwi r3, 0 /* 80068A20 00065960 41 82 00 2C */ beq lbl_80068A4C /* 80068A24 00065964 7E E3 BB 78 */ mr r3, r23 /* 80068A28 00065968 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80068A2C 0006596C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80068A30 00065970 38 84 00 64 */ addi r4, r4, 0x64 -/* 80068A34 00065974 48 2F FF 61 */ bl func_80368994 +/* 80068A34 00065974 48 2F FF 61 */ bl strcmp /* 80068A38 00065978 2C 03 00 00 */ cmpwi r3, 0 /* 80068A3C 0006597C 40 82 00 14 */ bne lbl_80068A50 /* 80068A40 00065980 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -14577,7 +14577,7 @@ lbl_80068A50: /* 80068A54 00065994 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80068A58 00065998 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80068A5C 0006599C 38 84 00 64 */ addi r4, r4, 0x64 -/* 80068A60 000659A0 48 2F FF 35 */ bl func_80368994 +/* 80068A60 000659A0 48 2F FF 35 */ bl strcmp /* 80068A64 000659A4 2C 03 00 00 */ cmpwi r3, 0 /* 80068A68 000659A8 40 82 00 14 */ bne lbl_80068A7C /* 80068A6C 000659AC 48 13 70 4D */ bl dKy_daynight_check @@ -14606,7 +14606,7 @@ lbl_80068AC0: /* 80068AC0 00065A00 7E E3 BB 78 */ mr r3, r23 /* 80068AC4 00065A04 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80068AC8 00065A08 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l -/* 80068ACC 00065A0C 48 2F FE C9 */ bl func_80368994 +/* 80068ACC 00065A0C 48 2F FE C9 */ bl strcmp /* 80068AD0 00065A10 2C 03 00 00 */ cmpwi r3, 0 /* 80068AD4 00065A14 40 82 00 30 */ bne lbl_80068B04 /* 80068AD8 00065A18 38 60 00 00 */ li r3, 0 @@ -16396,7 +16396,7 @@ lbl_8006A5B0: /* 8006A5B4 000674F4 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006A5B8 000674F8 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006A5BC 000674FC 38 84 00 5C */ addi r4, r4, 0x5c -/* 8006A5C0 00067500 48 2F E3 D5 */ bl func_80368994 +/* 8006A5C0 00067500 48 2F E3 D5 */ bl strcmp /* 8006A5C4 00067504 2C 03 00 00 */ cmpwi r3, 0 /* 8006A5C8 00067508 40 82 00 08 */ bne lbl_8006A5D0 /* 8006A5CC 0006750C C2 C2 8B 54 */ lfs f22, lbl_80452554-_SDA2_BASE_(r2) @@ -17000,42 +17000,42 @@ lbl_8006AEC4: /* 8006AEC8 00067E08 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006AECC 00067E0C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006AED0 00067E10 38 84 00 4C */ addi r4, r4, 0x4c -/* 8006AED4 00067E14 48 2F DA C1 */ bl func_80368994 +/* 8006AED4 00067E14 48 2F DA C1 */ bl strcmp /* 8006AED8 00067E18 2C 03 00 00 */ cmpwi r3, 0 /* 8006AEDC 00067E1C 41 82 00 9C */ beq lbl_8006AF78 /* 8006AEE0 00067E20 7E C3 B3 78 */ mr r3, r22 /* 8006AEE4 00067E24 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006AEE8 00067E28 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006AEEC 00067E2C 38 84 00 88 */ addi r4, r4, 0x88 -/* 8006AEF0 00067E30 48 2F DA A5 */ bl func_80368994 +/* 8006AEF0 00067E30 48 2F DA A5 */ bl strcmp /* 8006AEF4 00067E34 2C 03 00 00 */ cmpwi r3, 0 /* 8006AEF8 00067E38 41 82 00 80 */ beq lbl_8006AF78 /* 8006AEFC 00067E3C 7E C3 B3 78 */ mr r3, r22 /* 8006AF00 00067E40 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006AF04 00067E44 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006AF08 00067E48 38 84 00 45 */ addi r4, r4, 0x45 -/* 8006AF0C 00067E4C 48 2F DA 89 */ bl func_80368994 +/* 8006AF0C 00067E4C 48 2F DA 89 */ bl strcmp /* 8006AF10 00067E50 2C 03 00 00 */ cmpwi r3, 0 /* 8006AF14 00067E54 41 82 00 64 */ beq lbl_8006AF78 /* 8006AF18 00067E58 7E C3 B3 78 */ mr r3, r22 /* 8006AF1C 00067E5C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006AF20 00067E60 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006AF24 00067E64 38 84 00 5C */ addi r4, r4, 0x5c -/* 8006AF28 00067E68 48 2F DA 6D */ bl func_80368994 +/* 8006AF28 00067E68 48 2F DA 6D */ bl strcmp /* 8006AF2C 00067E6C 2C 03 00 00 */ cmpwi r3, 0 /* 8006AF30 00067E70 41 82 00 48 */ beq lbl_8006AF78 /* 8006AF34 00067E74 7E C3 B3 78 */ mr r3, r22 /* 8006AF38 00067E78 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006AF3C 00067E7C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006AF40 00067E80 38 84 00 5C */ addi r4, r4, 0x5c -/* 8006AF44 00067E84 48 2F DA 51 */ bl func_80368994 +/* 8006AF44 00067E84 48 2F DA 51 */ bl strcmp /* 8006AF48 00067E88 2C 03 00 00 */ cmpwi r3, 0 /* 8006AF4C 00067E8C 41 82 00 2C */ beq lbl_8006AF78 /* 8006AF50 00067E90 7E C3 B3 78 */ mr r3, r22 /* 8006AF54 00067E94 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006AF58 00067E98 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006AF5C 00067E9C 38 84 00 64 */ addi r4, r4, 0x64 -/* 8006AF60 00067EA0 48 2F DA 35 */ bl func_80368994 +/* 8006AF60 00067EA0 48 2F DA 35 */ bl strcmp /* 8006AF64 00067EA4 2C 03 00 00 */ cmpwi r3, 0 /* 8006AF68 00067EA8 40 82 01 68 */ bne lbl_8006B0D0 /* 8006AF6C 00067EAC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -17223,7 +17223,7 @@ dKyr_thunder_move: /* 8006B208 00068148 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006B20C 0006814C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006B210 00068150 38 84 00 1F */ addi r4, r4, 0x1f -/* 8006B214 00068154 48 2F D7 81 */ bl func_80368994 +/* 8006B214 00068154 48 2F D7 81 */ bl strcmp /* 8006B218 00068158 2C 03 00 00 */ cmpwi r3, 0 /* 8006B21C 0006815C 40 82 00 14 */ bne lbl_8006B230 /* 8006B220 00068160 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -17309,7 +17309,7 @@ lbl_8006B348: /* 8006B34C 0006828C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006B350 00068290 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006B354 00068294 38 84 00 08 */ addi r4, r4, 8 -/* 8006B358 00068298 48 2F D6 3D */ bl func_80368994 +/* 8006B358 00068298 48 2F D6 3D */ bl strcmp /* 8006B35C 0006829C 2C 03 00 00 */ cmpwi r3, 0 /* 8006B360 000682A0 40 82 00 A4 */ bne lbl_8006B404 /* 8006B364 000682A4 88 1C 4F AD */ lbz r0, 0x4fad(r28) @@ -18793,7 +18793,7 @@ lbl_8006C904: /* 8006C91C 0006985C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006C920 00069860 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006C924 00069864 38 84 00 54 */ addi r4, r4, 0x54 -/* 8006C928 00069868 48 2F C0 6D */ bl func_80368994 +/* 8006C928 00069868 48 2F C0 6D */ bl strcmp /* 8006C92C 0006986C 2C 03 00 00 */ cmpwi r3, 0 /* 8006C930 00069870 40 82 00 3C */ bne lbl_8006C96C /* 8006C934 00069874 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -19483,7 +19483,7 @@ lbl_8006D284: /* 8006D31C 0006A25C 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006D320 0006A260 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006D324 0006A264 38 84 00 54 */ addi r4, r4, 0x54 -/* 8006D328 0006A268 48 2F B6 6D */ bl func_80368994 +/* 8006D328 0006A268 48 2F B6 6D */ bl strcmp /* 8006D32C 0006A26C 2C 03 00 00 */ cmpwi r3, 0 /* 8006D330 0006A270 40 82 01 B4 */ bne lbl_8006D4E4 /* 8006D334 0006A274 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) @@ -20226,7 +20226,7 @@ lbl_8006DDDC: /* 8006DE58 0006AD98 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 8006DE5C 0006AD9C 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006DE60 0006ADA0 38 84 00 45 */ addi r4, r4, 0x45 -/* 8006DE64 0006ADA4 48 2F AB 31 */ bl func_80368994 +/* 8006DE64 0006ADA4 48 2F AB 31 */ bl strcmp /* 8006DE68 0006ADA8 2C 03 00 00 */ cmpwi r3, 0 /* 8006DE6C 0006ADAC 40 82 00 2C */ bne lbl_8006DE98 /* 8006DE70 0006ADB0 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) diff --git a/asm/d/kankyo/d_kankyo_wether.s b/asm/d/kankyo/d_kankyo_wether.s index 935b485da13..b171b5d8e6e 100644 --- a/asm/d/kankyo/d_kankyo_wether.s +++ b/asm/d/kankyo/d_kankyo_wether.s @@ -846,7 +846,7 @@ dKyw_wether_init: /* 80057594 000544D4 7F C3 F3 78 */ mr r3, r30 /* 80057598 000544D8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005759C 000544DC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l -/* 800575A0 000544E0 48 31 13 F5 */ bl func_80368994 +/* 800575A0 000544E0 48 31 13 F5 */ bl strcmp /* 800575A4 000544E4 2C 03 00 00 */ cmpwi r3, 0 /* 800575A8 000544E8 40 82 03 E0 */ bne lbl_80057988 /* 800575AC 000544EC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -1101,7 +1101,7 @@ lbl_80057988: /* 8005798C 000548CC 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80057990 000548D0 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80057994 000548D4 38 84 00 08 */ addi r4, r4, 8 -/* 80057998 000548D8 48 31 0F FD */ bl func_80368994 +/* 80057998 000548D8 48 31 0F FD */ bl strcmp /* 8005799C 000548DC 2C 03 00 00 */ cmpwi r3, 0 /* 800579A0 000548E0 40 82 00 34 */ bne lbl_800579D4 /* 800579A4 000548E4 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -1833,7 +1833,7 @@ lbl_800583A0: /* 800583A8 000552E8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800583AC 000552EC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800583B0 000552F0 38 84 00 0F */ addi r4, r4, 0xf -/* 800583B4 000552F4 48 31 05 E1 */ bl func_80368994 +/* 800583B4 000552F4 48 31 05 E1 */ bl strcmp /* 800583B8 000552F8 2C 03 00 00 */ cmpwi r3, 0 /* 800583BC 000552FC 40 82 00 0C */ bne lbl_800583C8 /* 800583C0 00055300 3B 80 00 01 */ li r28, 1 @@ -1843,14 +1843,14 @@ lbl_800583C8: /* 800583CC 0005530C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800583D0 00055310 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800583D4 00055314 38 84 00 17 */ addi r4, r4, 0x17 -/* 800583D8 00055318 48 31 05 BD */ bl func_80368994 +/* 800583D8 00055318 48 31 05 BD */ bl strcmp /* 800583DC 0005531C 2C 03 00 00 */ cmpwi r3, 0 /* 800583E0 00055320 41 82 00 20 */ beq lbl_80058400 /* 800583E4 00055324 7F A3 EB 78 */ mr r3, r29 /* 800583E8 00055328 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800583EC 0005532C 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800583F0 00055330 38 84 00 1E */ addi r4, r4, 0x1e -/* 800583F4 00055334 48 31 05 A1 */ bl func_80368994 +/* 800583F4 00055334 48 31 05 A1 */ bl strcmp /* 800583F8 00055338 2C 03 00 00 */ cmpwi r3, 0 /* 800583FC 0005533C 40 82 00 08 */ bne lbl_80058404 lbl_80058400: @@ -2254,7 +2254,7 @@ lbl_800589A4: /* 800589DC 0005591C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800589E0 00055920 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800589E4 00055924 38 84 00 89 */ addi r4, r4, 0x89 -/* 800589E8 00055928 48 30 FF AD */ bl func_80368994 +/* 800589E8 00055928 48 30 FF AD */ bl strcmp /* 800589EC 0005592C 2C 03 00 00 */ cmpwi r3, 0 /* 800589F0 00055930 40 82 00 14 */ bne lbl_80058A04 /* 800589F4 00055934 C0 3E 00 DC */ lfs f1, 0xdc(r30) @@ -2389,14 +2389,14 @@ wether_move_star: /* 80058BBC 00055AFC 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058BC0 00055B00 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058BC4 00055B04 38 84 00 17 */ addi r4, r4, 0x17 -/* 80058BC8 00055B08 48 30 FD CD */ bl func_80368994 +/* 80058BC8 00055B08 48 30 FD CD */ bl strcmp /* 80058BCC 00055B0C 2C 03 00 00 */ cmpwi r3, 0 /* 80058BD0 00055B10 41 82 03 28 */ beq lbl_80058EF8 /* 80058BD4 00055B14 7F E3 FB 78 */ mr r3, r31 /* 80058BD8 00055B18 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058BDC 00055B1C 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058BE0 00055B20 38 84 00 1E */ addi r4, r4, 0x1e -/* 80058BE4 00055B24 48 30 FD B1 */ bl func_80368994 +/* 80058BE4 00055B24 48 30 FD B1 */ bl strcmp /* 80058BE8 00055B28 2C 03 00 00 */ cmpwi r3, 0 /* 80058BEC 00055B2C 40 82 00 08 */ bne lbl_80058BF4 /* 80058BF0 00055B30 48 00 03 08 */ b lbl_80058EF8 @@ -2416,7 +2416,7 @@ lbl_80058C1C: /* 80058C20 00055B60 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058C24 00055B64 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058C28 00055B68 38 84 00 0F */ addi r4, r4, 0xf -/* 80058C2C 00055B6C 48 30 FD 69 */ bl func_80368994 +/* 80058C2C 00055B6C 48 30 FD 69 */ bl strcmp /* 80058C30 00055B70 2C 03 00 00 */ cmpwi r3, 0 /* 80058C34 00055B74 40 82 02 C4 */ bne lbl_80058EF8 lbl_80058C38: @@ -2443,7 +2443,7 @@ lbl_80058C80: /* 80058C84 00055BC4 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058C88 00055BC8 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058C8C 00055BCC 38 84 00 0F */ addi r4, r4, 0xf -/* 80058C90 00055BD0 48 30 FD 05 */ bl func_80368994 +/* 80058C90 00055BD0 48 30 FD 05 */ bl strcmp /* 80058C94 00055BD4 2C 03 00 00 */ cmpwi r3, 0 /* 80058C98 00055BD8 40 82 00 08 */ bne lbl_80058CA0 /* 80058C9C 00055BDC 3B C0 00 01 */ li r30, 1 @@ -2510,7 +2510,7 @@ lbl_80058D6C: /* 80058D70 00055CB0 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058D74 00055CB4 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058D78 00055CB8 38 84 00 0F */ addi r4, r4, 0xf -/* 80058D7C 00055CBC 48 30 FC 19 */ bl func_80368994 +/* 80058D7C 00055CBC 48 30 FC 19 */ bl strcmp /* 80058D80 00055CC0 2C 03 00 00 */ cmpwi r3, 0 /* 80058D84 00055CC4 40 82 00 08 */ bne lbl_80058D8C /* 80058D88 00055CC8 C3 E2 86 E4 */ lfs f31, lbl_804520E4-_SDA2_BASE_(r2) @@ -2538,21 +2538,21 @@ lbl_80058D8C: /* 80058DDC 00055D1C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058DE0 00055D20 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058DE4 00055D24 38 84 00 91 */ addi r4, r4, 0x91 -/* 80058DE8 00055D28 48 30 FB AD */ bl func_80368994 +/* 80058DE8 00055D28 48 30 FB AD */ bl strcmp /* 80058DEC 00055D2C 2C 03 00 00 */ cmpwi r3, 0 /* 80058DF0 00055D30 41 82 00 3C */ beq lbl_80058E2C /* 80058DF4 00055D34 7F E3 FB 78 */ mr r3, r31 /* 80058DF8 00055D38 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058DFC 00055D3C 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058E00 00055D40 38 84 00 99 */ addi r4, r4, 0x99 -/* 80058E04 00055D44 48 30 FB 91 */ bl func_80368994 +/* 80058E04 00055D44 48 30 FB 91 */ bl strcmp /* 80058E08 00055D48 2C 03 00 00 */ cmpwi r3, 0 /* 80058E0C 00055D4C 41 82 00 20 */ beq lbl_80058E2C /* 80058E10 00055D50 7F E3 FB 78 */ mr r3, r31 /* 80058E14 00055D54 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058E18 00055D58 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058E1C 00055D5C 38 84 00 A1 */ addi r4, r4, 0xa1 -/* 80058E20 00055D60 48 30 FB 75 */ bl func_80368994 +/* 80058E20 00055D60 48 30 FB 75 */ bl strcmp /* 80058E24 00055D64 2C 03 00 00 */ cmpwi r3, 0 /* 80058E28 00055D68 40 82 00 24 */ bne lbl_80058E4C lbl_80058E2C: @@ -2635,7 +2635,7 @@ wether_move_housi: /* 80058F3C 00055E7C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058F40 00055E80 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058F44 00055E84 38 84 00 A9 */ addi r4, r4, 0xa9 -/* 80058F48 00055E88 48 30 FA 4D */ bl func_80368994 +/* 80058F48 00055E88 48 30 FA 4D */ bl strcmp /* 80058F4C 00055E8C 2C 03 00 00 */ cmpwi r3, 0 /* 80058F50 00055E90 40 82 00 18 */ bne lbl_80058F68 /* 80058F54 00055E94 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -2648,21 +2648,21 @@ lbl_80058F68: /* 80058F6C 00055EAC 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058F70 00055EB0 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058F74 00055EB4 38 84 00 B0 */ addi r4, r4, 0xb0 -/* 80058F78 00055EB8 48 30 FA 1D */ bl func_80368994 +/* 80058F78 00055EB8 48 30 FA 1D */ bl strcmp /* 80058F7C 00055EBC 2C 03 00 00 */ cmpwi r3, 0 /* 80058F80 00055EC0 41 82 04 44 */ beq lbl_800593C4 /* 80058F84 00055EC4 7F E3 FB 78 */ mr r3, r31 /* 80058F88 00055EC8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058F8C 00055ECC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058F90 00055ED0 38 84 00 B8 */ addi r4, r4, 0xb8 -/* 80058F94 00055ED4 48 30 FA 01 */ bl func_80368994 +/* 80058F94 00055ED4 48 30 FA 01 */ bl strcmp /* 80058F98 00055ED8 2C 03 00 00 */ cmpwi r3, 0 /* 80058F9C 00055EDC 41 82 04 28 */ beq lbl_800593C4 /* 80058FA0 00055EE0 7F E3 FB 78 */ mr r3, r31 /* 80058FA4 00055EE4 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058FA8 00055EE8 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058FAC 00055EEC 38 84 00 C0 */ addi r4, r4, 0xc0 -/* 80058FB0 00055EF0 48 30 F9 E5 */ bl func_80368994 +/* 80058FB0 00055EF0 48 30 F9 E5 */ bl strcmp /* 80058FB4 00055EF4 2C 03 00 00 */ cmpwi r3, 0 /* 80058FB8 00055EF8 40 82 00 08 */ bne lbl_80058FC0 /* 80058FBC 00055EFC 48 00 04 08 */ b lbl_800593C4 @@ -2675,7 +2675,7 @@ lbl_80058FC0: /* 80058FD4 00055F14 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80058FD8 00055F18 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80058FDC 00055F1C 38 84 00 C8 */ addi r4, r4, 0xc8 -/* 80058FE0 00055F20 48 30 F9 B5 */ bl func_80368994 +/* 80058FE0 00055F20 48 30 F9 B5 */ bl strcmp /* 80058FE4 00055F24 2C 03 00 00 */ cmpwi r3, 0 /* 80058FE8 00055F28 40 82 01 34 */ bne lbl_8005911C /* 80058FEC 00055F2C 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -2700,7 +2700,7 @@ lbl_8005900C: /* 80059034 00055F74 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059038 00055F78 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005903C 00055F7C 38 84 00 D0 */ addi r4, r4, 0xd0 -/* 80059040 00055F80 48 30 F9 55 */ bl func_80368994 +/* 80059040 00055F80 48 30 F9 55 */ bl strcmp /* 80059044 00055F84 2C 03 00 00 */ cmpwi r3, 0 /* 80059048 00055F88 40 82 00 24 */ bne lbl_8005906C /* 8005904C 00055F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2716,7 +2716,7 @@ lbl_8005906C: /* 80059070 00055FB0 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059074 00055FB4 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80059078 00055FB8 38 84 00 D8 */ addi r4, r4, 0xd8 -/* 8005907C 00055FBC 48 30 F9 19 */ bl func_80368994 +/* 8005907C 00055FBC 48 30 F9 19 */ bl strcmp /* 80059080 00055FC0 2C 03 00 00 */ cmpwi r3, 0 /* 80059084 00055FC4 40 82 00 24 */ bne lbl_800590A8 /* 80059088 00055FC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2732,7 +2732,7 @@ lbl_800590A8: /* 800590AC 00055FEC 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800590B0 00055FF0 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800590B4 00055FF4 38 84 00 D0 */ addi r4, r4, 0xd0 -/* 800590B8 00055FF8 48 30 F8 DD */ bl func_80368994 +/* 800590B8 00055FF8 48 30 F8 DD */ bl strcmp /* 800590BC 00055FFC 2C 03 00 00 */ cmpwi r3, 0 /* 800590C0 00056000 40 82 00 24 */ bne lbl_800590E4 /* 800590C4 00056004 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2748,7 +2748,7 @@ lbl_800590E4: /* 800590E8 00056028 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 800590EC 0005602C 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800590F0 00056030 38 84 00 C8 */ addi r4, r4, 0xc8 -/* 800590F4 00056034 48 30 F8 A1 */ bl func_80368994 +/* 800590F4 00056034 48 30 F8 A1 */ bl strcmp /* 800590F8 00056038 2C 03 00 00 */ cmpwi r3, 0 /* 800590FC 0005603C 40 82 00 20 */ bne lbl_8005911C /* 80059100 00056040 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -3256,14 +3256,14 @@ lbl_800597AC: /* 80059804 00056744 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059808 00056748 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005980C 0005674C 38 84 01 01 */ addi r4, r4, 0x101 -/* 80059810 00056750 48 30 F1 85 */ bl func_80368994 +/* 80059810 00056750 48 30 F1 85 */ bl strcmp /* 80059814 00056754 2C 03 00 00 */ cmpwi r3, 0 /* 80059818 00056758 41 82 00 40 */ beq lbl_80059858 /* 8005981C 0005675C 7F 83 E3 78 */ mr r3, r28 /* 80059820 00056760 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059824 00056764 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80059828 00056768 38 84 01 09 */ addi r4, r4, 0x109 -/* 8005982C 0005676C 48 30 F1 69 */ bl func_80368994 +/* 8005982C 0005676C 48 30 F1 69 */ bl strcmp /* 80059830 00056770 2C 03 00 00 */ cmpwi r3, 0 /* 80059834 00056774 40 82 00 48 */ bne lbl_8005987C /* 80059838 00056778 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -3289,7 +3289,7 @@ lbl_8005987C: /* 80059880 000567C0 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059884 000567C4 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80059888 000567C8 38 84 01 11 */ addi r4, r4, 0x111 -/* 8005988C 000567CC 48 30 F1 09 */ bl func_80368994 +/* 8005988C 000567CC 48 30 F1 09 */ bl strcmp /* 80059890 000567D0 2C 03 00 00 */ cmpwi r3, 0 /* 80059894 000567D4 40 82 00 60 */ bne lbl_800598F4 /* 80059898 000567D8 38 60 00 00 */ li r3, 0 @@ -3427,7 +3427,7 @@ lbl_80059A70: /* 80059A78 000569B8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059A7C 000569BC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80059A80 000569C0 38 84 00 0F */ addi r4, r4, 0xf -/* 80059A84 000569C4 48 30 EF 11 */ bl func_80368994 +/* 80059A84 000569C4 48 30 EF 11 */ bl strcmp /* 80059A88 000569C8 2C 03 00 00 */ cmpwi r3, 0 /* 80059A8C 000569CC 40 82 00 18 */ bne lbl_80059AA4 /* 80059A90 000569D0 38 00 00 1E */ li r0, 0x1e @@ -3551,7 +3551,7 @@ lbl_80059C14: /* 80059C38 00056B78 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 80059C3C 00056B7C 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 80059C40 00056B80 38 84 00 89 */ addi r4, r4, 0x89 -/* 80059C44 00056B84 48 30 ED 51 */ bl func_80368994 +/* 80059C44 00056B84 48 30 ED 51 */ bl strcmp /* 80059C48 00056B88 2C 03 00 00 */ cmpwi r3, 0 /* 80059C4C 00056B8C 40 82 00 08 */ bne lbl_80059C54 /* 80059C50 00056B90 C3 E2 87 58 */ lfs f31, lbl_80452158-_SDA2_BASE_(r2) @@ -3889,7 +3889,7 @@ dKyw_wether_move_draw: /* 8005A0E8 00057028 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A0EC 0005702C 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A0F0 00057030 38 84 01 46 */ addi r4, r4, 0x146 -/* 8005A0F4 00057034 48 30 E8 A1 */ bl func_80368994 +/* 8005A0F4 00057034 48 30 E8 A1 */ bl strcmp /* 8005A0F8 00057038 2C 03 00 00 */ cmpwi r3, 0 /* 8005A0FC 0005703C 41 82 00 10 */ beq lbl_8005A10C /* 8005A100 00057040 4B FF E2 19 */ bl wether_move_sun @@ -3901,7 +3901,7 @@ lbl_8005A10C: /* 8005A114 00057054 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A118 00057058 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A11C 0005705C 38 84 01 46 */ addi r4, r4, 0x146 -/* 8005A120 00057060 48 30 E8 75 */ bl func_80368994 +/* 8005A120 00057060 48 30 E8 75 */ bl strcmp /* 8005A124 00057064 2C 03 00 00 */ cmpwi r3, 0 /* 8005A128 00057068 41 82 00 18 */ beq lbl_8005A140 /* 8005A12C 0005706C 4B FF ED ED */ bl wether_move_housi @@ -3941,7 +3941,7 @@ dKyw_wether_draw: /* 8005A198 000570D8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A19C 000570DC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A1A0 000570E0 38 84 01 46 */ addi r4, r4, 0x146 -/* 8005A1A4 000570E4 48 30 E7 F1 */ bl func_80368994 +/* 8005A1A4 000570E4 48 30 E7 F1 */ bl strcmp /* 8005A1A8 000570E8 2C 03 00 00 */ cmpwi r3, 0 /* 8005A1AC 000570EC 41 82 00 1C */ beq lbl_8005A1C8 /* 8005A1B0 000570F0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -3955,7 +3955,7 @@ lbl_8005A1C8: /* 8005A1CC 0005710C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A1D0 00057110 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A1D4 00057114 38 84 01 46 */ addi r4, r4, 0x146 -/* 8005A1D8 00057118 48 30 E7 BD */ bl func_80368994 +/* 8005A1D8 00057118 48 30 E7 BD */ bl strcmp /* 8005A1DC 0005711C 2C 03 00 00 */ cmpwi r3, 0 /* 8005A1E0 00057120 41 82 00 40 */ beq lbl_8005A220 /* 8005A1E4 00057124 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -3986,7 +3986,7 @@ lbl_8005A23C: /* 8005A240 00057180 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A244 00057184 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A248 00057188 38 84 01 46 */ addi r4, r4, 0x146 -/* 8005A24C 0005718C 48 30 E7 49 */ bl func_80368994 +/* 8005A24C 0005718C 48 30 E7 49 */ bl strcmp /* 8005A250 00057190 2C 03 00 00 */ cmpwi r3, 0 /* 8005A254 00057194 41 82 00 98 */ beq lbl_8005A2EC /* 8005A258 00057198 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4073,21 +4073,21 @@ dKyw_wether_proc: /* 8005A364 000572A4 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A368 000572A8 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A36C 000572AC 38 84 00 D0 */ addi r4, r4, 0xd0 -/* 8005A370 000572B0 48 30 E6 25 */ bl func_80368994 +/* 8005A370 000572B0 48 30 E6 25 */ bl strcmp /* 8005A374 000572B4 2C 03 00 00 */ cmpwi r3, 0 /* 8005A378 000572B8 41 82 00 54 */ beq lbl_8005A3CC /* 8005A37C 000572BC 7F E3 FB 78 */ mr r3, r31 /* 8005A380 000572C0 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A384 000572C4 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A388 000572C8 38 84 01 4B */ addi r4, r4, 0x14b -/* 8005A38C 000572CC 48 30 E6 09 */ bl func_80368994 +/* 8005A38C 000572CC 48 30 E6 09 */ bl strcmp /* 8005A390 000572D0 2C 03 00 00 */ cmpwi r3, 0 /* 8005A394 000572D4 41 82 00 38 */ beq lbl_8005A3CC /* 8005A398 000572D8 7F E3 FB 78 */ mr r3, r31 /* 8005A39C 000572DC 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A3A0 000572E0 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A3A4 000572E4 38 84 00 91 */ addi r4, r4, 0x91 -/* 8005A3A8 000572E8 48 30 E5 ED */ bl func_80368994 +/* 8005A3A8 000572E8 48 30 E5 ED */ bl strcmp /* 8005A3AC 000572EC 2C 03 00 00 */ cmpwi r3, 0 /* 8005A3B0 000572F0 40 82 01 3C */ bne lbl_8005A4EC /* 8005A3B4 000572F4 C0 22 86 E0 */ lfs f1, lbl_804520E0-_SDA2_BASE_(r2) @@ -4104,7 +4104,7 @@ lbl_8005A3CC: /* 8005A3DC 0005731C 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A3E0 00057320 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A3E4 00057324 38 84 00 91 */ addi r4, r4, 0x91 -/* 8005A3E8 00057328 48 30 E5 AD */ bl func_80368994 +/* 8005A3E8 00057328 48 30 E5 AD */ bl strcmp /* 8005A3EC 0005732C 2C 03 00 00 */ cmpwi r3, 0 /* 8005A3F0 00057330 41 82 00 30 */ beq lbl_8005A420 /* 8005A3F4 00057334 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4123,7 +4123,7 @@ lbl_8005A420: /* 8005A424 00057364 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A428 00057368 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A42C 0005736C 38 84 00 91 */ addi r4, r4, 0x91 -/* 8005A430 00057370 48 30 E5 65 */ bl func_80368994 +/* 8005A430 00057370 48 30 E5 65 */ bl strcmp /* 8005A434 00057374 2C 03 00 00 */ cmpwi r3, 0 /* 8005A438 00057378 40 82 00 60 */ bne lbl_8005A498 /* 8005A43C 0005737C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4177,7 +4177,7 @@ lbl_8005A4EC: /* 8005A4F0 00057430 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A4F4 00057434 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A4F8 00057438 38 84 01 4B */ addi r4, r4, 0x14b -/* 8005A4FC 0005743C 48 30 E4 99 */ bl func_80368994 +/* 8005A4FC 0005743C 48 30 E4 99 */ bl strcmp /* 8005A500 00057440 2C 03 00 00 */ cmpwi r3, 0 /* 8005A504 00057444 40 82 00 5C */ bne lbl_8005A560 /* 8005A508 00057448 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -4507,7 +4507,7 @@ lbl_8005A96C: /* 8005A978 000578B8 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A97C 000578BC 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 8005A980 000578C0 38 84 00 08 */ addi r4, r4, 8 -/* 8005A984 000578C4 48 30 E0 11 */ bl func_80368994 +/* 8005A984 000578C4 48 30 E0 11 */ bl strcmp /* 8005A988 000578C8 2C 03 00 00 */ cmpwi r3, 0 /* 8005A98C 000578CC 40 82 00 88 */ bne lbl_8005AA14 /* 8005A990 000578D0 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) diff --git a/asm/d/ky/d_ky_thunder.s b/asm/d/ky/d_ky_thunder.s index 22fcd01a362..a66f1a54b45 100644 --- a/asm/d/ky/d_ky_thunder.s +++ b/asm/d/ky/d_ky_thunder.s @@ -504,7 +504,7 @@ lbl_801AE68C: /* 801AE69C 001AB5DC 3C 80 80 39 */ lis r4, lbl_80394F40@ha /* 801AE6A0 001AB5E0 38 84 4F 40 */ addi r4, r4, lbl_80394F40@l /* 801AE6A4 001AB5E4 38 84 00 07 */ addi r4, r4, 7 -/* 801AE6A8 001AB5E8 48 1B A2 ED */ bl func_80368994 +/* 801AE6A8 001AB5E8 48 1B A2 ED */ bl strcmp /* 801AE6AC 001AB5EC 2C 03 00 00 */ cmpwi r3, 0 /* 801AE6B0 001AB5F0 40 82 00 20 */ bne lbl_801AE6D0 /* 801AE6B4 001AB5F4 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) @@ -619,7 +619,7 @@ lbl_801AE7B0: /* 801AE854 001AB794 3C 80 80 39 */ lis r4, lbl_80394F40@ha /* 801AE858 001AB798 38 84 4F 40 */ addi r4, r4, lbl_80394F40@l /* 801AE85C 001AB79C 38 84 00 07 */ addi r4, r4, 7 -/* 801AE860 001AB7A0 48 1B A1 35 */ bl func_80368994 +/* 801AE860 001AB7A0 48 1B A1 35 */ bl strcmp /* 801AE864 001AB7A4 2C 03 00 00 */ cmpwi r3, 0 /* 801AE868 001AB7A8 40 82 00 40 */ bne lbl_801AE8A8 /* 801AE86C 001AB7AC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index b1ce69973a9..ae3e2465196 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -771,7 +771,7 @@ dMenuFmapIconPointer_c_NS_getFirstData: /* 8003E1E0 0003B120 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8003E1E4 0003B124 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8003E1E8 0003B128 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E1EC 0003B12C 48 32 A7 A9 */ bl func_80368994 +/* 8003E1EC 0003B12C 48 32 A7 A9 */ bl strcmp /* 8003E1F0 0003B130 2C 03 00 00 */ cmpwi r3, 0 /* 8003E1F4 0003B134 40 82 00 1C */ bne lbl_8003E210 /* 8003E1F8 0003B138 88 7E 00 30 */ lbz r3, 0x30(r30) @@ -841,7 +841,7 @@ dMenuFmapIconPointer_c_NS_getData: /* 8003E2DC 0003B21C 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8003E2E0 0003B220 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8003E2E4 0003B224 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E2E8 0003B228 48 32 A6 AD */ bl func_80368994 +/* 8003E2E8 0003B228 48 32 A6 AD */ bl strcmp /* 8003E2EC 0003B22C 2C 03 00 00 */ cmpwi r3, 0 /* 8003E2F0 0003B230 40 82 00 34 */ bne lbl_8003E324 /* 8003E2F4 0003B234 80 9E 00 28 */ lwz r4, 0x28(r30) @@ -928,7 +928,7 @@ dMenuFmapIconPointer_c_NS_getNextData: /* 8003E3F8 0003B338 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8003E3FC 0003B33C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8003E400 0003B340 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E404 0003B344 48 32 A5 91 */ bl func_80368994 +/* 8003E404 0003B344 48 32 A5 91 */ bl strcmp /* 8003E408 0003B348 2C 03 00 00 */ cmpwi r3, 0 /* 8003E40C 0003B34C 40 82 00 30 */ bne lbl_8003E43C /* 8003E410 0003B350 80 7E 00 28 */ lwz r3, 0x28(r30) @@ -1083,7 +1083,7 @@ lbl_8003E60C: /* 8003E610 0003B550 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8003E614 0003B554 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8003E618 0003B558 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8003E61C 0003B55C 48 32 A3 79 */ bl func_80368994 +/* 8003E61C 0003B55C 48 32 A3 79 */ bl strcmp /* 8003E620 0003B560 2C 03 00 00 */ cmpwi r3, 0 /* 8003E624 0003B564 40 82 00 50 */ bne lbl_8003E674 /* 8003E628 0003B568 80 1C 00 28 */ lwz r0, 0x28(r28) diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index a0cf9dbc687..a72f5f589d1 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -6058,7 +6058,7 @@ dMenu_Dmap_c_NS__create: /* 801BD7DC 001BA71C 48 11 0F A9 */ bl JKRHeap_NS_getTotalFreeSize /* 801BD7E0 001BA720 83 BF 00 E8 */ lwz r29, 0xe8(r31) /* 801BD7E4 001BA724 7F A3 EB 78 */ mr r3, r29 -/* 801BD7E8 001BA728 48 11 0F 45 */ bl JKRHeap_NS_getFreeSize +/* 801BD7E8 001BA728 48 11 0F 45 */ bl getFreeSize__7JKRHeapFv /* 801BD7EC 001BA72C 38 63 FF F0 */ addi r3, r3, -16 /* 801BD7F0 001BA730 7F A4 EB 78 */ mr r4, r29 /* 801BD7F4 001BA734 38 A0 00 00 */ li r5, 0 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 67ba38612b3..c0b05a225b3 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -48,7 +48,7 @@ dMenuFmap_getStartStageName: lbl_801C668C: /* 801C668C 001C35CC 7F A3 EB 78 */ mr r3, r29 /* 801C6690 001C35D0 7C 9B FA 14 */ add r4, r27, r31 -/* 801C6694 001C35D4 48 1A 23 01 */ bl func_80368994 +/* 801C6694 001C35D4 48 1A 23 01 */ bl strcmp /* 801C6698 001C35D8 2C 03 00 00 */ cmpwi r3, 0 /* 801C669C 001C35DC 40 82 00 18 */ bne lbl_801C66B4 /* 801C66A0 001C35E0 38 6D 8B 24 */ addi r3, r13, lbl_804510A4-_SDA_BASE_ @@ -2735,7 +2735,7 @@ lbl_801C8DC8: /* 801C8DE0 001C5D20 3C 80 80 39 */ lis r4, lbl_803960E8@ha /* 801C8DE4 001C5D24 38 84 60 E8 */ addi r4, r4, lbl_803960E8@l /* 801C8DE8 001C5D28 38 84 00 1E */ addi r4, r4, 0x1e -/* 801C8DEC 001C5D2C 48 19 FB A9 */ bl func_80368994 +/* 801C8DEC 001C5D2C 48 19 FB A9 */ bl strcmp /* 801C8DF0 001C5D30 2C 03 00 00 */ cmpwi r3, 0 /* 801C8DF4 001C5D34 40 82 00 2C */ bne lbl_801C8E20 /* 801C8DF8 001C5D38 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13) @@ -5285,7 +5285,7 @@ lbl_801CB398: /* 801CB398 001C82D8 7F DD 9A 14 */ add r30, r29, r19 /* 801CB39C 001C82DC 7F C3 F3 78 */ mr r3, r30 /* 801CB3A0 001C82E0 38 81 00 08 */ addi r4, r1, 8 -/* 801CB3A4 001C82E4 48 19 D5 F1 */ bl func_80368994 +/* 801CB3A4 001C82E4 48 19 D5 F1 */ bl strcmp /* 801CB3A8 001C82E8 2C 03 00 00 */ cmpwi r3, 0 /* 801CB3AC 001C82EC 40 82 00 AC */ bne lbl_801CB458 /* 801CB3B0 001C82F0 38 A0 00 01 */ li r5, 1 @@ -5449,7 +5449,7 @@ lbl_801CB5C4: /* 801CB5CC 001C850C 38 63 02 60 */ addi r3, r3, 0x260 /* 801CB5D0 001C8510 7C 7F 1A 14 */ add r3, r31, r3 /* 801CB5D4 001C8514 7F C4 F3 78 */ mr r4, r30 -/* 801CB5D8 001C8518 48 19 D3 BD */ bl func_80368994 +/* 801CB5D8 001C8518 48 19 D3 BD */ bl strcmp /* 801CB5DC 001C851C 2C 03 00 00 */ cmpwi r3, 0 /* 801CB5E0 001C8520 40 82 00 48 */ bne lbl_801CB628 /* 801CB5E4 001C8524 38 A0 00 00 */ li r5, 0 @@ -5809,7 +5809,7 @@ lbl_801CBAB0: /* 801CBAB0 001C89F0 7E 59 EA 14 */ add r18, r25, r29 /* 801CBAB4 001C89F4 7E 43 93 78 */ mr r3, r18 /* 801CBAB8 001C89F8 38 81 00 08 */ addi r4, r1, 8 -/* 801CBABC 001C89FC 48 19 CE D9 */ bl func_80368994 +/* 801CBABC 001C89FC 48 19 CE D9 */ bl strcmp /* 801CBAC0 001C8A00 2C 03 00 00 */ cmpwi r3, 0 /* 801CBAC4 001C8A04 40 82 00 A0 */ bne lbl_801CBB64 /* 801CBAC8 001C8A08 38 80 00 01 */ li r4, 1 @@ -5939,7 +5939,7 @@ lbl_801CBC4C: /* 801CBC88 001C8BC8 80 6F 00 8C */ lwz r3, 0x8c(r15) /* 801CBC8C 001C8BCC 4B FF A9 A1 */ bl dMenuFmap_getStartStageName /* 801CBC90 001C8BD0 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBC94 001C8BD4 48 19 CD 01 */ bl func_80368994 +/* 801CBC94 001C8BD4 48 19 CD 01 */ bl strcmp /* 801CBC98 001C8BD8 2C 03 00 00 */ cmpwi r3, 0 /* 801CBC9C 001C8BDC 40 82 00 40 */ bne lbl_801CBCDC /* 801CBCA0 001C8BE0 80 6F 00 14 */ lwz r3, 0x14(r15) @@ -5951,7 +5951,7 @@ lbl_801CBC4C: lbl_801CBCB8: /* 801CBCB8 001C8BF8 38 63 00 72 */ addi r3, r3, 0x72 /* 801CBCBC 001C8BFC 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBCC0 001C8C00 48 19 CC D5 */ bl func_80368994 +/* 801CBCC0 001C8C00 48 19 CC D5 */ bl strcmp /* 801CBCC4 001C8C04 2C 03 00 00 */ cmpwi r3, 0 /* 801CBCC8 001C8C08 40 82 00 14 */ bne lbl_801CBCDC /* 801CBCCC 001C8C0C 80 6F 00 14 */ lwz r3, 0x14(r15) @@ -7620,7 +7620,7 @@ lbl_801CD3A4: /* 801CD3A4 001CA2E4 7F A3 EB 78 */ mr r3, r29 /* 801CD3A8 001CA2E8 38 9F 02 60 */ addi r4, r31, 0x260 /* 801CD3AC 001CA2EC 7C 9C 22 14 */ add r4, r28, r4 -/* 801CD3B0 001CA2F0 48 19 B5 E5 */ bl func_80368994 +/* 801CD3B0 001CA2F0 48 19 B5 E5 */ bl strcmp /* 801CD3B4 001CA2F4 2C 03 00 00 */ cmpwi r3, 0 /* 801CD3B8 001CA2F8 40 82 00 0C */ bne lbl_801CD3C4 /* 801CD3BC 001CA2FC 57 C3 06 3E */ clrlwi r3, r30, 0x18 diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index dba93fda7e7..04c216a46c2 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -3838,7 +3838,7 @@ lbl_801D2D14: /* 801D2D1C 001CFC5C 7C 1E 00 00 */ cmpw r30, r0 /* 801D2D20 001CFC60 40 82 00 44 */ bne lbl_801D2D64 /* 801D2D24 001CFC64 7F 23 CB 78 */ mr r3, r25 -/* 801D2D28 001CFC68 48 19 5C 6D */ bl func_80368994 +/* 801D2D28 001CFC68 48 19 5C 6D */ bl strcmp /* 801D2D2C 001CFC6C 2C 03 00 00 */ cmpwi r3, 0 /* 801D2D30 001CFC70 40 82 00 34 */ bne lbl_801D2D64 /* 801D2D34 001CFC74 57 00 15 BA */ rlwinm r0, r24, 2, 0x16, 0x1d diff --git a/asm/d/menu/fmap/d_menu_fmap_map.s b/asm/d/menu/fmap/d_menu_fmap_map.s index c32dd071af9..6782afce07e 100644 --- a/asm/d/menu/fmap/d_menu_fmap_map.s +++ b/asm/d/menu/fmap/d_menu_fmap_map.s @@ -140,7 +140,7 @@ renderingFmap_c_NS_isSwitchSpecialOff: /* 801CE248 001CB188 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 801CE24C 001CB18C 3C 80 80 39 */ lis r4, lbl_8039623C@ha /* 801CE250 001CB190 38 84 62 3C */ addi r4, r4, lbl_8039623C@l -/* 801CE254 001CB194 48 19 A7 41 */ bl func_80368994 +/* 801CE254 001CB194 48 19 A7 41 */ bl strcmp /* 801CE258 001CB198 2C 03 00 00 */ cmpwi r3, 0 /* 801CE25C 001CB19C 40 82 00 10 */ bne lbl_801CE26C /* 801CE260 001CB1A0 2C 1E 00 B2 */ cmpwi r30, 0xb2 diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index 963e01c7616..1684e3692e6 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -5209,7 +5209,7 @@ lbl_80205D64: /* 80205D74 00202CB4 3C 80 80 3A */ lis r4, lbl_803980E8@ha /* 80205D78 00202CB8 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 80205D7C 00202CBC 38 84 00 5D */ addi r4, r4, 0x5d -/* 80205D80 00202CC0 48 16 2C 15 */ bl func_80368994 +/* 80205D80 00202CC0 48 16 2C 15 */ bl strcmp /* 80205D84 00202CC4 2C 03 00 00 */ cmpwi r3, 0 /* 80205D88 00202CC8 40 82 00 30 */ bne lbl_80205DB8 /* 80205D8C 00202CCC 38 60 00 00 */ li r3, 0 @@ -5229,7 +5229,7 @@ lbl_80205DB8: /* 80205DBC 00202CFC 3C 80 80 3A */ lis r4, lbl_803980E8@ha /* 80205DC0 00202D00 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 80205DC4 00202D04 38 84 00 64 */ addi r4, r4, 0x64 -/* 80205DC8 00202D08 48 16 2B CD */ bl func_80368994 +/* 80205DC8 00202D08 48 16 2B CD */ bl strcmp /* 80205DCC 00202D0C 2C 03 00 00 */ cmpwi r3, 0 /* 80205DD0 00202D10 40 82 00 20 */ bne lbl_80205DF0 /* 80205DD4 00202D14 38 60 00 0E */ li r3, 0xe @@ -9223,7 +9223,7 @@ dMeterButton_c_NS_setString: /* 802095F0 00206530 3B C3 01 14 */ addi r30, r3, 0x114 /* 802095F4 00206534 7F D9 F2 14 */ add r30, r25, r30 /* 802095F8 00206538 7F C3 F3 78 */ mr r3, r30 -/* 802095FC 0020653C 48 15 F3 99 */ bl func_80368994 +/* 802095FC 0020653C 48 15 F3 99 */ bl strcmp /* 80209600 00206540 2C 03 00 00 */ cmpwi r3, 0 /* 80209604 00206544 40 82 00 18 */ bne lbl_8020961C /* 80209608 00206548 7C 79 FA 14 */ add r3, r25, r31 @@ -9236,7 +9236,7 @@ lbl_8020961C: /* 80209620 00206560 40 82 02 98 */ bne lbl_802098B8 /* 80209624 00206564 38 79 01 23 */ addi r3, r25, 0x123 /* 80209628 00206568 7F 44 D3 78 */ mr r4, r26 -/* 8020962C 0020656C 48 15 F3 69 */ bl func_80368994 +/* 8020962C 0020656C 48 15 F3 69 */ bl strcmp /* 80209630 00206570 2C 03 00 00 */ cmpwi r3, 0 /* 80209634 00206574 40 82 02 84 */ bne lbl_802098B8 /* 80209638 00206578 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -9428,7 +9428,7 @@ lbl_802098B8: /* 802098C0 00206800 40 82 02 5C */ bne lbl_80209B1C /* 802098C4 00206804 38 79 01 14 */ addi r3, r25, 0x114 /* 802098C8 00206808 7F 44 D3 78 */ mr r4, r26 -/* 802098CC 0020680C 48 15 F0 C9 */ bl func_80368994 +/* 802098CC 0020680C 48 15 F0 C9 */ bl strcmp /* 802098D0 00206810 2C 03 00 00 */ cmpwi r3, 0 /* 802098D4 00206814 40 82 02 48 */ bne lbl_80209B1C /* 802098D8 00206818 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -9612,12 +9612,12 @@ lbl_80209B1C: /* 80209B44 00206A84 D0 03 02 E8 */ stfs f0, 0x2e8(r3) /* 80209B48 00206A88 38 79 01 14 */ addi r3, r25, 0x114 /* 80209B4C 00206A8C 7F 44 D3 78 */ mr r4, r26 -/* 80209B50 00206A90 48 15 EE 45 */ bl func_80368994 +/* 80209B50 00206A90 48 15 EE 45 */ bl strcmp /* 80209B54 00206A94 2C 03 00 00 */ cmpwi r3, 0 /* 80209B58 00206A98 41 82 00 24 */ beq lbl_80209B7C /* 80209B5C 00206A9C 38 79 01 23 */ addi r3, r25, 0x123 /* 80209B60 00206AA0 7F 44 D3 78 */ mr r4, r26 -/* 80209B64 00206AA4 48 15 EE 31 */ bl func_80368994 +/* 80209B64 00206AA4 48 15 EE 31 */ bl strcmp /* 80209B68 00206AA8 2C 03 00 00 */ cmpwi r3, 0 /* 80209B6C 00206AAC 41 82 00 10 */ beq lbl_80209B7C /* 80209B70 00206AB0 38 00 00 01 */ li r0, 1 diff --git a/asm/d/meter/d_meter_hakusha.s b/asm/d/meter/d_meter_hakusha.s index 09692eb5471..d328d160f8b 100644 --- a/asm/d/meter/d_meter_hakusha.s +++ b/asm/d/meter/d_meter_hakusha.s @@ -254,7 +254,7 @@ lbl_8020C654: /* 8020C6CC 0020960C 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020C6D0 00209610 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l /* 8020C6D4 00209614 38 84 00 46 */ addi r4, r4, 0x46 -/* 8020C6D8 00209618 48 15 C2 BD */ bl func_80368994 +/* 8020C6D8 00209618 48 15 C2 BD */ bl strcmp /* 8020C6DC 0020961C 2C 03 00 00 */ cmpwi r3, 0 /* 8020C6E0 00209620 40 82 00 28 */ bne lbl_8020C708 /* 8020C6E4 00209624 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -661,7 +661,7 @@ dMeterHakusha_c_NS_alphaAnimeHakusha: /* 8020CCD4 00209C14 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020CCD8 00209C18 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l /* 8020CCDC 00209C1C 38 84 00 4E */ addi r4, r4, 0x4e -/* 8020CCE0 00209C20 48 15 BC B5 */ bl func_80368994 +/* 8020CCE0 00209C20 48 15 BC B5 */ bl strcmp /* 8020CCE4 00209C24 2C 03 00 00 */ cmpwi r3, 0 /* 8020CCE8 00209C28 40 82 00 14 */ bne lbl_8020CCFC /* 8020CCEC 00209C2C 38 60 00 00 */ li r3, 0 @@ -959,7 +959,7 @@ lbl_8020D0B4: /* 8020D10C 0020A04C 3C 80 80 3A */ lis r4, lbl_803981B0@ha /* 8020D110 0020A050 38 84 81 B0 */ addi r4, r4, lbl_803981B0@l /* 8020D114 0020A054 38 84 00 46 */ addi r4, r4, 0x46 -/* 8020D118 0020A058 48 15 B8 7D */ bl func_80368994 +/* 8020D118 0020A058 48 15 B8 7D */ bl strcmp /* 8020D11C 0020A05C 2C 03 00 00 */ cmpwi r3, 0 /* 8020D120 0020A060 40 82 00 28 */ bne lbl_8020D148 /* 8020D124 0020A064 80 7C 00 10 */ lwz r3, 0x10(r28) diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index 8d2d568648f..f3878360d37 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -647,7 +647,7 @@ dMeterMap_c_NS__move: /* 8020DD3C 0020AC7C 38 63 4E 00 */ addi r3, r3, 0x4e00 /* 8020DD40 0020AC80 3C 80 80 3A */ lis r4, lbl_80398208@ha /* 8020DD44 0020AC84 38 84 82 08 */ addi r4, r4, lbl_80398208@l -/* 8020DD48 0020AC88 48 15 AC 4D */ bl func_80368994 +/* 8020DD48 0020AC88 48 15 AC 4D */ bl strcmp /* 8020DD4C 0020AC8C 2C 03 00 00 */ cmpwi r3, 0 /* 8020DD50 0020AC90 40 82 00 1C */ bne lbl_8020DD6C /* 8020DD54 0020AC94 7F 83 E3 78 */ mr r3, r28 diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index 63a1d3a2b00..f20513e6b2b 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -13338,7 +13338,7 @@ dMeter2Draw_c_NS_getCanoeFishing: /* 8021BBCC 00218B0C 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8021BBD0 00218B10 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8021BBD4 00218B14 38 84 01 9F */ addi r4, r4, 0x19f -/* 8021BBD8 00218B18 48 14 CD BD */ bl func_80368994 +/* 8021BBD8 00218B18 48 14 CD BD */ bl strcmp /* 8021BBDC 00218B1C 2C 03 00 00 */ cmpwi r3, 0 /* 8021BBE0 00218B20 40 82 00 30 */ bne lbl_8021BC10 /* 8021BBE4 00218B24 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index 97c71afb9d5..80efc9d971a 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -952,7 +952,7 @@ dMeter2Info_c_NS_warpOutProc: /* 8021CAF0 00219A30 3C 80 80 3A */ lis r4, lbl_80399168@ha /* 8021CAF4 00219A34 38 84 91 68 */ addi r4, r4, lbl_80399168@l /* 8021CAF8 00219A38 38 84 00 0C */ addi r4, r4, 0xc -/* 8021CAFC 00219A3C 48 14 BE 99 */ bl func_80368994 +/* 8021CAFC 00219A3C 48 14 BE 99 */ bl strcmp /* 8021CB00 00219A40 2C 03 00 00 */ cmpwi r3, 0 /* 8021CB04 00219A44 40 82 00 60 */ bne lbl_8021CB64 /* 8021CB08 00219A48 38 60 FF FF */ li r3, -1 @@ -987,7 +987,7 @@ lbl_8021CB64: /* 8021CB68 00219AA8 3C 80 80 3A */ lis r4, lbl_80399168@ha /* 8021CB6C 00219AAC 38 84 91 68 */ addi r4, r4, lbl_80399168@l /* 8021CB70 00219AB0 38 84 00 13 */ addi r4, r4, 0x13 -/* 8021CB74 00219AB4 48 14 BE 21 */ bl func_80368994 +/* 8021CB74 00219AB4 48 14 BE 21 */ bl strcmp /* 8021CB78 00219AB8 2C 03 00 00 */ cmpwi r3, 0 /* 8021CB7C 00219ABC 40 82 00 20 */ bne lbl_8021CB9C /* 8021CB80 00219AC0 7F E0 07 75 */ extsb. r0, r31 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 7b6ec00aeca..7f37db1cb36 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -606,7 +606,7 @@ lbl_8024A728: /* 8024A734 00247674 4B DB 8E 0D */ bl func_80003540 /* 8024A738 00247678 38 61 00 08 */ addi r3, r1, 8 /* 8024A73C 0024767C 7F 84 E3 78 */ mr r4, r28 -/* 8024A740 00247680 48 11 E2 55 */ bl func_80368994 +/* 8024A740 00247680 48 11 E2 55 */ bl strcmp /* 8024A744 00247684 2C 03 00 00 */ cmpwi r3, 0 /* 8024A748 00247688 40 82 00 0C */ bne lbl_8024A754 /* 8024A74C 0024768C 7F E3 FB 78 */ mr r3, r31 @@ -2335,7 +2335,7 @@ lbl_8024BF34: /* 8024C014 00248F54 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8024C018 00248F58 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8024C01C 00248F5C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8024C020 00248F60 48 11 C9 75 */ bl func_80368994 +/* 8024C020 00248F60 48 11 C9 75 */ bl strcmp /* 8024C024 00248F64 2C 03 00 00 */ cmpwi r3, 0 /* 8024C028 00248F68 40 82 00 28 */ bne lbl_8024C050 /* 8024C02C 00248F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/asm/d/msg/d_msg_unit.s b/asm/d/msg/d_msg_unit.s index 666ae7f3387..2280fcb3c3b 100644 --- a/asm/d/msg/d_msg_unit.s +++ b/asm/d/msg/d_msg_unit.s @@ -222,7 +222,7 @@ lbl_80238F94: /* 80238F98 00235ED8 3C 80 80 3A */ lis r4, lbl_803996E8@ha /* 80238F9C 00235EDC 38 84 96 E8 */ addi r4, r4, lbl_803996E8@l /* 80238FA0 00235EE0 38 84 00 11 */ addi r4, r4, 0x11 -/* 80238FA4 00235EE4 48 12 F9 F1 */ bl func_80368994 +/* 80238FA4 00235EE4 48 12 F9 F1 */ bl strcmp /* 80238FA8 00235EE8 2C 03 00 00 */ cmpwi r3, 0 /* 80238FAC 00235EEC 40 82 00 28 */ bne lbl_80238FD4 /* 80238FB0 00235EF0 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 8bbc8b07acc..7510af04adf 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -519,14 +519,14 @@ lbl_80259B2C: /* 80259B58 00256A98 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259B5C 00256A9C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259B60 00256AA0 38 84 00 0F */ addi r4, r4, 0xf -/* 80259B64 00256AA4 48 10 EE 31 */ bl func_80368994 +/* 80259B64 00256AA4 48 10 EE 31 */ bl strcmp /* 80259B68 00256AA8 2C 03 00 00 */ cmpwi r3, 0 /* 80259B6C 00256AAC 41 82 00 40 */ beq lbl_80259BAC /* 80259B70 00256AB0 7F E3 FB 78 */ mr r3, r31 /* 80259B74 00256AB4 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259B78 00256AB8 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259B7C 00256ABC 38 84 00 17 */ addi r4, r4, 0x17 -/* 80259B80 00256AC0 48 10 EE 15 */ bl func_80368994 +/* 80259B80 00256AC0 48 10 EE 15 */ bl strcmp /* 80259B84 00256AC4 2C 03 00 00 */ cmpwi r3, 0 /* 80259B88 00256AC8 40 82 00 3C */ bne lbl_80259BC4 /* 80259B8C 00256ACC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -721,7 +721,7 @@ lbl_80259E20: /* 80259E38 00256D78 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259E3C 00256D7C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259E40 00256D80 38 84 00 1F */ addi r4, r4, 0x1f -/* 80259E44 00256D84 48 10 EB 51 */ bl func_80368994 +/* 80259E44 00256D84 48 10 EB 51 */ bl strcmp /* 80259E48 00256D88 2C 03 00 00 */ cmpwi r3, 0 /* 80259E4C 00256D8C 40 82 00 3C */ bne lbl_80259E88 /* 80259E50 00256D90 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -743,7 +743,7 @@ lbl_80259E88: /* 80259E8C 00256DCC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259E90 00256DD0 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259E94 00256DD4 38 84 00 0F */ addi r4, r4, 0xf -/* 80259E98 00256DD8 48 10 EA FD */ bl func_80368994 +/* 80259E98 00256DD8 48 10 EA FD */ bl strcmp /* 80259E9C 00256DDC 2C 03 00 00 */ cmpwi r3, 0 /* 80259EA0 00256DE0 40 82 00 34 */ bne lbl_80259ED4 /* 80259EA4 00256DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -763,7 +763,7 @@ lbl_80259ED4: /* 80259ED8 00256E18 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259EDC 00256E1C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259EE0 00256E20 38 84 00 27 */ addi r4, r4, 0x27 -/* 80259EE4 00256E24 48 10 EA B1 */ bl func_80368994 +/* 80259EE4 00256E24 48 10 EA B1 */ bl strcmp /* 80259EE8 00256E28 2C 03 00 00 */ cmpwi r3, 0 /* 80259EEC 00256E2C 40 82 00 34 */ bne lbl_80259F20 /* 80259EF0 00256E30 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -783,7 +783,7 @@ lbl_80259F20: /* 80259F24 00256E64 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259F28 00256E68 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259F2C 00256E6C 38 84 00 2F */ addi r4, r4, 0x2f -/* 80259F30 00256E70 48 10 EA 65 */ bl func_80368994 +/* 80259F30 00256E70 48 10 EA 65 */ bl strcmp /* 80259F34 00256E74 2C 03 00 00 */ cmpwi r3, 0 /* 80259F38 00256E78 40 82 00 30 */ bne lbl_80259F68 /* 80259F3C 00256E7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -802,7 +802,7 @@ lbl_80259F68: /* 80259F6C 00256EAC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 80259F70 00256EB0 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 80259F74 00256EB4 38 84 00 37 */ addi r4, r4, 0x37 -/* 80259F78 00256EB8 48 10 EA 1D */ bl func_80368994 +/* 80259F78 00256EB8 48 10 EA 1D */ bl strcmp /* 80259F7C 00256EBC 2C 03 00 00 */ cmpwi r3, 0 /* 80259F80 00256EC0 40 82 00 54 */ bne lbl_80259FD4 /* 80259F84 00256EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -857,7 +857,7 @@ lbl_8025A034: /* 8025A038 00256F78 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A03C 00256F7C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A040 00256F80 38 84 00 27 */ addi r4, r4, 0x27 -/* 8025A044 00256F84 48 10 E9 51 */ bl func_80368994 +/* 8025A044 00256F84 48 10 E9 51 */ bl strcmp /* 8025A048 00256F88 2C 03 00 00 */ cmpwi r3, 0 /* 8025A04C 00256F8C 40 82 00 38 */ bne lbl_8025A084 /* 8025A050 00256F90 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -878,7 +878,7 @@ lbl_8025A084: /* 8025A088 00256FC8 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A08C 00256FCC 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A090 00256FD0 38 84 00 1F */ addi r4, r4, 0x1f -/* 8025A094 00256FD4 48 10 E9 01 */ bl func_80368994 +/* 8025A094 00256FD4 48 10 E9 01 */ bl strcmp /* 8025A098 00256FD8 2C 03 00 00 */ cmpwi r3, 0 /* 8025A09C 00256FDC 40 82 00 1C */ bne lbl_8025A0B8 /* 8025A0A0 00256FE0 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -892,7 +892,7 @@ lbl_8025A0B8: /* 8025A0BC 00256FFC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A0C0 00257000 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A0C4 00257004 38 84 00 3F */ addi r4, r4, 0x3f -/* 8025A0C8 00257008 48 10 E8 CD */ bl func_80368994 +/* 8025A0C8 00257008 48 10 E8 CD */ bl strcmp /* 8025A0CC 0025700C 2C 03 00 00 */ cmpwi r3, 0 /* 8025A0D0 00257010 40 82 00 14 */ bne lbl_8025A0E4 /* 8025A0D4 00257014 38 60 00 00 */ li r3, 0 @@ -904,7 +904,7 @@ lbl_8025A0E4: /* 8025A0E8 00257028 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A0EC 0025702C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A0F0 00257030 38 84 00 0F */ addi r4, r4, 0xf -/* 8025A0F4 00257034 48 10 E8 A1 */ bl func_80368994 +/* 8025A0F4 00257034 48 10 E8 A1 */ bl strcmp /* 8025A0F8 00257038 2C 03 00 00 */ cmpwi r3, 0 /* 8025A0FC 0025703C 40 82 00 1C */ bne lbl_8025A118 /* 8025A100 00257040 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -918,7 +918,7 @@ lbl_8025A118: /* 8025A11C 0025705C 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A120 00257060 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A124 00257064 38 84 00 27 */ addi r4, r4, 0x27 -/* 8025A128 00257068 48 10 E8 6D */ bl func_80368994 +/* 8025A128 00257068 48 10 E8 6D */ bl strcmp /* 8025A12C 0025706C 2C 03 00 00 */ cmpwi r3, 0 /* 8025A130 00257070 40 82 00 1C */ bne lbl_8025A14C /* 8025A134 00257074 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -932,7 +932,7 @@ lbl_8025A14C: /* 8025A150 00257090 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A154 00257094 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A158 00257098 38 84 00 27 */ addi r4, r4, 0x27 -/* 8025A15C 0025709C 48 10 E8 39 */ bl func_80368994 +/* 8025A15C 0025709C 48 10 E8 39 */ bl strcmp /* 8025A160 002570A0 2C 03 00 00 */ cmpwi r3, 0 /* 8025A164 002570A4 40 82 00 24 */ bne lbl_8025A188 /* 8025A168 002570A8 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -949,7 +949,7 @@ lbl_8025A188: /* 8025A18C 002570CC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A190 002570D0 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A194 002570D4 38 84 00 46 */ addi r4, r4, 0x46 -/* 8025A198 002570D8 48 10 E7 FD */ bl func_80368994 +/* 8025A198 002570D8 48 10 E7 FD */ bl strcmp /* 8025A19C 002570DC 2C 03 00 00 */ cmpwi r3, 0 /* 8025A1A0 002570E0 40 82 00 30 */ bne lbl_8025A1D0 /* 8025A1A4 002570E4 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -972,7 +972,7 @@ lbl_8025A1D0: /* 8025A1E4 00257124 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A1E8 00257128 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A1EC 0025712C 38 84 00 4E */ addi r4, r4, 0x4e -/* 8025A1F0 00257130 48 10 E7 A5 */ bl func_80368994 +/* 8025A1F0 00257130 48 10 E7 A5 */ bl strcmp /* 8025A1F4 00257134 2C 03 00 00 */ cmpwi r3, 0 /* 8025A1F8 00257138 40 82 00 44 */ bne lbl_8025A23C /* 8025A1FC 0025713C 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -997,7 +997,7 @@ lbl_8025A23C: /* 8025A240 00257180 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A244 00257184 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A248 00257188 38 84 00 56 */ addi r4, r4, 0x56 -/* 8025A24C 0025718C 48 10 E7 49 */ bl func_80368994 +/* 8025A24C 0025718C 48 10 E7 49 */ bl strcmp /* 8025A250 00257190 2C 03 00 00 */ cmpwi r3, 0 /* 8025A254 00257194 40 82 00 34 */ bne lbl_8025A288 /* 8025A258 00257198 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -1017,7 +1017,7 @@ lbl_8025A288: /* 8025A28C 002571CC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A290 002571D0 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A294 002571D4 38 84 00 56 */ addi r4, r4, 0x56 -/* 8025A298 002571D8 48 10 E6 FD */ bl func_80368994 +/* 8025A298 002571D8 48 10 E6 FD */ bl strcmp /* 8025A29C 002571DC 2C 03 00 00 */ cmpwi r3, 0 /* 8025A2A0 002571E0 40 82 00 34 */ bne lbl_8025A2D4 /* 8025A2A4 002571E4 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -1037,7 +1037,7 @@ lbl_8025A2D4: /* 8025A2D8 00257218 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A2DC 0025721C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A2E0 00257220 38 84 00 56 */ addi r4, r4, 0x56 -/* 8025A2E4 00257224 48 10 E6 B1 */ bl func_80368994 +/* 8025A2E4 00257224 48 10 E6 B1 */ bl strcmp /* 8025A2E8 00257228 2C 03 00 00 */ cmpwi r3, 0 /* 8025A2EC 0025722C 40 82 00 44 */ bne lbl_8025A330 /* 8025A2F0 00257230 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -1062,7 +1062,7 @@ lbl_8025A330: /* 8025A334 00257274 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A338 00257278 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A33C 0025727C 38 84 00 5E */ addi r4, r4, 0x5e -/* 8025A340 00257280 48 10 E6 55 */ bl func_80368994 +/* 8025A340 00257280 48 10 E6 55 */ bl strcmp /* 8025A344 00257284 2C 03 00 00 */ cmpwi r3, 0 /* 8025A348 00257288 40 82 00 4C */ bne lbl_8025A394 /* 8025A34C 0025728C 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) @@ -1490,7 +1490,7 @@ lbl_8025A93C: /* 8025A99C 002578DC 3C 80 80 3A */ lis r4, lbl_8039A2C8@ha /* 8025A9A0 002578E0 38 84 A2 C8 */ addi r4, r4, lbl_8039A2C8@l /* 8025A9A4 002578E4 80 84 00 00 */ lwz r4, 0(r4) -/* 8025A9A8 002578E8 48 10 DF ED */ bl func_80368994 +/* 8025A9A8 002578E8 48 10 DF ED */ bl strcmp /* 8025A9AC 002578EC 2C 03 00 00 */ cmpwi r3, 0 /* 8025A9B0 002578F0 40 82 00 08 */ bne lbl_8025A9B8 /* 8025A9B4 002578F4 9B 8D 81 E4 */ stb r28, lbl_80450764-_SDA_BASE_(r13) diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index 94908df90ef..c910d2afa5d 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -62,7 +62,7 @@ lbl_8025AEC0: /* 8025AEDC 00257E1C 38 84 00 01 */ addi r4, r4, 1 /* 8025AEE0 00257E20 7C 9E 22 14 */ add r4, r30, r4 lbl_8025AEE4: -/* 8025AEE4 00257E24 48 10 DA B1 */ bl func_80368994 +/* 8025AEE4 00257E24 48 10 DA B1 */ bl strcmp /* 8025AEE8 00257E28 2C 03 00 00 */ cmpwi r3, 0 /* 8025AEEC 00257E2C 41 82 00 0C */ beq lbl_8025AEF8 /* 8025AEF0 00257E30 7F 83 E3 78 */ mr r3, r28 @@ -131,7 +131,7 @@ lbl_8025AFA0: lbl_8025AFC0: /* 8025AFC0 00257F00 7F 63 DB 78 */ mr r3, r27 /* 8025AFC4 00257F04 7F E4 FB 78 */ mr r4, r31 -/* 8025AFC8 00257F08 48 10 D9 CD */ bl func_80368994 +/* 8025AFC8 00257F08 48 10 D9 CD */ bl strcmp /* 8025AFCC 00257F0C 2C 03 00 00 */ cmpwi r3, 0 /* 8025AFD0 00257F10 41 82 00 EC */ beq lbl_8025B0BC /* 8025AFD4 00257F14 7F 63 DB 78 */ mr r3, r27 @@ -704,7 +704,7 @@ lbl_8025B728: /* 8025B7B8 002586F8 41 82 00 40 */ beq lbl_8025B7F8 /* 8025B7BC 002586FC 38 7D 4E 0E */ addi r3, r29, 0x4e0e /* 8025B7C0 00258700 38 9D 4E 00 */ addi r4, r29, 0x4e00 -/* 8025B7C4 00258704 48 10 D1 D1 */ bl func_80368994 +/* 8025B7C4 00258704 48 10 D1 D1 */ bl strcmp /* 8025B7C8 00258708 2C 03 00 00 */ cmpwi r3, 0 /* 8025B7CC 0025870C 40 82 00 2C */ bne lbl_8025B7F8 /* 8025B7D0 00258710 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -788,7 +788,7 @@ lbl_8025B888: /* 8025B8F8 00258838 4B DC 8A B9 */ bl dStage_roomControl_c_NS_getMemoryBlock /* 8025B8FC 0025883C 7C 7D 1B 79 */ or. r29, r3, r3 /* 8025B900 00258840 41 82 00 18 */ beq lbl_8025B918 -/* 8025B904 00258844 48 07 44 61 */ bl JKRExpHeap_NS_getTotalUsedSize +/* 8025B904 00258844 48 07 44 61 */ bl getTotalUsedSize__10JKRExpHeapCFv /* 8025B908 00258848 2C 03 00 00 */ cmpwi r3, 0 /* 8025B90C 0025884C 41 82 00 38 */ beq lbl_8025B944 /* 8025B910 00258850 38 60 00 00 */ li r3, 0 diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index 353d58d4f8f..d4fe9240826 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -2,54 +2,6 @@ .section .text, "ax" # 8025bb78 - -.global dSvBit_childSwPerfectionHIO_c -dSvBit_childSwPerfectionHIO_c: -/* 8025BB78 00258AB8 3C 80 80 3C */ lis r4, lbl_803C3384@ha -/* 8025BB7C 00258ABC 38 04 33 84 */ addi r0, r4, lbl_803C3384@l -/* 8025BB80 00258AC0 90 03 00 00 */ stw r0, 0(r3) -/* 8025BB84 00258AC4 38 C0 00 00 */ li r6, 0 -/* 8025BB88 00258AC8 38 80 00 00 */ li r4, 0 -/* 8025BB8C 00258ACC 38 00 00 80 */ li r0, 0x80 -/* 8025BB90 00258AD0 7C 09 03 A6 */ mtctr r0 -lbl_8025BB94: -/* 8025BB94 00258AD4 7C A3 32 14 */ add r5, r3, r6 -/* 8025BB98 00258AD8 98 85 00 05 */ stb r4, 5(r5) -/* 8025BB9C 00258ADC 98 85 00 85 */ stb r4, 0x85(r5) -/* 8025BBA0 00258AE0 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BBA4 00258AE4 42 00 FF F0 */ bdnz lbl_8025BB94 -/* 8025BBA8 00258AE8 4E 80 00 20 */ blr - -.global dSvBit_childSwPerfectionHIO_c_NS_init -dSvBit_childSwPerfectionHIO_c_NS_init: -/* 8025BBAC 00258AEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BBB0 00258AF0 7C 08 02 A6 */ mflr r0 -/* 8025BBB4 00258AF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BBB8 00258AF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BBBC 00258AFC 48 10 66 21 */ bl _savegpr_29 -/* 8025BBC0 00258B00 7C 7D 1B 78 */ mr r29, r3 -/* 8025BBC4 00258B04 3B C0 00 00 */ li r30, 0 -/* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8025BBCC 00258B0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8025BBD0 00258B10 3B E3 09 58 */ addi r31, r3, 0x958 -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 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) -/* 8025BBEC 00258B2C 98 04 00 85 */ stb r0, 0x85(r4) -/* 8025BBF0 00258B30 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BBF4 00258B34 2C 1E 00 80 */ cmpwi r30, 0x80 -/* 8025BBF8 00258B38 41 80 FF DC */ blt lbl_8025BBD4 -/* 8025BBFC 00258B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC00 00258B40 48 10 66 29 */ bl _restgpr_29 -/* 8025BC04 00258B44 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BC08 00258B48 7C 08 03 A6 */ mtlr r0 -/* 8025BC0C 00258B4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BC10 00258B50 4E 80 00 20 */ blr - .global dSvBit_childSwDungeonHIO_c dSvBit_childSwDungeonHIO_c: /* 8025BC14 00258B54 3C 80 80 3C */ lis r4, lbl_803C3378@ha @@ -523,7 +475,7 @@ dSvBit_HIO_c_NS_init: /* 8025C204 00259144 93 E1 00 0C */ stw r31, 0xc(r1) /* 8025C208 00259148 7C 7F 1B 78 */ mr r31, r3 /* 8025C20C 0025914C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8025C210 00259150 4B FF F9 9D */ bl dSvBit_childSwPerfectionHIO_c_NS_init +/* 8025C210 00259150 4B FF F9 9D */ bl init__29dSvBit_childSwPerfectionHIO_cFv /* 8025C214 00259154 38 7F 01 18 */ addi r3, r31, 0x118 /* 8025C218 00259158 4B FF FA 31 */ bl dSvBit_childSwDungeonHIO_c_NS_init /* 8025C21C 0025915C 38 7F 01 A0 */ addi r3, r31, 0x1a0 @@ -799,7 +751,7 @@ lbl_8025C5E4: /* 8025C624 00259564 38 03 33 A8 */ addi r0, r3, lbl_803C33A8@l /* 8025C628 00259568 90 1F 00 08 */ stw r0, 8(r31) /* 8025C62C 0025956C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8025C630 00259570 4B FF F5 49 */ bl dSvBit_childSwPerfectionHIO_c +/* 8025C630 00259570 4B FF F5 49 */ bl __ct__29dSvBit_childSwPerfectionHIO_cFv /* 8025C634 00259574 38 7F 01 18 */ addi r3, r31, 0x118 /* 8025C638 00259578 4B FF F5 DD */ bl dSvBit_childSwDungeonHIO_c /* 8025C63C 0025957C 38 7F 01 A0 */ addi r3, r31, 0x1a0 diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index ea75222d3e8..75fcc069570 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -395,7 +395,7 @@ lbl_8019473C: /* 80194784 001916C4 3C 80 80 39 */ lis r4, lbl_80394AA0@ha /* 80194788 001916C8 38 84 4A A0 */ addi r4, r4, lbl_80394AA0@l /* 8019478C 001916CC 38 84 00 7B */ addi r4, r4, 0x7b -/* 80194790 001916D0 48 1D 42 05 */ bl func_80368994 +/* 80194790 001916D0 48 1D 42 05 */ bl strcmp /* 80194794 001916D4 2C 03 00 00 */ cmpwi r3, 0 /* 80194798 001916D8 41 82 00 40 */ beq lbl_801947D8 /* 8019479C 001916DC 88 1F 00 B5 */ lbz r0, 0xb5(r31) @@ -426,7 +426,7 @@ lbl_801947E0: /* 801947F8 00191738 3C 80 80 39 */ lis r4, lbl_80394AA0@ha /* 801947FC 0019173C 38 84 4A A0 */ addi r4, r4, lbl_80394AA0@l /* 80194800 00191740 38 84 00 7B */ addi r4, r4, 0x7b -/* 80194804 00191744 48 1D 41 91 */ bl func_80368994 +/* 80194804 00191744 48 1D 41 91 */ bl strcmp /* 80194808 00191748 2C 03 00 00 */ cmpwi r3, 0 /* 8019480C 0019174C 41 82 00 40 */ beq lbl_8019484C /* 80194810 00191750 88 1F 00 B5 */ lbz r0, 0xb5(r31) @@ -457,7 +457,7 @@ lbl_80194854: /* 8019486C 001917AC 3C 80 80 39 */ lis r4, lbl_80394AA0@ha /* 80194870 001917B0 38 84 4A A0 */ addi r4, r4, lbl_80394AA0@l /* 80194874 001917B4 38 84 00 7B */ addi r4, r4, 0x7b -/* 80194878 001917B8 48 1D 41 1D */ bl func_80368994 +/* 80194878 001917B8 48 1D 41 1D */ bl strcmp /* 8019487C 001917BC 2C 03 00 00 */ cmpwi r3, 0 /* 80194880 001917C0 41 82 00 40 */ beq lbl_801948C0 /* 80194884 001917C4 88 1F 00 B5 */ lbz r0, 0xb5(r31) @@ -488,7 +488,7 @@ lbl_801948C8: /* 801948E0 00191820 3C 80 80 39 */ lis r4, lbl_80394AA0@ha /* 801948E4 00191824 38 84 4A A0 */ addi r4, r4, lbl_80394AA0@l /* 801948E8 00191828 38 84 00 7B */ addi r4, r4, 0x7b -/* 801948EC 0019182C 48 1D 40 A9 */ bl func_80368994 +/* 801948EC 0019182C 48 1D 40 A9 */ bl strcmp /* 801948F0 00191830 2C 03 00 00 */ cmpwi r3, 0 /* 801948F4 00191834 41 82 00 28 */ beq lbl_8019491C /* 801948F8 00191838 88 1F 00 B5 */ lbz r0, 0xb5(r31) diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index c9525edce5a..e3780624cea 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -1935,7 +1935,7 @@ lbl_80198BCC: /* 80198C04 00195B44 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 80198C08 00195B48 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 80198C0C 00195B4C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80198C10 00195B50 48 1C FD 85 */ bl func_80368994 +/* 80198C10 00195B50 48 1C FD 85 */ bl strcmp /* 80198C14 00195B54 2C 03 00 00 */ cmpwi r3, 0 /* 80198C18 00195B58 40 82 00 38 */ bne lbl_80198C50 /* 80198C1C 00195B5C 3C 60 80 43 */ lis r3, lbl_80430110@ha diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index b90a33488e5..d8fada4da34 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -728,7 +728,7 @@ lbl_8001A22C: /* 8001A260 000171A0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8001A264 000171A4 40 82 00 58 */ bne lbl_8001A2BC /* 8001A268 000171A8 7F C3 F3 78 */ mr r3, r30 -/* 8001A26C 000171AC 48 2B 44 C1 */ bl JKRHeap_NS_getFreeSize +/* 8001A26C 000171AC 48 2B 44 C1 */ bl getFreeSize__7JKRHeapFv /* 8001A270 000171B0 7C 65 1B 78 */ mr r5, r3 /* 8001A274 000171B4 3C 60 80 38 */ lis r3, lbl_803788C8@ha /* 8001A278 000171B8 38 63 88 C8 */ addi r3, r3, lbl_803788C8@l @@ -775,7 +775,7 @@ lbl_8001A2F8: /* 8001A310 00017250 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8001A314 00017254 40 82 00 38 */ bne lbl_8001A34C /* 8001A318 00017258 7F C3 F3 78 */ mr r3, r30 -/* 8001A31C 0001725C 48 2B 44 11 */ bl JKRHeap_NS_getFreeSize +/* 8001A31C 0001725C 48 2B 44 11 */ bl getFreeSize__7JKRHeapFv /* 8001A320 00017260 7C 64 1B 78 */ mr r4, r3 /* 8001A324 00017264 3C 60 80 38 */ lis r3, lbl_803788C8@ha /* 8001A328 00017268 38 63 88 C8 */ addi r3, r3, lbl_803788C8@l @@ -802,12 +802,12 @@ lbl_8001A374: /* 8001A374 000172B4 3B 00 00 00 */ li r24, 0 /* 8001A378 000172B8 83 3E 00 38 */ lwz r25, 0x38(r30) /* 8001A37C 000172BC 7F C3 F3 78 */ mr r3, r30 -/* 8001A380 000172C0 48 2B 43 AD */ bl JKRHeap_NS_getFreeSize +/* 8001A380 000172C0 48 2B 43 AD */ bl getFreeSize__7JKRHeapFv /* 8001A384 000172C4 7C 63 C8 50 */ subf r3, r3, r25 /* 8001A388 000172C8 38 03 00 1F */ addi r0, r3, 0x1f /* 8001A38C 000172CC 54 19 00 34 */ rlwinm r25, r0, 0, 0, 0x1a /* 8001A390 000172D0 4B FF 49 C1 */ bl mDoExt_getGameHeap -/* 8001A394 000172D4 48 2B 43 99 */ bl JKRHeap_NS_getFreeSize +/* 8001A394 000172D4 48 2B 43 99 */ bl getFreeSize__7JKRHeapFv /* 8001A398 000172D8 38 19 00 90 */ addi r0, r25, 0x90 /* 8001A39C 000172DC 7C 00 18 40 */ cmplw r0, r3 /* 8001A3A0 000172E0 40 80 00 14 */ bge lbl_8001A3B4 @@ -2777,7 +2777,7 @@ lbl_8001BE6C: lbl_8001BE8C: /* 8001BE8C 00018DCC 7E 63 9B 78 */ mr r3, r19 /* 8001BE90 00018DD0 38 9D 00 02 */ addi r4, r29, 2 -/* 8001BE94 00018DD4 48 34 CB 01 */ bl func_80368994 +/* 8001BE94 00018DD4 48 34 CB 01 */ bl strcmp /* 8001BE98 00018DD8 2C 03 00 00 */ cmpwi r3, 0 /* 8001BE9C 00018DDC 40 82 00 0C */ bne lbl_8001BEA8 /* 8001BEA0 00018DE0 8B FD 00 01 */ lbz r31, 1(r29) diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index 2518bd22d75..d426474ad11 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -1722,7 +1722,7 @@ lbl_8000E888: /* 8000E89C 0000B7DC 7F 44 D3 78 */ mr r4, r26 /* 8000E8A0 0000B7E0 48 2D 02 59 */ bl JUTNameTab_NS_getName /* 8000E8A4 0000B7E4 7E E4 BB 78 */ mr r4, r23 -/* 8000E8A8 0000B7E8 48 35 A0 ED */ bl func_80368994 +/* 8000E8A8 0000B7E8 48 35 A0 ED */ bl strcmp /* 8000E8AC 0000B7EC 2C 03 00 00 */ cmpwi r3, 0 /* 8000E8B0 0000B7F0 40 82 01 04 */ bne lbl_8000E9B4 /* 8000E8B4 0000B7F4 80 7D 00 04 */ lwz r3, 4(r29) diff --git a/asm/m/Do/m_Do_graphic.s b/asm/m/Do/m_Do_graphic.s index 0acbf580ca4..b1dd4310947 100644 --- a/asm/m/Do/m_Do_graphic.s +++ b/asm/m/Do/m_Do_graphic.s @@ -3151,7 +3151,7 @@ lbl_8000AC58: /* 8000AC78 00007BB8 7F 23 CB 78 */ mr r3, r25 /* 8000AC7C 00007BBC 3C 80 80 37 */ lis r4, lbl_80373DD0@ha /* 8000AC80 00007BC0 38 84 3D D0 */ addi r4, r4, lbl_80373DD0@l -/* 8000AC84 00007BC4 48 35 DD 11 */ bl func_80368994 +/* 8000AC84 00007BC4 48 35 DD 11 */ bl strcmp /* 8000AC88 00007BC8 2C 03 00 00 */ cmpwi r3, 0 /* 8000AC8C 00007BCC 40 82 00 20 */ bne lbl_8000ACAC /* 8000AC90 00007BD0 7F C3 F3 78 */ mr r3, r30 @@ -3222,7 +3222,7 @@ lbl_8000ACAC: /* 8000AD90 00007CD0 3C 80 80 37 */ lis r4, lbl_80373DD0@ha /* 8000AD94 00007CD4 38 84 3D D0 */ addi r4, r4, lbl_80373DD0@l /* 8000AD98 00007CD8 38 84 00 08 */ addi r4, r4, 8 -/* 8000AD9C 00007CDC 48 35 DB F9 */ bl func_80368994 +/* 8000AD9C 00007CDC 48 35 DB F9 */ bl strcmp /* 8000ADA0 00007CE0 2C 03 00 00 */ cmpwi r3, 0 /* 8000ADA4 00007CE4 40 82 00 48 */ bne lbl_8000ADEC lbl_8000ADA8: @@ -3306,7 +3306,7 @@ lbl_8000AEC0: /* 8000AED0 00007E10 3C 80 80 37 */ lis r4, lbl_80373DD0@ha /* 8000AED4 00007E14 38 84 3D D0 */ addi r4, r4, lbl_80373DD0@l /* 8000AED8 00007E18 38 84 00 0F */ addi r4, r4, 0xf -/* 8000AEDC 00007E1C 48 35 DA B9 */ bl func_80368994 +/* 8000AEDC 00007E1C 48 35 DA B9 */ bl strcmp /* 8000AEE0 00007E20 2C 03 00 00 */ cmpwi r3, 0 /* 8000AEE4 00007E24 41 82 00 14 */ beq lbl_8000AEF8 /* 8000AEE8 00007E28 88 0D 86 66 */ lbz r0, lbl_80450BE6-_SDA_BASE_(r13) @@ -3414,7 +3414,7 @@ lbl_8000B064: /* 8000B070 00007FB0 3C 80 80 37 */ lis r4, lbl_80373DD0@ha /* 8000B074 00007FB4 38 84 3D D0 */ addi r4, r4, lbl_80373DD0@l /* 8000B078 00007FB8 38 84 00 0F */ addi r4, r4, 0xf -/* 8000B07C 00007FBC 48 35 D9 19 */ bl func_80368994 +/* 8000B07C 00007FBC 48 35 D9 19 */ bl strcmp /* 8000B080 00007FC0 2C 03 00 00 */ cmpwi r3, 0 /* 8000B084 00007FC4 41 82 00 10 */ beq lbl_8000B094 /* 8000B088 00007FC8 88 0D 86 66 */ lbz r0, lbl_80450BE6-_SDA_BASE_(r13) diff --git a/asm/m/Do/m_Do_machine.s b/asm/m/Do/m_Do_machine.s index 043f072b307..4c0ba15f222 100644 --- a/asm/m/Do/m_Do_machine.s +++ b/asm/m/Do/m_Do_machine.s @@ -198,7 +198,7 @@ lbl_8000B45C: /* 8000B490 000083D0 48 2C 32 F5 */ bl JKRHeap_NS_getTotalFreeSize /* 8000B494 000083D4 7C 7E 1B 78 */ mr r30, r3 /* 8000B498 000083D8 7F E3 FB 78 */ mr r3, r31 -/* 8000B49C 000083DC 48 2C 32 91 */ bl JKRHeap_NS_getFreeSize +/* 8000B49C 000083DC 48 2C 32 91 */ bl getFreeSize__7JKRHeapFv /* 8000B4A0 000083E0 7C 64 1B 78 */ mr r4, r3 /* 8000B4A4 000083E4 93 81 00 08 */ stw r28, 8(r1) /* 8000B4A8 000083E8 93 A1 00 0C */ stw r29, 0xc(r1) @@ -999,7 +999,7 @@ lbl_8000BED4: /* 8000BFA0 00008EE0 4B FF FD 59 */ bl my_SysPrintHeap /* 8000BFA4 00008EE4 83 ED 8D F0 */ lwz r31, lbl_80451370-_SDA_BASE_(r13) /* 8000BFA8 00008EE8 7F E3 FB 78 */ mr r3, r31 -/* 8000BFAC 00008EEC 48 2C 27 81 */ bl JKRHeap_NS_getFreeSize +/* 8000BFAC 00008EEC 48 2C 27 81 */ bl getFreeSize__7JKRHeapFv /* 8000BFB0 00008EF0 3F C3 FF FF */ addis r30, r3, 0xffff /* 8000BFB4 00008EF4 7F C3 F3 78 */ mr r3, r30 /* 8000BFB8 00008EF8 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/m/Do/m_Do_main.s b/asm/m/Do/m_Do_main.s index 03d09cfec45..1dd7d97a4eb 100644 --- a/asm/m/Do/m_Do_main.s +++ b/asm/m/Do/m_Do_main.s @@ -1,166 +1,7 @@ .include "macros.inc" -.section .text, "ax" # 800056c0 - - -.include "macros.inc" - .section .text, "ax" # 0x800056C0 - 0x803737C0 -.global version_check -version_check: -/* 800056C0 00002600 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800056C4 00002604 7C 08 02 A6 */ mflr r0 -/* 800056C8 00002608 90 01 00 14 */ stw r0, 0x14(r1) -/* 800056CC 0000260C 3C 60 80 37 */ lis r3, lbl_803739A0@ha -/* 800056D0 00002610 38 63 39 A0 */ addi r3, r3, lbl_803739A0@l -/* 800056D4 00002614 7C 64 1B 78 */ mr r4, r3 -/* 800056D8 00002618 48 36 32 BD */ bl func_80368994 -/* 800056DC 0000261C 2C 03 00 00 */ cmpwi r3, 0 -/* 800056E0 00002620 40 82 00 20 */ bne lbl_80005700 -/* 800056E4 00002624 3C 60 80 37 */ lis r3, lbl_803739A0@ha -/* 800056E8 00002628 38 63 39 A0 */ addi r3, r3, lbl_803739A0@l -/* 800056EC 0000262C 38 63 00 0A */ addi r3, r3, 0xa -/* 800056F0 00002630 7C 64 1B 78 */ mr r4, r3 -/* 800056F4 00002634 48 36 32 A1 */ bl func_80368994 -/* 800056F8 00002638 2C 03 00 00 */ cmpwi r3, 0 -/* 800056FC 0000263C 41 82 00 1C */ beq lbl_80005718 -lbl_80005700: -/* 80005700 00002640 3C 60 80 37 */ lis r3, lbl_803739A0@ha -/* 80005704 00002644 38 63 39 A0 */ addi r3, r3, lbl_803739A0@l -/* 80005708 00002648 38 63 00 11 */ addi r3, r3, 0x11 -/* 8000570C 0000264C 4C C6 31 82 */ crclr 6 -/* 80005710 00002650 48 00 14 FD */ bl OSReport_Error -lbl_80005714: -/* 80005714 00002654 48 00 00 00 */ b lbl_80005714 -lbl_80005718: -/* 80005718 00002658 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8000571C 0000265C 7C 08 03 A6 */ mtlr r0 -/* 80005720 00002660 38 21 00 10 */ addi r1, r1, 0x10 -/* 80005724 00002664 4E 80 00 20 */ blr - -.global HeapCheck_NS_CheckHeap1 -HeapCheck_NS_CheckHeap1: -/* 80005728 00002668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000572C 0000266C 7C 08 02 A6 */ mflr r0 -/* 80005730 00002670 90 01 00 14 */ stw r0, 0x14(r1) -/* 80005734 00002674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80005738 00002678 93 C1 00 08 */ stw r30, 8(r1) -/* 8000573C 0000267C 7C 7E 1B 78 */ mr r30, r3 -/* 80005740 00002680 80 63 00 08 */ lwz r3, 8(r3) -/* 80005744 00002684 48 2C A6 21 */ bl JKRExpHeap_NS_getTotalUsedSize -/* 80005748 00002688 7C 7F 1B 78 */ mr r31, r3 -/* 8000574C 0000268C 80 7E 00 08 */ lwz r3, 8(r30) -/* 80005750 00002690 48 2C 8F DD */ bl JKRHeap_NS_getFreeSize -/* 80005754 00002694 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 80005758 00002698 7C 00 F8 00 */ cmpw r0, r31 -/* 8000575C 0000269C 40 80 00 08 */ bge lbl_80005764 -/* 80005760 000026A0 93 FE 00 0C */ stw r31, 0xc(r30) -lbl_80005764: -/* 80005764 000026A4 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 80005768 000026A8 7C 00 18 00 */ cmpw r0, r3 -/* 8000576C 000026AC 40 81 00 08 */ ble lbl_80005774 -/* 80005770 000026B0 90 7E 00 10 */ stw r3, 0x10(r30) -lbl_80005774: -/* 80005774 000026B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80005778 000026B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8000577C 000026BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80005780 000026C0 7C 08 03 A6 */ mtlr r0 -/* 80005784 000026C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80005788 000026C8 4E 80 00 20 */ blr - -.global CheckHeap -CheckHeap: -/* 8000578C 000026CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80005790 000026D0 7C 08 02 A6 */ mflr r0 -/* 80005794 000026D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80005798 000026D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000579C 000026DC 48 35 CA 39 */ bl _savegpr_27 -/* 800057A0 000026E0 7C 7B 1B 78 */ mr r27, r3 -/* 800057A4 000026E4 48 00 5E C5 */ bl mDoMch_HeapCheckAll -/* 800057A8 000026E8 48 33 C7 59 */ bl OSCheckActiveThreads -/* 800057AC 000026EC 38 A0 00 00 */ li r5, 0 -/* 800057B0 000026F0 57 64 30 32 */ slwi r4, r27, 6 -/* 800057B4 000026F4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha -/* 800057B8 000026F8 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l -/* 800057BC 000026FC 7C 60 22 14 */ add r3, r0, r4 -/* 800057C0 00002700 80 03 00 30 */ lwz r0, 0x30(r3) -/* 800057C4 00002704 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 800057C8 00002708 28 00 00 60 */ cmplwi r0, 0x60 -/* 800057CC 0000270C 40 82 00 14 */ bne lbl_800057E0 -/* 800057D0 00002710 80 03 00 34 */ lwz r0, 0x34(r3) -/* 800057D4 00002714 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800057D8 00002718 41 82 00 08 */ beq lbl_800057E0 -/* 800057DC 0000271C 38 A0 00 01 */ li r5, 1 -lbl_800057E0: -/* 800057E0 00002720 54 BC 06 3E */ clrlwi r28, r5, 0x18 -/* 800057E4 00002724 3B 60 00 00 */ li r27, 0 -/* 800057E8 00002728 3B E0 00 00 */ li r31, 0 -/* 800057EC 0000272C 3C 60 80 3A */ lis r3, lbl_803A2EF4@ha -/* 800057F0 00002730 3B C3 2E F4 */ addi r30, r3, lbl_803A2EF4@l -lbl_800057F4: -/* 800057F4 00002734 7C 7E F8 2E */ lwzx r3, r30, r31 -/* 800057F8 00002738 4B FF FF 31 */ bl HeapCheck_NS_CheckHeap1 -/* 800057FC 0000273C 2C 1C 00 00 */ cmpwi r28, 0 -/* 80005800 00002740 41 82 00 20 */ beq lbl_80005820 -/* 80005804 00002744 7F BE F8 2E */ lwzx r29, r30, r31 -/* 80005808 00002748 7F A3 EB 78 */ mr r3, r29 -/* 8000580C 0000274C 48 00 00 95 */ bl HeapCheck_NS_getUsedCount -/* 80005810 00002750 90 7D 00 20 */ stw r3, 0x20(r29) -/* 80005814 00002754 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005818 00002758 48 2C A5 4D */ bl JKRExpHeap_NS_getTotalUsedSize -/* 8000581C 0000275C 90 7D 00 24 */ stw r3, 0x24(r29) -lbl_80005820: -/* 80005820 00002760 3B 7B 00 01 */ addi r27, r27, 1 -/* 80005824 00002764 2C 1B 00 08 */ cmpwi r27, 8 -/* 80005828 00002768 3B FF 00 04 */ addi r31, r31, 4 -/* 8000582C 0000276C 41 80 FF C8 */ blt lbl_800057F4 -/* 80005830 00002770 39 61 00 20 */ addi r11, r1, 0x20 -/* 80005834 00002774 48 35 C9 ED */ bl _restgpr_27 -/* 80005838 00002778 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8000583C 0000277C 7C 08 03 A6 */ mtlr r0 -/* 80005840 00002780 38 21 00 20 */ addi r1, r1, 0x20 -/* 80005844 00002784 4E 80 00 20 */ blr - -.global countUsed -countUsed: -/* 80005848 00002788 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000584C 0000278C 7C 08 02 A6 */ mflr r0 -/* 80005850 00002790 90 01 00 14 */ stw r0, 0x14(r1) -/* 80005854 00002794 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80005858 00002798 93 C1 00 08 */ stw r30, 8(r1) -/* 8000585C 0000279C 7C 7E 1B 78 */ mr r30, r3 -/* 80005860 000027A0 48 33 B4 65 */ bl OSDisableScheduler -/* 80005864 000027A4 3B E0 00 00 */ li r31, 0 -/* 80005868 000027A8 80 7E 00 80 */ lwz r3, 0x80(r30) -/* 8000586C 000027AC 48 00 00 0C */ b lbl_80005878 -lbl_80005870: -/* 80005870 000027B0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80005874 000027B4 3B FF 00 01 */ addi r31, r31, 1 -lbl_80005878: -/* 80005878 000027B8 28 03 00 00 */ cmplwi r3, 0 -/* 8000587C 000027BC 40 82 FF F4 */ bne lbl_80005870 -/* 80005880 000027C0 48 33 B4 85 */ bl OSEnableScheduler -/* 80005884 000027C4 7F E3 FB 78 */ mr r3, r31 -/* 80005888 000027C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8000588C 000027CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80005890 000027D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80005894 000027D4 7C 08 03 A6 */ mtlr r0 -/* 80005898 000027D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000589C 000027DC 4E 80 00 20 */ blr - -.global HeapCheck_NS_getUsedCount -HeapCheck_NS_getUsedCount: -/* 800058A0 000027E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800058A4 000027E4 7C 08 02 A6 */ mflr r0 -/* 800058A8 000027E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800058AC 000027EC 80 63 00 08 */ lwz r3, 8(r3) -/* 800058B0 000027F0 4B FF FF 99 */ bl countUsed -/* 800058B4 000027F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800058B8 000027F8 7C 08 03 A6 */ mtlr r0 -/* 800058BC 000027FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800058C0 00002800 4E 80 00 20 */ blr - .global HeapCheck_NS_heapDisplay HeapCheck_NS_heapDisplay: /* 800058C4 00002804 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -174,13 +15,13 @@ HeapCheck_NS_heapDisplay: /* 800058E4 00002824 7C 9A 23 78 */ mr r26, r4 /* 800058E8 00002828 80 1D 00 1C */ lwz r0, 0x1c(r29) /* 800058EC 0000282C 7F E0 20 50 */ subf r31, r0, r4 -/* 800058F0 00002830 48 2C A4 75 */ bl JKRExpHeap_NS_getTotalUsedSize +/* 800058F0 00002830 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv /* 800058F4 00002834 7C 7E 1B 78 */ mr r30, r3 /* 800058F8 00002838 80 7D 00 08 */ lwz r3, 8(r29) /* 800058FC 0000283C 48 2C 8E 89 */ bl JKRHeap_NS_getTotalFreeSize /* 80005900 00002840 7C 7B 1B 78 */ mr r27, r3 /* 80005904 00002844 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005908 00002848 48 2C 8E 25 */ bl JKRHeap_NS_getFreeSize +/* 80005908 00002848 48 2C 8E 25 */ bl getFreeSize__7JKRHeapFv /* 8000590C 0000284C 7C 7C 1B 78 */ mr r28, r3 /* 80005910 00002850 38 60 00 64 */ li r3, 0x64 /* 80005914 00002854 38 80 00 D4 */ li r4, 0xd4 @@ -281,7 +122,7 @@ HeapCheck_NS_heapDisplay: /* 80005A90 000029D0 4C C6 31 82 */ crclr 6 /* 80005A94 000029D4 48 2D AA 9D */ bl JUTReport /* 80005A98 000029D8 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005A9C 000029DC 4B FF FD AD */ bl countUsed +/* 80005A9C 000029DC 4B FF FD AD */ bl countUsed__FP10JKRExpHeap /* 80005AA0 000029E0 7C 66 1B 78 */ mr r6, r3 /* 80005AA4 000029E4 38 60 00 64 */ li r3, 0x64 /* 80005AA8 000029E8 38 80 01 65 */ li r4, 0x165 @@ -409,7 +250,7 @@ lbl_80005C6C: /* 80005C70 00002BB0 48 2C 8B 15 */ bl JKRHeap_NS_getTotalFreeSize /* 80005C74 00002BB4 7C 7E 1B 78 */ mr r30, r3 /* 80005C78 00002BB8 7F 03 C3 78 */ mr r3, r24 -/* 80005C7C 00002BBC 48 2C 8A B1 */ bl JKRHeap_NS_getFreeSize +/* 80005C7C 00002BBC 48 2C 8A B1 */ bl getFreeSize__7JKRHeapFv /* 80005C80 00002BC0 7C 7D 1B 78 */ mr r29, r3 /* 80005C84 00002BC4 48 00 00 54 */ b lbl_80005CD8 lbl_80005C88: @@ -418,20 +259,20 @@ lbl_80005C88: /* 80005C90 00002BD0 48 00 00 48 */ b lbl_80005CD8 lbl_80005C94: /* 80005C94 00002BD4 7E E3 BB 78 */ mr r3, r23 -/* 80005C98 00002BD8 4B FF FC 09 */ bl HeapCheck_NS_getUsedCount +/* 80005C98 00002BD8 4B FF FC 09 */ bl getUsedCount__9HeapCheckCFv /* 80005C9C 00002BDC 7C 7E 1B 78 */ mr r30, r3 /* 80005CA0 00002BE0 7F 03 C3 78 */ mr r3, r24 -/* 80005CA4 00002BE4 48 2C A0 C1 */ bl JKRExpHeap_NS_getTotalUsedSize +/* 80005CA4 00002BE4 48 2C A0 C1 */ bl getTotalUsedSize__10JKRExpHeapCFv /* 80005CA8 00002BE8 7C 7D 1B 78 */ mr r29, r3 /* 80005CAC 00002BEC 48 00 00 2C */ b lbl_80005CD8 lbl_80005CB0: /* 80005CB0 00002BF0 7E E3 BB 78 */ mr r3, r23 -/* 80005CB4 00002BF4 4B FF FB ED */ bl HeapCheck_NS_getUsedCount +/* 80005CB4 00002BF4 4B FF FB ED */ bl getUsedCount__9HeapCheckCFv /* 80005CB8 00002BF8 80 17 00 20 */ lwz r0, 0x20(r23) /* 80005CBC 00002BFC 7C 00 18 50 */ subf r0, r0, r3 /* 80005CC0 00002C00 7C 1E 03 78 */ mr r30, r0 /* 80005CC4 00002C04 80 77 00 08 */ lwz r3, 8(r23) -/* 80005CC8 00002C08 48 2C A0 9D */ bl JKRExpHeap_NS_getTotalUsedSize +/* 80005CC8 00002C08 48 2C A0 9D */ bl getTotalUsedSize__10JKRExpHeapCFv /* 80005CCC 00002C0C 80 17 00 24 */ lwz r0, 0x24(r23) /* 80005CD0 00002C10 7C 00 18 50 */ subf r0, r0, r3 /* 80005CD4 00002C14 7C 1D 03 78 */ mr r29, r0 @@ -795,7 +636,7 @@ debug: /* 800061E4 00003124 28 00 00 00 */ cmplwi r0, 0 /* 800061E8 00003128 41 82 00 0C */ beq lbl_800061F4 /* 800061EC 0000312C 38 60 00 02 */ li r3, 2 -/* 800061F0 00003130 4B FF F5 9D */ bl CheckHeap +/* 800061F0 00003130 4B FF F5 9D */ bl CheckHeap__FUl lbl_800061F4: /* 800061F4 00003134 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha /* 800061F8 00003138 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l @@ -986,7 +827,7 @@ main: /* 8000647C 000033BC 90 8D 85 8C */ stw r4, lbl_80450B0C-_SDA_BASE_(r13) /* 80006480 000033C0 90 6D 85 88 */ stw r3, lbl_80450B08-_SDA_BASE_(r13) /* 80006484 000033C4 48 00 04 41 */ bl OSReportInit -/* 80006488 000033C8 4B FF F2 39 */ bl version_check +/* 80006488 000033C8 4B FF F2 39 */ bl version_check__Fv /* 8000648C 000033CC 38 60 00 18 */ li r3, 0x18 /* 80006490 000033D0 38 80 00 04 */ li r4, 4 /* 80006494 000033D4 48 33 4E 19 */ bl OSAllocFromArenaLo diff --git a/asm/m/Do/machine/m_Do_machine_exception.s b/asm/m/Do/machine/m_Do_machine_exception.s index 94c3710df9c..766d836744d 100644 --- a/asm/m/Do/machine/m_Do_machine_exception.s +++ b/asm/m/Do/machine/m_Do_machine_exception.s @@ -66,13 +66,13 @@ dispHeapInfo: /* 80017E48 00014D88 7C 7F 1B 78 */ mr r31, r3 /* 80017E4C 00014D8C 83 CD 86 A8 */ lwz r30, lbl_80450C28-_SDA_BASE_(r13) /* 80017E50 00014D90 83 AD 86 B4 */ lwz r29, lbl_80450C34-_SDA_BASE_(r13) -/* 80017E54 00014D94 48 2B 68 D9 */ bl JKRHeap_NS_getFreeSize +/* 80017E54 00014D94 48 2B 68 D9 */ bl getFreeSize__7JKRHeapFv /* 80017E58 00014D98 7C 77 1B 78 */ mr r23, r3 /* 80017E5C 00014D9C 7F C3 F3 78 */ mr r3, r30 -/* 80017E60 00014DA0 48 2B 68 CD */ bl JKRHeap_NS_getFreeSize +/* 80017E60 00014DA0 48 2B 68 CD */ bl getFreeSize__7JKRHeapFv /* 80017E64 00014DA4 7C 78 1B 78 */ mr r24, r3 /* 80017E68 00014DA8 7F A3 EB 78 */ mr r3, r29 -/* 80017E6C 00014DAC 48 2B 68 C1 */ bl JKRHeap_NS_getFreeSize +/* 80017E6C 00014DAC 48 2B 68 C1 */ bl getFreeSize__7JKRHeapFv /* 80017E70 00014DB0 7C 79 1B 78 */ mr r25, r3 /* 80017E74 00014DB4 7F E3 FB 78 */ mr r3, r31 /* 80017E78 00014DB8 48 2B 69 0D */ bl JKRHeap_NS_getTotalFreeSize diff --git a/include/d_save_HIO.h b/include/d_save_HIO.h new file mode 100644 index 00000000000..89894cb3576 --- /dev/null +++ b/include/d_save_HIO.h @@ -0,0 +1,19 @@ +#include "dolphin/types.h" + +struct dSvBit_childSwPerfectionHIO_c_vtable { + u32* unk0; + u32* unk4; + u32* dtor; +}; + +class dSvBit_childSwPerfectionHIO_c { + public: + dSvBit_childSwPerfectionHIO_c(); + void init(void); + ~dSvBit_childSwPerfectionHIO_c(); + dSvBit_childSwPerfectionHIO_c_vtable* __vt; + + private: + u8 unk0[10]; +}; + diff --git a/include/func_8000578C.s b/include/func_8000578C.s new file mode 100644 index 00000000000..e01b808e217 --- /dev/null +++ b/include/func_8000578C.s @@ -0,0 +1,50 @@ +/* 8000578C 000026CC 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80005790 000026D0 7C 08 02 A6 */ mflr r0 +/* 80005794 000026D4 90 01 00 24 */ stw r0, 0x24(r1) +/* 80005798 000026D8 39 61 00 20 */ addi r11, r1, 0x20 +/* 8000579C 000026DC 48 35 CA 39 */ bl _savegpr_27 +/* 800057A0 000026E0 7C 7B 1B 78 */ mr r27, r3 +/* 800057A4 000026E4 48 00 5E C5 */ bl mDoMch_HeapCheckAll +/* 800057A8 000026E8 48 33 C7 59 */ bl OSCheckActiveThreads +/* 800057AC 000026EC 38 A0 00 00 */ li r5, 0 +/* 800057B0 000026F0 57 64 30 32 */ slwi r4, r27, 6 +/* 800057B4 000026F4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha +/* 800057B8 000026F8 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l +/* 800057BC 000026FC 7C 60 22 14 */ add r3, r0, r4 +/* 800057C0 00002700 80 03 00 30 */ lwz r0, 0x30(r3) +/* 800057C4 00002704 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a +/* 800057C8 00002708 28 00 00 60 */ cmplwi r0, 0x60 +/* 800057CC 0000270C 40 82 00 14 */ bne lbl_800057E0 +/* 800057D0 00002710 80 03 00 34 */ lwz r0, 0x34(r3) +/* 800057D4 00002714 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b +/* 800057D8 00002718 41 82 00 08 */ beq lbl_800057E0 +/* 800057DC 0000271C 38 A0 00 01 */ li r5, 1 +lbl_800057E0: +/* 800057E0 00002720 54 BC 06 3E */ clrlwi r28, r5, 0x18 +/* 800057E4 00002724 3B 60 00 00 */ li r27, 0 +/* 800057E8 00002728 3B E0 00 00 */ li r31, 0 +/* 800057EC 0000272C 3C 60 80 3A */ lis r3, lbl_803A2EF4@ha +/* 800057F0 00002730 3B C3 2E F4 */ addi r30, r3, lbl_803A2EF4@l +lbl_800057F4: +/* 800057F4 00002734 7C 7E F8 2E */ lwzx r3, r30, r31 +/* 800057F8 00002738 4B FF FF 31 */ bl CheckHeap1__9HeapCheckFv +/* 800057FC 0000273C 2C 1C 00 00 */ cmpwi r28, 0 +/* 80005800 00002740 41 82 00 20 */ beq lbl_80005820 +/* 80005804 00002744 7F BE F8 2E */ lwzx r29, r30, r31 +/* 80005808 00002748 7F A3 EB 78 */ mr r3, r29 +/* 8000580C 0000274C 48 00 00 95 */ bl getUsedCount__9HeapCheckCFv +/* 80005810 00002750 90 7D 00 20 */ stw r3, 0x20(r29) +/* 80005814 00002754 80 7D 00 08 */ lwz r3, 8(r29) +/* 80005818 00002758 48 2C A5 4D */ bl getTotalUsedSize__10JKRExpHeapCFv +/* 8000581C 0000275C 90 7D 00 24 */ stw r3, 0x24(r29) +lbl_80005820: +/* 80005820 00002760 3B 7B 00 01 */ addi r27, r27, 1 +/* 80005824 00002764 2C 1B 00 08 */ cmpwi r27, 8 +/* 80005828 00002768 3B FF 00 04 */ addi r31, r31, 4 +/* 8000582C 0000276C 41 80 FF C8 */ blt lbl_800057F4 +/* 80005830 00002770 39 61 00 20 */ addi r11, r1, 0x20 +/* 80005834 00002774 48 35 C9 ED */ bl _restgpr_27 +/* 80005838 00002778 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8000583C 0000277C 7C 08 03 A6 */ mtlr r0 +/* 80005840 00002780 38 21 00 20 */ addi r1, r1, 0x20 +/* 80005844 00002784 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_80005848.s b/include/func_80005848.s new file mode 100644 index 00000000000..2e0399c686f --- /dev/null +++ b/include/func_80005848.s @@ -0,0 +1,24 @@ +/* 80005848 00002788 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8000584C 0000278C 7C 08 02 A6 */ mflr r0 +/* 80005850 00002790 90 01 00 14 */ stw r0, 0x14(r1) +/* 80005854 00002794 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80005858 00002798 93 C1 00 08 */ stw r30, 8(r1) +/* 8000585C 0000279C 7C 7E 1B 78 */ mr r30, r3 +/* 80005860 000027A0 48 33 B4 65 */ bl OSDisableScheduler +/* 80005864 000027A4 3B E0 00 00 */ li r31, 0 +/* 80005868 000027A8 80 7E 00 80 */ lwz r3, 0x80(r30) +/* 8000586C 000027AC 48 00 00 0C */ b lbl_80005878 +lbl_80005870: +/* 80005870 000027B0 80 63 00 0C */ lwz r3, 0xc(r3) +/* 80005874 000027B4 3B FF 00 01 */ addi r31, r31, 1 +lbl_80005878: +/* 80005878 000027B8 28 03 00 00 */ cmplwi r3, 0 +/* 8000587C 000027BC 40 82 FF F4 */ bne lbl_80005870 +/* 80005880 000027C0 48 33 B4 85 */ bl OSEnableScheduler +/* 80005884 000027C4 7F E3 FB 78 */ mr r3, r31 +/* 80005888 000027C8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8000588C 000027CC 83 C1 00 08 */ lwz r30, 8(r1) +/* 80005890 000027D0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80005894 000027D4 7C 08 03 A6 */ mtlr r0 +/* 80005898 000027D8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8000589C 000027DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_8000585C.s b/include/func_8000585C.s new file mode 100644 index 00000000000..2e0399c686f --- /dev/null +++ b/include/func_8000585C.s @@ -0,0 +1,24 @@ +/* 80005848 00002788 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8000584C 0000278C 7C 08 02 A6 */ mflr r0 +/* 80005850 00002790 90 01 00 14 */ stw r0, 0x14(r1) +/* 80005854 00002794 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80005858 00002798 93 C1 00 08 */ stw r30, 8(r1) +/* 8000585C 0000279C 7C 7E 1B 78 */ mr r30, r3 +/* 80005860 000027A0 48 33 B4 65 */ bl OSDisableScheduler +/* 80005864 000027A4 3B E0 00 00 */ li r31, 0 +/* 80005868 000027A8 80 7E 00 80 */ lwz r3, 0x80(r30) +/* 8000586C 000027AC 48 00 00 0C */ b lbl_80005878 +lbl_80005870: +/* 80005870 000027B0 80 63 00 0C */ lwz r3, 0xc(r3) +/* 80005874 000027B4 3B FF 00 01 */ addi r31, r31, 1 +lbl_80005878: +/* 80005878 000027B8 28 03 00 00 */ cmplwi r3, 0 +/* 8000587C 000027BC 40 82 FF F4 */ bne lbl_80005870 +/* 80005880 000027C0 48 33 B4 85 */ bl OSEnableScheduler +/* 80005884 000027C4 7F E3 FB 78 */ mr r3, r31 +/* 80005888 000027C8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8000588C 000027CC 83 C1 00 08 */ lwz r30, 8(r1) +/* 80005890 000027D0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80005894 000027D4 7C 08 03 A6 */ mtlr r0 +/* 80005898 000027D8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8000589C 000027DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_8025BB78.s b/include/func_8025BB78.s new file mode 100644 index 00000000000..626d2630855 --- /dev/null +++ b/include/func_8025BB78.s @@ -0,0 +1,14 @@ +/* 8025BB78 00258AB8 3C 80 80 3C */ lis r4, lbl_803C3384@ha +/* 8025BB7C 00258ABC 38 04 33 84 */ addi r0, r4, lbl_803C3384@l +/* 8025BB80 00258AC0 90 03 00 00 */ stw r0, 0(r3) +/* 8025BB84 00258AC4 38 C0 00 00 */ li r6, 0 +/* 8025BB88 00258AC8 38 80 00 00 */ li r4, 0 +/* 8025BB8C 00258ACC 38 00 00 80 */ li r0, 0x80 +/* 8025BB90 00258AD0 7C 09 03 A6 */ mtctr r0 +lbl_8025BB94: +/* 8025BB94 00258AD4 7C A3 32 14 */ add r5, r3, r6 +/* 8025BB98 00258AD8 98 85 00 05 */ stb r4, 5(r5) +/* 8025BB9C 00258ADC 98 85 00 85 */ stb r4, 0x85(r5) +/* 8025BBA0 00258AE0 38 C6 00 01 */ addi r6, r6, 1 +/* 8025BBA4 00258AE4 42 00 FF F0 */ bdnz lbl_8025BB94 +/* 8025BBA8 00258AE8 4E 80 00 20 */ blr diff --git a/include/func_8025BBAC.s b/include/func_8025BBAC.s new file mode 100644 index 00000000000..7e0095196a9 --- /dev/null +++ b/include/func_8025BBAC.s @@ -0,0 +1,27 @@ +/* 8025BBAC 00258AEC 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8025BBB0 00258AF0 7C 08 02 A6 */ mflr r0 +/* 8025BBB4 00258AF4 90 01 00 24 */ stw r0, 0x24(r1) +/* 8025BBB8 00258AF8 39 61 00 20 */ addi r11, r1, 0x20 +/* 8025BBBC 00258AFC 48 10 66 21 */ bl _savegpr_29 +/* 8025BBC0 00258B00 7C 7D 1B 78 */ mr r29, r3 +/* 8025BBC4 00258B04 3B C0 00 00 */ li r30, 0 +/* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 8025BBCC 00258B0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8025BBD0 00258B10 3B E3 09 58 */ addi r31, r3, 0x958 +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 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) +/* 8025BBEC 00258B2C 98 04 00 85 */ stb r0, 0x85(r4) +/* 8025BBF0 00258B30 3B DE 00 01 */ addi r30, r30, 1 +/* 8025BBF4 00258B34 2C 1E 00 80 */ cmpwi r30, 0x80 +/* 8025BBF8 00258B38 41 80 FF DC */ blt lbl_8025BBD4 +/* 8025BBFC 00258B3C 39 61 00 20 */ addi r11, r1, 0x20 +/* 8025BC00 00258B40 48 10 66 29 */ bl _restgpr_29 +/* 8025BC04 00258B44 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8025BC08 00258B48 7C 08 03 A6 */ mtlr r0 +/* 8025BC0C 00258B4C 38 21 00 20 */ addi r1, r1, 0x20 +/* 8025BC10 00258B50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 4bebbfdb1b6..812ab982436 100644 --- a/include/functions.h +++ b/include/functions.h @@ -5,13 +5,17 @@ class JMSMesgEntry_c { extern "C" { void init__20dSv_player_collect_cFv(void); void dComIfGp_setSelectItem(int); - void OSReport_Error(void); + void OSReport_Error(char*,...); + void OSEnableScheduler(void); + void OSDisableScheduler(void); + void getUsedCount__9HeapCheckCFv(void); void isEventBit__11dSv_event_cCFUs(void); void dComIfGs_setMixItemIndex(void); void dComIfGs_setSelectItemIndex(void); void dComIfGs_getMixItemIndex(void); void dComIfGs_getBottleMax(void); char* strcpy(char*,const char*); + int strcmp(char*,char*); void setBombNum__21dSv_player_item_max_cFUcUc(void); void func_80362224(void); void func_803621D8(void); @@ -83,4 +87,7 @@ extern "C" { void dComIfGs_setKeyNum(void); void getSound__19dSv_player_config_cFv(void); void setSound__19dSv_player_config_cFUc(void); + void getTotalUsedSize__10JKRExpHeapCFv(void); + void HeapCheck_NS_getUsedCount(void); + void CheckHeap1__9HeapCheckFv(void); } \ No newline at end of file diff --git a/include/m_Do_main.h b/include/m_Do_main.h new file mode 100644 index 00000000000..b78c776ecb1 --- /dev/null +++ b/include/m_Do_main.h @@ -0,0 +1,30 @@ +#include "dolphin/types.h" + +class JKRExpHeap { + public: + s32 getTotalUsedSize() const; + +}; + +class JKRHeap { + public: + s32 getFreeSize(); +}; + +class HeapCheck { + public: + void CheckHeap1(void); + s32 getUsedCount(void) const; + + + private: + char* names[2]; + JKRExpHeap* heap; + s32 max_total_used_size; + s32 max_total_free_size; + u8 unk20[8]; // 8 bytes + u32 heap_size; + u32 used_count; + u32 total_used_size; + +}; \ No newline at end of file diff --git a/include/variables.h b/include/variables.h index 7b3efead54a..0650eca48ce 100644 --- a/include/variables.h +++ b/include/variables.h @@ -6,8 +6,13 @@ extern u8 lbl_803A7270[24]; extern u8 lbl_80430188[16]; extern u8 lbl_803A7288; extern u8 lbl_80379235[16]; +extern u8 lbl_803739A0[0x310]; extern u32 lbl_80451368; extern u32 lbl_804514E0; +extern u8 lbl_803C3384; +extern u8 lbl_803DD2E8; +extern u8 lbl_803A2EF4; +//extern char lbl_803739a0[0x310]; #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 \ No newline at end of file diff --git a/obj_files.mk b/obj_files.mk index 736c19d7064..445817bf626 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -10,6 +10,7 @@ EXTABINDEX_O_FILES := \ $(BUILD_DIR)/asm/extabindex.o TEXT_O_FILES := \ + $(BUILD_DIR)/src/m_Do/m_Do_main.o \ $(BUILD_DIR)/asm/m/Do/m_Do_main.o \ $(BUILD_DIR)/asm/m/Do/m_Do_printf.o \ $(BUILD_DIR)/asm/m/Do/m_Do_audio.o \ @@ -233,6 +234,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/d/s/d_s_name.o \ $(BUILD_DIR)/asm/d/s/d_s_play.o \ $(BUILD_DIR)/asm/d/s/d_s_room.o \ + $(BUILD_DIR)/src/d/d_save/d_save_HIO.o \ $(BUILD_DIR)/asm/d/save/d_save_HIO.o \ $(BUILD_DIR)/asm/d/d_timer.o \ $(BUILD_DIR)/asm/d/k/d_k_wmark.o \ diff --git a/src/d/d_save/d_save_HIO.cpp b/src/d/d_save/d_save_HIO.cpp index 7d8d5e37b42..f2926f95bca 100644 --- a/src/d/d_save/d_save_HIO.cpp +++ b/src/d/d_save/d_save_HIO.cpp @@ -1,2 +1,23 @@ -// ok -.include "asm/d/save/d_save_HIO.s" \ No newline at end of file +#include "d_save_HIO.h" +#include "global.h" + +#ifdef NONMATCHING +dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() { + + this->__vt = (dSvBit_childSwPerfectionHIO_c_vtable *)0x803C3384; + for (int i = 0; i < 0x80; i++) { + + } +} +#else +asm dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() { + nofralloc + #include "func_8025BB78.s" +} +#endif + + +asm void dSvBit_childSwPerfectionHIO_c::init(void) { + nofralloc + #include "func_8025BBAC.s" +} \ No newline at end of file diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 4bf93c8658d..f7c5ec1e527 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -1 +1,82 @@ -// ok +#include "m_Do_main.h" +#include "global.h" + +void version_check(void) { + if ((!strcmp((char*)lbl_803739A0,(char*)lbl_803739A0)) && (!strcmp(((char*)lbl_803739A0+0xA),((char*)lbl_803739A0+0xA)))) { + return; + } + + OSReport_Error((char*)lbl_803739A0+0x11); + do { + + } while( true ); +} + +void HeapCheck::CheckHeap1(void) { + s32 totalUsedSize = this->heap->getTotalUsedSize(); + s32 freeSize = ((JKRHeap*)this->heap)->getFreeSize(); + + if (this->max_total_used_size < totalUsedSize) { + this->max_total_used_size = totalUsedSize; + } + + if (this->max_total_free_size > freeSize) { + this->max_total_free_size = freeSize; + } +} + +extern "C" { + int strcmp(char*,char*); + void OSReport_Error(char *format,...); + void mDoMch_HeapCheckAll(void); + void OSCheckActiveThreads(void); + // s32 getTotalUsedSize(JKRExpHeap*); + // s32 getFreeSize(JKRExpHeap*); +} + + +#ifdef NONMATCHING +extern u8 lbl_803A2EF4[0x4c]; +extern u8 lbl_803DD2E8[0x100]; + +void CheapHeap(u32 param_1) { + + HeapCheck* currentHeap; + s32 unk; + + mDoMch_HeapCheckAll(); + OSCheckActiveThreads(); + + unk = 0; + + if ((((lbl_803DD2E8+0x30)[param_1 * 0x10] & 0xffffffef) == 0x60) && (((lbl_803DD2E8+0x30)[param_1 * 0x10] & 0x10) != 0)) { + unk = 1; + } + + for (int i = 0; i < 8; i++) { + ((HeapCheck*)lbl_803A2EF4[i])->CheckHeap1(); + + if (unk) { + currentHeap = (HeapCheck*)lbl_803A2EF4[i*4]; + s32 current_used_count = currentHeap->getUsedCount(); + currentHeap->used_count = current_used_count; + s32 current_total_used_size = currentHeap->heap->getTotalUsedSize(); + currentHeap->total_used_size = current_total_used_size; + } + } +} +#else +asm void CheckHeap(u32 param_1) { + nofralloc + #include "func_8000578C.s" +} +#endif + +asm int countUsed(JKRExpHeap *heap) { + nofralloc + #include "func_80005848.s" +} + +s32 HeapCheck::getUsedCount(void) const { + return countUsed(this->heap); +} \ No newline at end of file