diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2020-12-05 20:30:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 23:30:55 -0500 |
| commit | 2fbecbc1daca79c835ed235b074fa8997623ab84 (patch) | |
| tree | 658b34c4a3453fadf1e813ddcd767918897bd0ae /asm/d/msg | |
| parent | fb1217e3f95c64dc5dcc096c246704f26803c2ac (diff) | |
d_item (#18)
* item_funcs ok
* item_getcheck_func ok
* remove unnecessary asm file
* execItemGet / checkItemGet ok, add enums for readability
* fix return types
Diffstat (limited to 'asm/d/msg')
| -rw-r--r-- | asm/d/msg/d_msg_class.s | 296 | ||||
| -rw-r--r-- | asm/d/msg/d_msg_flow.s | 546 | ||||
| -rw-r--r-- | asm/d/msg/d_msg_object.s | 436 | ||||
| -rw-r--r-- | asm/d/msg/out/d_msg_out_font.s | 8 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_3select.s | 8 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_arrow.s | 8 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_base.s | 8 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_boss.s | 12 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_explain.s | 28 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_howl.s | 88 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_item.s | 32 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_jimaku.s | 20 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_kanban.s | 12 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_light.s | 8 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_place.s | 12 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_staff.s | 12 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_talk.s | 44 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_tree.s | 12 | ||||
| -rw-r--r-- | asm/d/msg/string/d_msg_string_base.s | 8 |
19 files changed, 799 insertions, 799 deletions
diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 5fa20c34ac..85ca635c9a 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -398,8 +398,8 @@ lbl_80228AC4: .global getPohNum getPohNum: /* 80228ACC 00225A0C 38 60 00 00 */ li r3, 0 -/* 80228AD0 00225A10 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80228AD4 00225A14 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80228AD0 00225A10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80228AD4 00225A14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80228AD8 00225A18 88 04 01 0C */ lbz r0, 0x10c(r4) /* 80228ADC 00225A1C 28 00 00 14 */ cmplwi r0, 0x14 /* 80228AE0 00225A20 40 80 00 10 */ bge lbl_80228AF0 @@ -576,8 +576,8 @@ jmessage_tReference_NS_calcDistance: /* 80228D68 00225CA8 D0 1F 04 54 */ stfs f0, 0x454(r31) /* 80228D6C 00225CAC 48 00 00 60 */ b lbl_80228DCC lbl_80228D70: -/* 80228D70 00225CB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80228D74 00225CB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80228D70 00225CB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80228D74 00225CB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80228D78 00225CB8 80 A3 5D AC */ lwz r5, 0x5dac(r3) /* 80228D7C 00225CBC 38 61 00 14 */ addi r3, r1, 0x14 /* 80228D80 00225CC0 38 9F 04 14 */ addi r4, r31, 0x414 @@ -1125,8 +1125,8 @@ jmessage_tReference_NS_inputNumber: /* 802294CC 0022640C AB C3 01 74 */ lha r30, 0x174(r3) /* 802294D0 00226410 7F DD F3 78 */ mr r29, r30 /* 802294D4 00226414 3B 60 00 00 */ li r27, 0 -/* 802294D8 00226418 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802294DC 0022641C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802294D8 00226418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802294DC 0022641C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802294E0 00226420 A0 1F 00 04 */ lhz r0, 4(r31) /* 802294E4 00226424 28 00 03 E8 */ cmplwi r0, 0x3e8 /* 802294E8 00226428 41 80 00 0C */ blt lbl_802294F4 @@ -2242,8 +2242,8 @@ lbl_8022A420: /* 8022A45C 0022739C 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022A460 002273A0 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022A464 002273A4 38 84 00 04 */ addi r4, r4, 4 -/* 8022A468 002273A8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022A46C 002273AC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022A468 002273A8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022A46C 002273AC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022A470 002273B0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022A474 002273B4 38 00 00 64 */ li r0, 0x64 /* 8022A478 002273B8 7C A5 03 D6 */ divw r5, r5, r0 @@ -2258,8 +2258,8 @@ lbl_8022A420: /* 8022A49C 002273DC 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022A4A0 002273E0 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022A4A4 002273E4 38 84 00 04 */ addi r4, r4, 4 -/* 8022A4A8 002273E8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022A4AC 002273EC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022A4A8 002273E8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022A4AC 002273EC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022A4B0 002273F0 80 C5 5E 0C */ lwz r6, 0x5e0c(r5) /* 8022A4B4 002273F4 38 A0 00 64 */ li r5, 0x64 /* 8022A4B8 002273F8 7C 06 2B D6 */ divw r0, r6, r5 @@ -2291,8 +2291,8 @@ lbl_8022A4F8: /* 8022A51C 0022745C 38 00 00 00 */ li r0, 0 /* 8022A520 00227460 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A524: -/* 8022A524 00227464 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022A528 00227468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022A524 00227464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022A528 00227468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022A52C 0022746C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8022A530 00227470 38 61 01 64 */ addi r3, r1, 0x164 /* 8022A534 00227474 48 13 E5 F9 */ bl strcpy @@ -2307,8 +2307,8 @@ lbl_8022A524: /* 8022A558 00227498 38 00 00 00 */ li r0, 0 /* 8022A55C 0022749C 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A560: -/* 8022A560 002274A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022A564 002274A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022A560 002274A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022A564 002274A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022A568 002274A8 38 83 01 C5 */ addi r4, r3, 0x1c5 /* 8022A56C 002274AC 38 61 01 00 */ addi r3, r1, 0x100 /* 8022A570 002274B0 48 13 E5 BD */ bl strcpy @@ -2606,8 +2606,8 @@ lbl_8022A9B4: /* 8022A9BC 002278FC 40 82 00 08 */ bne lbl_8022A9C4 /* 8022A9C0 00227900 38 80 00 72 */ li r4, 0x72 lbl_8022A9C4: -/* 8022A9C4 00227904 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022A9C8 00227908 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022A9C4 00227904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022A9C8 00227908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022A9CC 0022790C 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8022A9D0 00227910 4B E0 97 29 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8022A9D4 00227914 7C 60 1B 78 */ mr r0, r3 @@ -2622,8 +2622,8 @@ lbl_8022A9C4: /* 8022A9F8 00227938 48 00 0A E9 */ bl jmessage_tMeasureProcessor_NS_push_word /* 8022A9FC 0022793C 38 60 00 01 */ li r3, 1 /* 8022AA00 00227940 48 00 06 98 */ b lbl_8022B098 -/* 8022AA04 00227944 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AA08 00227948 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AA04 00227944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AA08 00227948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AA0C 0022794C 88 A3 00 F8 */ lbz r5, 0xf8(r3) /* 8022AA10 00227950 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AA14 00227954 38 80 00 00 */ li r4, 0 @@ -2786,8 +2786,8 @@ lbl_8022AC74: /* 8022AC74 00227BB4 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8022AC78 00227BB8 28 00 00 02 */ cmplwi r0, 2 /* 8022AC7C 00227BBC 40 82 00 28 */ bne lbl_8022ACA4 -/* 8022AC80 00227BC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AC84 00227BC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AC80 00227BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AC84 00227BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AC88 00227BC8 80 A3 09 4C */ lwz r5, 0x94c(r3) /* 8022AC8C 00227BCC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AC90 00227BD0 38 80 00 04 */ li r4, 4 @@ -2807,8 +2807,8 @@ lbl_8022ACA4: /* 8022ACC4 00227C04 48 00 02 54 */ b lbl_8022AF18 /* 8022ACC8 00227C08 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACCC 00227C0C 38 80 00 00 */ li r4, 0 -/* 8022ACD0 00227C10 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022ACD4 00227C14 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022ACD0 00227C10 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022ACD4 00227C14 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022ACD8 00227C18 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022ACDC 00227C1C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ACE0 00227C20 38 E0 00 01 */ li r7, 1 @@ -2816,8 +2816,8 @@ lbl_8022ACA4: /* 8022ACE8 00227C28 48 00 02 30 */ b lbl_8022AF18 /* 8022ACEC 00227C2C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACF0 00227C30 38 80 00 01 */ li r4, 1 -/* 8022ACF4 00227C34 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022ACF8 00227C38 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022ACF4 00227C34 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022ACF8 00227C38 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022ACFC 00227C3C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AD00 00227C40 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AD04 00227C44 38 E0 00 01 */ li r7, 1 @@ -2855,13 +2855,13 @@ lbl_8022ACA4: /* 8022AD84 00227CC4 88 1D 00 00 */ lbz r0, 0(r29) /* 8022AD88 00227CC8 28 00 00 00 */ cmplwi r0, 0 /* 8022AD8C 00227CCC 40 82 00 14 */ bne lbl_8022ADA0 -/* 8022AD90 00227CD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AD94 00227CD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AD90 00227CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AD94 00227CD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AD98 00227CD8 80 A3 5E 0C */ lwz r5, 0x5e0c(r3) /* 8022AD9C 00227CDC 48 00 00 10 */ b lbl_8022ADAC lbl_8022ADA0: -/* 8022ADA0 00227CE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022ADA4 00227CE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022ADA0 00227CE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022ADA4 00227CE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022ADA8 00227CE8 80 A3 09 48 */ lwz r5, 0x948(r3) lbl_8022ADAC: /* 8022ADAC 00227CEC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -2896,15 +2896,15 @@ lbl_8022ADE8: /* 8022AE18 00227D58 48 00 01 00 */ b lbl_8022AF18 /* 8022AE1C 00227D5C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE20 00227D60 3C 80 00 01 */ lis r4, 1 -/* 8022AE24 00227D64 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AE28 00227D68 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AE24 00227D64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AE28 00227D68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AE2C 00227D6C 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 8022AE30 00227D70 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE34 00227D74 38 E0 00 01 */ li r7, 1 /* 8022AE38 00227D78 48 00 DE B5 */ bl dMsgUnit_c_NS_setTag /* 8022AE3C 00227D7C 48 00 00 DC */ b lbl_8022AF18 -/* 8022AE40 00227D80 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022AE44 00227D84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022AE40 00227D80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022AE44 00227D84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022AE48 00227D88 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8022AE4C 00227D8C 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 8022AE50 00227D90 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -2920,8 +2920,8 @@ lbl_8022ADE8: /* 8022AE78 00227DB8 48 00 00 A0 */ b lbl_8022AF18 /* 8022AE7C 00227DBC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE80 00227DC0 38 80 00 09 */ li r4, 9 -/* 8022AE84 00227DC4 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AE88 00227DC8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AE84 00227DC4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AE88 00227DC8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AE8C 00227DCC 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AE90 00227DD0 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE94 00227DD4 38 E0 00 01 */ li r7, 1 @@ -2929,8 +2929,8 @@ lbl_8022ADE8: /* 8022AE9C 00227DDC 48 00 00 7C */ b lbl_8022AF18 /* 8022AEA0 00227DE0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEA4 00227DE4 38 80 00 0E */ li r4, 0xe -/* 8022AEA8 00227DE8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AEAC 00227DEC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AEA8 00227DE8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AEAC 00227DEC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AEB0 00227DF0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AEB4 00227DF4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AEB8 00227DF8 38 E0 00 01 */ li r7, 1 @@ -2939,8 +2939,8 @@ lbl_8022ADE8: /* 8022AEC4 00227E04 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEC8 00227E08 3C 80 00 01 */ lis r4, 0x00010001@ha /* 8022AECC 00227E0C 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 8022AED0 00227E10 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022AED4 00227E14 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022AED0 00227E10 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022AED4 00227E14 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022AED8 00227E18 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AEDC 00227E1C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AEE0 00227E20 38 E0 00 01 */ li r7, 1 @@ -3522,8 +3522,8 @@ lbl_8022B6B0: /* 8022B70C 0022864C 7F E3 FB 78 */ mr r3, r31 /* 8022B710 00228650 4B FF D6 19 */ bl jmessage_tReference_NS_calcDistance /* 8022B714 00228654 88 1D 00 10 */ lbz r0, 0x10(r29) -/* 8022B718 00228658 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022B71C 0022865C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022B718 00228658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022B71C 0022865C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022B720 00228660 98 03 5E 7A */ stb r0, 0x5e7a(r3) /* 8022B724 00228664 88 1D 00 11 */ lbz r0, 0x11(r29) /* 8022B728 00228668 98 03 5E 7B */ stb r0, 0x5e7b(r3) @@ -3564,8 +3564,8 @@ lbl_8022B78C: /* 8022B7A0 002286E0 A0 1D 00 06 */ lhz r0, 6(r29) /* 8022B7A4 002286E4 28 00 00 00 */ cmplwi r0, 0 /* 8022B7A8 002286E8 41 82 00 24 */ beq lbl_8022B7CC -/* 8022B7AC 002286EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022B7B0 002286F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022B7AC 002286EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022B7B0 002286F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022B7B4 002286F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8022B7B8 002286F8 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8022B7BC 002286FC 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -3804,8 +3804,8 @@ lbl_8022BB10: /* 8022BB10 00228A50 38 00 00 07 */ li r0, 7 /* 8022BB14 00228A54 98 1F 12 4D */ stb r0, 0x124d(r31) lbl_8022BB18: -/* 8022BB18 00228A58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022BB1C 00228A5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022BB18 00228A58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022BB1C 00228A5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022BB20 00228A60 88 03 5E B4 */ lbz r0, 0x5eb4(r3) /* 8022BB24 00228A64 28 00 00 00 */ cmplwi r0, 0 /* 8022BB28 00228A68 41 82 00 0C */ beq lbl_8022BB34 @@ -3839,8 +3839,8 @@ lbl_8022BB5C: /* 8022BB8C 00228ACC 93 C1 00 18 */ stw r30, 0x18(r1) /* 8022BB90 00228AD0 7C 7E 1B 78 */ mr r30, r3 /* 8022BB94 00228AD4 83 E3 00 04 */ lwz r31, 4(r3) -/* 8022BB98 00228AD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022BB9C 00228ADC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8022BB98 00228AD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022BB9C 00228ADC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8022BBA0 00228AE0 88 04 5E B4 */ lbz r0, 0x5eb4(r4) /* 8022BBA4 00228AE4 28 00 00 00 */ cmplwi r0, 0 /* 8022BBA8 00228AE8 41 82 00 78 */ beq lbl_8022BC20 @@ -4333,8 +4333,8 @@ lbl_8022C244: /* 8022C280 002291C0 48 00 06 64 */ b lbl_8022C8E4 lbl_8022C284: /* 8022C284 002291C4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8022C288 002291C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022C28C 002291CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022C288 002291C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022C28C 002291CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022C290 002291D0 90 03 5E E8 */ stw r0, 0x5ee8(r3) /* 8022C294 002291D4 38 60 00 01 */ li r3, 1 /* 8022C298 002291D8 48 00 06 4C */ b lbl_8022C8E4 @@ -4657,8 +4657,8 @@ lbl_8022C6A8: /* 8022C734 00229674 80 1E 00 00 */ lwz r0, 0(r30) /* 8022C738 00229678 28 00 00 01 */ cmplwi r0, 1 /* 8022C73C 0022967C 40 82 00 20 */ bne lbl_8022C75C -/* 8022C740 00229680 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022C744 00229684 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022C740 00229680 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022C744 00229684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022C748 00229688 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8022C74C 0022968C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8022C750 00229690 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l @@ -6357,8 +6357,8 @@ lbl_8022DEDC: /* 8022E02C 0022AF6C 48 00 0A B9 */ bl jmessage_tRenderingProcessor_NS_do_outfont /* 8022E030 0022AF70 38 60 00 01 */ li r3, 1 /* 8022E034 0022AF74 48 00 00 E0 */ b lbl_8022E114 -/* 8022E038 0022AF78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022E03C 0022AF7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022E038 0022AF78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022E03C 0022AF7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022E040 0022AF80 88 03 01 EB */ lbz r0, 0x1eb(r3) /* 8022E044 0022AF84 28 00 00 00 */ cmplwi r0, 0 /* 8022E048 0022AF88 40 82 00 18 */ bne lbl_8022E060 @@ -8503,14 +8503,14 @@ lbl_8022FED4: /* 8022FEE8 0022CE28 7C 06 00 2E */ lwzx r0, r6, r0 /* 8022FEEC 0022CE2C 7C 09 03 A6 */ mtctr r0 /* 8022FEF0 0022CE30 4E 80 04 20 */ bctr -/* 8022FEF4 0022CE34 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FEF8 0022CE38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FEF4 0022CE34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FEF8 0022CE38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FEFC 0022CE3C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8022FF00 0022CE40 7F E3 FB 78 */ mr r3, r31 /* 8022FF04 0022CE44 48 07 7C F5 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF08 0022CE48 48 00 0A 58 */ b lbl_80230960 -/* 8022FF0C 0022CE4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF10 0022CE50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF0C 0022CE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF10 0022CE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF14 0022CE54 38 83 01 C5 */ addi r4, r3, 0x1c5 /* 8022FF18 0022CE58 7F E3 FB 78 */ mr r3, r31 /* 8022FF1C 0022CE5C 48 07 7C DD */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent @@ -8520,40 +8520,40 @@ lbl_8022FED4: /* 8022FF2C 0022CE6C 7F E3 FB 78 */ mr r3, r31 /* 8022FF30 0022CE70 48 07 7C C9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF34 0022CE74 48 00 0A 2C */ b lbl_80230960 -/* 8022FF38 0022CE78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF3C 0022CE7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF38 0022CE78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF3C 0022CE7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF40 0022CE80 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FF44 0022CE84 48 00 73 89 */ bl dMsgObject_c_NS_getSmellName /* 8022FF48 0022CE88 7C 64 1B 78 */ mr r4, r3 /* 8022FF4C 0022CE8C 7F E3 FB 78 */ mr r3, r31 /* 8022FF50 0022CE90 48 07 7C A9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF54 0022CE94 48 00 0A 0C */ b lbl_80230960 -/* 8022FF58 0022CE98 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF5C 0022CE9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF58 0022CE98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF5C 0022CE9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF60 0022CEA0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FF64 0022CEA4 48 00 73 D1 */ bl dMsgObject_c_NS_getPortalName /* 8022FF68 0022CEA8 7C 64 1B 78 */ mr r4, r3 /* 8022FF6C 0022CEAC 7F E3 FB 78 */ mr r3, r31 /* 8022FF70 0022CEB0 48 07 7C 89 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF74 0022CEB4 48 00 09 EC */ b lbl_80230960 -/* 8022FF78 0022CEB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF7C 0022CEBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF78 0022CEB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF7C 0022CEBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF80 0022CEC0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FF84 0022CEC4 48 00 74 09 */ bl dMsgObject_c_NS_getBombName /* 8022FF88 0022CEC8 7C 64 1B 78 */ mr r4, r3 /* 8022FF8C 0022CECC 7F E3 FB 78 */ mr r3, r31 /* 8022FF90 0022CED0 48 07 7C 69 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FF94 0022CED4 48 00 09 CC */ b lbl_80230960 -/* 8022FF98 0022CED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FF9C 0022CEDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FF98 0022CED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FF9C 0022CEDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FFA0 0022CEE0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FFA4 0022CEE4 48 00 74 79 */ bl dMsgObject_c_NS_getInsectName /* 8022FFA8 0022CEE8 7C 64 1B 78 */ mr r4, r3 /* 8022FFAC 0022CEEC 7F E3 FB 78 */ mr r3, r31 /* 8022FFB0 0022CEF0 48 07 7C 49 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent /* 8022FFB4 0022CEF4 48 00 09 AC */ b lbl_80230960 -/* 8022FFB8 0022CEF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8022FFBC 0022CEFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8022FFB8 0022CEF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8022FFBC 0022CEFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FFC0 0022CF00 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8022FFC4 0022CF04 48 00 74 B5 */ bl dMsgObject_c_NS_getLetterName /* 8022FFC8 0022CF08 7C 64 1B 78 */ mr r4, r3 @@ -8564,8 +8564,8 @@ lbl_8022FED4: /* 8022FFDC 0022CF1C 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022FFE0 0022CF20 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022FFE4 0022CF24 38 84 00 04 */ addi r4, r4, 4 -/* 8022FFE8 0022CF28 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8022FFEC 0022CF2C 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 8022FFE8 0022CF28 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8022FFEC 0022CF2C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8022FFF0 0022CF30 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022FFF4 0022CF34 38 00 00 64 */ li r0, 0x64 /* 8022FFF8 0022CF38 7C A5 03 D6 */ divw r5, r5, r0 @@ -8579,8 +8579,8 @@ lbl_8022FED4: /* 80230018 0022CF58 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8023001C 0022CF5C 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 80230020 0022CF60 38 84 00 04 */ addi r4, r4, 4 -/* 80230024 0022CF64 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80230028 0022CF68 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230024 0022CF64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80230028 0022CF68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8023002C 0022CF6C 80 C5 5E 0C */ lwz r6, 0x5e0c(r5) /* 80230030 0022CF70 38 A0 00 64 */ li r5, 0x64 /* 80230034 0022CF74 7C 06 2B D6 */ divw r0, r6, r5 @@ -8628,8 +8628,8 @@ lbl_802300A4: /* 802300D8 0022D018 2C 1E 00 04 */ cmpwi r30, 4 /* 802300DC 0022D01C 41 80 FF C8 */ blt lbl_802300A4 /* 802300E0 0022D020 48 00 08 80 */ b lbl_80230960 -/* 802300E4 0022D024 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802300E8 0022D028 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802300E4 0022D024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802300E8 0022D028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802300EC 0022D02C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802300F0 0022D030 48 00 73 E1 */ bl dMsgObject_c_NS_getSelectBombNum /* 802300F4 0022D034 7C 60 1B 78 */ mr r0, r3 @@ -8677,8 +8677,8 @@ lbl_80230190: /* 80230198 0022D0D8 40 82 00 08 */ bne lbl_802301A0 /* 8023019C 0022D0DC 38 80 00 72 */ li r4, 0x72 lbl_802301A0: -/* 802301A0 0022D0E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802301A4 0022D0E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802301A0 0022D0E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802301A4 0022D0E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802301A8 0022D0E8 38 63 00 F8 */ addi r3, r3, 0xf8 /* 802301AC 0022D0EC 4B E0 3F 4D */ bl getBombNum__21dSv_player_item_max_cCFUc /* 802301B0 0022D0F0 7C 60 1B 78 */ mr r0, r3 @@ -8697,8 +8697,8 @@ lbl_802301A0: /* 802301E4 0022D124 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802301E8 0022D128 4B FF F9 09 */ bl jmessage_string_tReference_NS_clearOutfontLength /* 802301EC 0022D12C 48 00 07 74 */ b lbl_80230960 -/* 802301F0 0022D130 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802301F4 0022D134 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802301F0 0022D130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802301F4 0022D134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802301F8 0022D138 88 A3 00 F8 */ lbz r5, 0xf8(r3) /* 802301FC 0022D13C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230200 0022D140 38 80 00 00 */ li r4, 0 @@ -8851,8 +8851,8 @@ lbl_8023043C: /* 8023043C 0022D37C 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80230440 0022D380 28 00 00 02 */ cmplwi r0, 2 /* 80230444 0022D384 40 82 00 28 */ bne lbl_8023046C -/* 80230448 0022D388 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023044C 0022D38C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230448 0022D388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023044C 0022D38C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230450 0022D390 80 A3 09 4C */ lwz r5, 0x94c(r3) /* 80230454 0022D394 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230458 0022D398 38 80 00 04 */ li r4, 4 @@ -8872,8 +8872,8 @@ lbl_8023046C: /* 8023048C 0022D3CC 48 00 02 5C */ b lbl_802306E8 /* 80230490 0022D3D0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230494 0022D3D4 38 80 00 00 */ li r4, 0 -/* 80230498 0022D3D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8023049C 0022D3DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230498 0022D3D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8023049C 0022D3DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802304A0 0022D3E0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802304A4 0022D3E4 38 C1 00 38 */ addi r6, r1, 0x38 /* 802304A8 0022D3E8 38 E0 00 01 */ li r7, 1 @@ -8881,8 +8881,8 @@ lbl_8023046C: /* 802304B0 0022D3F0 48 00 02 38 */ b lbl_802306E8 /* 802304B4 0022D3F4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802304B8 0022D3F8 38 80 00 01 */ li r4, 1 -/* 802304BC 0022D3FC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802304C0 0022D400 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802304BC 0022D3FC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802304C0 0022D400 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802304C4 0022D404 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802304C8 0022D408 38 C1 00 38 */ addi r6, r1, 0x38 /* 802304CC 0022D40C 38 E0 00 01 */ li r7, 1 @@ -8890,8 +8890,8 @@ lbl_8023046C: /* 802304D4 0022D414 48 00 02 14 */ b lbl_802306E8 /* 802304D8 0022D418 80 05 00 00 */ lwz r0, 0(r5) /* 802304DC 0022D41C 7C 1E 07 34 */ extsh r30, r0 -/* 802304E0 0022D420 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802304E4 0022D424 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802304E0 0022D420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802304E4 0022D424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802304E8 0022D428 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802304EC 0022D42C B0 03 01 76 */ sth r0, 0x176(r3) /* 802304F0 0022D430 48 00 84 39 */ bl dMsgObject_getFundRaising @@ -8922,13 +8922,13 @@ lbl_8023046C: /* 80230554 0022D494 88 05 00 00 */ lbz r0, 0(r5) /* 80230558 0022D498 28 00 00 00 */ cmplwi r0, 0 /* 8023055C 0022D49C 40 82 00 14 */ bne lbl_80230570 -/* 80230560 0022D4A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80230564 0022D4A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230560 0022D4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80230564 0022D4A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230568 0022D4A8 80 A3 5E 0C */ lwz r5, 0x5e0c(r3) /* 8023056C 0022D4AC 48 00 00 10 */ b lbl_8023057C lbl_80230570: -/* 80230570 0022D4B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80230574 0022D4B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230570 0022D4B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80230574 0022D4B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230578 0022D4B8 80 A3 09 48 */ lwz r5, 0x948(r3) lbl_8023057C: /* 8023057C 0022D4BC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -8963,15 +8963,15 @@ lbl_802305B8: /* 802305E8 0022D528 48 00 01 00 */ b lbl_802306E8 /* 802305EC 0022D52C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802305F0 0022D530 3C 80 00 01 */ lis r4, 1 -/* 802305F4 0022D534 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802305F8 0022D538 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802305F4 0022D534 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802305F8 0022D538 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802305FC 0022D53C 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 80230600 0022D540 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230604 0022D544 38 E0 00 01 */ li r7, 1 /* 80230608 0022D548 48 00 86 E5 */ bl dMsgUnit_c_NS_setTag /* 8023060C 0022D54C 48 00 00 DC */ b lbl_802306E8 -/* 80230610 0022D550 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80230614 0022D554 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80230610 0022D550 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80230614 0022D554 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80230618 0022D558 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8023061C 0022D55C 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 80230620 0022D560 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -8987,8 +8987,8 @@ lbl_802305B8: /* 80230648 0022D588 48 00 00 A0 */ b lbl_802306E8 /* 8023064C 0022D58C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230650 0022D590 38 80 00 09 */ li r4, 9 -/* 80230654 0022D594 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80230658 0022D598 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230654 0022D594 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80230658 0022D598 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8023065C 0022D59C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80230660 0022D5A0 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230664 0022D5A4 38 E0 00 01 */ li r7, 1 @@ -8996,8 +8996,8 @@ lbl_802305B8: /* 8023066C 0022D5AC 48 00 00 7C */ b lbl_802306E8 /* 80230670 0022D5B0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230674 0022D5B4 38 80 00 0E */ li r4, 0xe -/* 80230678 0022D5B8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8023067C 0022D5BC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80230678 0022D5B8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 8023067C 0022D5BC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80230680 0022D5C0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80230684 0022D5C4 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230688 0022D5C8 38 E0 00 01 */ li r7, 1 @@ -9006,8 +9006,8 @@ lbl_802305B8: /* 80230694 0022D5D4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230698 0022D5D8 3C 80 00 01 */ lis r4, 0x00010001@ha /* 8023069C 0022D5DC 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 802306A0 0022D5E0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802306A4 0022D5E4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802306A0 0022D5E0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802306A4 0022D5E4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802306A8 0022D5E8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802306AC 0022D5EC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802306B0 0022D5F0 38 E0 00 01 */ li r7, 1 @@ -9805,13 +9805,13 @@ lbl_80231208: /* 8023121C 0022E15C 7C 06 00 2E */ lwzx r0, r6, r0 /* 80231220 0022E160 7C 09 03 A6 */ mtctr r0 /* 80231224 0022E164 4E 80 04 20 */ bctr -/* 80231228 0022E168 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023122C 0022E16C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80231228 0022E168 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023122C 0022E16C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231230 0022E170 38 84 01 B4 */ addi r4, r4, 0x1b4 /* 80231234 0022E174 48 00 15 89 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 80231238 0022E178 48 00 0B 1C */ b lbl_80231D54 -/* 8023123C 0022E17C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80231240 0022E180 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023123C 0022E17C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80231240 0022E180 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231244 0022E184 38 84 01 C5 */ addi r4, r4, 0x1c5 /* 80231248 0022E188 48 00 15 75 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 8023124C 0022E18C 48 00 0B 08 */ b lbl_80231D54 @@ -9820,40 +9820,40 @@ lbl_80231208: /* 80231258 0022E198 7F E3 FB 78 */ mr r3, r31 /* 8023125C 0022E19C 48 00 15 61 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 80231260 0022E1A0 48 00 0A F4 */ b lbl_80231D54 -/* 80231264 0022E1A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231268 0022E1A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231264 0022E1A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231268 0022E1A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023126C 0022E1AC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231270 0022E1B0 48 00 60 5D */ bl dMsgObject_c_NS_getSmellName /* 80231274 0022E1B4 7C 64 1B 78 */ mr r4, r3 /* 80231278 0022E1B8 7F E3 FB 78 */ mr r3, r31 /* 8023127C 0022E1BC 48 00 15 41 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 80231280 0022E1C0 48 00 0A D4 */ b lbl_80231D54 -/* 80231284 0022E1C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231288 0022E1C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231284 0022E1C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231288 0022E1C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023128C 0022E1CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231290 0022E1D0 48 00 60 A5 */ bl dMsgObject_c_NS_getPortalName /* 80231294 0022E1D4 7C 64 1B 78 */ mr r4, r3 /* 80231298 0022E1D8 7F E3 FB 78 */ mr r3, r31 /* 8023129C 0022E1DC 48 00 15 21 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 802312A0 0022E1E0 48 00 0A B4 */ b lbl_80231D54 -/* 802312A4 0022E1E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802312A8 0022E1E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802312A4 0022E1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802312A8 0022E1E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312AC 0022E1EC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802312B0 0022E1F0 48 00 60 DD */ bl dMsgObject_c_NS_getBombName /* 802312B4 0022E1F4 7C 64 1B 78 */ mr r4, r3 /* 802312B8 0022E1F8 7F E3 FB 78 */ mr r3, r31 /* 802312BC 0022E1FC 48 00 15 01 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 802312C0 0022E200 48 00 0A 94 */ b lbl_80231D54 -/* 802312C4 0022E204 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802312C8 0022E208 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802312C4 0022E204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802312C8 0022E208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312CC 0022E20C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802312D0 0022E210 48 00 61 4D */ bl dMsgObject_c_NS_getInsectName /* 802312D4 0022E214 7C 64 1B 78 */ mr r4, r3 /* 802312D8 0022E218 7F E3 FB 78 */ mr r3, r31 /* 802312DC 0022E21C 48 00 14 E1 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 802312E0 0022E220 48 00 0A 74 */ b lbl_80231D54 -/* 802312E4 0022E224 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802312E8 0022E228 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802312E4 0022E224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802312E8 0022E228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312EC 0022E22C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802312F0 0022E230 48 00 61 89 */ bl dMsgObject_c_NS_getLetterName /* 802312F4 0022E234 7C 64 1B 78 */ mr r4, r3 @@ -9868,8 +9868,8 @@ lbl_80231208: /* 80231318 0022E258 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8023131C 0022E25C 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 80231320 0022E260 38 84 00 04 */ addi r4, r4, 4 -/* 80231324 0022E264 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231328 0022E268 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231324 0022E264 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231328 0022E268 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8023132C 0022E26C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231330 0022E270 38 00 00 64 */ li r0, 0x64 /* 80231334 0022E274 7C A5 03 D6 */ divw r5, r5, r0 @@ -9883,8 +9883,8 @@ lbl_80231208: /* 80231354 0022E294 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 80231358 0022E298 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8023135C 0022E29C 38 84 00 04 */ addi r4, r4, 4 -/* 80231360 0022E2A0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231364 0022E2A4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231360 0022E2A0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231364 0022E2A4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231368 0022E2A8 80 C5 5E 0C */ lwz r6, 0x5e0c(r5) /* 8023136C 0022E2AC 38 A0 00 64 */ li r5, 0x64 /* 80231370 0022E2B0 7C 06 2B D6 */ divw r0, r6, r5 @@ -9964,8 +9964,8 @@ lbl_80231208: /* 80231498 0022E3D8 48 00 08 BC */ b lbl_80231D54 /* 8023149C 0022E3DC 38 80 00 1E */ li r4, 0x1e /* 802314A0 0022E3E0 48 00 0E 2D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont -/* 802314A4 0022E3E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802314A8 0022E3E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802314A4 0022E3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802314A8 0022E3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802314AC 0022E3EC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802314B0 0022E3F0 A8 83 01 74 */ lha r4, 0x174(r3) /* 802314B4 0022E3F4 7F E3 FB 78 */ mr r3, r31 @@ -10013,8 +10013,8 @@ lbl_8023152C: /* 80231554 0022E494 38 80 00 1C */ li r4, 0x1c /* 80231558 0022E498 48 00 0D 75 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont /* 8023155C 0022E49C 48 00 07 F8 */ b lbl_80231D54 -/* 80231560 0022E4A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231564 0022E4A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231560 0022E4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231564 0022E4A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231568 0022E4A8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023156C 0022E4AC 48 00 5F 65 */ bl dMsgObject_c_NS_getSelectBombNum /* 80231570 0022E4B0 7C 60 1B 78 */ mr r0, r3 @@ -10052,8 +10052,8 @@ lbl_802315E4: /* 802315EC 0022E52C 40 82 00 08 */ bne lbl_802315F4 /* 802315F0 0022E530 38 80 00 72 */ li r4, 0x72 lbl_802315F4: -/* 802315F4 0022E534 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802315F8 0022E538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802315F4 0022E534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802315F8 0022E538 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802315FC 0022E53C 38 63 00 F8 */ addi r3, r3, 0xf8 /* 80231600 0022E540 4B E0 2A F9 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 80231604 0022E544 7C 60 1B 78 */ mr r0, r3 @@ -10067,8 +10067,8 @@ lbl_802315F4: /* 80231624 0022E564 38 81 00 88 */ addi r4, r1, 0x88 /* 80231628 0022E568 48 00 11 95 */ bl jmessage_string_tRenderingProcessor_NS_push_word /* 8023162C 0022E56C 48 00 07 28 */ b lbl_80231D54 -/* 80231630 0022E570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231634 0022E574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231630 0022E570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231634 0022E574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231638 0022E578 88 A3 00 F8 */ lbz r5, 0xf8(r3) /* 8023163C 0022E57C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231640 0022E580 38 80 00 00 */ li r4, 0 @@ -10210,8 +10210,8 @@ lbl_80231854: /* 80231854 0022E794 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80231858 0022E798 28 00 00 02 */ cmplwi r0, 2 /* 8023185C 0022E79C 40 82 00 28 */ bne lbl_80231884 -/* 80231860 0022E7A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231864 0022E7A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231860 0022E7A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231864 0022E7A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231868 0022E7A8 80 A3 09 4C */ lwz r5, 0x94c(r3) /* 8023186C 0022E7AC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231870 0022E7B0 38 80 00 04 */ li r4, 4 @@ -10231,8 +10231,8 @@ lbl_80231884: /* 802318A4 0022E7E4 48 00 02 5C */ b lbl_80231B00 /* 802318A8 0022E7E8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802318AC 0022E7EC 38 80 00 00 */ li r4, 0 -/* 802318B0 0022E7F0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802318B4 0022E7F4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802318B0 0022E7F0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802318B4 0022E7F4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802318B8 0022E7F8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802318BC 0022E7FC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802318C0 0022E800 38 E0 00 01 */ li r7, 1 @@ -10240,8 +10240,8 @@ lbl_80231884: /* 802318C8 0022E808 48 00 02 38 */ b lbl_80231B00 /* 802318CC 0022E80C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802318D0 0022E810 38 80 00 01 */ li r4, 1 -/* 802318D4 0022E814 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 802318D8 0022E818 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 802318D4 0022E814 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 802318D8 0022E818 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 802318DC 0022E81C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802318E0 0022E820 38 C1 00 38 */ addi r6, r1, 0x38 /* 802318E4 0022E824 38 E0 00 01 */ li r7, 1 @@ -10249,8 +10249,8 @@ lbl_80231884: /* 802318EC 0022E82C 48 00 02 14 */ b lbl_80231B00 /* 802318F0 0022E830 80 05 00 00 */ lwz r0, 0(r5) /* 802318F4 0022E834 7C 1E 07 34 */ extsh r30, r0 -/* 802318F8 0022E838 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802318FC 0022E83C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802318F8 0022E838 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802318FC 0022E83C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231900 0022E840 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231904 0022E844 B0 03 01 76 */ sth r0, 0x176(r3) /* 80231908 0022E848 48 00 70 21 */ bl dMsgObject_getFundRaising @@ -10281,13 +10281,13 @@ lbl_80231884: /* 8023196C 0022E8AC 88 05 00 00 */ lbz r0, 0(r5) /* 80231970 0022E8B0 28 00 00 00 */ cmplwi r0, 0 /* 80231974 0022E8B4 40 82 00 14 */ bne lbl_80231988 -/* 80231978 0022E8B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023197C 0022E8BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231978 0022E8B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023197C 0022E8BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231980 0022E8C0 80 A3 5E 0C */ lwz r5, 0x5e0c(r3) /* 80231984 0022E8C4 48 00 00 10 */ b lbl_80231994 lbl_80231988: -/* 80231988 0022E8C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023198C 0022E8CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231988 0022E8C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023198C 0022E8CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231990 0022E8D0 80 A3 09 48 */ lwz r5, 0x948(r3) lbl_80231994: /* 80231994 0022E8D4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -10322,15 +10322,15 @@ lbl_802319D0: /* 80231A00 0022E940 48 00 01 00 */ b lbl_80231B00 /* 80231A04 0022E944 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A08 0022E948 3C 80 00 01 */ lis r4, 1 -/* 80231A0C 0022E94C 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231A10 0022E950 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231A0C 0022E94C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231A10 0022E950 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231A14 0022E954 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 80231A18 0022E958 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A1C 0022E95C 38 E0 00 01 */ li r7, 1 /* 80231A20 0022E960 48 00 72 CD */ bl dMsgUnit_c_NS_setTag /* 80231A24 0022E964 48 00 00 DC */ b lbl_80231B00 -/* 80231A28 0022E968 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80231A2C 0022E96C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80231A28 0022E968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80231A2C 0022E96C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231A30 0022E970 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80231A34 0022E974 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 80231A38 0022E978 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -10346,8 +10346,8 @@ lbl_802319D0: /* 80231A60 0022E9A0 48 00 00 A0 */ b lbl_80231B00 /* 80231A64 0022E9A4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A68 0022E9A8 38 80 00 09 */ li r4, 9 -/* 80231A6C 0022E9AC 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231A70 0022E9B0 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231A6C 0022E9AC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231A70 0022E9B0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231A74 0022E9B4 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231A78 0022E9B8 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A7C 0022E9BC 38 E0 00 01 */ li r7, 1 @@ -10355,8 +10355,8 @@ lbl_802319D0: /* 80231A84 0022E9C4 48 00 00 7C */ b lbl_80231B00 /* 80231A88 0022E9C8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A8C 0022E9CC 38 80 00 0E */ li r4, 0xe -/* 80231A90 0022E9D0 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231A94 0022E9D4 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231A90 0022E9D0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231A94 0022E9D4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231A98 0022E9D8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231A9C 0022E9DC 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AA0 0022E9E0 38 E0 00 01 */ li r7, 1 @@ -10365,8 +10365,8 @@ lbl_802319D0: /* 80231AAC 0022E9EC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231AB0 0022E9F0 3C 80 00 01 */ lis r4, 0x00010001@ha /* 80231AB4 0022E9F4 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 80231AB8 0022E9F8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 80231ABC 0022E9FC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 80231AB8 0022E9F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha +/* 80231ABC 0022E9FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80231AC0 0022EA00 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231AC4 0022EA04 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AC8 0022EA08 38 E0 00 01 */ li r7, 1 @@ -10508,8 +10508,8 @@ lbl_80231C24: /* 80231CD8 0022EC18 38 80 00 44 */ li r4, 0x44 /* 80231CDC 0022EC1C 48 00 05 F1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont /* 80231CE0 0022EC20 48 00 00 74 */ b lbl_80231D54 -/* 80231CE4 0022EC24 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80231CE8 0022EC28 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80231CE4 0022EC24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80231CE8 0022EC28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231CEC 0022EC2C 88 04 01 EB */ lbz r0, 0x1eb(r4) /* 80231CF0 0022EC30 28 00 00 00 */ cmplwi r0, 0 /* 80231CF4 0022EC34 40 82 00 10 */ bne lbl_80231D04 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 5e62cfd235..5868010643 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -68,8 +68,8 @@ dMsgFlow_c_NS_init: /* 80249FD4 00246F14 28 1E 00 00 */ cmplwi r30, 0 /* 80249FD8 00246F18 40 82 00 38 */ bne lbl_8024A010 /* 80249FDC 00246F1C 38 00 00 00 */ li r0, 0 -/* 80249FE0 00246F20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80249FE4 00246F24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80249FE0 00246F20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80249FE4 00246F24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80249FE8 00246F28 90 03 5E F0 */ stw r0, 0x5ef0(r3) /* 80249FEC 00246F2C 90 03 5E F4 */ stw r0, 0x5ef4(r3) /* 80249FF0 00246F30 90 03 5E F8 */ stw r0, 0x5ef8(r3) @@ -972,8 +972,8 @@ lbl_8024AC20: /* 8024AC34 00247B74 98 1E 00 25 */ stb r0, 0x25(r30) /* 8024AC38 00247B78 48 00 01 00 */ b lbl_8024AD38 lbl_8024AC3C: -/* 8024AC3C 00247B7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024AC40 00247B80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024AC3C 00247B7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024AC40 00247B80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024AC44 00247B84 80 63 5E EC */ lwz r3, 0x5eec(r3) /* 8024AC48 00247B88 80 1E 00 34 */ lwz r0, 0x34(r30) /* 8024AC4C 00247B8C 7C 03 00 00 */ cmpw r3, r0 @@ -1001,8 +1001,8 @@ lbl_8024AC58: /* 8024ACA0 00247BE0 88 1E 00 41 */ lbz r0, 0x41(r30) /* 8024ACA4 00247BE4 28 00 00 00 */ cmplwi r0, 0 /* 8024ACA8 00247BE8 41 82 00 14 */ beq lbl_8024ACBC -/* 8024ACAC 00247BEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024ACB0 00247BF0 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8024ACAC 00247BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024ACB0 00247BF0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8024ACB4 00247BF4 88 64 5E 7A */ lbz r3, 0x5e7a(r4) /* 8024ACB8 00247BF8 8B E4 5E 7B */ lbz r31, 0x5e7b(r4) lbl_8024ACBC: @@ -1161,8 +1161,8 @@ lbl_8024AED8: /* 8024AEE0 00247E20 48 00 02 51 */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024AEE4 00247E24 2C 03 00 00 */ cmpwi r3, 0 /* 8024AEE8 00247E28 40 82 00 60 */ bne lbl_8024AF48 -/* 8024AEEC 00247E2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024AEF0 00247E30 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8024AEEC 00247E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024AEF0 00247E30 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8024AEF4 00247E34 80 65 5D B4 */ lwz r3, 0x5db4(r5) /* 8024AEF8 00247E38 A0 03 31 20 */ lhz r0, 0x3120(r3) /* 8024AEFC 00247E3C 28 00 FF FF */ cmplwi r0, 0xffff @@ -1204,8 +1204,8 @@ lbl_8024AF48: /* 8024AF80 00247EC0 88 1E 00 48 */ lbz r0, 0x48(r30) /* 8024AF84 00247EC4 28 00 00 00 */ cmplwi r0, 0 /* 8024AF88 00247EC8 40 82 00 54 */ bne lbl_8024AFDC -/* 8024AF8C 00247ECC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024AF90 00247ED0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024AF8C 00247ECC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024AF90 00247ED0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024AF94 00247ED4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8024AF98 00247ED8 4B FE C1 65 */ bl dMsgObject_c_NS_isMidonaMessage /* 8024AF9C 00247EDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -1339,8 +1339,8 @@ dMsgFlow_c_NS_getParam_X2_: /* 8024B138 00248078 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B13C 0024807C 7C 08 02 A6 */ mflr r0 /* 8024B140 00248080 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B144 00248084 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B148 00248088 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B144 00248084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B148 00248088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B14C 0024808C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024B150 00248090 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B154 00248094 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e @@ -1358,8 +1358,8 @@ dMsgFlow_c_NS_getParam_X2_: /* 8024B184 002480C4 7C 08 02 A6 */ mflr r0 /* 8024B188 002480C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024B18C 002480CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024B190 002480D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B194 002480D4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8024B190 002480D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B194 002480D4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8024B198 002480D8 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 8024B19C 002480DC 80 03 05 74 */ lwz r0, 0x574(r3) /* 8024B1A0 002480E0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -1416,11 +1416,11 @@ lbl_8024B1F4: /* 8024B25C 0024819C A0 04 00 04 */ lhz r0, 4(r4) /* 8024B260 002481A0 28 00 00 00 */ cmplwi r0, 0 /* 8024B264 002481A4 40 82 00 30 */ bne lbl_8024B294 -/* 8024B268 002481A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B26C 002481AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B268 002481A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B26C 002481AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B270 002481B0 4B DE 78 39 */ bl getRupeeMax__21dSv_player_status_a_cCFv -/* 8024B274 002481B4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024B278 002481B8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024B274 002481B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024B278 002481B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024B27C 002481BC A0 84 00 04 */ lhz r4, 4(r4) /* 8024B280 002481C0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8024B284 002481C4 7C 00 20 50 */ subf r0, r0, r4 @@ -1428,8 +1428,8 @@ lbl_8024B1F4: /* 8024B28C 002481CC 7C 03 03 78 */ mr r3, r0 /* 8024B290 002481D0 48 00 00 20 */ b lbl_8024B2B0 lbl_8024B294: -/* 8024B294 002481D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B298 002481D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B294 002481D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B298 002481D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B29C 002481DC A0 63 00 04 */ lhz r3, 4(r3) /* 8024B2A0 002481E0 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 8024B2A4 002481E4 7C 00 18 50 */ subf r0, r0, r3 @@ -1479,8 +1479,8 @@ dMsgFlow_c_NS_query005: /* 8024B344 00248284 48 11 6E 91 */ bl _savegpr_27 /* 8024B348 00248288 7C BF 2B 78 */ mr r31, r5 /* 8024B34C 0024828C A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024B350 00248290 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B354 00248294 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 8024B350 00248290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B354 00248294 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8024B358 00248298 80 7D 5D AC */ lwz r3, 0x5dac(r29) /* 8024B35C 0024829C C0 03 05 50 */ lfs f0, 0x550(r3) /* 8024B360 002482A0 D0 01 00 20 */ stfs f0, 0x20(r1) @@ -1527,8 +1527,8 @@ lbl_8024B3E8: /* 8024B400 00248340 7F 63 DB 78 */ mr r3, r27 /* 8024B404 00248344 4B EF FC 0D */ bl dAttention_c_NS_getDistTable /* 8024B408 00248348 7C 67 1B 78 */ mr r7, r3 -/* 8024B40C 0024834C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B410 00248350 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B40C 0024834C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B410 00248350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B414 00248354 38 63 56 B8 */ addi r3, r3, 0x56b8 /* 8024B418 00248358 38 81 00 20 */ addi r4, r1, 0x20 /* 8024B41C 0024835C 7F 85 E3 78 */ mr r5, r28 @@ -1592,8 +1592,8 @@ lbl_8024B3E8: /* 8024B504 00248444 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B508 00248448 7C 08 02 A6 */ mflr r0 /* 8024B50C 0024844C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B510 00248450 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B514 00248454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B510 00248450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B514 00248454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B518 00248458 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024B51C 0024845C A0 04 00 04 */ lhz r0, 4(r4) /* 8024B520 00248460 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e @@ -1610,8 +1610,8 @@ lbl_8024B3E8: /* 8024B54C 0024848C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B550 00248490 7C 08 02 A6 */ mflr r0 /* 8024B554 00248494 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B558 00248498 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B55C 0024849C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B558 00248498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B55C 0024849C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B560 002484A0 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B564 002484A4 A0 84 00 04 */ lhz r4, 4(r4) /* 8024B568 002484A8 4B DE 92 81 */ bl isTbox__12dSv_memBit_cCFi @@ -1624,8 +1624,8 @@ lbl_8024B3E8: /* 8024B584 002484C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B588 002484C8 7C 08 02 A6 */ mflr r0 /* 8024B58C 002484CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B590 002484D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B594 002484D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B590 002484D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B594 002484D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B598 002484D8 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B59C 002484DC A0 84 00 04 */ lhz r4, 4(r4) /* 8024B5A0 002484E0 4B DE 92 C1 */ bl isSwitch__12dSv_memBit_cCFi @@ -1638,8 +1638,8 @@ lbl_8024B3E8: /* 8024B5BC 002484FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B5C0 00248500 7C 08 02 A6 */ mflr r0 /* 8024B5C4 00248504 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B5C8 00248508 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B5CC 0024850C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B5C8 00248508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B5CC 0024850C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B5D0 00248510 38 63 09 58 */ addi r3, r3, 0x958 /* 8024B5D4 00248514 A0 84 00 04 */ lhz r4, 4(r4) /* 8024B5D8 00248518 4B DE 93 15 */ bl isItem__12dSv_memBit_cCFi @@ -1652,8 +1652,8 @@ lbl_8024B3E8: /* 8024B5F4 00248534 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B5F8 00248538 7C 08 02 A6 */ mflr r0 /* 8024B5FC 0024853C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B600 00248540 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B604 00248544 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B600 00248540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B604 00248544 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B608 00248548 38 63 09 78 */ addi r3, r3, 0x978 /* 8024B60C 0024854C A0 84 00 04 */ lhz r4, 4(r4) /* 8024B610 00248550 4B DE 95 D9 */ bl isSwitch__12dSv_danBit_cCFi @@ -1666,8 +1666,8 @@ lbl_8024B3E8: /* 8024B62C 0024856C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B630 00248570 7C 08 02 A6 */ mflr r0 /* 8024B634 00248574 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B638 00248578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B63C 0024857C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B638 00248578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B63C 0024857C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B640 00248580 38 63 09 78 */ addi r3, r3, 0x978 /* 8024B644 00248584 A0 84 00 04 */ lhz r4, 4(r4) /* 8024B648 00248588 4B DE 96 2D */ bl isItem__12dSv_danBit_cCFi @@ -1776,37 +1776,37 @@ lbl_8024B7BC: /* 8024B7CC 0024870C 40 80 00 5C */ bge lbl_8024B828 /* 8024B7D0 00248710 48 00 00 3C */ b lbl_8024B80C lbl_8024B7D4: -/* 8024B7D4 00248714 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B7D8 00248718 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B7D4 00248714 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B7D8 00248718 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B7DC 0024871C 88 03 00 14 */ lbz r0, 0x14(r3) /* 8024B7E0 00248720 7C 1F 00 40 */ cmplw r31, r0 /* 8024B7E4 00248724 40 82 00 E4 */ bne lbl_8024B8C8 /* 8024B7E8 00248728 3B C0 00 01 */ li r30, 1 /* 8024B7EC 0024872C 48 00 00 DC */ b lbl_8024B8C8 lbl_8024B7F0: -/* 8024B7F0 00248730 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B7F4 00248734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B7F0 00248730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B7F4 00248734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B7F8 00248738 88 03 00 15 */ lbz r0, 0x15(r3) /* 8024B7FC 0024873C 7C 1F 00 40 */ cmplw r31, r0 /* 8024B800 00248740 40 82 00 C8 */ bne lbl_8024B8C8 /* 8024B804 00248744 3B C0 00 01 */ li r30, 1 /* 8024B808 00248748 48 00 00 C0 */ b lbl_8024B8C8 lbl_8024B80C: -/* 8024B80C 0024874C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B810 00248750 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B80C 0024874C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B810 00248750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B814 00248754 88 03 00 13 */ lbz r0, 0x13(r3) /* 8024B818 00248758 7C 1F 00 40 */ cmplw r31, r0 /* 8024B81C 0024875C 40 82 00 AC */ bne lbl_8024B8C8 /* 8024B820 00248760 3B C0 00 01 */ li r30, 1 /* 8024B824 00248764 48 00 00 A4 */ b lbl_8024B8C8 lbl_8024B828: -/* 8024B828 00248768 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B82C 0024876C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B828 00248768 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B82C 0024876C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B830 00248770 38 80 00 00 */ li r4, 0 /* 8024B834 00248774 4B DE 72 29 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B838 00248778 7C 60 1B 78 */ mr r0, r3 -/* 8024B83C 0024877C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B840 00248780 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B83C 0024877C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B840 00248780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B844 00248784 3B A3 00 9C */ addi r29, r3, 0x9c /* 8024B848 00248788 7F A3 EB 78 */ mr r3, r29 /* 8024B84C 0024878C 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -1815,8 +1815,8 @@ lbl_8024B828: /* 8024B858 00248798 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B85C 0024879C 7C 1F 00 40 */ cmplw r31, r0 /* 8024B860 002487A0 41 82 00 64 */ beq lbl_8024B8C4 -/* 8024B864 002487A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B868 002487A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B864 002487A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B868 002487A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B86C 002487AC 38 80 00 01 */ li r4, 1 /* 8024B870 002487B0 4B DE 71 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B874 002487B4 7C 60 1B 78 */ mr r0, r3 @@ -1827,8 +1827,8 @@ lbl_8024B828: /* 8024B888 002487C8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B88C 002487CC 7C 1F 00 40 */ cmplw r31, r0 /* 8024B890 002487D0 41 82 00 34 */ beq lbl_8024B8C4 -/* 8024B894 002487D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B898 002487D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B894 002487D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B898 002487D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B89C 002487DC 38 80 00 02 */ li r4, 2 /* 8024B8A0 002487E0 4B DE 71 BD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B8A4 002487E4 7C 60 1B 78 */ mr r0, r3 @@ -1855,7 +1855,7 @@ lbl_8024B8C8: /* 8024B8F0 00248830 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B8F4 00248834 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8024B8F8 00248838 38 80 00 01 */ li r4, 1 -/* 8024B8FC 0024883C 4B E4 C5 E5 */ bl checkItemGet +/* 8024B8FC 0024883C 4B E4 C5 E5 */ bl checkItemGet__FUci /* 8024B900 00248840 7C 60 00 34 */ cntlzw r0, r3 /* 8024B904 00248844 54 03 DC 3E */ rlwinm r3, r0, 0x1b, 0x10, 0x1f /* 8024B908 00248848 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1865,8 +1865,8 @@ lbl_8024B8C8: /* 8024B918 00248858 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B91C 0024885C 7C 08 02 A6 */ mflr r0 /* 8024B920 00248860 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B924 00248864 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B928 00248868 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B924 00248864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B928 00248868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B92C 0024886C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024B930 00248870 38 80 00 FF */ li r4, 0xff /* 8024B934 00248874 4B DE 82 B9 */ bl checkBombBag__17dSv_player_item_cFUc @@ -1877,8 +1877,8 @@ lbl_8024B8C8: /* 8024B948 00248888 7C 08 03 A6 */ mtlr r0 /* 8024B94C 0024888C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024B950 00248890 4E 80 00 20 */ blr -/* 8024B954 00248894 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B958 00248898 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B954 00248894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B958 00248898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B95C 0024889C 88 63 00 EC */ lbz r3, 0xec(r3) /* 8024B960 002488A0 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B964 002488A4 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -1891,8 +1891,8 @@ lbl_8024B8C8: /* 8024B980 002488C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024B984 002488C4 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B988 002488C8 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 8024B98C 002488CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024B990 002488D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024B98C 002488CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024B990 002488D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024B994 002488D4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024B998 002488D8 4B DE 7E 55 */ bl checkEmptyBottle__17dSv_player_item_cFv /* 8024B99C 002488DC 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -1922,12 +1922,12 @@ lbl_8024B8C8: /* 8024B9FC 0024893C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8024BA00 00248940 7C 1F 03 78 */ mr r31, r0 /* 8024BA04 00248944 40 82 00 10 */ bne lbl_8024BA14 -/* 8024BA08 00248948 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BA0C 0024894C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BA08 00248948 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BA0C 0024894C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BA10 00248950 8B E3 5E A1 */ lbz r31, 0x5ea1(r3) lbl_8024BA14: -/* 8024BA14 00248954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BA18 00248958 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8024BA14 00248954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BA18 00248958 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8024BA1C 0024895C 38 64 01 14 */ addi r3, r4, 0x114 /* 8024BA20 00248960 88 84 4E 0C */ lbz r4, 0x4e0c(r4) /* 8024BA24 00248964 4B DE 89 1D */ bl getLightDropNum__16dSv_light_drop_cCFUc @@ -1963,8 +1963,8 @@ lbl_8024BA90: /* 8024BA98 002489D8 90 04 00 88 */ stw r0, 0x88(r4) /* 8024BA9C 002489DC 4E 80 00 20 */ blr /* 8024BAA0 002489E0 38 A0 00 01 */ li r5, 1 -/* 8024BAA4 002489E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BAA8 002489E8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 8024BAA4 002489E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BAA8 002489E8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8024BAAC 002489EC A0 04 00 08 */ lhz r0, 8(r4) /* 8024BAB0 002489F0 54 03 04 3F */ clrlwi. r3, r0, 0x10 /* 8024BAB4 002489F4 41 82 00 10 */ beq lbl_8024BAC4 @@ -1984,8 +1984,8 @@ lbl_8024BAD8: /* 8024BAE0 00248A20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024BAE4 00248A24 7C 08 02 A6 */ mflr r0 /* 8024BAE8 00248A28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BAEC 00248A2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BAF0 00248A30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BAEC 00248A2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BAF0 00248A30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BAF4 00248A34 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BAF8 00248A38 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BAFC 00248A3C 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -2000,8 +2000,8 @@ lbl_8024BAD8: /* 8024BB20 00248A60 90 01 00 14 */ stw r0, 0x14(r1) /* 8024BB24 00248A64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024BB28 00248A68 A3 E4 00 04 */ lhz r31, 4(r4) -/* 8024BB2C 00248A6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BB30 00248A70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BB2C 00248A6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BB30 00248A70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BB34 00248A74 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024BB38 00248A78 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 8024BB3C 00248A7C 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l @@ -2019,8 +2019,8 @@ lbl_8024BAD8: /* 8024BB6C 00248AAC 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BB70 00248AB0 4E 80 00 20 */ blr /* 8024BB74 00248AB4 38 A0 00 01 */ li r5, 1 -/* 8024BB78 00248AB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BB7C 00248ABC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BB78 00248AB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BB7C 00248ABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BB80 00248AC0 A0 63 00 02 */ lhz r3, 2(r3) /* 8024BB84 00248AC4 A0 04 00 04 */ lhz r0, 4(r4) /* 8024BB88 00248AC8 7C 03 00 00 */ cmpw r3, r0 @@ -2032,8 +2032,8 @@ lbl_8024BB94: /* 8024BB9C 00248ADC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024BBA0 00248AE0 7C 08 02 A6 */ mflr r0 /* 8024BBA4 00248AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BBA8 00248AE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BBAC 00248AEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BBA8 00248AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BBAC 00248AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BBB0 00248AF0 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8024BBB4 00248AF4 38 80 00 01 */ li r4, 1 /* 8024BBB8 00248AF8 81 83 06 28 */ lwz r12, 0x628(r3) @@ -2048,8 +2048,8 @@ lbl_8024BB94: /* 8024BBDC 00248B1C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BBE0 00248B20 4E 80 00 20 */ blr /* 8024BBE4 00248B24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BBE8 00248B28 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BBEC 00248B2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BBE8 00248B28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BBEC 00248B2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BBF0 00248B30 C0 23 00 34 */ lfs f1, 0x34(r3) /* 8024BBF4 00248B34 C0 02 B3 98 */ lfs f0, lbl_80454D98-_SDA2_BASE_(r2) /* 8024BBF8 00248B38 EC 00 00 72 */ fmuls f0, f0, f1 @@ -2060,8 +2060,8 @@ lbl_8024BB94: /* 8024BC0C 00248B4C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BC10 00248B50 4E 80 00 20 */ blr /* 8024BC14 00248B54 38 A0 00 00 */ li r5, 0 -/* 8024BC18 00248B58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BC1C 00248B5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BC18 00248B58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BC1C 00248B5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BC20 00248B60 88 63 00 1B */ lbz r3, 0x1b(r3) /* 8024BC24 00248B64 A0 04 00 04 */ lhz r0, 4(r4) /* 8024BC28 00248B68 7C 03 00 00 */ cmpw r3, r0 @@ -2076,8 +2076,8 @@ lbl_8024BC34: /* 8024BC48 00248B88 80 63 00 20 */ lwz r3, 0x20(r3) /* 8024BC4C 00248B8C 4B DD 3D D9 */ bl fopMsgM_SearchByID /* 8024BC50 00248B90 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024BC54 00248B94 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024BC58 00248B98 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024BC54 00248B94 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024BC58 00248B98 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024BC5C 00248B9C 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 8024BC60 00248BA0 88 04 01 A2 */ lbz r0, 0x1a2(r4) /* 8024BC64 00248BA4 28 00 00 02 */ cmplwi r0, 2 @@ -2094,8 +2094,8 @@ lbl_8024BC70: /* 8024BC8C 00248BCC 80 63 00 20 */ lwz r3, 0x20(r3) /* 8024BC90 00248BD0 4B DD 3D 95 */ bl fopMsgM_SearchByID /* 8024BC94 00248BD4 88 63 00 FA */ lbz r3, 0xfa(r3) -/* 8024BC98 00248BD8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024BC9C 00248BDC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024BC98 00248BD8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024BC9C 00248BDC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024BCA0 00248BE0 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 8024BCA4 00248BE4 88 04 01 A2 */ lbz r0, 0x1a2(r4) /* 8024BCA8 00248BE8 28 00 00 02 */ cmplwi r0, 2 @@ -2129,8 +2129,8 @@ lbl_8024BCF4: /* 8024BD10 00248C50 7C 04 03 78 */ mr r4, r0 /* 8024BD14 00248C54 48 00 00 24 */ b lbl_8024BD38 lbl_8024BD18: -/* 8024BD18 00248C58 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BD1C 00248C5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BD18 00248C58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BD1C 00248C5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BD20 00248C60 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BD24 00248C64 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BD28 00248C68 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -2139,8 +2139,8 @@ lbl_8024BD18: /* 8024BD34 00248C74 54 04 06 3E */ clrlwi r4, r0, 0x18 lbl_8024BD38: /* 8024BD38 00248C78 3B E0 00 00 */ li r31, 0 -/* 8024BD3C 00248C7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BD40 00248C80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BD3C 00248C7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BD40 00248C80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BD44 00248C84 38 63 00 9C */ addi r3, r3, 0x9c /* 8024BD48 00248C88 38 04 00 0F */ addi r0, r4, 0xf /* 8024BD4C 00248C8C 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -2179,22 +2179,22 @@ lbl_8024BD94: /* 8024BDBC 00248CFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024BDC0 00248D00 93 C1 00 08 */ stw r30, 8(r1) /* 8024BDC4 00248D04 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BDC8 00248D08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BDCC 00248D0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BDC8 00248D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BDCC 00248D0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BDD0 00248D10 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BDD4 00248D14 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BDD8 00248D18 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024BDDC 00248D1C 4B DE 8C 29 */ bl getEventReg__11dSv_event_cCFUs /* 8024BDE0 00248D20 7C 64 1B 78 */ mr r4, r3 -/* 8024BDE4 00248D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BDE8 00248D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BDE4 00248D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BDE8 00248D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BDEC 00248D2C 38 63 00 EC */ addi r3, r3, 0xec /* 8024BDF0 00248D30 38 04 FF FF */ addi r0, r4, -1 /* 8024BDF4 00248D34 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BDF8 00248D38 4B DE 81 85 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024BDFC 00248D3C 7C 7F 1B 78 */ mr r31, r3 -/* 8024BE00 00248D40 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BE04 00248D44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BE00 00248D40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BE04 00248D44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BE08 00248D48 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024BE0C 00248D4C 38 80 00 70 */ li r4, 0x70 /* 8024BE10 00248D50 4B DE 82 E9 */ bl getBombNum__21dSv_player_item_max_cCFUc @@ -2236,8 +2236,8 @@ lbl_8024BE80: /* 8024BE9C 00248DDC 7C 1E 03 78 */ mr r30, r0 /* 8024BEA0 00248DE0 48 00 00 24 */ b lbl_8024BEC4 lbl_8024BEA4: -/* 8024BEA4 00248DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BEA8 00248DE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEA4 00248DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BEA8 00248DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BEAC 00248DEC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BEB0 00248DF0 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BEB4 00248DF4 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -2245,22 +2245,22 @@ lbl_8024BEA4: /* 8024BEBC 00248DFC 38 03 FF FF */ addi r0, r3, -1 /* 8024BEC0 00248E00 54 1E 06 3E */ clrlwi r30, r0, 0x18 lbl_8024BEC4: -/* 8024BEC4 00248E04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BEC8 00248E08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEC4 00248E04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BEC8 00248E08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BECC 00248E0C 38 63 00 EC */ addi r3, r3, 0xec /* 8024BED0 00248E10 7F C4 F3 78 */ mr r4, r30 /* 8024BED4 00248E14 4B DE 80 A9 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024BED8 00248E18 7C 7F 1B 78 */ mr r31, r3 -/* 8024BEDC 00248E1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BEE0 00248E20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEDC 00248E1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BEE0 00248E20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BEE4 00248E24 38 63 00 9C */ addi r3, r3, 0x9c /* 8024BEE8 00248E28 38 1E 00 0F */ addi r0, r30, 0xf /* 8024BEEC 00248E2C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BEF0 00248E30 38 A0 00 00 */ li r5, 0 /* 8024BEF4 00248E34 4B DE 71 3D */ bl getItem__17dSv_player_item_cCFib /* 8024BEF8 00248E38 7C 64 1B 78 */ mr r4, r3 -/* 8024BEFC 00248E3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BF00 00248E40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BEFC 00248E3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BF00 00248E40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BF04 00248E44 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024BF08 00248E48 4B DE 81 F1 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024BF0C 00248E4C 57 E4 06 3F */ clrlwi. r4, r31, 0x18 @@ -2289,22 +2289,22 @@ lbl_8024BF34: /* 8024BF5C 00248E9C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024BF60 00248EA0 93 C1 00 08 */ stw r30, 8(r1) /* 8024BF64 00248EA4 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BF68 00248EA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BF6C 00248EAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BF68 00248EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BF6C 00248EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BF70 00248EB0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BF74 00248EB4 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BF78 00248EB8 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024BF7C 00248EBC 4B DE 8A 89 */ bl getEventReg__11dSv_event_cCFUs /* 8024BF80 00248EC0 7C 64 1B 78 */ mr r4, r3 -/* 8024BF84 00248EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BF88 00248EC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BF84 00248EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BF88 00248EC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BF8C 00248ECC 38 63 00 EC */ addi r3, r3, 0xec /* 8024BF90 00248ED0 38 04 FF FF */ addi r0, r4, -1 /* 8024BF94 00248ED4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BF98 00248ED8 4B DE 7F E5 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024BF9C 00248EDC 7C 7F 1B 78 */ mr r31, r3 -/* 8024BFA0 00248EE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024BFA4 00248EE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024BFA0 00248EE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024BFA4 00248EE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024BFA8 00248EE8 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024BFAC 00248EEC 38 80 00 71 */ li r4, 0x71 /* 8024BFB0 00248EF0 4B DE 81 49 */ bl getBombNum__21dSv_player_item_max_cCFUc @@ -2332,14 +2332,14 @@ lbl_8024BF34: /* 8024C008 00248F48 3C 60 80 3A */ lis r3, lbl_80399CB0@ha /* 8024C00C 00248F4C 38 63 9C B0 */ addi r3, r3, lbl_80399CB0@l /* 8024C010 00248F50 38 63 00 10 */ addi r3, r3, 0x10 -/* 8024C014 00248F54 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C018 00248F58 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024C014 00248F54 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C018 00248F58 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024C01C 00248F5C 38 84 4E 00 */ addi r4, r4, 0x4e00 /* 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 -/* 8024C030 00248F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C02C 00248F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C030 00248F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C034 00248F74 38 63 09 78 */ addi r3, r3, 0x978 /* 8024C038 00248F78 38 80 00 3C */ li r4, 0x3c /* 8024C03C 00248F7C 4B DE 8B AD */ bl isSwitch__12dSv_danBit_cCFi @@ -2379,22 +2379,22 @@ lbl_8024C08C: /* 8024C0B4 00248FF4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024C0B8 00248FF8 93 C1 00 08 */ stw r30, 8(r1) /* 8024C0BC 00248FFC A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024C0C0 00249000 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C0C4 00249004 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C0C0 00249000 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C0C4 00249004 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C0C8 00249008 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C0CC 0024900C 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024C0D0 00249010 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024C0D4 00249014 4B DE 89 31 */ bl getEventReg__11dSv_event_cCFUs /* 8024C0D8 00249018 7C 64 1B 78 */ mr r4, r3 -/* 8024C0DC 0024901C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C0E0 00249020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C0DC 0024901C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C0E0 00249020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C0E4 00249024 38 63 00 EC */ addi r3, r3, 0xec /* 8024C0E8 00249028 38 04 FF FF */ addi r0, r4, -1 /* 8024C0EC 0024902C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024C0F0 00249030 4B DE 7E 8D */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8024C0F4 00249034 7C 7F 1B 78 */ mr r31, r3 -/* 8024C0F8 00249038 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C0FC 0024903C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C0F8 00249038 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C0FC 0024903C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C100 00249040 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024C104 00249044 38 80 00 72 */ li r4, 0x72 /* 8024C108 00249048 4B DE 7F F1 */ bl getBombNum__21dSv_player_item_max_cCFUc @@ -2415,8 +2415,8 @@ lbl_8024C08C: /* 8024C144 00249084 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024C148 00249088 7C 08 02 A6 */ mflr r0 /* 8024C14C 0024908C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C150 00249090 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C154 00249094 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C150 00249090 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C154 00249094 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C158 00249098 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8024C15C 0024909C 38 80 00 00 */ li r4, 0 /* 8024C160 002490A0 81 83 06 28 */ lwz r12, 0x628(r3) @@ -2473,8 +2473,8 @@ lbl_8024C204: /* 8024C218 00249158 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024C21C 0024915C 7C 08 02 A6 */ mflr r0 /* 8024C220 00249160 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C224 00249164 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C228 00249168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C224 00249164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C228 00249168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C22C 0024916C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024C230 00249170 4B DE 75 25 */ bl checkInsectBottle__17dSv_player_item_cFv /* 8024C234 00249174 54 63 06 3E */ clrlwi r3, r3, 0x18 @@ -2506,8 +2506,8 @@ lbl_8024C288: /* 8024C294 002491D4 7C 08 03 A6 */ mtlr r0 /* 8024C298 002491D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8024C29C 002491DC 4E 80 00 20 */ blr -/* 8024C2A0 002491E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C2A4 002491E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C2A0 002491E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C2A4 002491E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C2A8 002491E8 88 03 01 0C */ lbz r0, 0x10c(r3) /* 8024C2AC 002491EC 28 00 00 00 */ cmplwi r0, 0 /* 8024C2B0 002491F0 40 82 00 0C */ bne lbl_8024C2BC @@ -2551,8 +2551,8 @@ lbl_8024C2F4: /* 8024C334 00249274 7C 08 03 A6 */ mtlr r0 /* 8024C338 00249278 38 21 00 10 */ addi r1, r1, 0x10 /* 8024C33C 0024927C 4E 80 00 20 */ blr -/* 8024C340 00249280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C344 00249284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C340 00249280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C344 00249284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C348 00249288 80 83 5E 0C */ lwz r4, 0x5e0c(r3) /* 8024C34C 0024928C 2C 04 00 00 */ cmpwi r4, 0 /* 8024C350 00249290 40 82 00 0C */ bne lbl_8024C35C @@ -2581,8 +2581,8 @@ lbl_8024C398: /* 8024C398 002492D8 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8024C39C 002492DC 4E 80 00 20 */ blr /* 8024C3A0 002492E0 38 A0 00 00 */ li r5, 0 -/* 8024C3A4 002492E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C3A8 002492E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C3A4 002492E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C3A8 002492E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C3AC 002492EC 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 8024C3B0 002492F0 80 04 05 70 */ lwz r0, 0x570(r4) /* 8024C3B4 002492F4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 @@ -2596,8 +2596,8 @@ lbl_8024C3CC: /* 8024C3CC 0024930C 54 A3 06 3E */ clrlwi r3, r5, 0x18 /* 8024C3D0 00249310 4E 80 00 20 */ blr /* 8024C3D4 00249314 38 80 00 00 */ li r4, 0 -/* 8024C3D8 00249318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C3DC 0024931C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C3D8 00249318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C3DC 0024931C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C3E0 00249320 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 8024C3E4 00249324 80 03 05 70 */ lwz r0, 0x570(r3) /* 8024C3E8 00249328 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -2617,8 +2617,8 @@ lbl_8024C3F4: /* 8024C41C 0024935C A0 01 00 08 */ lhz r0, 8(r1) /* 8024C420 00249360 28 00 00 00 */ cmplwi r0, 0 /* 8024C424 00249364 41 82 00 24 */ beq lbl_8024C448 -/* 8024C428 00249368 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C42C 0024936C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C428 00249368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C42C 0024936C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C430 00249370 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C434 00249374 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C438 00249378 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2629,8 +2629,8 @@ lbl_8024C448: /* 8024C448 00249388 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C44C 0024938C 28 00 00 00 */ cmplwi r0, 0 /* 8024C450 00249390 41 82 00 24 */ beq lbl_8024C474 -/* 8024C454 00249394 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C458 00249398 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C454 00249394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C458 00249398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C45C 0024939C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C460 002493A0 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C464 002493A4 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2654,8 +2654,8 @@ lbl_8024C474: /* 8024C4A8 002493E8 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C4AC 002493EC 28 00 00 00 */ cmplwi r0, 0 /* 8024C4B0 002493F0 41 82 00 24 */ beq lbl_8024C4D4 -/* 8024C4B4 002493F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C4B8 002493F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C4B4 002493F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C4B8 002493F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C4BC 002493FC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C4C0 00249400 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C4C4 00249404 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2666,8 +2666,8 @@ lbl_8024C4D4: /* 8024C4D4 00249414 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C4D8 00249418 28 00 00 00 */ cmplwi r0, 0 /* 8024C4DC 0024941C 41 82 00 24 */ beq lbl_8024C500 -/* 8024C4E0 00249420 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C4E4 00249424 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C4E0 00249420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C4E4 00249424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C4E8 00249428 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024C4EC 0024942C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C4F0 00249430 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -2685,8 +2685,8 @@ lbl_8024C500: /* 8024C51C 0024945C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C520 00249460 38 84 00 04 */ addi r4, r4, 4 /* 8024C524 00249464 4B FF EC 0D */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C528 00249468 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C52C 0024946C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8024C528 00249468 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C52C 0024946C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024C530 00249470 80 04 5D C4 */ lwz r0, 0x5dc4(r4) /* 8024C534 00249474 7C 00 1A 14 */ add r0, r0, r3 /* 8024C538 00249478 90 04 5D C4 */ stw r0, 0x5dc4(r4) @@ -2700,8 +2700,8 @@ lbl_8024C500: /* 8024C558 00249498 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C55C 0024949C 38 84 00 04 */ addi r4, r4, 4 /* 8024C560 002494A0 4B FF EB D1 */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C564 002494A4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C568 002494A8 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024C564 002494A4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C568 002494A8 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C56C 002494AC 80 85 5D C4 */ lwz r4, 0x5dc4(r5) /* 8024C570 002494B0 7C 03 00 D0 */ neg r0, r3 /* 8024C574 002494B4 7C 04 02 14 */ add r0, r4, r0 @@ -2723,8 +2723,8 @@ lbl_8024C500: /* 8024C5B4 002494F4 90 01 00 08 */ stw r0, 8(r1) /* 8024C5B8 002494F8 C8 01 00 08 */ lfd f0, 8(r1) /* 8024C5BC 002494FC EC 20 08 28 */ fsubs f1, f0, f1 -/* 8024C5C0 00249500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C5C4 00249504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C5C0 00249500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C5C4 00249504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C5C8 00249508 C0 03 5D C0 */ lfs f0, 0x5dc0(r3) /* 8024C5CC 0024950C EC 00 08 2A */ fadds f0, f0, f1 /* 8024C5D0 00249510 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) @@ -2747,8 +2747,8 @@ lbl_8024C500: /* 8024C614 00249554 90 01 00 08 */ stw r0, 8(r1) /* 8024C618 00249558 C8 01 00 08 */ lfd f0, 8(r1) /* 8024C61C 0024955C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8024C620 00249560 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C624 00249564 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C620 00249560 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C624 00249564 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C628 00249568 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) /* 8024C62C 0024956C FC 00 00 50 */ fneg f0, f0 /* 8024C630 00249570 EC 01 00 2A */ fadds f0, f1, f0 @@ -2765,8 +2765,8 @@ lbl_8024C500: /* 8024C65C 0024959C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C660 002495A0 38 84 00 04 */ addi r4, r4, 4 /* 8024C664 002495A4 4B FF EA CD */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C668 002495A8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C66C 002495AC 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024C668 002495A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C66C 002495AC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C670 002495B0 A8 85 5D CC */ lha r4, 0x5dcc(r5) /* 8024C674 002495B4 7C 60 07 34 */ extsh r0, r3 /* 8024C678 002495B8 7C 04 02 14 */ add r0, r4, r0 @@ -2781,8 +2781,8 @@ lbl_8024C500: /* 8024C69C 002495DC 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C6A0 002495E0 38 84 00 04 */ addi r4, r4, 4 /* 8024C6A4 002495E4 4B FF EA 8D */ bl dMsgFlow_c_NS_getParam_X2_ -/* 8024C6A8 002495E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024C6AC 002495EC 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024C6A8 002495E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024C6AC 002495EC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C6B0 002495F0 A8 85 5D CC */ lha r4, 0x5dcc(r5) /* 8024C6B4 002495F4 7C 03 00 D0 */ neg r0, r3 /* 8024C6B8 002495F8 7C 00 07 34 */ extsh r0, r0 @@ -2843,8 +2843,8 @@ lbl_8024C730: /* 8024C78C 002496CC A0 01 00 08 */ lhz r0, 8(r1) /* 8024C790 002496D0 28 00 00 00 */ cmplwi r0, 0 /* 8024C794 002496D4 41 82 00 24 */ beq lbl_8024C7B8 -/* 8024C798 002496D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C79C 002496DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C798 002496D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C79C 002496DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C7A0 002496E0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C7A4 002496E4 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C7A8 002496E8 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2855,8 +2855,8 @@ lbl_8024C7B8: /* 8024C7B8 002496F8 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C7BC 002496FC 28 00 00 00 */ cmplwi r0, 0 /* 8024C7C0 00249700 41 82 00 24 */ beq lbl_8024C7E4 -/* 8024C7C4 00249704 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C7C8 00249708 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C7C4 00249704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C7C8 00249708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C7CC 0024970C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C7D0 00249710 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C7D4 00249714 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2880,8 +2880,8 @@ lbl_8024C7E4: /* 8024C818 00249758 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C81C 0024975C 28 00 00 00 */ cmplwi r0, 0 /* 8024C820 00249760 41 82 00 24 */ beq lbl_8024C844 -/* 8024C824 00249764 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C828 00249768 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C824 00249764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C828 00249768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C82C 0024976C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C830 00249770 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C834 00249774 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2892,8 +2892,8 @@ lbl_8024C844: /* 8024C844 00249784 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C848 00249788 28 00 00 00 */ cmplwi r0, 0 /* 8024C84C 0024978C 41 82 00 24 */ beq lbl_8024C870 -/* 8024C850 00249790 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C854 00249794 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C850 00249790 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C854 00249794 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C858 00249798 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C85C 0024979C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024C860 002497A0 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -2954,15 +2954,15 @@ lbl_8024C92C: /* 8024C930 00249870 40 80 00 4C */ bge lbl_8024C97C /* 8024C934 00249874 48 00 00 40 */ b lbl_8024C974 lbl_8024C938: -/* 8024C938 00249878 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C93C 0024987C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C938 00249878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C93C 0024987C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C940 00249880 38 63 09 58 */ addi r3, r3, 0x958 /* 8024C944 00249884 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024C948 00249888 4B DE 7E C9 */ bl onSwitch__12dSv_memBit_cFi /* 8024C94C 0024988C 48 00 00 30 */ b lbl_8024C97C lbl_8024C950: -/* 8024C950 00249890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024C954 00249894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024C950 00249890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024C954 00249894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024C958 00249898 38 63 09 78 */ addi r3, r3, 0x978 /* 8024C95C 0024989C A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024C960 002498A0 4B DE 82 39 */ bl onSwitch__12dSv_danBit_cFi @@ -3011,15 +3011,15 @@ lbl_8024C9F4: /* 8024C9F8 00249938 40 80 00 4C */ bge lbl_8024CA44 /* 8024C9FC 0024993C 48 00 00 40 */ b lbl_8024CA3C lbl_8024CA00: -/* 8024CA00 00249940 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CA04 00249944 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CA00 00249940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CA04 00249944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CA08 00249948 38 63 09 58 */ addi r3, r3, 0x958 /* 8024CA0C 0024994C A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024CA10 00249950 4B DE 7E 29 */ bl offSwitch__12dSv_memBit_cFi /* 8024CA14 00249954 48 00 00 30 */ b lbl_8024CA44 lbl_8024CA18: -/* 8024CA18 00249958 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CA1C 0024995C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CA18 00249958 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CA1C 0024995C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CA20 00249960 38 63 09 78 */ addi r3, r3, 0x978 /* 8024CA24 00249964 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024CA28 00249968 4B DE 81 99 */ bl offSwitch__12dSv_danBit_cFi @@ -3080,8 +3080,8 @@ lbl_8024CAEC: /* 8024CAF0 00249A30 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024CAF4 00249A34 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024CAF8 00249A38 98 03 00 E3 */ stb r0, 0xe3(r3) -/* 8024CAFC 00249A3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CB00 00249A40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CAFC 00249A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CB00 00249A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CB04 00249A44 38 63 01 14 */ addi r3, r3, 0x114 /* 8024CB08 00249A48 38 80 00 00 */ li r4, 0 /* 8024CB0C 00249A4C 4B DE 78 5D */ bl onLightDropGetFlag__16dSv_light_drop_cFUc @@ -3091,8 +3091,8 @@ lbl_8024CB14: /* 8024CB18 00249A58 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024CB1C 00249A5C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024CB20 00249A60 98 03 00 E4 */ stb r0, 0xe4(r3) -/* 8024CB24 00249A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CB28 00249A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CB24 00249A64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CB28 00249A68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CB2C 00249A6C 38 63 01 14 */ addi r3, r3, 0x114 /* 8024CB30 00249A70 38 80 00 01 */ li r4, 1 /* 8024CB34 00249A74 4B DE 78 35 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc @@ -3102,15 +3102,15 @@ lbl_8024CB3C: /* 8024CB40 00249A80 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024CB44 00249A84 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024CB48 00249A88 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 8024CB4C 00249A8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CB50 00249A90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CB4C 00249A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CB50 00249A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CB54 00249A94 38 63 01 14 */ addi r3, r3, 0x114 /* 8024CB58 00249A98 38 80 00 02 */ li r4, 2 /* 8024CB5C 00249A9C 4B DE 78 0D */ bl onLightDropGetFlag__16dSv_light_drop_cFUc /* 8024CB60 00249AA0 48 00 00 0C */ b lbl_8024CB6C lbl_8024CB64: /* 8024CB64 00249AA4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024CB68 00249AA8 4B E4 B3 25 */ bl execItemGet +/* 8024CB68 00249AA8 4B E4 B3 25 */ bl execItemGet__FUc lbl_8024CB6C: /* 8024CB6C 00249AAC 38 60 00 01 */ li r3, 1 /* 8024CB70 00249AB0 48 00 00 2C */ b lbl_8024CB9C @@ -3120,7 +3120,7 @@ lbl_8024CB74: lbl_8024CB7C: /* 8024CB7C 00249ABC A0 01 00 08 */ lhz r0, 8(r1) /* 8024CB80 00249AC0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024CB84 00249AC4 4B E4 B3 09 */ bl execItemGet +/* 8024CB84 00249AC4 4B E4 B3 09 */ bl execItemGet__FUc /* 8024CB88 00249AC8 3B FF 00 01 */ addi r31, r31, 1 lbl_8024CB8C: /* 8024CB8C 00249ACC A0 01 00 0A */ lhz r0, 0xa(r1) @@ -3209,8 +3209,8 @@ lbl_8024CC88: /* 8024CCC4 00249C04 38 84 00 04 */ addi r4, r4, 4 /* 8024CCC8 00249C08 4B FF E4 69 */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024CCCC 00249C0C 7C 7F 1B 78 */ mr r31, r3 -/* 8024CCD0 00249C10 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CCD4 00249C14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CCD0 00249C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CCD4 00249C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CCD8 00249C18 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 8024CCDC 00249C1C 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8024CCE0 00249C20 88 1B 04 E2 */ lbz r0, 0x4e2(r27) @@ -3277,8 +3277,8 @@ lbl_8024CD68: /* 8024CDC4 00249D04 40 82 00 08 */ bne lbl_8024CDCC /* 8024CDC8 00249D08 38 60 00 64 */ li r3, 0x64 lbl_8024CDCC: -/* 8024CDCC 00249D0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024CDD0 00249D10 38 C4 61 C0 */ addi r6, r4, lbl_804061C0@l +/* 8024CDCC 00249D0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024CDD0 00249D10 38 C4 61 C0 */ addi r6, r4, g_dComIfG_gameInfo@l /* 8024CDD4 00249D14 A0 A6 00 06 */ lhz r5, 6(r6) /* 8024CDD8 00249D18 80 86 5D D4 */ lwz r4, 0x5dd4(r6) /* 8024CDDC 00249D1C C8 22 B3 A0 */ lfd f1, lbl_80454DA0-_SDA2_BASE_(r2) @@ -3319,44 +3319,44 @@ lbl_8024CDCC: /* 8024CE68 00249DA8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8024CE6C 00249DAC 7C 09 03 A6 */ mtctr r0 /* 8024CE70 00249DB0 4E 80 04 20 */ bctr -/* 8024CE74 00249DB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CE78 00249DB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CE74 00249DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CE78 00249DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CE7C 00249DBC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CE80 00249DC0 38 80 00 61 */ li r4, 0x61 /* 8024CE84 00249DC4 4B DE 65 CD */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CE88 00249DC8 48 00 00 90 */ b lbl_8024CF18 -/* 8024CE8C 00249DCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CE90 00249DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CE8C 00249DCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CE90 00249DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CE94 00249DD4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CE98 00249DD8 38 80 00 62 */ li r4, 0x62 /* 8024CE9C 00249DDC 4B DE 65 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEA0 00249DE0 48 00 00 78 */ b lbl_8024CF18 -/* 8024CEA4 00249DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CEA8 00249DE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CEA4 00249DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CEA8 00249DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEAC 00249DEC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEB0 00249DF0 38 80 00 63 */ li r4, 0x63 /* 8024CEB4 00249DF4 4B DE 65 9D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEB8 00249DF8 48 00 00 60 */ b lbl_8024CF18 -/* 8024CEBC 00249DFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CEC0 00249E00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CEBC 00249DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CEC0 00249E00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEC4 00249E04 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEC8 00249E08 38 80 00 64 */ li r4, 0x64 /* 8024CECC 00249E0C 4B DE 65 85 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CED0 00249E10 48 00 00 48 */ b lbl_8024CF18 -/* 8024CED4 00249E14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CED8 00249E18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CED4 00249E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CED8 00249E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEDC 00249E1C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEE0 00249E20 38 80 00 65 */ li r4, 0x65 /* 8024CEE4 00249E24 4B DE 65 6D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEE8 00249E28 48 00 00 30 */ b lbl_8024CF18 -/* 8024CEEC 00249E2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CEF0 00249E30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CEEC 00249E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CEF0 00249E30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CEF4 00249E34 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEF8 00249E38 38 80 00 66 */ li r4, 0x66 /* 8024CEFC 00249E3C 4B DE 65 55 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CF00 00249E40 48 00 00 18 */ b lbl_8024CF18 -/* 8024CF04 00249E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CF08 00249E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CF04 00249E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CF08 00249E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CF0C 00249E4C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CF10 00249E50 38 80 00 6B */ li r4, 0x6b /* 8024CF14 00249E54 4B DE 65 3D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc @@ -3382,8 +3382,8 @@ lbl_8024CF18: /* 8024CF60 00249EA0 38 84 00 04 */ addi r4, r4, 4 /* 8024CF64 00249EA4 4B FF E1 CD */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024CF68 00249EA8 7C 60 1B 78 */ mr r0, r3 -/* 8024CF6C 00249EAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024CF70 00249EB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024CF6C 00249EAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024CF70 00249EB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024CF74 00249EB4 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024CF78 00249EB8 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024CF7C 00249EBC 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -3457,8 +3457,8 @@ lbl_8024D060: /* 8024D07C 00249FBC 7C 1F 03 78 */ mr r31, r0 /* 8024D080 00249FC0 48 00 00 24 */ b lbl_8024D0A4 lbl_8024D084: -/* 8024D084 00249FC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D088 00249FC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D084 00249FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D088 00249FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D08C 00249FCC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024D090 00249FD0 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024D094 00249FD4 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -3475,8 +3475,8 @@ lbl_8024D0A4: /* 8024D0BC 00249FFC 7C 03 00 2E */ lwzx r0, r3, r0 /* 8024D0C0 0024A000 7C 09 03 A6 */ mtctr r0 /* 8024D0C4 0024A004 4E 80 04 20 */ bctr -/* 8024D0C8 0024A008 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D0CC 0024A00C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D0C8 0024A008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D0CC 0024A00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D0D0 0024A010 3B C3 00 9C */ addi r30, r3, 0x9c /* 8024D0D4 0024A014 7F C3 F3 78 */ mr r3, r30 /* 8024D0D8 0024A018 38 1F 00 0F */ addi r0, r31, 0xf @@ -3495,29 +3495,29 @@ lbl_8024D108: /* 8024D108 0024A048 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D10C 0024A04C 28 00 00 00 */ cmplwi r0, 0 /* 8024D110 0024A050 41 82 00 20 */ beq lbl_8024D130 -/* 8024D114 0024A054 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D118 0024A058 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D114 0024A054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D118 0024A058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D11C 0024A05C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D120 0024A060 7F E4 FB 78 */ mr r4, r31 /* 8024D124 0024A064 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D128 0024A068 4B DD E2 45 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D12C 0024A06C 48 00 02 7C */ b lbl_8024D3A8 lbl_8024D130: -/* 8024D130 0024A070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D134 0024A074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D130 0024A070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D134 0024A074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D138 0024A078 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D13C 0024A07C 38 80 00 70 */ li r4, 0x70 /* 8024D140 0024A080 4B DE 6F B9 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D144 0024A084 7C 60 1B 78 */ mr r0, r3 -/* 8024D148 0024A088 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D14C 0024A08C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D148 0024A088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D14C 0024A08C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D150 0024A090 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D154 0024A094 7F E4 FB 78 */ mr r4, r31 /* 8024D158 0024A098 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D15C 0024A09C 4B DD E2 11 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D160 0024A0A0 48 00 02 48 */ b lbl_8024D3A8 -/* 8024D164 0024A0A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D168 0024A0A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D164 0024A0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D168 0024A0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D16C 0024A0AC 3B A3 00 9C */ addi r29, r3, 0x9c /* 8024D170 0024A0B0 7F A3 EB 78 */ mr r3, r29 /* 8024D174 0024A0B4 38 1F 00 0F */ addi r0, r31, 0xf @@ -3536,29 +3536,29 @@ lbl_8024D1A4: /* 8024D1A4 0024A0E4 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D1A8 0024A0E8 28 00 00 00 */ cmplwi r0, 0 /* 8024D1AC 0024A0EC 41 82 00 20 */ beq lbl_8024D1CC -/* 8024D1B0 0024A0F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D1B4 0024A0F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D1B0 0024A0F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D1B4 0024A0F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D1B8 0024A0F8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D1BC 0024A0FC 7F E4 FB 78 */ mr r4, r31 /* 8024D1C0 0024A100 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D1C4 0024A104 4B DD E1 A9 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D1C8 0024A108 48 00 01 E0 */ b lbl_8024D3A8 lbl_8024D1CC: -/* 8024D1CC 0024A10C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D1D0 0024A110 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D1CC 0024A10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D1D0 0024A110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D1D4 0024A114 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D1D8 0024A118 38 80 00 71 */ li r4, 0x71 /* 8024D1DC 0024A11C 4B DE 6F 1D */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D1E0 0024A120 7C 60 1B 78 */ mr r0, r3 -/* 8024D1E4 0024A124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D1E8 0024A128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D1E4 0024A124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D1E8 0024A128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D1EC 0024A12C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D1F0 0024A130 7F E4 FB 78 */ mr r4, r31 /* 8024D1F4 0024A134 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D1F8 0024A138 4B DD E1 75 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D1FC 0024A13C 48 00 01 AC */ b lbl_8024D3A8 -/* 8024D200 0024A140 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D204 0024A144 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D200 0024A140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D204 0024A144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D208 0024A148 3B A3 00 9C */ addi r29, r3, 0x9c /* 8024D20C 0024A14C 7F A3 EB 78 */ mr r3, r29 /* 8024D210 0024A150 38 1F 00 0F */ addi r0, r31, 0xf @@ -3577,90 +3577,90 @@ lbl_8024D240: /* 8024D240 0024A180 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D244 0024A184 28 00 00 00 */ cmplwi r0, 0 /* 8024D248 0024A188 41 82 00 20 */ beq lbl_8024D268 -/* 8024D24C 0024A18C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D250 0024A190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D24C 0024A18C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D250 0024A190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D254 0024A194 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D258 0024A198 7F E4 FB 78 */ mr r4, r31 /* 8024D25C 0024A19C 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D260 0024A1A0 4B DD E1 0D */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D264 0024A1A4 48 00 01 44 */ b lbl_8024D3A8 lbl_8024D268: -/* 8024D268 0024A1A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D26C 0024A1AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D268 0024A1A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D26C 0024A1AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D270 0024A1B0 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D274 0024A1B4 38 80 00 72 */ li r4, 0x72 /* 8024D278 0024A1B8 4B DE 6E 81 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D27C 0024A1BC 7C 60 1B 78 */ mr r0, r3 -/* 8024D280 0024A1C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D284 0024A1C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D280 0024A1C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D284 0024A1C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D288 0024A1C8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D28C 0024A1CC 7F E4 FB 78 */ mr r4, r31 /* 8024D290 0024A1D0 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D294 0024A1D4 4B DD E0 D9 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D298 0024A1D8 48 00 01 10 */ b lbl_8024D3A8 -/* 8024D29C 0024A1DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2A0 0024A1E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D29C 0024A1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2A0 0024A1E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2A4 0024A1E4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D2A8 0024A1E8 7F E4 FB 78 */ mr r4, r31 /* 8024D2AC 0024A1EC A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D2B0 0024A1F0 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D2B4 0024A1F4 4B DD E0 B9 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D2B8 0024A1F8 48 00 00 F0 */ b lbl_8024D3A8 -/* 8024D2BC 0024A1FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2C0 0024A200 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D2BC 0024A1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2C0 0024A200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2C4 0024A204 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D2C8 0024A208 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D2CC 0024A20C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D2D0 0024A210 38 A0 00 70 */ li r5, 0x70 /* 8024D2D4 0024A214 4B DE 5C E5 */ bl setItem__17dSv_player_item_cFiUc -/* 8024D2D8 0024A218 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2DC 0024A21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D2D8 0024A218 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2DC 0024A21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2E0 0024A220 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D2E4 0024A224 38 80 00 70 */ li r4, 0x70 /* 8024D2E8 0024A228 4B DE 6E 11 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D2EC 0024A22C 7C 60 1B 78 */ mr r0, r3 -/* 8024D2F0 0024A230 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D2F4 0024A234 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D2F0 0024A230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D2F4 0024A234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D2F8 0024A238 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D2FC 0024A23C 7F E4 FB 78 */ mr r4, r31 /* 8024D300 0024A240 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D304 0024A244 4B DD E0 69 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D308 0024A248 48 00 00 A0 */ b lbl_8024D3A8 -/* 8024D30C 0024A24C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D310 0024A250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D30C 0024A24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D310 0024A250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D314 0024A254 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D318 0024A258 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D31C 0024A25C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D320 0024A260 38 A0 00 71 */ li r5, 0x71 /* 8024D324 0024A264 4B DE 5C 95 */ bl setItem__17dSv_player_item_cFiUc -/* 8024D328 0024A268 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D32C 0024A26C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D328 0024A268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D32C 0024A26C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D330 0024A270 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D334 0024A274 38 80 00 71 */ li r4, 0x71 /* 8024D338 0024A278 4B DE 6D C1 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D33C 0024A27C 7C 60 1B 78 */ mr r0, r3 -/* 8024D340 0024A280 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D344 0024A284 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D340 0024A280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D344 0024A284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D348 0024A288 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D34C 0024A28C 7F E4 FB 78 */ mr r4, r31 /* 8024D350 0024A290 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8024D354 0024A294 4B DD E0 19 */ bl dComIfG_play_c_NS_setItemBombNumCount /* 8024D358 0024A298 48 00 00 50 */ b lbl_8024D3A8 -/* 8024D35C 0024A29C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D360 0024A2A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D35C 0024A29C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D360 0024A2A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D364 0024A2A4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D368 0024A2A8 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D36C 0024A2AC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D370 0024A2B0 38 A0 00 72 */ li r5, 0x72 /* 8024D374 0024A2B4 4B DE 5C 45 */ bl setItem__17dSv_player_item_cFiUc -/* 8024D378 0024A2B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D37C 0024A2BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D378 0024A2B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D37C 0024A2BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D380 0024A2C0 38 63 00 F8 */ addi r3, r3, 0xf8 /* 8024D384 0024A2C4 38 80 00 72 */ li r4, 0x72 /* 8024D388 0024A2C8 4B DE 6D 71 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 8024D38C 0024A2CC 7C 60 1B 78 */ mr r0, r3 -/* 8024D390 0024A2D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D394 0024A2D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D390 0024A2D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D394 0024A2D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D398 0024A2D8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D39C 0024A2DC 7F E4 FB 78 */ mr r4, r31 /* 8024D3A0 0024A2E0 54 05 06 3E */ clrlwi r5, r0, 0x18 @@ -3678,8 +3678,8 @@ lbl_8024D3A8: /* 8024D3CC 0024A30C 90 01 00 24 */ stw r0, 0x24(r1) /* 8024D3D0 0024A310 39 61 00 20 */ addi r11, r1, 0x20 /* 8024D3D4 0024A314 48 11 4D FD */ bl _savegpr_26 -/* 8024D3D8 0024A318 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D3DC 0024A31C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D3D8 0024A318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D3DC 0024A31C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D3E0 0024A320 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024D3E4 0024A324 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024D3E8 0024A328 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l @@ -3690,8 +3690,8 @@ lbl_8024D3A8: /* 8024D3FC 0024A33C 4B FE B1 B9 */ bl dMsgObject_c_NS_getSelectBombBagID /* 8024D400 0024A340 7C 7F 1B 78 */ mr r31, r3 /* 8024D404 0024A344 4B FE B1 DD */ bl dMsgObject_c_NS_getSelectBombPrice -/* 8024D408 0024A348 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8024D40C 0024A34C 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l +/* 8024D408 0024A348 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8024D40C 0024A34C 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024D410 0024A350 80 85 5D C4 */ lwz r4, 0x5dc4(r5) /* 8024D414 0024A354 7C 60 07 34 */ extsh r0, r3 /* 8024D418 0024A358 7C 04 02 14 */ add r0, r4, r0 @@ -3700,8 +3700,8 @@ lbl_8024D3A8: /* 8024D424 0024A364 7F E4 FB 78 */ mr r4, r31 /* 8024D428 0024A368 38 A0 00 00 */ li r5, 0 /* 8024D42C 0024A36C 4B DE 6B 41 */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 8024D430 0024A370 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D434 0024A374 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D430 0024A370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D434 0024A374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D438 0024A378 3B C3 00 9C */ addi r30, r3, 0x9c /* 8024D43C 0024A37C 7F C3 F3 78 */ mr r3, r30 /* 8024D440 0024A380 57 E4 06 3E */ clrlwi r4, r31, 0x18 @@ -3720,8 +3720,8 @@ lbl_8024D3A8: /* 8024D474 0024A3B4 48 00 00 70 */ b lbl_8024D4E4 lbl_8024D478: /* 8024D478 0024A3B8 3B 60 00 00 */ li r27, 0 -/* 8024D47C 0024A3BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D480 0024A3C0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 8024D47C 0024A3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D480 0024A3C0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_8024D484: /* 8024D484 0024A3C4 7F E3 FB 78 */ mr r3, r31 /* 8024D488 0024A3C8 7F 64 DB 78 */ mr r4, r27 @@ -3784,15 +3784,15 @@ lbl_8024D4E4: /* 8024D564 0024A4A4 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024D568 0024A4A8 7C 04 07 35 */ extsh. r4, r0 /* 8024D56C 0024A4AC 40 82 00 10 */ bne lbl_8024D57C -/* 8024D570 0024A4B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D574 0024A4B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D570 0024A4B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D574 0024A4B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D578 0024A4B8 88 83 00 F8 */ lbz r4, 0xf8(r3) lbl_8024D57C: /* 8024D57C 0024A4BC A0 01 00 08 */ lhz r0, 8(r1) /* 8024D580 0024A4C0 28 00 00 00 */ cmplwi r0, 0 /* 8024D584 0024A4C4 40 82 00 1C */ bne lbl_8024D5A0 -/* 8024D588 0024A4C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D58C 0024A4CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D588 0024A4C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D58C 0024A4CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D590 0024A4D0 A8 03 5D F4 */ lha r0, 0x5df4(r3) /* 8024D594 0024A4D4 7C 00 22 14 */ add r0, r0, r4 /* 8024D598 0024A4D8 B0 03 5D F4 */ sth r0, 0x5df4(r3) @@ -3933,8 +3933,8 @@ lbl_8024D768: /* 8024D794 0024A6D4 38 84 00 04 */ addi r4, r4, 4 /* 8024D798 0024A6D8 4B FF D9 99 */ bl dMsgFlow_c_NS_getParam_X2_ /* 8024D79C 0024A6DC 7C 60 1B 78 */ mr r0, r3 -/* 8024D7A0 0024A6E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D7A4 0024A6E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D7A0 0024A6E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D7A4 0024A6E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D7A8 0024A6E8 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D7AC 0024A6EC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D7B0 0024A6F0 4B DE 64 7D */ bl setWarashibeItem__17dSv_player_item_cFUc @@ -3954,8 +3954,8 @@ lbl_8024D768: /* 8024D7E8 0024A728 2C 04 00 F5 */ cmpwi r4, 0xf5 /* 8024D7EC 0024A72C 40 82 00 1C */ bne lbl_8024D808 lbl_8024D7F0: -/* 8024D7F0 0024A730 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D7F4 0024A734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D7F0 0024A730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D7F4 0024A734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D7F8 0024A738 38 63 00 CC */ addi r3, r3, 0xcc /* 8024D7FC 0024A73C 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8024D800 0024A740 4B DE 66 95 */ bl offFirstBit__21dSv_player_get_item_cFUc @@ -3966,8 +3966,8 @@ lbl_8024D808: /* 8024D810 0024A750 2C 04 00 91 */ cmpwi r4, 0x91 /* 8024D814 0024A754 40 82 00 20 */ bne lbl_8024D834 lbl_8024D818: -/* 8024D818 0024A758 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D81C 0024A75C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D818 0024A758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D81C 0024A75C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D820 0024A760 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D824 0024A764 38 80 00 13 */ li r4, 0x13 /* 8024D828 0024A768 38 A0 00 FF */ li r5, 0xff @@ -3980,8 +3980,8 @@ lbl_8024D834: /* 8024D840 0024A780 2C 04 00 83 */ cmpwi r4, 0x83 /* 8024D844 0024A784 40 82 00 18 */ bne lbl_8024D85C lbl_8024D848: -/* 8024D848 0024A788 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D84C 0024A78C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D848 0024A788 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D84C 0024A78C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D850 0024A790 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D854 0024A794 38 80 00 FF */ li r4, 0xff /* 8024D858 0024A798 4B DE 63 D5 */ bl setWarashibeItem__17dSv_player_item_cFUc @@ -4001,8 +4001,8 @@ lbl_8024D85C: /* 8024D88C 0024A7CC 4B FF D8 65 */ bl dMsgFlow_c_NS_getParam /* 8024D890 0024A7D0 A0 01 00 08 */ lhz r0, 8(r1) /* 8024D894 0024A7D4 54 04 28 34 */ slwi r4, r0, 5 -/* 8024D898 0024A7D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D89C 0024A7DC 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8024D898 0024A7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D89C 0024A7DC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8024D8A0 0024A7E0 7C 60 22 14 */ add r3, r0, r4 /* 8024D8A4 0024A7E4 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8024D8A8 0024A7E8 A0 81 00 0A */ lhz r4, 0xa(r1) @@ -4022,8 +4022,8 @@ lbl_8024D85C: /* 8024D8E0 0024A820 4B FF D8 11 */ bl dMsgFlow_c_NS_getParam /* 8024D8E4 0024A824 A0 01 00 08 */ lhz r0, 8(r1) /* 8024D8E8 0024A828 54 04 28 34 */ slwi r4, r0, 5 -/* 8024D8EC 0024A82C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D8F0 0024A830 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l +/* 8024D8EC 0024A82C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D8F0 0024A830 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 8024D8F4 0024A834 7C 60 22 14 */ add r3, r0, r4 /* 8024D8F8 0024A838 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 8024D8FC 0024A83C A0 81 00 0A */ lhz r4, 0xa(r1) @@ -4068,50 +4068,50 @@ lbl_8024D85C: /* 8024D998 0024A8D8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8024D99C 0024A8DC 7C 09 03 A6 */ mtctr r0 /* 8024D9A0 0024A8E0 4E 80 04 20 */ bctr -/* 8024D9A4 0024A8E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9A8 0024A8E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9A4 0024A8E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9A8 0024A8E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D9AC 0024A8EC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9B0 0024A8F0 38 80 00 61 */ li r4, 0x61 /* 8024D9B4 0024A8F4 38 A0 00 60 */ li r5, 0x60 /* 8024D9B8 0024A8F8 4B DE 59 B9 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9BC 0024A8FC 48 00 00 A8 */ b lbl_8024DA64 -/* 8024D9C0 0024A900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9C4 0024A904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9C0 0024A900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9C4 0024A904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D9C8 0024A908 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9CC 0024A90C 38 80 00 62 */ li r4, 0x62 /* 8024D9D0 0024A910 38 A0 00 60 */ li r5, 0x60 /* 8024D9D4 0024A914 4B DE 59 9D */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9D8 0024A918 48 00 00 8C */ b lbl_8024DA64 -/* 8024D9DC 0024A91C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9E0 0024A920 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9DC 0024A91C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9E0 0024A920 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024D9E4 0024A924 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9E8 0024A928 38 80 00 63 */ li r4, 0x63 /* 8024D9EC 0024A92C 38 A0 00 60 */ li r5, 0x60 /* 8024D9F0 0024A930 4B DE 59 81 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9F4 0024A934 48 00 00 70 */ b lbl_8024DA64 -/* 8024D9F8 0024A938 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024D9FC 0024A93C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024D9F8 0024A938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024D9FC 0024A93C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA00 0024A940 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA04 0024A944 38 80 00 64 */ li r4, 0x64 /* 8024DA08 0024A948 38 A0 00 60 */ li r5, 0x60 /* 8024DA0C 0024A94C 4B DE 59 65 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA10 0024A950 48 00 00 54 */ b lbl_8024DA64 -/* 8024DA14 0024A954 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024DA18 0024A958 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024DA14 0024A954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024DA18 0024A958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA1C 0024A95C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA20 0024A960 38 80 00 65 */ li r4, 0x65 /* 8024DA24 0024A964 38 A0 00 60 */ li r5, 0x60 /* 8024DA28 0024A968 4B DE 59 49 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA2C 0024A96C 48 00 00 38 */ b lbl_8024DA64 -/* 8024DA30 0024A970 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024DA34 0024A974 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024DA30 0024A970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024DA34 0024A974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA38 0024A978 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA3C 0024A97C 38 80 00 66 */ li r4, 0x66 /* 8024DA40 0024A980 38 A0 00 60 */ li r5, 0x60 /* 8024DA44 0024A984 4B DE 59 2D */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA48 0024A988 48 00 00 1C */ b lbl_8024DA64 -/* 8024DA4C 0024A98C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024DA50 0024A990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024DA4C 0024A98C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024DA50 0024A990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024DA54 0024A994 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA58 0024A998 38 80 00 6B */ li r4, 0x6b /* 8024DA5C 0024A99C 38 A0 00 60 */ li r5, 0x60 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 8fc7734d82..e2fb0683f8 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -15,8 +15,8 @@ dMsgObject_searchSSItem: /* 80232A50 0022F990 93 E1 00 0C */ stw r31, 0xc(r1) /* 80232A54 0022F994 93 C1 00 08 */ stw r30, 8(r1) /* 80232A58 0022F998 7C 7E 1B 78 */ mr r30, r3 -/* 80232A5C 0022F99C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80232A60 0022F9A0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80232A5C 0022F99C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80232A60 0022F9A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80232A64 0022F9A4 83 E4 5D AC */ lwz r31, 0x5dac(r4) /* 80232A68 0022F9A8 4B DE 62 79 */ bl fopAc_IsActor /* 80232A6C 0022F9AC 2C 03 00 00 */ cmpwi r3, 0 @@ -1101,8 +1101,8 @@ lbl_80233A74: /* 80233A74 002309B4 80 DE 01 04 */ lwz r6, 0x104(r30) /* 80233A78 002309B8 28 06 00 00 */ cmplwi r6, 0 /* 80233A7C 002309BC 41 82 00 50 */ beq lbl_80233ACC -/* 80233A80 002309C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233A84 002309C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233A80 002309C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233A84 002309C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233A88 002309C8 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80233A8C 002309CC 28 00 00 00 */ cmplwi r0, 0 /* 80233A90 002309D0 41 82 00 18 */ beq lbl_80233AA8 @@ -1260,8 +1260,8 @@ lbl_80233C88: /* 80233CAC 00230BEC 41 82 00 08 */ beq lbl_80233CB4 /* 80233CB0 00230BF0 90 7F 01 44 */ stw r3, 0x144(r31) lbl_80233CB4: -/* 80233CB4 00230BF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233CB8 00230BF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233CB4 00230BF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233CB8 00230BF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233CBC 00230BFC 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 80233CC0 00230C00 28 00 00 05 */ cmplwi r0, 5 /* 80233CC4 00230C04 40 82 00 14 */ bne lbl_80233CD8 @@ -1271,8 +1271,8 @@ lbl_80233CB4: /* 80233CD4 00230C14 4B DF A4 B5 */ bl dComIfGp_offHeapLockFlag lbl_80233CD8: /* 80233CD8 00230C18 38 00 00 00 */ li r0, 0 -/* 80233CDC 00230C1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233CE0 00230C20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233CDC 00230C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233CE0 00230C20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233CE4 00230C24 90 03 5D BC */ stw r0, 0x5dbc(r3) /* 80233CE8 00230C28 38 60 00 01 */ li r3, 1 /* 80233CEC 00230C2C 39 61 00 30 */ addi r11, r1, 0x30 @@ -1311,8 +1311,8 @@ lbl_80233D44: /* 80233D60 00230CA0 41 82 00 2C */ beq lbl_80233D8C /* 80233D64 00230CA4 28 04 00 00 */ cmplwi r4, 0 /* 80233D68 00230CA8 41 82 00 24 */ beq lbl_80233D8C -/* 80233D6C 00230CAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233D70 00230CB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233D6C 00230CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233D70 00230CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233D74 00230CB4 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80233D78 00230CB8 4B E0 F9 15 */ bl dEvt_control_c_NS_setPtT /* 80233D7C 00230CBC 38 00 00 01 */ li r0, 1 @@ -1339,8 +1339,8 @@ lbl_80233D8C: /* 80233DCC 00230D0C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80233DD0 00230D10 7C 7C 02 14 */ add r3, r28, r0 /* 80233DD4 00230D14 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 80233DD8 00230D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233DDC 00230D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233DD8 00230D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233DDC 00230D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233DE0 00230D20 90 03 5E EC */ stw r0, 0x5eec(r3) /* 80233DE4 00230D24 80 9D 01 5C */ lwz r4, 0x15c(r29) /* 80233DE8 00230D28 28 04 03 E8 */ cmplwi r4, 0x3e8 @@ -1409,8 +1409,8 @@ dMsgObject_c_NS_setMessageIndexDemo: /* 80233EC8 00230E08 41 82 00 2C */ beq lbl_80233EF4 /* 80233ECC 00230E0C 28 04 00 00 */ cmplwi r4, 0 /* 80233ED0 00230E10 41 82 00 24 */ beq lbl_80233EF4 -/* 80233ED4 00230E14 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233ED8 00230E18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233ED4 00230E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233ED8 00230E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233EDC 00230E1C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80233EE0 00230E20 4B E0 F7 AD */ bl dEvt_control_c_NS_setPtT /* 80233EE4 00230E24 38 00 00 01 */ li r0, 1 @@ -1435,8 +1435,8 @@ lbl_80233EF4: /* 80233F2C 00230E6C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80233F30 00230E70 7C 7D 02 14 */ add r3, r29, r0 /* 80233F34 00230E74 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 80233F38 00230E78 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80233F3C 00230E7C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80233F38 00230E78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80233F3C 00230E7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233F40 00230E80 90 03 5E EC */ stw r0, 0x5eec(r3) /* 80233F44 00230E84 38 00 00 00 */ li r0, 0 /* 80233F48 00230E88 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -1617,8 +1617,8 @@ lbl_8023417C: /* 80234180 002310C0 48 00 2F B9 */ bl dMsgObject_c_NS_isMidonaNormalTalkWait /* 80234184 002310C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234188 002310C8 41 82 01 7C */ beq lbl_80234304 -/* 8023418C 002310CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80234190 002310D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023418C 002310CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80234190 002310D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80234194 002310D4 88 03 5D B0 */ lbz r0, 0x5db0(r3) /* 80234198 002310D8 7C 00 07 74 */ extsb r0, r0 /* 8023419C 002310DC 1C 00 00 38 */ mulli r0, r0, 0x38 @@ -1629,8 +1629,8 @@ lbl_8023417C: /* 802341B0 002310F0 48 00 37 85 */ bl dMsgObject_c_NS_isCameraCancelFlag /* 802341B4 002310F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802341B8 002310F8 40 82 00 18 */ bne lbl_802341D0 -/* 802341BC 002310FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802341C0 00231100 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802341BC 002310FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802341C0 00231100 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802341C4 00231104 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 802341C8 00231108 28 00 00 00 */ cmplwi r0, 0 /* 802341CC 0023110C 41 82 01 38 */ beq lbl_80234304 @@ -1640,8 +1640,8 @@ lbl_802341D0: /* 802341D8 00231118 41 82 00 70 */ beq lbl_80234248 /* 802341DC 0023111C 38 00 00 00 */ li r0, 0 /* 802341E0 00231120 98 1F 01 9D */ stb r0, 0x19d(r31) -/* 802341E4 00231124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802341E8 00231128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802341E4 00231124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802341E8 00231128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802341EC 0023112C 98 03 5E 86 */ stb r0, 0x5e86(r3) /* 802341F0 00231130 98 1F 01 9F */ stb r0, 0x19f(r31) /* 802341F4 00231134 7F E3 FB 78 */ mr r3, r31 @@ -1693,8 +1693,8 @@ lbl_80234280: /* 802342A0 002311E0 48 00 00 64 */ b lbl_80234304 lbl_802342A4: /* 802342A4 002311E4 38 00 00 00 */ li r0, 0 -/* 802342A8 002311E8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802342AC 002311EC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802342A8 002311E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802342AC 002311EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802342B0 002311F0 98 04 5E 86 */ stb r0, 0x5e86(r4) /* 802342B4 002311F4 98 1F 01 9F */ stb r0, 0x19f(r31) /* 802342B8 002311F8 38 80 00 02 */ li r4, 2 @@ -2854,8 +2854,8 @@ lbl_80235380: /* 80235394 002322D4 28 00 00 00 */ cmplwi r0, 0 /* 80235398 002322D8 41 82 00 1C */ beq lbl_802353B4 /* 8023539C 002322DC 38 00 00 2A */ li r0, 0x2a -/* 802353A0 002322E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802353A4 002322E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802353A0 002322E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802353A4 002322E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802353A8 002322E8 98 03 5E 35 */ stb r0, 0x5e35(r3) /* 802353AC 002322EC 38 00 00 00 */ li r0, 0 /* 802353B0 002322F0 98 03 5E 50 */ stb r0, 0x5e50(r3) @@ -3244,8 +3244,8 @@ dMsgObject_c_NS_inputProc: /* 80235924 00232864 80 63 00 34 */ lwz r3, 0x34(r3) /* 80235928 00232868 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 8023592C 0023286C 41 82 01 58 */ beq lbl_80235A84 -/* 80235930 00232870 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235934 00232874 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235930 00232870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235934 00232874 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235938 00232878 3B A3 0D D8 */ addi r29, r3, 0xdd8 /* 8023593C 0023287C 7F A3 EB 78 */ mr r3, r29 /* 80235940 00232880 3C 80 80 38 */ lis r4, lbl_803790C0@ha @@ -3256,8 +3256,8 @@ dMsgObject_c_NS_inputProc: /* 80235954 00232894 A8 1C 01 74 */ lha r0, 0x174(r28) /* 80235958 00232898 2C 00 00 00 */ cmpwi r0, 0 /* 8023595C 0023289C 40 81 00 30 */ ble lbl_8023598C -/* 80235960 002328A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235964 002328A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235960 002328A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235964 002328A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235968 002328A8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8023596C 002328AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80235970 002328B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -3268,8 +3268,8 @@ dMsgObject_c_NS_inputProc: /* 80235984 002328C4 38 00 00 01 */ li r0, 1 /* 80235988 002328C8 98 1C 04 D0 */ stb r0, 0x4d0(r28) lbl_8023598C: -/* 8023598C 002328CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235990 002328D0 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l +/* 8023598C 002328CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235990 002328D0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80235994 002328D4 80 85 5D C4 */ lwz r4, 0x5dc4(r5) /* 80235998 002328D8 A8 7C 01 74 */ lha r3, 0x174(r28) /* 8023599C 002328DC 7C 03 00 D0 */ neg r0, r3 @@ -3286,8 +3286,8 @@ lbl_8023598C: /* 802359C8 00232908 A8 1C 01 76 */ lha r0, 0x176(r28) /* 802359CC 0023290C 7C 03 00 00 */ cmpw r3, r0 /* 802359D0 00232910 41 80 00 9C */ blt lbl_80235A6C -/* 802359D4 00232914 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802359D8 00232918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802359D4 00232914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802359D8 00232918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802359DC 0023291C 3B 63 07 F0 */ addi r27, r3, 0x7f0 /* 802359E0 00232920 7F 63 DB 78 */ mr r3, r27 /* 802359E4 00232924 3C 80 80 3A */ lis r4, lbl_803A7288@ha @@ -3339,8 +3339,8 @@ lbl_80235A6C: lbl_80235A84: /* 80235A84 002329C4 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 80235A88 002329C8 41 82 00 34 */ beq lbl_80235ABC -/* 80235A8C 002329CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235A90 002329D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235A8C 002329CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235A90 002329D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235A94 002329D4 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80235A98 002329D8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80235A9C 002329DC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l @@ -3673,8 +3673,8 @@ lbl_80235F2C: /* 80235F44 00232E84 7F E3 FB 78 */ mr r3, r31 /* 80235F48 00232E88 48 00 18 01 */ bl dMsgObject_c_NS_updateEquipBombInfoLocal /* 80235F4C 00232E8C 38 00 00 FF */ li r0, 0xff -/* 80235F50 00232E90 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80235F54 00232E94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80235F50 00232E90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80235F54 00232E94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80235F58 00232E98 98 03 5E 7C */ stb r0, 0x5e7c(r3) /* 80235F5C 00232E9C 38 00 FF FF */ li r0, -1 /* 80235F60 00232EA0 90 03 5E E8 */ stw r0, 0x5ee8(r3) @@ -3742,8 +3742,8 @@ lbl_80236028: /* 80236040 00232F80 88 9F 01 A5 */ lbz r4, 0x1a5(r31) /* 80236044 00232F84 28 04 00 00 */ cmplwi r4, 0 /* 80236048 00232F88 41 82 00 20 */ beq lbl_80236068 -/* 8023604C 00232F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236050 00232F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023604C 00232F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236050 00232F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236054 00232F94 A8 03 5D F4 */ lha r0, 0x5df4(r3) /* 80236058 00232F98 7C 00 22 14 */ add r0, r0, r4 /* 8023605C 00232F9C B0 03 5D F4 */ sth r0, 0x5df4(r3) @@ -3802,8 +3802,8 @@ lbl_8023610C: /* 80236110 00233050 88 03 12 46 */ lbz r0, 0x1246(r3) /* 80236114 00233054 98 1F 01 9A */ stb r0, 0x19a(r31) lbl_80236118: -/* 80236118 00233058 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023611C 0023305C 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 80236118 00233058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023611C 0023305C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 80236120 00233060 88 1C 5E 8F */ lbz r0, 0x5e8f(r28) /* 80236124 00233064 28 00 00 08 */ cmplwi r0, 8 /* 80236128 00233068 41 82 00 2C */ beq lbl_80236154 @@ -4247,8 +4247,8 @@ lbl_80236774: lbl_8023677C: /* 8023677C 002336BC 28 1E 00 03 */ cmplwi r30, 3 /* 80236780 002336C0 40 82 00 F4 */ bne lbl_80236874 -/* 80236784 002336C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236788 002336C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236784 002336C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236788 002336C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023678C 002336CC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80236790 002336D0 38 63 05 38 */ addi r3, r3, 0x538 /* 80236794 002336D4 38 81 00 14 */ addi r4, r1, 0x14 @@ -4398,8 +4398,8 @@ lbl_80236978: /* 8023697C 002338BC 90 1E 01 04 */ stw r0, 0x104(r30) /* 80236980 002338C0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80236984 002338C4 41 82 00 20 */ beq lbl_802369A4 -/* 80236988 002338C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023698C 002338CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236988 002338C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023698C 002338CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236990 002338D0 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 80236994 002338D4 28 00 00 05 */ cmplwi r0, 5 /* 80236998 002338D8 40 82 00 0C */ bne lbl_802369A4 @@ -4430,8 +4430,8 @@ dMsgObject_c_NS_isSend: /* 802369E8 00233928 93 C1 00 08 */ stw r30, 8(r1) /* 802369EC 0023392C 7C 7F 1B 78 */ mr r31, r3 /* 802369F0 00233930 38 00 00 00 */ li r0, 0 -/* 802369F4 00233934 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802369F8 00233938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802369F4 00233934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802369F8 00233938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802369FC 0023393C 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80236A00 00233940 98 03 5E 57 */ stb r0, 0x5e57(r3) /* 80236A04 00233944 8B C3 5E 86 */ lbz r30, 0x5e86(r3) @@ -4589,8 +4589,8 @@ dMsgObject_c_NS_readMessageGroupLocal: /* 80236C04 00233B44 93 E1 00 0C */ stw r31, 0xc(r1) /* 80236C08 00233B48 93 C1 00 08 */ stw r30, 8(r1) /* 80236C0C 00233B4C 7C 9E 23 78 */ mr r30, r4 -/* 80236C10 00233B50 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236C14 00233B54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236C10 00233B50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236C14 00233B54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236C18 00233B58 85 83 4E 20 */ lwzu r12, 0x4e20(r3) /* 80236C1C 00233B5C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80236C20 00233B60 7D 89 03 A6 */ mtctr r12 @@ -4672,8 +4672,8 @@ dMsgObject_c_NS_changeGroupLocal: /* 80236D1C 00233C5C 48 12 B4 C1 */ bl _savegpr_29 /* 80236D20 00233C60 7C 7E 1B 78 */ mr r30, r3 /* 80236D24 00233C64 7C 9F 23 78 */ mr r31, r4 -/* 80236D28 00233C68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80236D2C 00233C6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80236D28 00233C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80236D2C 00233C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236D30 00233C70 80 63 5E C8 */ lwz r3, 0x5ec8(r3) /* 80236D34 00233C74 4B DD 84 99 */ bl mDoExt_setCurrentHeap /* 80236D38 00233C78 7C 7D 1B 78 */ mr r29, r3 @@ -5494,8 +5494,8 @@ lbl_8023779C: /* 802377A0 002346E0 3B 60 00 00 */ li r27, 0 /* 802377A4 002346E4 3B A0 00 00 */ li r29, 0 /* 802377A8 002346E8 3B 40 00 00 */ li r26, 0 -/* 802377AC 002346EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802377B0 002346F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802377AC 002346EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802377B0 002346F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802377B4 002346F4 3B 23 00 9C */ addi r25, r3, 0x9c /* 802377B8 002346F8 3B 03 00 EC */ addi r24, r3, 0xec lbl_802377BC: @@ -5572,8 +5572,8 @@ lbl_802378A0: .global dMsgObject_c_NS_setShopWaitTimer dMsgObject_c_NS_setShopWaitTimer: -/* 802378B8 002347F8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802378BC 002347FC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802378B8 002347F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802378BC 002347FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802378C0 00234800 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802378C4 00234804 98 64 04 C9 */ stb r3, 0x4c9(r4) /* 802378C8 00234808 4E 80 00 20 */ blr @@ -5613,8 +5613,8 @@ lbl_80237918: .global dMsgObject_c_NS_isCameraCancelFlag dMsgObject_c_NS_isCameraCancelFlag: -/* 80237934 00234874 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237938 00234878 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237934 00234874 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237938 00234878 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023793C 0023487C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237940 00234880 88 63 01 9E */ lbz r3, 0x19e(r3) /* 80237944 00234884 30 03 FF FF */ addic r0, r3, -1 @@ -5623,8 +5623,8 @@ dMsgObject_c_NS_isCameraCancelFlag: .global dMsgObject_c_NS_onCameraCancelFlag dMsgObject_c_NS_onCameraCancelFlag: -/* 80237950 00234890 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237954 00234894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237950 00234890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237954 00234894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237958 00234898 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023795C 0023489C 38 00 00 01 */ li r0, 1 /* 80237960 002348A0 98 03 01 9E */ stb r0, 0x19e(r3) @@ -5632,8 +5632,8 @@ dMsgObject_c_NS_onCameraCancelFlag: .global dMsgObject_c_NS_offCameraCancelFlag dMsgObject_c_NS_offCameraCancelFlag: -/* 80237968 002348A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023796C 002348AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237968 002348A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023796C 002348AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237970 002348B0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237974 002348B4 38 00 00 00 */ li r0, 0 /* 80237978 002348B8 98 03 01 9E */ stb r0, 0x19e(r3) @@ -5641,16 +5641,16 @@ dMsgObject_c_NS_offCameraCancelFlag: .global dMsgObject_c_NS_isKillMessageFlag dMsgObject_c_NS_isKillMessageFlag: -/* 80237980 002348C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237984 002348C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237980 002348C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237984 002348C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237988 002348C8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023798C 002348CC 88 63 04 D2 */ lbz r3, 0x4d2(r3) /* 80237990 002348D0 4E 80 00 20 */ blr .global dMsgObject_c_NS_onKillMessageFlag dMsgObject_c_NS_onKillMessageFlag: -/* 80237994 002348D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237998 002348D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237994 002348D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237998 002348D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023799C 002348DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802379A0 002348E0 38 00 00 01 */ li r0, 1 /* 802379A4 002348E4 98 03 04 D2 */ stb r0, 0x4d2(r3) @@ -5661,8 +5661,8 @@ dMsgObject_c_NS_setKillMessageFlag: /* 802379AC 002348EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802379B0 002348F0 7C 08 02 A6 */ mflr r0 /* 802379B4 002348F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802379B8 002348F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802379BC 002348FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802379B8 002348F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802379BC 002348FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802379C0 00234900 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802379C4 00234904 48 00 00 15 */ bl dMsgObject_c_NS_setKillMessageFlagLocal /* 802379C8 00234908 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5677,8 +5677,8 @@ dMsgObject_c_NS_setKillMessageFlagLocal: /* 802379E0 00234920 90 01 00 14 */ stw r0, 0x14(r1) /* 802379E4 00234924 93 E1 00 0C */ stw r31, 0xc(r1) /* 802379E8 00234928 7C 7F 1B 78 */ mr r31, r3 -/* 802379EC 0023492C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802379F0 00234930 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802379EC 0023492C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802379F0 00234930 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802379F4 00234934 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 802379F8 00234938 28 00 00 00 */ cmplwi r0, 0 /* 802379FC 0023493C 40 82 00 64 */ bne lbl_80237A60 @@ -5717,21 +5717,21 @@ lbl_80237A60: .global dMsgObject_c_NS_setTalkPartner dMsgObject_c_NS_setTalkPartner: -/* 80237A74 002349B4 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80237A78 002349B8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80237A74 002349B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80237A78 002349B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237A7C 002349BC 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80237A80 002349C0 90 64 01 40 */ stw r3, 0x140(r4) /* 80237A84 002349C4 4E 80 00 20 */ blr .global dMsgObject_c_NS_setNowTalkFlowNo dMsgObject_c_NS_setNowTalkFlowNo: -/* 80237A88 002349C8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80237A8C 002349CC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80237A88 002349C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80237A8C 002349CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237A90 002349D0 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80237A94 002349D4 B0 64 01 70 */ sth r3, 0x170(r4) /* 80237A98 002349D8 4E 80 00 20 */ blr -/* 80237A9C 002349DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237AA0 002349E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237A9C 002349DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237AA0 002349E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AA4 002349E4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237AA8 002349E8 A8 63 01 70 */ lha r3, 0x170(r3) /* 80237AAC 002349EC 4E 80 00 20 */ blr @@ -5742,8 +5742,8 @@ dMsgObject_c_NS_setDemoMessage: /* 80237AB4 002349F4 7C 08 02 A6 */ mflr r0 /* 80237AB8 002349F8 90 01 00 14 */ stw r0, 0x14(r1) /* 80237ABC 002349FC 7C 64 1B 78 */ mr r4, r3 -/* 80237AC0 00234A00 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237AC4 00234A04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237AC0 00234A00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237AC4 00234A04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AC8 00234A08 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237ACC 00234A0C 48 00 02 BD */ bl dMsgObject_c_NS_setDemoMessageLocal /* 80237AD0 00234A10 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5757,8 +5757,8 @@ dMsgObject_c_NS_setTalkHeap: /* 80237AE4 00234A24 7C 08 02 A6 */ mflr r0 /* 80237AE8 00234A28 90 01 00 14 */ stw r0, 0x14(r1) /* 80237AEC 00234A2C 7C 64 1B 78 */ mr r4, r3 -/* 80237AF0 00234A30 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237AF4 00234A34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237AF0 00234A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237AF4 00234A34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AF8 00234A38 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237AFC 00234A3C 48 00 00 15 */ bl dMsgObject_c_NS_setTalkHeapLocal /* 80237B00 00234A40 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5789,8 +5789,8 @@ lbl_80237B38: .global dMsgObject_c_NS_getTalkHeap dMsgObject_c_NS_getTalkHeap: -/* 80237B54 00234A94 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237B58 00234A98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237B54 00234A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237B58 00234A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237B5C 00234A9C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237B60 00234AA0 80 63 01 44 */ lwz r3, 0x144(r3) /* 80237B64 00234AA4 4E 80 00 20 */ blr @@ -5874,8 +5874,8 @@ dMsgObject_c_NS_setButtonStatusLocal: /* 80237C78 00234BB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237C7C 00234BBC 41 82 00 2C */ beq lbl_80237CA8 /* 80237C80 00234BC0 38 00 00 05 */ li r0, 5 -/* 80237C84 00234BC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237C88 00234BC8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80237C84 00234BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237C88 00234BC8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80237C8C 00234BCC 98 04 5E 3C */ stb r0, 0x5e3c(r4) /* 80237C90 00234BD0 38 60 00 00 */ li r3, 0 /* 80237C94 00234BD4 98 64 5E 57 */ stb r3, 0x5e57(r4) @@ -5885,8 +5885,8 @@ dMsgObject_c_NS_setButtonStatusLocal: /* 80237CA4 00234BE4 48 00 00 CC */ b lbl_80237D70 lbl_80237CA8: /* 80237CA8 00234BE8 38 00 00 23 */ li r0, 0x23 -/* 80237CAC 00234BEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237CB0 00234BF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237CAC 00234BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237CB0 00234BF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237CB4 00234BF4 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80237CB8 00234BF8 38 00 00 00 */ li r0, 0 /* 80237CBC 00234BFC 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -5909,8 +5909,8 @@ lbl_80237CC4: /* 80237CFC 00234C3C 40 82 00 20 */ bne lbl_80237D1C lbl_80237D00: /* 80237D00 00234C40 38 00 00 22 */ li r0, 0x22 -/* 80237D04 00234C44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237D08 00234C48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237D04 00234C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237D08 00234C48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237D0C 00234C4C 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80237D10 00234C50 38 00 00 00 */ li r0, 0 /* 80237D14 00234C54 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -5922,8 +5922,8 @@ lbl_80237D1C: /* 80237D28 00234C68 28 00 00 15 */ cmplwi r0, 0x15 /* 80237D2C 00234C6C 40 82 00 2C */ bne lbl_80237D58 /* 80237D30 00234C70 38 00 00 22 */ li r0, 0x22 -/* 80237D34 00234C74 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237D38 00234C78 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l +/* 80237D34 00234C74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237D38 00234C78 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80237D3C 00234C7C 98 04 5E 3C */ stb r0, 0x5e3c(r4) /* 80237D40 00234C80 38 60 00 00 */ li r3, 0 /* 80237D44 00234C84 98 64 5E 57 */ stb r3, 0x5e57(r4) @@ -5933,8 +5933,8 @@ lbl_80237D1C: /* 80237D54 00234C94 48 00 00 1C */ b lbl_80237D70 lbl_80237D58: /* 80237D58 00234C98 38 00 00 23 */ li r0, 0x23 -/* 80237D5C 00234C9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237D60 00234CA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237D5C 00234C9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237D60 00234CA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237D64 00234CA4 98 03 5E 3C */ stb r0, 0x5e3c(r3) /* 80237D68 00234CA8 38 00 00 00 */ li r0, 0 /* 80237D6C 00234CAC 98 03 5E 57 */ stb r0, 0x5e57(r3) @@ -5956,8 +5956,8 @@ dMsgObject_c_NS_setDemoMessageLocal: /* 80237D9C 00234CDC 38 00 00 01 */ li r0, 1 /* 80237DA0 00234CE0 98 03 04 CC */ stb r0, 0x4cc(r3) /* 80237DA4 00234CE4 4B FF FB AD */ bl dMsgObject_c_NS_onCameraCancelFlag -/* 80237DA8 00234CE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237DAC 00234CEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237DA8 00234CE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237DAC 00234CEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237DB0 00234CF0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237DB4 00234CF4 7F E4 FB 78 */ mr r4, r31 /* 80237DB8 00234CF8 4B FF C3 71 */ bl dMsgObject_c_NS_getMessageIDAlways @@ -5972,8 +5972,8 @@ dMsgObject_c_NS_setDemoMessageLocal: .global dMsgObject_c_NS_getSmellTypeMessageIDLocal dMsgObject_c_NS_getSmellTypeMessageIDLocal: /* 80237DD8 00234D18 38 60 00 00 */ li r3, 0 -/* 80237DDC 00234D1C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80237DE0 00234D20 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80237DDC 00234D1C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80237DE0 00234D20 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237DE4 00234D24 88 84 00 16 */ lbz r4, 0x16(r4) /* 80237DE8 00234D28 2C 04 00 B6 */ cmpwi r4, 0xb6 /* 80237DEC 00234D2C 4C 80 00 20 */ bgelr @@ -5991,13 +5991,13 @@ dMsgObject_c_NS_setSmellTypeLocal: /* 80237E10 00234D50 93 E1 00 0C */ stw r31, 0xc(r1) /* 80237E14 00234D54 7C 7F 1B 78 */ mr r31, r3 /* 80237E18 00234D58 98 83 01 A0 */ stb r4, 0x1a0(r3) -/* 80237E1C 00234D5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237E20 00234D60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237E1C 00234D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237E20 00234D60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E24 00234D64 38 63 00 CC */ addi r3, r3, 0xcc /* 80237E28 00234D68 4B DF C0 39 */ bl onFirstBit__21dSv_player_get_item_cFUc /* 80237E2C 00234D6C 88 9F 01 A0 */ lbz r4, 0x1a0(r31) -/* 80237E30 00234D70 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237E34 00234D74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237E30 00234D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237E34 00234D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E38 00234D78 98 83 00 16 */ stb r4, 0x16(r3) /* 80237E3C 00234D7C 38 60 00 02 */ li r3, 2 /* 80237E40 00234D80 4B DF 5E 85 */ bl dComIfGs_setSelectItemIndex @@ -6024,8 +6024,8 @@ dMsgObject_c_NS_setSelectCursorPosLocal: /* 80237E7C 00234DBC 7C 9E 23 78 */ mr r30, r4 /* 80237E80 00234DC0 80 63 01 20 */ lwz r3, 0x120(r3) /* 80237E84 00234DC4 83 E3 00 04 */ lwz r31, 4(r3) -/* 80237E88 00234DC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237E8C 00234DCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80237E88 00234DC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237E8C 00234DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E90 00234DD0 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80237E94 00234DD4 28 00 00 00 */ cmplwi r0, 0 /* 80237E98 00234DD8 40 82 00 50 */ bne lbl_80237EE8 @@ -6097,8 +6097,8 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237F8C 00234ECC 39 61 00 20 */ addi r11, r1, 0x20 /* 80237F90 00234ED0 48 12 A2 4D */ bl _savegpr_29 /* 80237F94 00234ED4 7C 7E 1B 78 */ mr r30, r3 -/* 80237F98 00234ED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80237F9C 00234EDC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80237F98 00234ED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80237F9C 00234EDC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80237FA0 00234EE0 93 DF 5D BC */ stw r30, 0x5dbc(r31) /* 80237FA4 00234EE4 80 7F 5E C8 */ lwz r3, 0x5ec8(r31) /* 80237FA8 00234EE8 4B DD 72 25 */ bl mDoExt_setCurrentHeap @@ -6133,8 +6133,8 @@ dMsgObject_c_NS_readMessageGroup: /* 80238010 00234F50 7C 08 02 A6 */ mflr r0 /* 80238014 00234F54 90 01 00 14 */ stw r0, 0x14(r1) /* 80238018 00234F58 7C 64 1B 78 */ mr r4, r3 -/* 8023801C 00234F5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238020 00234F60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023801C 00234F5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238020 00234F60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238024 00234F64 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238028 00234F68 4B FF EB D1 */ bl dMsgObject_c_NS_readMessageGroupLocal /* 8023802C 00234F6C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6148,8 +6148,8 @@ dMsgObject_c_NS_changeFlowGroup: /* 80238040 00234F80 7C 08 02 A6 */ mflr r0 /* 80238044 00234F84 90 01 00 14 */ stw r0, 0x14(r1) /* 80238048 00234F88 7C 64 1B 78 */ mr r4, r3 -/* 8023804C 00234F8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238050 00234F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023804C 00234F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238050 00234F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238054 00234F94 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238058 00234F98 4B FF EC 39 */ bl dMsgObject_c_NS_changeFlowGroupLocal /* 8023805C 00234F9C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6162,8 +6162,8 @@ dMsgObject_c_NS_demoMessageGroup: /* 8023806C 00234FAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238070 00234FB0 7C 08 02 A6 */ mflr r0 /* 80238074 00234FB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238078 00234FB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023807C 00234FBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238078 00234FB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023807C 00234FBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238080 00234FC0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238084 00234FC4 4B FF EC 51 */ bl dMsgObject_c_NS_demoMessageGroupLocal /* 80238088 00234FC8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6176,8 +6176,8 @@ dMsgObject_c_NS_endFlowGroup: /* 80238098 00234FD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023809C 00234FDC 7C 08 02 A6 */ mflr r0 /* 802380A0 00234FE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802380A4 00234FE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802380A8 00234FE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802380A4 00234FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802380A8 00234FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802380AC 00234FEC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802380B0 00234FF0 4B FF EC 51 */ bl dMsgObject_c_NS_endFlowGroupLocal /* 802380B4 00234FF4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6191,8 +6191,8 @@ dMsgObject_c_NS_changeGroup: /* 802380C8 00235008 7C 08 02 A6 */ mflr r0 /* 802380CC 0023500C 90 01 00 14 */ stw r0, 0x14(r1) /* 802380D0 00235010 7C 64 1B 78 */ mr r4, r3 -/* 802380D4 00235014 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802380D8 00235018 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802380D4 00235014 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802380D8 00235018 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802380DC 0023501C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802380E0 00235020 4B FF EC 2D */ bl dMsgObject_c_NS_changeGroupLocal /* 802380E4 00235024 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6217,8 +6217,8 @@ dMsgObject_c_NS_getString: /* 80238124 00235064 80 01 00 38 */ lwz r0, 0x38(r1) /* 80238128 00235068 91 41 00 08 */ stw r10, 8(r1) /* 8023812C 0023506C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80238130 00235070 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238134 00235074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238130 00235070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238134 00235074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238138 00235078 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023813C 0023507C 7F 64 DB 78 */ mr r4, r27 /* 80238140 00235080 7F 85 E3 78 */ mr r5, r28 @@ -6237,21 +6237,21 @@ dMsgObject_c_NS_getString: .global dMsgObject_c_NS_getMsgDtPtr dMsgObject_c_NS_getMsgDtPtr: -/* 80238174 002350B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238178 002350B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238174 002350B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238178 002350B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023817C 002350BC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238180 002350C0 80 63 01 30 */ lwz r3, 0x130(r3) /* 80238184 002350C4 4E 80 00 20 */ blr -/* 80238188 002350C8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023818C 002350CC 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80238188 002350C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023818C 002350CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238190 002350D0 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80238194 002350D4 90 64 01 4C */ stw r3, 0x14c(r4) /* 80238198 002350D8 4E 80 00 20 */ blr .global dMsgObject_c_NS_getActor dMsgObject_c_NS_getActor: -/* 8023819C 002350DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381A0 002350E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023819C 002350DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381A0 002350E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381A4 002350E4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381A8 002350E8 28 03 00 00 */ cmplwi r3, 0 /* 802381AC 002350EC 40 82 00 0C */ bne lbl_802381B8 @@ -6260,18 +6260,18 @@ dMsgObject_c_NS_getActor: lbl_802381B8: /* 802381B8 002350F8 80 63 01 00 */ lwz r3, 0x100(r3) /* 802381BC 002350FC 4E 80 00 20 */ blr -/* 802381C0 00235100 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381C4 00235104 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802381C0 00235100 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381C4 00235104 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381C8 00235108 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381CC 0023510C 80 63 01 38 */ lwz r3, 0x138(r3) /* 802381D0 00235110 4E 80 00 20 */ blr -/* 802381D4 00235114 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381D8 00235118 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802381D4 00235114 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381D8 00235118 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381DC 0023511C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381E0 00235120 80 63 01 60 */ lwz r3, 0x160(r3) /* 802381E4 00235124 4E 80 00 20 */ blr -/* 802381E8 00235128 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802381EC 0023512C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802381E8 00235128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802381EC 0023512C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381F0 00235130 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802381F4 00235134 A0 63 01 64 */ lhz r3, 0x164(r3) /* 802381F8 00235138 4E 80 00 20 */ blr @@ -6282,8 +6282,8 @@ dMsgObject_c_NS_setStatus: /* 80238200 00235140 7C 08 02 A6 */ mflr r0 /* 80238204 00235144 90 01 00 14 */ stw r0, 0x14(r1) /* 80238208 00235148 7C 64 1B 78 */ mr r4, r3 -/* 8023820C 0023514C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238210 00235150 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023820C 0023514C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238210 00235150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238214 00235154 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238218 00235158 4B FF E6 CD */ bl dMsgObject_c_NS_setStatusLocal /* 8023821C 0023515C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6296,8 +6296,8 @@ dMsgObject_c_NS_getStatus: /* 8023822C 0023516C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238230 00235170 7C 08 02 A6 */ mflr r0 /* 80238234 00235174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238238 00235178 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023823C 0023517C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238238 00235178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023823C 0023517C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238240 00235180 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238244 00235184 4B FF E6 B5 */ bl dMsgObject_c_NS_getStatusLocal /* 80238248 00235188 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6307,8 +6307,8 @@ dMsgObject_c_NS_getStatus: .global dMsgObject_c_NS_getScrnDrawPtr dMsgObject_c_NS_getScrnDrawPtr: -/* 80238258 00235198 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023825C 0023519C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238258 00235198 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023825C 0023519C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238260 002351A0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238264 002351A4 80 63 01 04 */ lwz r3, 0x104(r3) /* 80238268 002351A8 4E 80 00 20 */ blr @@ -6319,8 +6319,8 @@ dMsgObject_c_NS_setTalkActor: /* 80238270 002351B0 7C 08 02 A6 */ mflr r0 /* 80238274 002351B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80238278 002351B8 7C 64 1B 78 */ mr r4, r3 -/* 8023827C 002351BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238280 002351C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023827C 002351BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238280 002351C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238284 002351C4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238288 002351C8 4B FF FC 89 */ bl dMsgObject_c_NS_setTalkActorLocal /* 8023828C 002351CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6333,8 +6333,8 @@ dMsgObject_c_NS_onMsgSendControl: /* 8023829C 002351DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382A0 002351E0 7C 08 02 A6 */ mflr r0 /* 802382A4 002351E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802382A8 002351E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802382AC 002351EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802382A8 002351E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802382AC 002351EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802382B0 002351F0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802382B4 002351F4 4B FF F2 6D */ bl dMsgObject_c_NS_onMsgSendControlLocal /* 802382B8 002351F8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6347,8 +6347,8 @@ dMsgObject_c_NS_offMsgSendControl: /* 802382C8 00235208 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382CC 0023520C 7C 08 02 A6 */ mflr r0 /* 802382D0 00235210 90 01 00 14 */ stw r0, 0x14(r1) -/* 802382D4 00235214 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802382D8 00235218 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802382D4 00235214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802382D8 00235218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802382DC 0023521C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802382E0 00235220 4B FF F2 51 */ bl dMsgObject_c_NS_offMsgSendControlLocal /* 802382E4 00235224 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6361,8 +6361,8 @@ dMsgObject_c_NS_isMsgSendControl: /* 802382F4 00235234 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382F8 00235238 7C 08 02 A6 */ mflr r0 /* 802382FC 0023523C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238300 00235240 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238304 00235244 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238300 00235240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238304 00235244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238308 00235248 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023830C 0023524C 4B FF F2 45 */ bl dMsgObject_c_NS_isMsgSendControlLocal /* 80238310 00235250 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6375,8 +6375,8 @@ dMsgObject_c_NS_onMsgSend: /* 80238320 00235260 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238324 00235264 7C 08 02 A6 */ mflr r0 /* 80238328 00235268 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023832C 0023526C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238330 00235270 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023832C 0023526C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238330 00235270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238334 00235274 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238338 00235278 4B FF F2 25 */ bl dMsgObject_c_NS_onMsgSendLocal /* 8023833C 0023527C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6389,8 +6389,8 @@ dMsgObject_c_NS_offMsgSend: /* 8023834C 0023528C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238350 00235290 7C 08 02 A6 */ mflr r0 /* 80238354 00235294 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238358 00235298 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023835C 0023529C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238358 00235298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023835C 0023529C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238360 002352A0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238364 002352A4 4B FF F2 09 */ bl dMsgObject_c_NS_offMsgSendLocal /* 80238368 002352A8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6403,8 +6403,8 @@ dMsgObject_c_NS_isMsgSend: /* 80238378 002352B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023837C 002352BC 7C 08 02 A6 */ mflr r0 /* 80238380 002352C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238384 002352C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238388 002352C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238384 002352C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238388 002352C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023838C 002352CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238390 002352D0 4B FF F1 ED */ bl dMsgObject_c_NS_isMsgSendLocal /* 80238394 002352D4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6417,8 +6417,8 @@ dMsgObject_c_NS_isMouthCheck: /* 802383A4 002352E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802383A8 002352E8 7C 08 02 A6 */ mflr r0 /* 802383AC 002352EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802383B0 002352F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802383B4 002352F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802383B0 002352F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802383B4 002352F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383B8 002352F8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383BC 002352FC 4B FF F1 CD */ bl dMsgObject_c_NS_isMouthCheckLocal /* 802383C0 00235300 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6428,8 +6428,8 @@ dMsgObject_c_NS_isMouthCheck: .global dMsgObject_c_NS_getMessageID dMsgObject_c_NS_getMessageID: -/* 802383D0 00235310 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802383D4 00235314 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802383D0 00235310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802383D4 00235314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383D8 00235318 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383DC 0023531C 80 63 01 54 */ lwz r3, 0x154(r3) /* 802383E0 00235320 4E 80 00 20 */ blr @@ -6439,8 +6439,8 @@ dMsgObject_c_NS_getSmellTypeMessageID: /* 802383E4 00235324 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802383E8 00235328 7C 08 02 A6 */ mflr r0 /* 802383EC 0023532C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802383F0 00235330 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802383F4 00235334 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802383F0 00235330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802383F4 00235334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383F8 00235338 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383FC 0023533C 4B FF F9 DD */ bl dMsgObject_c_NS_getSmellTypeMessageIDLocal /* 80238400 00235340 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6454,8 +6454,8 @@ dMsgObject_c_NS_setSmellType: /* 80238414 00235354 7C 08 02 A6 */ mflr r0 /* 80238418 00235358 90 01 00 14 */ stw r0, 0x14(r1) /* 8023841C 0023535C 7C 64 1B 78 */ mr r4, r3 -/* 80238420 00235360 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238424 00235364 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238420 00235360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238424 00235364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238428 00235368 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023842C 0023536C 4B FF F9 D9 */ bl dMsgObject_c_NS_setSmellTypeLocal /* 80238430 00235370 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6468,8 +6468,8 @@ dMsgObject_c_NS_getSelectCursorPos: /* 80238440 00235380 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238444 00235384 7C 08 02 A6 */ mflr r0 /* 80238448 00235388 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023844C 0023538C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238450 00235390 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023844C 0023538C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238450 00235390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238454 00235394 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238458 00235398 4B FF FA 01 */ bl dMsgObject_c_NS_getSelectCursorPosLocal /* 8023845C 0023539C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6483,8 +6483,8 @@ dMsgObject_c_NS_setSelectCursorPos: /* 80238470 002353B0 7C 08 02 A6 */ mflr r0 /* 80238474 002353B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80238478 002353B8 7C 64 1B 78 */ mr r4, r3 -/* 8023847C 002353BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238480 002353C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023847C 002353BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238480 002353C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238484 002353C4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238488 002353C8 4B FF F9 E1 */ bl dMsgObject_c_NS_setSelectCursorPosLocal /* 8023848C 002353CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6494,61 +6494,61 @@ dMsgObject_c_NS_setSelectCursorPos: .global dMsgObject_c_NS_setPortalMessageID dMsgObject_c_NS_setPortalMessageID: -/* 8023849C 002353DC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384A0 002353E0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023849C 002353DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384A0 002353E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384A4 002353E4 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384A8 002353E8 B0 64 01 80 */ sth r3, 0x180(r4) /* 802384AC 002353EC 4E 80 00 20 */ blr -/* 802384B0 002353F0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384B4 002353F4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384B0 002353F0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384B4 002353F4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384B8 002353F8 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384BC 002353FC 98 64 01 94 */ stb r3, 0x194(r4) /* 802384C0 00235400 4E 80 00 20 */ blr .global dMsgObject_c_NS_setLetterNameID dMsgObject_c_NS_setLetterNameID: -/* 802384C4 00235404 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384C8 00235408 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384C4 00235404 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384C8 00235408 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384CC 0023540C 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384D0 00235410 B0 64 01 88 */ sth r3, 0x188(r4) /* 802384D4 00235414 4E 80 00 20 */ blr .global dMsgObject_c_NS_setArrowNum dMsgObject_c_NS_setArrowNum: -/* 802384D8 00235418 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384DC 0023541C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384D8 00235418 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384DC 0023541C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384E0 00235420 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384E4 00235424 98 64 01 A5 */ stb r3, 0x1a5(r4) /* 802384E8 00235428 4E 80 00 20 */ blr .global dMsgObject_c_NS_setMsgOutputType dMsgObject_c_NS_setMsgOutputType: -/* 802384EC 0023542C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802384F0 00235430 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 802384EC 0023542C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802384F0 00235430 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384F4 00235434 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384F8 00235438 98 64 04 C8 */ stb r3, 0x4c8(r4) /* 802384FC 0023543C 4E 80 00 20 */ blr .global dMsgObject_c_NS_getMsgOutputType dMsgObject_c_NS_getMsgOutputType: -/* 80238500 00235440 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238504 00235444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238500 00235440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238504 00235444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238508 00235448 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023850C 0023544C 88 63 04 C8 */ lbz r3, 0x4c8(r3) /* 80238510 00235450 4E 80 00 20 */ blr .global dMsgObject_c_NS_getWord dMsgObject_c_NS_getWord: -/* 80238514 00235454 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238518 00235458 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238514 00235454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238518 00235458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023851C 0023545C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238520 00235460 38 63 01 A6 */ addi r3, r3, 0x1a6 /* 80238524 00235464 4E 80 00 20 */ blr .global dMsgObject_c_NS_getSelectWord dMsgObject_c_NS_getSelectWord: -/* 80238528 00235468 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023852C 0023546C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80238528 00235468 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023852C 0023546C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238530 00235470 80 04 5D BC */ lwz r0, 0x5dbc(r4) /* 80238534 00235474 1C 63 00 C8 */ mulli r3, r3, 0xc8 /* 80238538 00235478 38 63 02 6E */ addi r3, r3, 0x26e @@ -6561,8 +6561,8 @@ dMsgObject_c_NS_setSelectWordFlag: /* 80238548 00235488 7C 08 02 A6 */ mflr r0 /* 8023854C 0023548C 90 01 00 14 */ stw r0, 0x14(r1) /* 80238550 00235490 7C 64 1B 78 */ mr r4, r3 -/* 80238554 00235494 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238558 00235498 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238554 00235494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238558 00235498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023855C 0023549C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238560 002354A0 4B FF F3 6D */ bl dMsgObject_c_NS_setSelectWordFlagLocal /* 80238564 002354A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6572,8 +6572,8 @@ dMsgObject_c_NS_setSelectWordFlag: .global dMsgObject_c_NS_getSelectWordFlag dMsgObject_c_NS_getSelectWordFlag: -/* 80238574 002354B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238578 002354B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238574 002354B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238578 002354B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023857C 002354BC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238580 002354C0 88 63 04 C6 */ lbz r3, 0x4c6(r3) /* 80238584 002354C4 4E 80 00 20 */ blr @@ -6583,8 +6583,8 @@ dMsgObject_c_NS_isHowlHearingMode: /* 80238588 002354C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023858C 002354CC 7C 08 02 A6 */ mflr r0 /* 80238590 002354D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238594 002354D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238598 002354D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238594 002354D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238598 002354D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023859C 002354DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802385A0 002354E0 4B FF F3 35 */ bl dMsgObject_c_NS_isHowlHearingModeLocal /* 802385A4 002354E4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6597,8 +6597,8 @@ dMsgObject_c_NS_getSelectBombBagID: /* 802385B4 002354F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802385B8 002354F8 7C 08 02 A6 */ mflr r0 /* 802385BC 002354FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802385C0 00235500 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802385C4 00235504 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802385C0 00235500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802385C4 00235504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802385C8 00235508 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802385CC 0023550C 4B FF F0 71 */ bl dMsgObject_c_NS_getSelectBombBagIDLocal /* 802385D0 00235510 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6611,8 +6611,8 @@ dMsgObject_c_NS_getSelectBombPrice: /* 802385E0 00235520 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802385E4 00235524 7C 08 02 A6 */ mflr r0 /* 802385E8 00235528 90 01 00 14 */ stw r0, 0x14(r1) -/* 802385EC 0023552C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802385F0 00235530 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802385EC 0023552C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802385F0 00235530 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802385F4 00235534 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802385F8 00235538 4B FF F0 95 */ bl dMsgObject_c_NS_getSelectBombPriceLocal /* 802385FC 0023553C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6625,8 +6625,8 @@ dMsgObject_c_NS_setEquipBombInfo: /* 8023860C 0023554C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238610 00235550 7C 08 02 A6 */ mflr r0 /* 80238614 00235554 90 01 00 14 */ stw r0, 0x14(r1) -/* 80238618 00235558 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023861C 0023555C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238618 00235558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023861C 0023555C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238620 00235560 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238624 00235564 4B FF F1 19 */ bl dMsgObject_c_NS_setEquipBombInfoLocal /* 80238628 00235568 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6636,16 +6636,16 @@ dMsgObject_c_NS_setEquipBombInfo: .global dMsgObject_c_NS_getItemEquipButton dMsgObject_c_NS_getItemEquipButton: -/* 80238638 00235578 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023863C 0023557C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238638 00235578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023863C 0023557C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238640 00235580 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238644 00235584 88 63 01 A4 */ lbz r3, 0x1a4(r3) /* 80238648 00235588 4E 80 00 20 */ blr .global dMsgObject_c_NS_setSelectCancelPos dMsgObject_c_NS_setSelectCancelPos: -/* 8023864C 0023558C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80238650 00235590 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023864C 0023558C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80238650 00235590 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238654 00235594 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80238658 00235598 98 64 01 A1 */ stb r3, 0x1a1(r4) /* 8023865C 0023559C 4E 80 00 20 */ blr @@ -6657,8 +6657,8 @@ dMsgObject_getTotalPrice: /* 80238668 002355A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8023866C 002355AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238670 002355B0 93 C1 00 08 */ stw r30, 8(r1) -/* 80238674 002355B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238678 002355B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238674 002355B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238678 002355B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023867C 002355BC 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238680 002355C0 7F C3 F3 78 */ mr r3, r30 /* 80238684 002355C4 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -6684,8 +6684,8 @@ dMsgObject_getTotalPrice: /* 802386D4 00235614 93 E1 00 0C */ stw r31, 0xc(r1) /* 802386D8 00235618 93 C1 00 08 */ stw r30, 8(r1) /* 802386DC 0023561C 7C 60 1B 78 */ mr r0, r3 -/* 802386E0 00235620 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802386E4 00235624 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802386E0 00235620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802386E4 00235624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802386E8 00235628 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802386EC 0023562C 7F C3 F3 78 */ mr r3, r30 /* 802386F0 00235630 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -6710,8 +6710,8 @@ dMsgObject_getTotalPrice: /* 8023873C 0023567C 39 61 00 20 */ addi r11, r1, 0x20 /* 80238740 00235680 48 12 9A 9D */ bl _savegpr_29 /* 80238744 00235684 7C 7D 1B 78 */ mr r29, r3 -/* 80238748 00235688 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023874C 0023568C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238748 00235688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023874C 0023568C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238750 00235690 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238754 00235694 A8 03 01 7A */ lha r0, 0x17a(r3) /* 80238758 00235698 7C 00 EA 14 */ add r0, r0, r29 @@ -6722,8 +6722,8 @@ dMsgObject_getTotalPrice: /* 8023876C 002356AC 40 80 00 08 */ bge lbl_80238774 /* 80238770 002356B0 3B A0 00 00 */ li r29, 0 lbl_80238774: -/* 80238774 002356B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238778 002356B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238774 002356B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238778 002356B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023877C 002356BC 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238780 002356C0 7F C3 F3 78 */ mr r3, r30 /* 80238784 002356C4 3C 80 00 01 */ lis r4, 0x0000FEFF@ha @@ -6750,8 +6750,8 @@ dMsgObject_getTotalPayment: /* 802387CC 0023570C 90 01 00 14 */ stw r0, 0x14(r1) /* 802387D0 00235710 93 E1 00 0C */ stw r31, 0xc(r1) /* 802387D4 00235714 93 C1 00 08 */ stw r30, 8(r1) -/* 802387D8 00235718 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802387DC 0023571C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802387D8 00235718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802387DC 0023571C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802387E0 00235720 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802387E4 00235724 7F C3 F3 78 */ mr r3, r30 /* 802387E8 00235728 3C 80 00 01 */ lis r4, 0x0000FCFF@ha @@ -6777,8 +6777,8 @@ dMsgObject_getTotalPayment: /* 80238838 00235778 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023883C 0023577C 93 C1 00 08 */ stw r30, 8(r1) /* 80238840 00235780 7C 60 1B 78 */ mr r0, r3 -/* 80238844 00235784 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238848 00235788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238844 00235784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238848 00235788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023884C 0023578C 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238850 00235790 7F C3 F3 78 */ mr r3, r30 /* 80238854 00235794 3C 80 00 01 */ lis r4, 0x0000FCFF@ha @@ -6806,8 +6806,8 @@ dMsgObject_addTotalPayment: /* 802388A0 002357E0 39 61 00 20 */ addi r11, r1, 0x20 /* 802388A4 002357E4 48 12 99 39 */ bl _savegpr_29 /* 802388A8 002357E8 7C 7D 1B 78 */ mr r29, r3 -/* 802388AC 002357EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802388B0 002357F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802388AC 002357EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802388B0 002357F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802388B4 002357F4 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802388B8 002357F8 A8 03 01 7C */ lha r0, 0x17c(r3) /* 802388BC 002357FC 7C 00 EA 14 */ add r0, r0, r29 @@ -6818,8 +6818,8 @@ dMsgObject_addTotalPayment: /* 802388D0 00235810 40 80 00 08 */ bge lbl_802388D8 /* 802388D4 00235814 3B A0 00 00 */ li r29, 0 lbl_802388D8: -/* 802388D8 00235818 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802388DC 0023581C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802388D8 00235818 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802388DC 0023581C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802388E0 00235820 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802388E4 00235824 7F C3 F3 78 */ mr r3, r30 /* 802388E8 00235828 3C 80 00 01 */ lis r4, 0x0000FCFF@ha @@ -6846,8 +6846,8 @@ dMsgObject_getFundRaising: /* 80238930 00235870 90 01 00 14 */ stw r0, 0x14(r1) /* 80238934 00235874 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238938 00235878 93 C1 00 08 */ stw r30, 8(r1) -/* 8023893C 0023587C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238940 00235880 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023893C 0023587C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238940 00235880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238944 00235884 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238948 00235888 7F C3 F3 78 */ mr r3, r30 /* 8023894C 0023588C 3C 80 00 01 */ lis r4, 0x0000F9FF@ha @@ -6876,8 +6876,8 @@ dMsgObject_setFundRaising: /* 8023899C 002358DC 93 E1 00 0C */ stw r31, 0xc(r1) /* 802389A0 002358E0 93 C1 00 08 */ stw r30, 8(r1) /* 802389A4 002358E4 7C 60 1B 78 */ mr r0, r3 -/* 802389A8 002358E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802389AC 002358EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802389A8 002358E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802389AC 002358EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802389B0 002358F0 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 802389B4 002358F4 7F C3 F3 78 */ mr r3, r30 /* 802389B8 002358F8 3C 80 00 01 */ lis r4, 0x0000F9FF@ha @@ -6911,8 +6911,8 @@ dMsgObject_addFundRaising: /* 80238A1C 0023595C 40 80 00 08 */ bge lbl_80238A24 /* 80238A20 00235960 3B A0 00 00 */ li r29, 0 lbl_80238A24: -/* 80238A24 00235964 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238A28 00235968 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238A24 00235964 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238A28 00235968 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238A2C 0023596C 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238A30 00235970 7F C3 F3 78 */ mr r3, r30 /* 80238A34 00235974 3C 80 00 01 */ lis r4, 0x0000F9FF@ha @@ -6939,8 +6939,8 @@ dMsgObject_getOffering: /* 80238A7C 002359BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80238A80 002359C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238A84 002359C4 93 C1 00 08 */ stw r30, 8(r1) -/* 80238A88 002359C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238A8C 002359CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238A88 002359C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238A8C 002359CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238A90 002359D0 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238A94 002359D4 7F C3 F3 78 */ mr r3, r30 /* 80238A98 002359D8 3C 80 00 01 */ lis r4, 0x0000F7FF@ha @@ -6975,8 +6975,8 @@ dMsgObject_addOffering: /* 80238B00 00235A40 40 80 00 08 */ bge lbl_80238B08 /* 80238B04 00235A44 38 00 00 00 */ li r0, 0 lbl_80238B08: -/* 80238B08 00235A48 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80238B0C 00235A4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80238B08 00235A48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80238B0C 00235A4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238B10 00235A50 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80238B14 00235A54 7F C3 F3 78 */ mr r3, r30 /* 80238B18 00235A58 3C 80 00 01 */ lis r4, 0x0000F7FF@ha diff --git a/asm/d/msg/out/d_msg_out_font.s b/asm/d/msg/out/d_msg_out_font.s index 1ad5b00b52..12b7481f6b 100644 --- a/asm/d/msg/out/d_msg_out_font.s +++ b/asm/d/msg/out/d_msg_out_font.s @@ -180,8 +180,8 @@ lbl_80225E18: /* 80225E20 00222D60 3B DE 00 04 */ addi r30, r30, 4 /* 80225E24 00222D64 41 80 FF C8 */ blt lbl_80225DEC lbl_80225E28: -/* 80225E28 00222D68 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225E2C 00222D6C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80225E28 00222D68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225E2C 00222D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80225E30 00222D70 80 03 5E BC */ lwz r0, 0x5ebc(r3) /* 80225E34 00222D74 28 00 00 00 */ cmplwi r0, 0 /* 80225E38 00222D78 40 82 00 18 */ bne lbl_80225E50 @@ -223,8 +223,8 @@ lbl_80225E88: /* 80225EBC 00222DFC 7C 7F 1B 78 */ mr r31, r3 /* 80225EC0 00222E00 3B A0 00 00 */ li r29, 0 /* 80225EC4 00222E04 3B 60 00 00 */ li r27, 0 -/* 80225EC8 00222E08 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80225ECC 00222E0C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80225EC8 00222E08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80225ECC 00222E0C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l lbl_80225ED0: /* 80225ED0 00222E10 2C 1D 00 29 */ cmpwi r29, 0x29 /* 80225ED4 00222E14 40 82 00 3C */ bne lbl_80225F10 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index b7c76ef969..3ddf6c153d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -31,8 +31,8 @@ lbl_80239104: /* 8023910C 0023604C 3C 80 80 3A */ lis r4, lbl_80399840@ha /* 80239110 00236050 38 84 98 40 */ addi r4, r4, lbl_80399840@l /* 80239114 00236054 3C A0 00 02 */ lis r5, 2 -/* 80239118 00236058 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, lbl_804061C0@l +/* 80239118 00236058 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, g_dComIfG_gameInfo@l /* 80239120 00236060 80 D4 5C 6C */ lwz r6, 0x5c6c(r20) /* 80239124 00236064 48 0B F5 25 */ bl J2DScreen_NS_setPriority /* 80239128 00236068 80 7F 00 04 */ lwz r3, 4(r31) @@ -918,8 +918,8 @@ dMsgScrn3Select_c_NS_draw: /* 80239DF8 00236D38 7C 7D 1B 78 */ mr r29, r3 /* 80239DFC 00236D3C FF C0 08 90 */ fmr f30, f1 /* 80239E00 00236D40 FF E0 10 90 */ fmr f31, f2 -/* 80239E04 00236D44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80239E08 00236D48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80239E04 00236D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80239E08 00236D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80239E0C 00236D4C 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80239E10 00236D50 7F E3 FB 78 */ mr r3, r31 /* 80239E14 00236D54 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_arrow.s b/asm/d/msg/scrn/d_msg_scrn_arrow.s index 43cdb58337..ddf96aa811 100644 --- a/asm/d/msg/scrn/d_msg_scrn_arrow.s +++ b/asm/d/msg/scrn/d_msg_scrn_arrow.s @@ -26,8 +26,8 @@ lbl_8023B9F0: /* 8023B9F8 00238938 3C 80 80 3A */ lis r4, lbl_803998A0@ha /* 8023B9FC 0023893C 38 84 98 A0 */ addi r4, r4, lbl_803998A0@l /* 8023BA00 00238940 3C A0 00 02 */ lis r5, 2 -/* 8023BA04 00238944 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 8023BA04 00238944 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8023BA0C 0023894C 80 DE 5C 6C */ lwz r6, 0x5c6c(r30) /* 8023BA10 00238950 48 0B CC 39 */ bl J2DScreen_NS_setPriority /* 8023BA14 00238954 80 7F 00 04 */ lwz r3, 4(r31) @@ -281,8 +281,8 @@ dMsgScrnArrow_c_NS_draw: /* 8023BDC0 00238D00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023BDC4 00238D04 7C 08 02 A6 */ mflr r0 /* 8023BDC8 00238D08 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BDCC 00238D0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023BDD0 00238D10 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023BDCC 00238D0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023BDD0 00238D10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8023BDD4 00238D14 80 84 5F 50 */ lwz r4, 0x5f50(r4) /* 8023BDD8 00238D18 80 63 00 04 */ lwz r3, 4(r3) /* 8023BDDC 00238D1C C0 22 B1 98 */ lfs f1, lbl_80454B98-_SDA2_BASE_(r2) diff --git a/asm/d/msg/scrn/d_msg_scrn_base.s b/asm/d/msg/scrn/d_msg_scrn_base.s index fdeea4a102..a124e23154 100644 --- a/asm/d/msg/scrn/d_msg_scrn_base.s +++ b/asm/d/msg/scrn/d_msg_scrn_base.s @@ -106,8 +106,8 @@ lbl_8023C1FC: /* 8023C240 00239180 80 C3 00 48 */ lwz r6, 0x48(r3) /* 8023C244 00239184 28 06 00 00 */ cmplwi r6, 0 /* 8023C248 00239188 41 82 00 1C */ beq lbl_8023C264 -/* 8023C24C 0023918C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023C250 00239190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023C24C 0023918C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023C250 00239190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023C254 00239194 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8023C258 00239198 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8023C25C 0023919C 38 A3 01 B8 */ addi r5, r3, 0x1b8 @@ -123,8 +123,8 @@ lbl_8023C264: /* 8023C280 002391C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023C284 002391C4 93 C1 00 08 */ stw r30, 8(r1) /* 8023C288 002391C8 7C 7E 1B 78 */ mr r30, r3 -/* 8023C28C 002391CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023C290 002391D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023C28C 002391CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023C290 002391D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023C294 002391D4 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8023C298 002391D8 7F E3 FB 78 */ mr r3, r31 /* 8023C29C 002391DC 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_boss.s b/asm/d/msg/scrn/d_msg_scrn_boss.s index d07c39982b..ad67da710f 100644 --- a/asm/d/msg/scrn/d_msg_scrn_boss.s +++ b/asm/d/msg/scrn/d_msg_scrn_boss.s @@ -31,8 +31,8 @@ lbl_8023C618: /* 8023C620 00239560 3C 80 80 3A */ lis r4, lbl_803998F8@ha /* 8023C624 00239564 38 84 98 F8 */ addi r4, r4, lbl_803998F8@l /* 8023C628 00239568 3C A0 00 02 */ lis r5, 2 -/* 8023C62C 0023956C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023C62C 0023956C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023C634 00239574 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) /* 8023C638 00239578 48 0B C0 11 */ bl J2DScreen_NS_setPriority /* 8023C63C 0023957C 80 7E 00 04 */ lwz r3, 4(r30) @@ -301,8 +301,8 @@ lbl_8023CA20: /* 8023CA28 00239968 2C 1B 00 07 */ cmpwi r27, 7 /* 8023CA2C 0023996C 3B DE 00 04 */ addi r30, r30, 4 /* 8023CA30 00239970 41 80 FF CC */ blt lbl_8023C9FC -/* 8023CA34 00239974 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023CA38 00239978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023CA34 00239974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023CA38 00239978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023CA3C 0023997C 80 63 5C 7C */ lwz r3, 0x5c7c(r3) /* 8023CA40 00239980 81 83 00 00 */ lwz r12, 0(r3) /* 8023CA44 00239984 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -397,8 +397,8 @@ lbl_8023CB84: /* 8023CBA0 00239AE0 90 01 00 14 */ stw r0, 0x14(r1) /* 8023CBA4 00239AE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023CBA8 00239AE8 7C 7F 1B 78 */ mr r31, r3 -/* 8023CBAC 00239AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023CBB0 00239AF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023CBAC 00239AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023CBB0 00239AF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023CBB4 00239AF4 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 8023CBB8 00239AF8 81 83 00 00 */ lwz r12, 0(r3) /* 8023CBBC 00239AFC 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index 8686ca66c3..3b7198e501 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -72,8 +72,8 @@ lbl_8023CD74: /* 8023CD7C 00239CBC 3C 80 80 3A */ lis r4, lbl_80399910@ha /* 8023CD80 00239CC0 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023CD84 00239CC4 3C A0 00 02 */ lis r5, 2 -/* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CD90 00239CD0 80 C6 5C 70 */ lwz r6, 0x5c70(r6) /* 8023CD94 00239CD4 48 0B B8 B5 */ bl J2DScreen_NS_setPriority /* 8023CD98 00239CD8 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -99,8 +99,8 @@ lbl_8023CDD8: /* 8023CDE0 00239D20 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023CDE4 00239D24 38 84 00 1D */ addi r4, r4, 0x1d /* 8023CDE8 00239D28 3C A0 00 02 */ lis r5, 2 -/* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CDF4 00239D34 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 8023CDF8 00239D38 48 0B B8 51 */ bl J2DScreen_NS_setPriority /* 8023CDFC 00239D3C 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -181,8 +181,8 @@ lbl_8023CF14: /* 8023CF1C 00239E5C 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023CF20 00239E60 38 84 00 45 */ addi r4, r4, 0x45 /* 8023CF24 00239E64 3C A0 00 02 */ lis r5, 2 -/* 8023CF28 00239E68 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 8023CF28 00239E68 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CF30 00239E70 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 8023CF34 00239E74 48 0B B7 15 */ bl J2DScreen_NS_setPriority /* 8023CF38 00239E78 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -460,8 +460,8 @@ lbl_8023D344: /* 8023D348 0023A288 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8023D34C 0023A28C 28 00 00 01 */ cmplwi r0, 1 /* 8023D350 0023A290 40 82 00 C8 */ bne lbl_8023D418 -/* 8023D354 0023A294 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D358 0023A298 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D354 0023A294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D358 0023A298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D35C 0023A29C 80 63 5D 30 */ lwz r3, 0x5d30(r3) /* 8023D360 0023A2A0 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 8023D364 0023A2A4 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -740,22 +740,22 @@ lbl_8023D750: /* 8023D750 0023A690 38 00 00 00 */ li r0, 0 /* 8023D754 0023A694 90 1E 00 38 */ stw r0, 0x38(r30) lbl_8023D758: -/* 8023D758 0023A698 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D75C 0023A69C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D758 0023A698 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D75C 0023A69C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D760 0023A6A0 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 8023D764 0023A6A4 81 83 00 00 */ lwz r12, 0(r3) /* 8023D768 0023A6A8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023D76C 0023A6AC 7D 89 03 A6 */ mtctr r12 /* 8023D770 0023A6B0 4E 80 04 21 */ bctrl -/* 8023D774 0023A6B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D778 0023A6B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D774 0023A6B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D778 0023A6B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D77C 0023A6BC 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 8023D780 0023A6C0 81 83 00 00 */ lwz r12, 0(r3) /* 8023D784 0023A6C4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023D788 0023A6C8 7D 89 03 A6 */ mtctr r12 /* 8023D78C 0023A6CC 4E 80 04 21 */ bctrl -/* 8023D790 0023A6D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023D794 0023A6D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023D790 0023A6D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023D794 0023A6D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023D798 0023A6D8 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 8023D79C 0023A6DC 81 83 00 00 */ lwz r12, 0(r3) /* 8023D7A0 0023A6E0 81 8C 00 24 */ lwz r12, 0x24(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index eb3f4ca4a6..d54e5526db 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -37,8 +37,8 @@ lbl_802409D4: /* 802409DC 0023D91C 3C 80 80 3A */ lis r4, lbl_80399A20@ha /* 802409E0 0023D920 38 84 9A 20 */ addi r4, r4, lbl_80399A20@l /* 802409E4 0023D924 3C A0 00 02 */ lis r5, 2 -/* 802409E8 0023D928 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, lbl_804061C0@l +/* 802409E8 0023D928 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, g_dComIfG_gameInfo@l /* 802409F0 0023D930 80 DC 5C 80 */ lwz r6, 0x5c80(r28) /* 802409F4 0023D934 48 0B 7C 55 */ bl J2DScreen_NS_setPriority /* 802409F8 0023D938 80 7F 00 04 */ lwz r3, 4(r31) @@ -308,8 +308,8 @@ lbl_80240D8C: /* 80240DF8 0023DD38 98 9F 27 9A */ stb r4, 0x279a(r31) /* 80240DFC 0023DD3C C0 02 B2 50 */ lfs f0, lbl_80454C50-_SDA2_BASE_(r2) /* 80240E00 0023DD40 D0 1F 19 9C */ stfs f0, 0x199c(r31) -/* 80240E04 0023DD44 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80240E08 0023DD48 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80240E04 0023DD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80240E08 0023DD48 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80240E0C 0023DD4C 80 7D 5D B4 */ lwz r3, 0x5db4(r29) /* 80240E10 0023DD50 A8 03 30 10 */ lha r0, 0x3010(r3) /* 80240E14 0023DD54 7C 00 07 35 */ extsh. r0, r0 @@ -702,8 +702,8 @@ lbl_8024135C: /* 802413F0 0023E330 81 8C 01 30 */ lwz r12, 0x130(r12) /* 802413F4 0023E334 7D 89 03 A6 */ mtctr r12 /* 802413F8 0023E338 4E 80 04 21 */ bctrl -/* 802413FC 0023E33C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241400 0023E340 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l +/* 802413FC 0023E33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241400 0023E340 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 80241404 0023E344 80 7C 5D 30 */ lwz r3, 0x5d30(r28) /* 80241408 0023E348 3C 80 54 49 */ lis r4, 0x54494D47@ha /* 8024140C 0023E34C 38 84 4D 47 */ addi r4, r4, 0x54494D47@l @@ -1116,8 +1116,8 @@ lbl_802419E0: lbl_80241A14: /* 80241A14 0023E954 38 00 00 00 */ li r0, 0 /* 80241A18 0023E958 90 1E 01 24 */ stw r0, 0x124(r30) -/* 80241A1C 0023E95C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241A20 0023E960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241A1C 0023E95C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241A20 0023E960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241A24 0023E964 80 63 5C 80 */ lwz r3, 0x5c80(r3) /* 80241A28 0023E968 81 83 00 00 */ lwz r12, 0(r3) /* 80241A2C 0023E96C 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1263,8 +1263,8 @@ lbl_80241BC4: /* 80241C3C 0023EB7C 93 E1 00 3C */ stw r31, 0x3c(r1) /* 80241C40 0023EB80 93 C1 00 38 */ stw r30, 0x38(r1) /* 80241C44 0023EB84 7C 7E 1B 78 */ mr r30, r3 -/* 80241C48 0023EB88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241C4C 0023EB8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241C48 0023EB88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241C4C 0023EB8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241C50 0023EB90 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80241C54 0023EB94 38 7E 21 14 */ addi r3, r30, 0x2114 /* 80241C58 0023EB98 38 9E 21 18 */ addi r4, r30, 0x2118 @@ -1341,8 +1341,8 @@ lbl_80241CB0: /* 80241D64 0023ECA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80241D68 0023ECA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80241D6C 0023ECAC 7C 7F 1B 78 */ mr r31, r3 -/* 80241D70 0023ECB0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80241D74 0023ECB4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80241D70 0023ECB0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80241D74 0023ECB4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80241D78 0023ECB8 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 80241D7C 0023ECBC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80241D80 0023ECC0 28 00 00 00 */ cmplwi r0, 0 @@ -1388,8 +1388,8 @@ lbl_80241DE8: /* 80241E10 0023ED50 93 C1 00 08 */ stw r30, 8(r1) /* 80241E14 0023ED54 7C 7E 1B 78 */ mr r30, r3 /* 80241E18 0023ED58 48 00 1A 21 */ bl dMsgScrnHowl_c_NS_calcMain -/* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80241E24 0023ED64 80 7F 5D B4 */ lwz r3, 0x5db4(r31) /* 80241E28 0023ED68 81 83 06 28 */ lwz r12, 0x628(r3) /* 80241E2C 0023ED6C 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -1420,8 +1420,8 @@ lbl_80241E64: /* 80241E88 0023EDC8 90 01 00 14 */ stw r0, 0x14(r1) /* 80241E8C 0023EDCC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80241E90 0023EDD0 7C 7F 1B 78 */ mr r31, r3 -/* 80241E94 0023EDD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241E98 0023EDD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241E94 0023EDD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241E98 0023EDD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241E9C 0023EDDC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80241EA0 0023EDE0 81 83 06 28 */ lwz r12, 0x628(r3) /* 80241EA4 0023EDE4 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -1473,8 +1473,8 @@ lbl_80241F14: /* 80241F54 0023EE94 80 04 00 30 */ lwz r0, 0x30(r4) /* 80241F58 0023EE98 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80241F5C 0023EE9C 41 82 00 28 */ beq lbl_80241F84 -/* 80241F60 0023EEA0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80241F64 0023EEA4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80241F60 0023EEA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80241F64 0023EEA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80241F68 0023EEA8 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 80241F6C 0023EEAC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80241F70 0023EEB0 28 00 00 00 */ cmplwi r0, 0 @@ -1491,8 +1491,8 @@ lbl_80241F84: /* 80241F98 0023EED8 40 82 00 08 */ bne lbl_80241FA0 /* 80241F9C 0023EEDC 3B C0 00 01 */ li r30, 1 lbl_80241FA0: -/* 80241FA0 0023EEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80241FA4 0023EEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80241FA0 0023EEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80241FA4 0023EEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80241FA8 0023EEE8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80241FAC 0023EEEC 81 83 06 28 */ lwz r12, 0x628(r3) /* 80241FB0 0023EEF0 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -1552,8 +1552,8 @@ lbl_80242014: .global dMsgScrnHowl_c_NS_isKeyCheck dMsgScrnHowl_c_NS_isKeyCheck: -/* 80242080 0023EFC0 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80242080 0023EFC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80242088 0023EFC8 80 84 5D B4 */ lwz r4, 0x5db4(r4) /* 8024208C 0023EFCC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80242090 0023EFD0 28 00 00 00 */ cmplwi r0, 0 @@ -1668,8 +1668,8 @@ dMsgScrnHowl_c_NS_drawWave: /* 8024221C 0023F15C 39 61 00 70 */ addi r11, r1, 0x70 /* 80242220 0023F160 48 11 FF 9D */ bl func_803621BC /* 80242224 0023F164 7C 79 1B 78 */ mr r25, r3 -/* 80242228 0023F168 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80242228 0023F168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242230 0023F170 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80242234 0023F174 80 79 00 C4 */ lwz r3, 0xc4(r25) /* 80242238 0023F178 48 01 20 B1 */ bl CPaneMgr_NS_getGlobalPosX @@ -1688,8 +1688,8 @@ dMsgScrnHowl_c_NS_drawWave: /* 8024226C 0023F1AC A8 79 21 28 */ lha r3, 0x2128(r25) /* 80242270 0023F1B0 38 03 FF FF */ addi r0, r3, -1 /* 80242274 0023F1B4 7F 9D 00 50 */ subf r28, r29, r0 -/* 80242278 0023F1B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024227C 0023F1BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80242278 0023F1B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024227C 0023F1BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242280 0023F1C0 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80242284 0023F1C4 81 83 06 28 */ lwz r12, 0x628(r3) /* 80242288 0023F1C8 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -2064,8 +2064,8 @@ dMsgScrnHowl_c_NS_drawGuide: /* 802427FC 0023F73C 39 61 01 20 */ addi r11, r1, 0x120 /* 80242800 0023F740 48 11 F9 D5 */ bl _savegpr_27 /* 80242804 0023F744 7C 7C 1B 78 */ mr r28, r3 -/* 80242808 0023F748 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80242808 0023F748 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242810 0023F750 83 63 5F 50 */ lwz r27, 0x5f50(r3) /* 80242814 0023F754 80 7C 01 28 */ lwz r3, 0x128(r28) /* 80242818 0023F758 80 1C 01 2C */ lwz r0, 0x12c(r28) @@ -2606,8 +2606,8 @@ dMsgScrnHowl_c_NS_drawGuide2: /* 80243028 0023FF68 39 61 00 A0 */ addi r11, r1, 0xa0 /* 8024302C 0023FF6C 48 11 F1 9D */ bl func_803621C8 /* 80243030 0023FF70 7C 7A 1B 78 */ mr r26, r3 -/* 80243034 0023FF74 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80243034 0023FF74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024303C 0023FF7C 83 24 5F 50 */ lwz r25, 0x5f50(r4) /* 80243040 0023FF80 88 03 27 98 */ lbz r0, 0x2798(r3) /* 80243044 0023FF84 28 00 00 03 */ cmplwi r0, 3 @@ -2987,8 +2987,8 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802435D8 00240518 39 61 00 70 */ addi r11, r1, 0x70 /* 802435DC 0024051C 48 11 EC 01 */ bl _savegpr_29 /* 802435E0 00240520 7C 7F 1B 78 */ mr r31, r3 -/* 802435E4 00240524 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802435E4 00240524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802435EC 0024052C 83 C3 5F 50 */ lwz r30, 0x5f50(r3) /* 802435F0 00240530 80 7F 01 28 */ lwz r3, 0x128(r31) /* 802435F4 00240534 80 1F 01 2C */ lwz r0, 0x12c(r31) @@ -3038,8 +3038,8 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802436A4 002405E4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802436A8 002405E8 7D 89 03 A6 */ mtctr r12 /* 802436AC 002405EC 4E 80 04 21 */ bctrl -/* 802436B0 002405F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802436B4 002405F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802436B0 002405F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802436B4 002405F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802436B8 002405F8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 802436BC 002405FC 81 83 06 28 */ lwz r12, 0x628(r3) /* 802436C0 00240600 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -3227,8 +3227,8 @@ lbl_80243964: /* 80243964 002408A4 88 1F 27 98 */ lbz r0, 0x2798(r31) /* 80243968 002408A8 28 00 00 03 */ cmplwi r0, 3 /* 8024396C 002408AC 41 82 00 74 */ beq lbl_802439E0 -/* 80243970 002408B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 80243970 002408B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80243978 002408B8 80 7E 5D B4 */ lwz r3, 0x5db4(r30) /* 8024397C 002408BC 38 63 2D 84 */ addi r3, r3, 0x2d84 /* 80243980 002408C0 48 08 7C D1 */ bl Z2WolfHowlMgr_NS_getOnLineNum @@ -3257,8 +3257,8 @@ lbl_802439D0: /* 802439D8 00240918 7C 7F 02 14 */ add r3, r31, r0 /* 802439DC 0024091C 98 83 24 98 */ stb r4, 0x2498(r3) lbl_802439E0: -/* 802439E0 00240920 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802439E4 00240924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802439E0 00240920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802439E4 00240924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802439E8 00240928 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 802439EC 0024092C 81 83 06 28 */ lwz r12, 0x628(r3) /* 802439F0 00240930 81 8C 02 98 */ lwz r12, 0x298(r12) @@ -3297,8 +3297,8 @@ dMsgScrnHowl_c_NS_calcGuide: /* 80243A68 002409A8 A0 03 21 38 */ lhz r0, 0x2138(r3) /* 80243A6C 002409AC 28 00 00 00 */ cmplwi r0, 0 /* 80243A70 002409B0 41 82 01 58 */ beq lbl_80243BC8 -/* 80243A74 002409B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80243A78 002409B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80243A74 002409B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80243A78 002409B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80243A7C 002409BC 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 80243A80 002409C0 80 03 2E 0C */ lwz r0, 0x2e0c(r3) /* 80243A84 002409C4 28 00 00 00 */ cmplwi r0, 0 @@ -3914,8 +3914,8 @@ dMsgScrnHowl_c_NS_getGuideDataSize: /* 80244318 00241258 7C 7C 1B 78 */ mr r28, r3 /* 8024431C 0024125C 8B C3 21 97 */ lbz r30, 0x2197(r3) /* 80244320 00241260 3B A0 00 00 */ li r29, 0 -/* 80244324 00241264 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244328 00241268 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 80244324 00241264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244328 00241268 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8024432C 0024126C 48 00 00 38 */ b lbl_80244364 lbl_80244330: /* 80244330 00241270 80 7F 5D B4 */ lwz r3, 0x5db4(r31) @@ -3956,8 +3956,8 @@ dMsgScrnHowl_c_NS_getGuideDataType: /* 802443AC 002412EC 7C 1E 03 78 */ mr r30, r0 /* 802443B0 002412F0 7C 1D 03 78 */ mr r29, r0 /* 802443B4 002412F4 3B 80 00 00 */ li r28, 0 -/* 802443B8 002412F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802443BC 002412FC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +/* 802443B8 002412F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802443BC 002412FC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802443C0 00241300 48 00 00 6C */ b lbl_8024442C lbl_802443C4: /* 802443C4 00241304 80 7F 5D B4 */ lwz r3, 0x5db4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 91a5a1aff9..f0ac004ee6 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -168,8 +168,8 @@ lbl_8023E9A8: /* 8023E9C8 0023B908 2C 00 00 3A */ cmpwi r0, 0x3a /* 8023E9CC 0023B90C 40 82 00 6C */ bne lbl_8023EA38 lbl_8023E9D0: -/* 8023E9D0 0023B910 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023E9D4 0023B914 A0 A4 61 C0 */ lhz r5, lbl_804061C0@l(r4) +/* 8023E9D0 0023B910 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023E9D4 0023B914 A0 A4 61 C0 */ lhz r5, g_dComIfG_gameInfo@l(r4) /* 8023E9D8 0023B918 38 80 00 05 */ li r4, 5 /* 8023E9DC 0023B91C 7C 05 23 D6 */ divw r0, r5, r4 /* 8023E9E0 0023B920 7C 00 21 D6 */ mullw r0, r0, r4 @@ -204,8 +204,8 @@ lbl_8023EA38: /* 8023EA38 0023B978 48 00 1E 6D */ bl dMsgScrnItem_c_NS_isOugiID /* 8023EA3C 0023B97C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023EA40 0023B980 41 82 00 4C */ beq lbl_8023EA8C -/* 8023EA44 0023B984 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 8023EA48 0023B988 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 8023EA44 0023B984 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 8023EA48 0023B988 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8023EA4C 0023B98C 80 64 5C D0 */ lwz r3, 0x5cd0(r4) /* 8023EA50 0023B990 80 9F 00 D4 */ lwz r4, 0xd4(r31) /* 8023EA54 0023B994 38 A0 0C 00 */ li r5, 0xc00 @@ -285,8 +285,8 @@ lbl_8023EB58: /* 8023EB60 0023BAA0 3C 80 80 3A */ lis r4, lbl_80399990@ha /* 8023EB64 0023BAA4 38 84 99 90 */ addi r4, r4, lbl_80399990@l /* 8023EB68 0023BAA8 3C A0 01 02 */ lis r5, 0x102 -/* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8023EB74 0023BAB4 80 DE 5C 78 */ lwz r6, 0x5c78(r30) /* 8023EB78 0023BAB8 48 0B 9A D1 */ bl J2DScreen_NS_setPriority /* 8023EB7C 0023BABC 80 7F 00 04 */ lwz r3, 4(r31) @@ -1134,22 +1134,22 @@ lbl_8023F7EC: /* 8023F7F0 0023C730 2C 1A 00 03 */ cmpwi r26, 3 /* 8023F7F4 0023C734 3B BD 00 04 */ addi r29, r29, 4 /* 8023F7F8 0023C738 41 80 FF 9C */ blt lbl_8023F794 -/* 8023F7FC 0023C73C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023F800 0023C740 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023F7FC 0023C73C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023F800 0023C740 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023F804 0023C744 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 8023F808 0023C748 81 83 00 00 */ lwz r12, 0(r3) /* 8023F80C 0023C74C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023F810 0023C750 7D 89 03 A6 */ mtctr r12 /* 8023F814 0023C754 4E 80 04 21 */ bctrl -/* 8023F818 0023C758 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023F81C 0023C75C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023F818 0023C758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023F81C 0023C75C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023F820 0023C760 80 63 5C 78 */ lwz r3, 0x5c78(r3) /* 8023F824 0023C764 81 83 00 00 */ lwz r12, 0(r3) /* 8023F828 0023C768 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8023F82C 0023C76C 7D 89 03 A6 */ mtctr r12 /* 8023F830 0023C770 4E 80 04 21 */ bctrl -/* 8023F834 0023C774 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023F838 0023C778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023F834 0023C774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023F838 0023C778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023F83C 0023C77C 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 8023F840 0023C780 81 83 00 00 */ lwz r12, 0(r3) /* 8023F844 0023C784 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -1355,8 +1355,8 @@ lbl_8023FA64: /* 8023FB38 0023CA78 39 61 00 30 */ addi r11, r1, 0x30 /* 8023FB3C 0023CA7C 48 12 26 91 */ bl func_803621CC /* 8023FB40 0023CA80 7C 7B 1B 78 */ mr r27, r3 -/* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023FB4C 0023CA8C 83 A3 5F 50 */ lwz r29, 0x5f50(r3) /* 8023FB50 0023CA90 7F A3 EB 78 */ mr r3, r29 /* 8023FB54 0023CA94 81 9D 00 00 */ lwz r12, 0(r29) @@ -1801,8 +1801,8 @@ lbl_802401D8: /* 802401D8 0023D118 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802401DC 0023D11C 28 00 00 03 */ cmplwi r0, 3 /* 802401E0 0023D120 40 82 01 B0 */ bne lbl_80240390 -/* 802401E4 0023D124 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802401E8 0023D128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802401E4 0023D124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802401E8 0023D128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802401EC 0023D12C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802401F0 0023D130 38 63 05 38 */ addi r3, r3, 0x538 /* 802401F4 0023D134 38 81 00 44 */ addi r4, r1, 0x44 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index a5db8ec945..a0c43fc642 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -42,8 +42,8 @@ lbl_802445CC: /* 802445D4 00241514 3C 80 80 3A */ lis r4, lbl_80399A80@ha /* 802445D8 00241518 38 84 9A 80 */ addi r4, r4, lbl_80399A80@l /* 802445DC 0024151C 3C A0 00 02 */ lis r5, 2 -/* 802445E0 00241520 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 802445E0 00241520 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 802445E8 00241528 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) /* 802445EC 0024152C 48 0B 40 5D */ bl J2DScreen_NS_setPriority /* 802445F0 00241530 80 7F 00 04 */ lwz r3, 4(r31) @@ -428,22 +428,22 @@ lbl_80244B90: /* 80244B94 00241AD4 2C 1B 00 02 */ cmpwi r27, 2 /* 80244B98 00241AD8 3B BD 00 04 */ addi r29, r29, 4 /* 80244B9C 00241ADC 41 80 FF 9C */ blt lbl_80244B38 -/* 80244BA0 00241AE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244BA4 00241AE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244BA0 00241AE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244BA4 00241AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244BA8 00241AE8 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 80244BAC 00241AEC 81 83 00 00 */ lwz r12, 0(r3) /* 80244BB0 00241AF0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80244BB4 00241AF4 7D 89 03 A6 */ mtctr r12 /* 80244BB8 00241AF8 4E 80 04 21 */ bctrl -/* 80244BBC 00241AFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244BC0 00241B00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244BBC 00241AFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244BC0 00241B00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244BC4 00241B04 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 80244BC8 00241B08 81 83 00 00 */ lwz r12, 0(r3) /* 80244BCC 00241B0C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80244BD0 00241B10 7D 89 03 A6 */ mtctr r12 /* 80244BD4 00241B14 4E 80 04 21 */ bctrl -/* 80244BD8 00241B18 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244BDC 00241B1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244BD8 00241B18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244BDC 00241B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244BE0 00241B20 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 80244BE4 00241B24 81 83 00 00 */ lwz r12, 0(r3) /* 80244BE8 00241B28 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -538,8 +538,8 @@ lbl_80244D08: /* 80244D3C 00241C7C 90 01 00 14 */ stw r0, 0x14(r1) /* 80244D40 00241C80 93 E1 00 0C */ stw r31, 0xc(r1) /* 80244D44 00241C84 7C 7F 1B 78 */ mr r31, r3 -/* 80244D48 00241C88 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80244D4C 00241C8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80244D48 00241C88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80244D4C 00241C8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80244D50 00241C90 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80244D54 00241C94 81 83 00 00 */ lwz r12, 0(r3) /* 80244D58 00241C98 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_kanban.s b/asm/d/msg/scrn/d_msg_scrn_kanban.s index be3bbaf7fd..d2cffff568 100644 --- a/asm/d/msg/scrn/d_msg_scrn_kanban.s +++ b/asm/d/msg/scrn/d_msg_scrn_kanban.s @@ -43,8 +43,8 @@ lbl_80244EB0: /* 80244EB8 00241DF8 3C 80 80 3A */ lis r4, lbl_80399AB8@ha /* 80244EBC 00241DFC 38 84 9A B8 */ addi r4, r4, lbl_80399AB8@l /* 80244EC0 00241E00 3C A0 01 02 */ lis r5, 0x102 -/* 80244EC4 00241E04 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, lbl_804061C0@l +/* 80244EC4 00241E04 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 80244ECC 00241E0C 80 DD 5C 74 */ lwz r6, 0x5c74(r29) /* 80244ED0 00241E10 48 0B 37 79 */ bl J2DScreen_NS_setPriority /* 80244ED4 00241E14 80 7F 00 04 */ lwz r3, 4(r31) @@ -450,8 +450,8 @@ lbl_802454C4: /* 802454C8 00242408 2C 1B 00 03 */ cmpwi r27, 3 /* 802454CC 0024240C 3B BD 00 04 */ addi r29, r29, 4 /* 802454D0 00242410 41 80 FF 9C */ blt lbl_8024546C -/* 802454D4 00242414 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802454D8 00242418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802454D4 00242414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802454D8 00242418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802454DC 0024241C 80 63 5C 74 */ lwz r3, 0x5c74(r3) /* 802454E0 00242420 81 83 00 00 */ lwz r12, 0(r3) /* 802454E4 00242424 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -540,8 +540,8 @@ lbl_802455D4: /* 80245624 00242564 93 E1 00 0C */ stw r31, 0xc(r1) /* 80245628 00242568 93 C1 00 08 */ stw r30, 8(r1) /* 8024562C 0024256C 7C 7E 1B 78 */ mr r30, r3 -/* 80245630 00242570 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80245634 00242574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80245630 00242570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80245634 00242574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80245638 00242578 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 8024563C 0024257C 7F E3 FB 78 */ mr r3, r31 /* 80245640 00242580 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_light.s b/asm/d/msg/scrn/d_msg_scrn_light.s index 085bbcd2ba..fa80397e0a 100644 --- a/asm/d/msg/scrn/d_msg_scrn_light.s +++ b/asm/d/msg/scrn/d_msg_scrn_light.s @@ -176,8 +176,8 @@ lbl_802459AC: /* 802459B4 002428F4 3C 80 80 3A */ lis r4, lbl_80399B08@ha /* 802459B8 002428F8 38 84 9B 08 */ addi r4, r4, lbl_80399B08@l /* 802459BC 002428FC 3C A0 00 02 */ lis r5, 2 -/* 802459C0 00242900 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l +/* 802459C0 00242900 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 802459C8 00242908 80 DE 5D 30 */ lwz r6, 0x5d30(r30) /* 802459CC 0024290C 48 0B 2C 7D */ bl J2DScreen_NS_setPriority /* 802459D0 00242910 80 7F 00 04 */ lwz r3, 4(r31) @@ -680,8 +680,8 @@ dMsgScrnLight_c_NS_drawCommon: /* 8024612C 0024306C FF 80 18 90 */ fmr f28, f3 /* 80246130 00243070 FF A0 20 90 */ fmr f29, f4 /* 80246134 00243074 FF C0 28 90 */ fmr f30, f5 -/* 80246138 00243078 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024613C 0024307C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246138 00243078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024613C 0024307C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246140 00243080 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80246144 00243084 7F E3 FB 78 */ mr r3, r31 /* 80246148 00243088 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_place.s b/asm/d/msg/scrn/d_msg_scrn_place.s index ebdd1745f4..b4f5465756 100644 --- a/asm/d/msg/scrn/d_msg_scrn_place.s +++ b/asm/d/msg/scrn/d_msg_scrn_place.s @@ -51,8 +51,8 @@ lbl_80246464: /* 8024646C 002433AC 3C 80 80 3A */ lis r4, lbl_80399B78@ha /* 80246470 002433B0 38 84 9B 78 */ addi r4, r4, lbl_80399B78@l /* 80246474 002433B4 3C A0 00 02 */ lis r5, 2 -/* 80246478 002433B8 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80246478 002433B8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80246480 002433C0 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) /* 80246484 002433C4 48 0B 21 C5 */ bl J2DScreen_NS_setPriority /* 80246488 002433C8 80 7F 00 04 */ lwz r3, 4(r31) @@ -341,8 +341,8 @@ lbl_802468BC: /* 802468C4 00243804 2C 1B 00 07 */ cmpwi r27, 7 /* 802468C8 00243808 3B DE 00 04 */ addi r30, r30, 4 /* 802468CC 0024380C 41 80 FF CC */ blt lbl_80246898 -/* 802468D0 00243810 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802468D4 00243814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802468D0 00243810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802468D4 00243814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802468D8 00243818 80 63 5C 7C */ lwz r3, 0x5c7c(r3) /* 802468DC 0024381C 81 83 00 00 */ lwz r12, 0(r3) /* 802468E0 00243820 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -441,8 +441,8 @@ lbl_80246A30: /* 80246A4C 0024398C 90 01 00 14 */ stw r0, 0x14(r1) /* 80246A50 00243990 93 E1 00 0C */ stw r31, 0xc(r1) /* 80246A54 00243994 7C 7F 1B 78 */ mr r31, r3 -/* 80246A58 00243998 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80246A5C 0024399C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246A58 00243998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80246A5C 0024399C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246A60 002439A0 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80246A64 002439A4 81 83 00 00 */ lwz r12, 0(r3) /* 80246A68 002439A8 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_staff.s b/asm/d/msg/scrn/d_msg_scrn_staff.s index 43164a4fac..493631d6e9 100644 --- a/asm/d/msg/scrn/d_msg_scrn_staff.s +++ b/asm/d/msg/scrn/d_msg_scrn_staff.s @@ -32,8 +32,8 @@ lbl_80246B88: /* 80246B90 00243AD0 3C 80 80 3A */ lis r4, lbl_80399B98@ha /* 80246B94 00243AD4 38 84 9B 98 */ addi r4, r4, lbl_80399B98@l /* 80246B98 00243AD8 3C A0 00 02 */ lis r5, 2 -/* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80246BA4 00243AE4 80 C6 5C 84 */ lwz r6, 0x5c84(r6) /* 80246BA8 00243AE8 48 0B 1A A1 */ bl J2DScreen_NS_setPriority /* 80246BAC 00243AEC 80 7E 00 04 */ lwz r3, 4(r30) @@ -230,8 +230,8 @@ lbl_80246E80: /* 80246E88 00243DC8 2C 1C 00 06 */ cmpwi r28, 6 /* 80246E8C 00243DCC 3B FF 00 04 */ addi r31, r31, 4 /* 80246E90 00243DD0 41 80 FF CC */ blt lbl_80246E5C -/* 80246E94 00243DD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80246E98 00243DD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246E94 00243DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80246E98 00243DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246E9C 00243DDC 80 63 5C 84 */ lwz r3, 0x5c84(r3) /* 80246EA0 00243DE0 81 83 00 00 */ lwz r12, 0(r3) /* 80246EA4 00243DE4 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -290,8 +290,8 @@ lbl_80246F54: /* 80246F70 00243EB0 90 01 00 14 */ stw r0, 0x14(r1) /* 80246F74 00243EB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80246F78 00243EB8 7C 7F 1B 78 */ mr r31, r3 -/* 80246F7C 00243EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80246F80 00243EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80246F7C 00243EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80246F80 00243EC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80246F84 00243EC4 80 63 5F 50 */ lwz r3, 0x5f50(r3) /* 80246F88 00243EC8 81 83 00 00 */ lwz r12, 0(r3) /* 80246F8C 00243ECC 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index ebf1ea7d56..86f9a1eea9 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -45,8 +45,8 @@ lbl_80247070: /* 80247078 00243FB8 3C 80 80 3A */ lis r4, lbl_80399BB0@ha /* 8024707C 00243FBC 38 84 9B B0 */ addi r4, r4, lbl_80399BB0@l /* 80247080 00243FC0 3C A0 00 02 */ lis r5, 2 -/* 80247084 00243FC4 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l +/* 80247084 00243FC4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8024708C 00243FCC 80 C6 5C 70 */ lwz r6, 0x5c70(r6) /* 80247090 00243FD0 48 0B 15 B9 */ bl J2DScreen_NS_setPriority /* 80247094 00243FD4 80 7F 00 04 */ lwz r3, 4(r31) @@ -59,8 +59,8 @@ lbl_80247070: /* 802470B0 00243FF0 7C 60 1B 78 */ mr r0, r3 lbl_802470B4: /* 802470B4 00243FF4 90 1F 00 C4 */ stw r0, 0xc4(r31) -/* 802470B8 00243FF8 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 802470BC 00243FFC 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l +/* 802470B8 00243FF8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 802470BC 00243FFC 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 802470C0 00244000 80 9E 5D BC */ lwz r4, 0x5dbc(r30) /* 802470C4 00244004 88 04 01 9A */ lbz r0, 0x19a(r4) /* 802470C8 00244008 28 00 00 08 */ cmplwi r0, 8 @@ -92,8 +92,8 @@ lbl_8024710C: /* 80247128 00244068 7C 60 1B 78 */ mr r0, r3 lbl_8024712C: /* 8024712C 0024406C 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80247130 00244070 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80247134 00244074 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80247130 00244070 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha +/* 80247134 00244074 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80247138 00244078 88 04 5E 8F */ lbz r0, 0x5e8f(r4) /* 8024713C 0024407C 28 00 00 03 */ cmplwi r0, 3 /* 80247140 00244080 41 82 00 24 */ beq lbl_80247164 @@ -881,22 +881,22 @@ lbl_80247C98: /* 80247C9C 00244BDC 2C 1A 00 06 */ cmpwi r26, 6 /* 80247CA0 00244BE0 3B BD 00 04 */ addi r29, r29, 4 /* 80247CA4 00244BE4 41 80 FF 98 */ blt lbl_80247C3C -/* 80247CA8 00244BE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247CAC 00244BEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247CA8 00244BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247CAC 00244BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247CB0 00244BF0 80 63 5C 6C */ lwz r3, 0x5c6c(r3) /* 80247CB4 00244BF4 81 83 00 00 */ lwz r12, 0(r3) /* 80247CB8 00244BF8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80247CBC 00244BFC 7D 89 03 A6 */ mtctr r12 /* 80247CC0 00244C00 4E 80 04 21 */ bctrl -/* 80247CC4 00244C04 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247CC8 00244C08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247CC4 00244C04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247CC8 00244C08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247CCC 00244C0C 80 63 5C 70 */ lwz r3, 0x5c70(r3) /* 80247CD0 00244C10 81 83 00 00 */ lwz r12, 0(r3) /* 80247CD4 00244C14 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80247CD8 00244C18 7D 89 03 A6 */ mtctr r12 /* 80247CDC 00244C1C 4E 80 04 21 */ bctrl -/* 80247CE0 00244C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247CE4 00244C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247CE0 00244C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247CE4 00244C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247CE8 00244C28 80 63 5C E4 */ lwz r3, 0x5ce4(r3) /* 80247CEC 00244C2C 81 83 00 00 */ lwz r12, 0(r3) /* 80247CF0 00244C30 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -999,8 +999,8 @@ lbl_80247E20: /* 80247E60 00244DA0 39 61 00 50 */ addi r11, r1, 0x50 /* 80247E64 00244DA4 48 11 A3 59 */ bl func_803621BC /* 80247E68 00244DA8 7C 78 1B 78 */ mr r24, r3 -/* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80247E74 00244DB4 83 63 5F 50 */ lwz r27, 0x5f50(r3) /* 80247E78 00244DB8 7F 63 DB 78 */ mr r3, r27 /* 80247E7C 00244DBC 81 9B 00 00 */ lwz r12, 0(r27) @@ -1018,8 +1018,8 @@ lbl_80247E20: /* 80247EAC 00244DEC 3A E0 00 00 */ li r23, 0 /* 80247EB0 00244DF0 3A C0 00 00 */ li r22, 0 /* 80247EB4 00244DF4 3A A0 00 00 */ li r21, 0 -/* 80247EB8 00244DF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l +/* 80247EB8 00244DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80247EC0 00244E00 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80247EC4 00244E04 3B C3 02 8C */ addi r30, r3, lbl_8043028C@l /* 80247EC8 00244E08 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1120,8 +1120,8 @@ lbl_8024801C: /* 80248024 00244F64 41 80 FE B0 */ blt lbl_80247ED4 /* 80248028 00244F68 48 00 00 60 */ b lbl_80248088 lbl_8024802C: -/* 8024802C 00244F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80248030 00244F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8024802C 00244F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80248030 00244F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80248034 00244F74 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80248038 00244F78 88 03 01 9A */ lbz r0, 0x19a(r3) /* 8024803C 00244F7C 28 00 00 08 */ cmplwi r0, 8 @@ -1368,8 +1368,8 @@ lbl_802483C0: /* 802483C0 00245300 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802483C4 00245304 28 00 00 03 */ cmplwi r0, 3 /* 802483C8 00245308 40 82 01 A4 */ bne lbl_8024856C -/* 802483CC 0024530C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802483D0 00245310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802483CC 0024530C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802483D0 00245310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802483D4 00245314 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802483D8 00245318 38 63 05 38 */ addi r3, r3, 0x538 /* 802483DC 0024531C 38 81 00 44 */ addi r4, r1, 0x44 @@ -1579,8 +1579,8 @@ lbl_802486B4: /* 802486D8 00245618 C0 42 B3 40 */ lfs f2, lbl_80454D40-_SDA2_BASE_(r2) /* 802486DC 0024561C 4B FF 16 BD */ bl dMsgScrn3Select_c_NS_translate lbl_802486E0: -/* 802486E0 00245620 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802486E0 00245620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802486E8 00245628 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 802486EC 0024562C 28 00 00 02 */ cmplwi r0, 2 /* 802486F0 00245630 41 82 00 0C */ beq lbl_802486FC diff --git a/asm/d/msg/scrn/d_msg_scrn_tree.s b/asm/d/msg/scrn/d_msg_scrn_tree.s index 69cbf12831..afd12b2e1e 100644 --- a/asm/d/msg/scrn/d_msg_scrn_tree.s +++ b/asm/d/msg/scrn/d_msg_scrn_tree.s @@ -52,8 +52,8 @@ lbl_802489E8: /* 802489F0 00245930 3C 80 80 3A */ lis r4, lbl_80399C30@ha /* 802489F4 00245934 38 84 9C 30 */ addi r4, r4, lbl_80399C30@l /* 802489F8 00245938 3C A0 01 02 */ lis r5, 0x102 -/* 802489FC 0024593C 3C C0 80 40 */ lis r6, lbl_804061C0@ha -/* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, lbl_804061C0@l +/* 802489FC 0024593C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha +/* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, g_dComIfG_gameInfo@l /* 80248A04 00245944 80 DB 5C 74 */ lwz r6, 0x5c74(r27) /* 80248A08 00245948 48 0A FC 41 */ bl J2DScreen_NS_setPriority /* 80248A0C 0024594C 80 7F 00 04 */ lwz r3, 4(r31) @@ -506,8 +506,8 @@ lbl_802490B4: /* 802490B8 00245FF8 2C 1B 00 03 */ cmpwi r27, 3 /* 802490BC 00245FFC 3B BD 00 04 */ addi r29, r29, 4 /* 802490C0 00246000 41 80 FF 9C */ blt lbl_8024905C -/* 802490C4 00246004 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802490C8 00246008 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802490C4 00246004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802490C8 00246008 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802490CC 0024600C 80 63 5C 74 */ lwz r3, 0x5c74(r3) /* 802490D0 00246010 81 83 00 00 */ lwz r12, 0(r3) /* 802490D4 00246014 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -623,8 +623,8 @@ lbl_8024922C: /* 8024927C 002461BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80249280 002461C0 93 C1 00 08 */ stw r30, 8(r1) /* 80249284 002461C4 7C 7E 1B 78 */ mr r30, r3 -/* 80249288 002461C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 8024928C 002461CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80249288 002461C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 8024928C 002461CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80249290 002461D0 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80249294 002461D4 7F E3 FB 78 */ mr r3, r31 /* 80249298 002461D8 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 23bf4e779e..d0e401c29b 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -217,8 +217,8 @@ lbl_8024969C: /* 802496AC 002465EC 80 03 00 10 */ lwz r0, 0x10(r3) /* 802496B0 002465F0 28 00 00 00 */ cmplwi r0, 0 /* 802496B4 002465F4 40 82 00 20 */ bne lbl_802496D4 -/* 802496B8 002465F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 802496BC 002465FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 802496B8 002465F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 802496BC 002465FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802496C0 00246600 80 63 5C F4 */ lwz r3, 0x5cf4(r3) /* 802496C4 00246604 81 83 00 00 */ lwz r12, 0(r3) /* 802496C8 00246608 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -252,8 +252,8 @@ dMsgStringBase_c_NS_getResource: /* 80249724 00246664 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 80249728 00246668 28 00 00 00 */ cmplwi r0, 0 /* 8024972C 0024666C 40 82 00 28 */ bne lbl_80249754 -/* 80249730 00246670 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80249734 00246674 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80249730 00246670 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha +/* 80249734 00246674 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80249738 00246678 80 A3 5C F4 */ lwz r5, 0x5cf4(r3) /* 8024973C 0024667C 3C 60 52 4F */ lis r3, 0x524F4F54@ha /* 80249740 00246680 38 63 4F 54 */ addi r3, r3, 0x524F4F54@l |