From 0df7ef28a3b00c2d7160e131078a79bd3ecfd191 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 14:21:58 -0500 Subject: [PATCH 01/12] gCurrentEncounter offsets + some funcs --- .../code_13870_len_6980/func_8003E514.s | 4 +- .../code_13870_len_6980/kill_encounter.s | 4 +- .../code_13870_len_6980/kill_enemy.s | 4 +- asm/nonmatchings/code_16F740/func_80244D90.s | 4 +- asm/nonmatchings/code_181810/func_80253FB0.s | 4 +- .../code_1a1f0_len_5390/create_npcs.s | 56 +- .../code_1a1f0_len_5390/func_800431DC.s | 24 +- .../code_20ec0_len_5040/spawn_drops.s | 28 +- asm/nonmatchings/code_317E50/func_802BD758.s | 4 +- asm/nonmatchings/code_319670/func_802BD660.s | 4 +- asm/nonmatchings/code_31B120/func_802BD638.s | 4 +- .../code_362a0_len_2f70/func_8005DDF0.s | 4 +- .../iwa_01/90FBD0/func_8024228C_91193C.s | 4 +- .../kmr_00/8ABF90/func_80240584_8AC514.s | 13 - .../kmr_00/8ABF90/func_802405A8_8AC538.s | 13 - .../kmr_00/8ABF90/func_802405CC_8AC55C.s | 13 - .../kpa_03/A48720/func_80241DC4_A4A384.s | 4 +- .../kpa_08/A4CAC0/func_8024141C_A4DE3C.s | 4 +- .../kpa_09/A4F0A0/func_802412B4_A502B4.s | 4 +- .../kpa_102/A93A50/func_80241524_A94C64.s | 4 +- .../kpa_102/A93A50/func_80243504_A96C44.s | 4 +- .../kpa_111/A99590/func_80241384_A9A914.s | 4 +- .../kpa_115/A9ED40/func_80241384_AA00C4.s | 4 +- .../kpa_50/A609D0/func_80241214_A61BE4.s | 4 +- .../kpa_51/A640E0/func_802413CC_A6545C.s | 4 +- .../kpa_52/A671E0/func_802412F4_A683F4.s | 4 +- .../kpa_61/A6E6F0/func_802422B8_A70698.s | 4 +- .../kzn_04/C69180/func_80241050_C69180.s | 4 +- .../kzn_11/C80600/func_80241F4C_C820EC.s | 4 +- .../mac_00/7EB340/func_80242178_7ECE88.s | 4 +- .../omo_02/D9D510/func_80242B70_DA0040.s | 4 +- .../omo_09/DCD6B0/func_80243580_DD0250.s | 4 +- .../omo_17/DEF400/func_802436D4_DF2574.s | 4 +- .../tik_01/869EE0/func_80240A30_869EE0.s | 4 +- .../tik_02/86CD10/func_80240940_86D080.s | 4 +- .../tik_08/87F820/func_80240A5C_87F84C.s | 4 +- .../trd_08/9BB5B0/func_80240310_9BB5B0.s | 4 +- .../world/script_api/7E0E80/MakeShop.s | 233 +++++++ .../world/script_api/7E0E80/MakeShopOwner.s | 22 + .../world/script_api/7E0E80/draw_shop_items.s | 221 +++++++ .../world/script_api/7E0E80/func_80280000.s | 38 ++ .../world/script_api/7E0E80/func_80280088.s | 68 ++ .../world/script_api/7E0E80/func_8028017C.s | 39 ++ .../world/script_api/7E0E80/func_80280208.s | 55 ++ .../world/script_api/7E0E80/func_802802D0.s | 39 ++ .../world/script_api/7E0E80/func_8028035C.s | 31 + .../world/script_api/7E0E80/func_802803C8.s | 24 + .../world/script_api/7E0E80/func_80280410.s | 73 +++ .../world/script_api/7E0E80/func_8028051C.s | 297 +++++++++ .../world/script_api/7E0E80/func_80280954.s | 104 +++ .../world/script_api/7E0E80/func_80280AC4.s | 40 ++ .../world/script_api/7E0E80/func_80280B44.s | 17 + .../world/script_api/7E0E80/func_80280B78.s | 29 + .../world/script_api/7E0E80/func_80280BD0.s | 604 ++++++++++++++++++ .../world/script_api/7E0E80/func_80281434.s | 43 ++ .../world/script_api/7E0E80/func_802814D0.s | 25 + .../script_api/7E2AA0/MakeDoorAdvanced.s | 394 ++++++++++++ .../world/script_api/7E2AA0/func_802822A8.s | 31 + .../world/script_api/7E2AA0/func_8028236C.s | 21 + .../world/script_api/7E2AA0/func_802823B0.s | 29 + .../world/script_api/7E2AA0/func_80282414.s | 105 +++ .../world/script_api/7E2AA0/func_80282634.s | 60 ++ .../world/script_api/7E2AA0/func_80282700.s | 36 ++ .../script_api/7E3700/CreatePushBlockGrid.s | 112 ++++ .../script_api/7E3700/GetGridIndexFromPos.s | 65 ++ .../world/script_api/7E3700/GetPushBlock.s | 70 ++ .../world/script_api/7E3700/SetPushBlock.s | 86 +++ .../7E3700/SetPushBlockFallEffect.s | 29 + .../7E3700/TeleportPartnerToPlayer.s | 41 ++ .../world/script_api/7E3700/func_80282880.s | 27 + .../world/script_api/7E3700/func_802828DC.s | 224 +++++++ .../world/script_api/7E3700/func_80282C40.s | 133 ++++ .../world/script_api/7E3700/func_80282E30.s | 160 +++++ .../world/script_api/7E3700/func_80283080.s | 65 ++ .../world/script_api/7E3700/func_80283174.s | 33 + .../world/script_api/7E3700/func_80283240.s | 48 ++ .../world/script_api/7E3700/func_80283810.s | 33 + .../world/script_api/7E3700/func_80283908.s | 88 +++ .../world/script_api/7E3700/func_80283A50.s | 85 +++ .../world/script_api/7E3700/func_80283B88.s | 14 + .../world/script_api/7E3700/func_80283BB0.s | 12 + .../world/script_api/7E3700/func_80283BD0.s | 30 + .../world/script_api/7E3700/func_80283C34.s | 55 ++ .../world/script_api/7E3700/func_80283D00.s | 33 + .../world/script_api/7E3700/func_80283D6C.s | 39 ++ .../world/script_api/7E3700/func_80283DF0.s | 19 + .../world/script_api/7E3700/func_80283E2C.s | 25 + asm/nonmatchings/world/world/func_80058DD0.s | 51 ++ asm/nonmatchings/world/world/func_80058E84.s | 70 ++ asm/nonmatchings/world/world/func_80058F88.s | 36 ++ asm/nonmatchings/world/world/func_80059008.s | 23 + asm/nonmatchings/world/world/func_8005904C.s | 191 ++++++ asm/nonmatchings/world/world/func_80059310.s | 375 +++++++++++ asm/nonmatchings/world/world/func_800598A0.s | 140 ++++ asm/nonmatchings/world/world/func_80059AB8.s | 77 +++ asm/nonmatchings/world/world/func_80059BD4.s | 50 ++ asm/nonmatchings/world/world/func_80059C88.s | 9 + asm/nonmatchings/world/world/func_80059C9C.s | 49 ++ asm/nonmatchings/world/world/func_80059D50.s | 121 ++++ asm/nonmatchings/world/world/func_80059F94.s | 211 ++++++ asm/nonmatchings/world/world/func_8005A2BC.s | 122 ++++ .../world/world/get_asset_offset.s | 58 ++ .../world/world/get_current_map_config.s | 8 + .../world/world/get_current_map_header.s | 8 + .../world/world/get_map_IDs_by_name.s | 70 ++ .../world/world/load_asset_by_name.s | 64 ++ .../world/world/load_map_by_IDs.s | 333 ++++++++++ asm/nonmatchings/world/world/play_effect.s | 101 +++ .../world/world/remove_all_effects.s | 40 ++ asm/nonmatchings/world/world/remove_effect.s | 45 ++ asm/nonmatchings/world/world/render_effects.s | 48 ++ src/world/area_kmr/kmr_00/8ABF90.c | 15 +- tools/symbol_addrs.txt | 3 +- 113 files changed, 6634 insertions(+), 159 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/MakeShop.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280000.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280088.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280208.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280410.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280954.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_80281434.s create mode 100644 asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s create mode 100644 asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80282880.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_802828DC.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80282C40.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80282E30.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283080.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283174.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283240.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283810.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283908.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283A50.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283B88.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283C34.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283D00.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s create mode 100644 asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s create mode 100644 asm/nonmatchings/world/world/func_80058DD0.s create mode 100644 asm/nonmatchings/world/world/func_80058E84.s create mode 100644 asm/nonmatchings/world/world/func_80058F88.s create mode 100644 asm/nonmatchings/world/world/func_80059008.s create mode 100644 asm/nonmatchings/world/world/func_8005904C.s create mode 100644 asm/nonmatchings/world/world/func_80059310.s create mode 100644 asm/nonmatchings/world/world/func_800598A0.s create mode 100644 asm/nonmatchings/world/world/func_80059AB8.s create mode 100644 asm/nonmatchings/world/world/func_80059BD4.s create mode 100644 asm/nonmatchings/world/world/func_80059C88.s create mode 100644 asm/nonmatchings/world/world/func_80059C9C.s create mode 100644 asm/nonmatchings/world/world/func_80059D50.s create mode 100644 asm/nonmatchings/world/world/func_80059F94.s create mode 100644 asm/nonmatchings/world/world/func_8005A2BC.s create mode 100644 asm/nonmatchings/world/world/get_asset_offset.s create mode 100644 asm/nonmatchings/world/world/get_current_map_config.s create mode 100644 asm/nonmatchings/world/world/get_current_map_header.s create mode 100644 asm/nonmatchings/world/world/get_map_IDs_by_name.s create mode 100644 asm/nonmatchings/world/world/load_asset_by_name.s create mode 100644 asm/nonmatchings/world/world/load_map_by_IDs.s create mode 100644 asm/nonmatchings/world/world/play_effect.s create mode 100644 asm/nonmatchings/world/world/remove_all_effects.s create mode 100644 asm/nonmatchings/world/world/remove_effect.s create mode 100644 asm/nonmatchings/world/world/render_effects.s diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s index 0ebe33a68e..7749f68b28 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_8003E514 -/* 19914 8003E514 3C01800B */ lui $at, 0x800b -/* 19918 8003E518 A0240F18 */ sb $a0, 0xf18($at) +/* 19914 8003E514 3C01800B */ lui $at, %hi(gCurrentEncounter+0x8) +/* 19918 8003E518 A0240F18 */ sb $a0, %lo(gCurrentEncounter+0x8)($at) /* 1991C 8003E51C 03E00008 */ jr $ra /* 19920 8003E520 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s index 9fa4ce7827..8c3fed029e 100644 --- a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s +++ b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s @@ -9,9 +9,9 @@ glabel kill_encounter /* 19B40 8003E740 AFB00010 */ sw $s0, 0x10($sp) /* 19B44 8003E744 80820004 */ lb $v0, 4($a0) /* 19B48 8003E748 00021080 */ sll $v0, $v0, 2 -/* 19B4C 8003E74C 3C12800B */ lui $s2, 0x800b +/* 19B4C 8003E74C 3C12800B */ lui $s2, %hi(gCurrentEncounter+0x28) /* 19B50 8003E750 02429021 */ addu $s2, $s2, $v0 -/* 19B54 8003E754 8E520F38 */ lw $s2, 0xf38($s2) +/* 19B54 8003E754 8E520F38 */ lw $s2, %lo(gCurrentEncounter+0x28)($s2) /* 19B58 8003E758 8E420000 */ lw $v0, ($s2) /* 19B5C 8003E75C 1840000D */ blez $v0, .L8003E794 /* 19B60 8003E760 0000882D */ daddu $s1, $zero, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s index dd06b054b2..f735ff9372 100644 --- a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s +++ b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s @@ -11,9 +11,9 @@ glabel kill_enemy /* 19BC4 8003E7C4 AFB10014 */ sw $s1, 0x14($sp) /* 19BC8 8003E7C8 82020004 */ lb $v0, 4($s0) /* 19BCC 8003E7CC 00021080 */ sll $v0, $v0, 2 -/* 19BD0 8003E7D0 3C13800B */ lui $s3, 0x800b +/* 19BD0 8003E7D0 3C13800B */ lui $s3, %hi(gCurrentEncounter+0x28) /* 19BD4 8003E7D4 02629821 */ addu $s3, $s3, $v0 -/* 19BD8 8003E7D8 8E730F38 */ lw $s3, 0xf38($s3) +/* 19BD8 8003E7D8 8E730F38 */ lw $s3, %lo(gCurrentEncounter+0x28)($s3) /* 19BDC 8003E7DC 8E640000 */ lw $a0, ($s3) /* 19BE0 8003E7E0 3C12800B */ lui $s2, %hi(gCurrentEncounter) /* 19BE4 8003E7E4 26520F10 */ addiu $s2, $s2, %lo(gCurrentEncounter) diff --git a/asm/nonmatchings/code_16F740/func_80244D90.s b/asm/nonmatchings/code_16F740/func_80244D90.s index 0b30f27ad5..6a7a1c2487 100644 --- a/asm/nonmatchings/code_16F740/func_80244D90.s +++ b/asm/nonmatchings/code_16F740/func_80244D90.s @@ -16,8 +16,8 @@ glabel func_80244D90 /* 17369C 80244DBC 00431021 */ addu $v0, $v0, $v1 /* 1736A0 80244DC0 000210C0 */ sll $v0, $v0, 3 /* 1736A4 80244DC4 00443021 */ addu $a2, $v0, $a0 -/* 1736A8 80244DC8 3C03800B */ lui $v1, 0x800b -/* 1736AC 80244DCC 80630F19 */ lb $v1, 0xf19($v1) +/* 1736A8 80244DC8 3C03800B */ lui $v1, %hi(gCurrentEncounter+0x9) +/* 1736AC 80244DCC 80630F19 */ lb $v1, %lo(gCurrentEncounter+0x9)($v1) /* 1736B0 80244DD0 24020001 */ addiu $v0, $zero, 1 /* 1736B4 80244DD4 1462000E */ bne $v1, $v0, .L80244E10 /* 1736B8 80244DD8 3C030080 */ lui $v1, 0x80 diff --git a/asm/nonmatchings/code_181810/func_80253FB0.s b/asm/nonmatchings/code_181810/func_80253FB0.s index 9659441959..3b756fb9c0 100644 --- a/asm/nonmatchings/code_181810/func_80253FB0.s +++ b/asm/nonmatchings/code_181810/func_80253FB0.s @@ -5,8 +5,8 @@ glabel func_80253FB0 /* 182890 80253FB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 182894 80253FB4 24020003 */ addiu $v0, $zero, 3 /* 182898 80253FB8 AFBF0010 */ sw $ra, 0x10($sp) -/* 18289C 80253FBC 3C01800B */ lui $at, 0x800b -/* 1828A0 80253FC0 A0220F19 */ sb $v0, 0xf19($at) +/* 18289C 80253FBC 3C01800B */ lui $at, %hi(gCurrentEncounter+0x9) +/* 1828A0 80253FC0 A0220F19 */ sb $v0, %lo(gCurrentEncounter+0x9)($at) /* 1828A4 80253FC4 0C090464 */ jal func_80241190 /* 1828A8 80253FC8 24040020 */ addiu $a0, $zero, 0x20 /* 1828AC 80253FCC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s index eae68e1603..9fef79a944 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s @@ -5,12 +5,12 @@ glabel create_npcs /* 1EAB0 800436B0 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 1EAB4 800436B4 AFBE0058 */ sw $fp, 0x58($sp) /* 1EAB8 800436B8 27BE0010 */ addiu $fp, $sp, 0x10 -/* 1EABC 800436BC 3C07800B */ lui $a3, 0x800b -/* 1EAC0 800436C0 8CE70F34 */ lw $a3, 0xf34($a3) +/* 1EABC 800436BC 3C07800B */ lui $a3, %hi(gCurrentEncounter+0x24) +/* 1EAC0 800436C0 8CE70F34 */ lw $a3, %lo(gCurrentEncounter+0x24)($a3) /* 1EAC4 800436C4 3C03800A */ lui $v1, 0x800a /* 1EAC8 800436C8 8C63A5D0 */ lw $v1, -0x5a30($v1) -/* 1EACC 800436CC 3C08800B */ lui $t0, 0x800b -/* 1EAD0 800436D0 81080F30 */ lb $t0, 0xf30($t0) +/* 1EACC 800436CC 3C08800B */ lui $t0, %hi(gCurrentEncounter+0x20) +/* 1EAD0 800436D0 81080F30 */ lb $t0, %lo(gCurrentEncounter+0x20)($t0) /* 1EAD4 800436D4 24040001 */ addiu $a0, $zero, 1 /* 1EAD8 800436D8 AFBF005C */ sw $ra, 0x5c($sp) /* 1EADC 800436DC AFB70054 */ sw $s7, 0x54($sp) @@ -37,8 +37,8 @@ glabel create_npcs /* 1EB2C 8004372C 08011044 */ j .L80044110 /* 1EB30 80043730 00000000 */ nop .L80043734: -/* 1EB34 80043734 3C02800B */ lui $v0, 0x800b -/* 1EB38 80043738 80420F31 */ lb $v0, 0xf31($v0) +/* 1EB34 80043734 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x21) +/* 1EB38 80043738 80420F31 */ lb $v0, %lo(gCurrentEncounter+0x21)($v0) /* 1EB3C 8004373C 1044002A */ beq $v0, $a0, .L800437E8 /* 1EB40 80043740 00000000 */ nop /* 1EB44 80043744 0000982D */ daddu $s3, $zero, $zero @@ -479,16 +479,16 @@ glabel create_npcs /* 1F178 80043D78 AFA7002C */ sw $a3, 0x2c($sp) .L80043D7C: /* 1F17C 80043D7C 24020001 */ addiu $v0, $zero, 1 -/* 1F180 80043D80 3C01800B */ lui $at, 0x800b -/* 1F184 80043D84 A0360F2C */ sb $s6, 0xf2c($at) +/* 1F180 80043D80 3C01800B */ lui $at, %hi(gCurrentEncounter+0x1C) +/* 1F184 80043D84 A0360F2C */ sb $s6, %lo(gCurrentEncounter+0x1C)($at) /* 1F188 80043D88 3C01800A */ lui $at, 0x800a /* 1F18C 80043D8C AC22A5D0 */ sw $v0, -0x5a30($at) /* 1F190 80043D90 08011044 */ j .L80044110 /* 1F194 80043D94 00000000 */ nop .L80043D98: /* 1F198 80043D98 0000A82D */ daddu $s5, $zero, $zero -/* 1F19C 80043D9C 3C02800B */ lui $v0, 0x800b -/* 1F1A0 80043DA0 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F19C 80043D9C 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F1A0 80043DA0 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F1A4 80043DA4 1840001F */ blez $v0, .L80043E24 /* 1F1A8 80043DA8 02A0B02D */ daddu $s6, $s5, $zero /* 1F1AC 80043DAC 3C12800B */ lui $s2, %hi(gCurrentEncounter) @@ -519,8 +519,8 @@ glabel create_npcs /* 1F204 80043E04 1440FFF2 */ bnez $v0, .L80043DD0 /* 1F208 80043E08 26310004 */ addiu $s1, $s1, 4 .L80043E0C: -/* 1F20C 80043E0C 3C02800B */ lui $v0, 0x800b -/* 1F210 80043E10 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F20C 80043E0C 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F210 80043E10 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F214 80043E14 26D60001 */ addiu $s6, $s6, 1 /* 1F218 80043E18 02C2102A */ slt $v0, $s6, $v0 /* 1F21C 80043E1C 1440FFE5 */ bnez $v0, .L80043DB4 @@ -528,8 +528,8 @@ glabel create_npcs .L80043E24: /* 1F224 80043E24 16A000BA */ bnez $s5, .L80044110 /* 1F228 80043E28 00000000 */ nop -/* 1F22C 80043E2C 3C02800B */ lui $v0, 0x800b -/* 1F230 80043E30 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F22C 80043E2C 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F230 80043E30 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F234 80043E34 18400026 */ blez $v0, .L80043ED0 /* 1F238 80043E38 0000B02D */ daddu $s6, $zero, $zero /* 1F23C 80043E3C 3C12800B */ lui $s2, %hi(gCurrentEncounter) @@ -567,8 +567,8 @@ glabel create_npcs /* 1F2B0 80043EB0 1440FFEB */ bnez $v0, .L80043E60 /* 1F2B4 80043EB4 26310004 */ addiu $s1, $s1, 4 .L80043EB8: -/* 1F2B8 80043EB8 3C02800B */ lui $v0, 0x800b -/* 1F2BC 80043EBC 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F2B8 80043EB8 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F2BC 80043EBC 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F2C0 80043EC0 26D60001 */ addiu $s6, $s6, 1 /* 1F2C4 80043EC4 02C2102A */ slt $v0, $s6, $v0 /* 1F2C8 80043EC8 1440FFDE */ bnez $v0, .L80043E44 @@ -580,8 +580,8 @@ glabel create_npcs /* 1F2DC 80043EDC 08011044 */ j .L80044110 /* 1F2E0 80043EE0 00000000 */ nop .L80043EE4: -/* 1F2E4 80043EE4 3C02800B */ lui $v0, 0x800b -/* 1F2E8 80043EE8 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F2E4 80043EE4 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F2E8 80043EE8 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F2EC 80043EEC 18400020 */ blez $v0, .L80043F70 /* 1F2F0 80043EF0 02A0B02D */ daddu $s6, $s5, $zero /* 1F2F4 80043EF4 3C12800B */ lui $s2, %hi(gCurrentEncounter) @@ -613,8 +613,8 @@ glabel create_npcs /* 1F350 80043F50 1440FFF1 */ bnez $v0, .L80043F18 /* 1F354 80043F54 26310004 */ addiu $s1, $s1, 4 .L80043F58: -/* 1F358 80043F58 3C02800B */ lui $v0, 0x800b -/* 1F35C 80043F5C 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F358 80043F58 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F35C 80043F5C 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F360 80043F60 26D60001 */ addiu $s6, $s6, 1 /* 1F364 80043F64 02C2102A */ slt $v0, $s6, $v0 /* 1F368 80043F68 1440FFE4 */ bnez $v0, .L80043EFC @@ -622,8 +622,8 @@ glabel create_npcs .L80043F70: /* 1F370 80043F70 16A00067 */ bnez $s5, .L80044110 /* 1F374 80043F74 00000000 */ nop -/* 1F378 80043F78 3C02800B */ lui $v0, 0x800b -/* 1F37C 80043F7C 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F378 80043F78 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F37C 80043F7C 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F380 80043F80 1840002E */ blez $v0, .L8004403C /* 1F384 80043F84 0000B02D */ daddu $s6, $zero, $zero /* 1F388 80043F88 24150064 */ addiu $s5, $zero, 0x64 @@ -667,14 +667,14 @@ glabel create_npcs /* 1F414 80044014 1440FFE6 */ bnez $v0, .L80043FB0 /* 1F418 80044018 26310004 */ addiu $s1, $s1, 4 .L8004401C: -/* 1F41C 8004401C 3C02800B */ lui $v0, 0x800b -/* 1F420 80044020 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F41C 8004401C 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F420 80044020 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F424 80044024 26D60001 */ addiu $s6, $s6, 1 /* 1F428 80044028 02C2102A */ slt $v0, $s6, $v0 /* 1F42C 8004402C 1440FFD9 */ bnez $v0, .L80043F94 /* 1F430 80044030 26520004 */ addiu $s2, $s2, 4 -/* 1F434 80044034 3C02800B */ lui $v0, 0x800b -/* 1F438 80044038 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F434 80044034 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F438 80044038 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) .L8004403C: /* 1F43C 8004403C 1840002A */ blez $v0, .L800440E8 /* 1F440 80044040 0000B02D */ daddu $s6, $zero, $zero @@ -717,8 +717,8 @@ glabel create_npcs /* 1F4C8 800440C8 1440FFE7 */ bnez $v0, .L80044068 /* 1F4CC 800440CC 26310004 */ addiu $s1, $s1, 4 .L800440D0: -/* 1F4D0 800440D0 3C02800B */ lui $v0, 0x800b -/* 1F4D4 800440D4 80420F2C */ lb $v0, 0xf2c($v0) +/* 1F4D0 800440D0 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1F4D4 800440D4 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1F4D8 800440D8 26D60001 */ addiu $s6, $s6, 1 /* 1F4DC 800440DC 02C2102A */ slt $v0, $s6, $v0 /* 1F4E0 800440E0 1440FFDA */ bnez $v0, .L8004404C diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s index fa8ec26815..749025b275 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s @@ -65,8 +65,8 @@ glabel func_800431DC /* 1E6CC 800432CC E7A60038 */ swc1 $f6, 0x38($sp) /* 1E6D0 800432D0 0000F02D */ daddu $fp, $zero, $zero /* 1E6D4 800432D4 03C0A82D */ daddu $s5, $fp, $zero -/* 1E6D8 800432D8 3C02800B */ lui $v0, 0x800b -/* 1E6DC 800432DC 80420F2C */ lb $v0, 0xf2c($v0) +/* 1E6D8 800432D8 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1E6DC 800432DC 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1E6E0 800432E0 3C01477F */ lui $at, 0x477f /* 1E6E4 800432E4 3421FF00 */ ori $at, $at, 0xff00 /* 1E6E8 800432E8 44814000 */ mtc1 $at, $f8 @@ -260,8 +260,8 @@ glabel func_800431DC /* 1E9B8 800435B8 1440FF5B */ bnez $v0, .L80043328 /* 1E9BC 800435BC 00121080 */ sll $v0, $s2, 2 .L800435C0: -/* 1E9C0 800435C0 3C02800B */ lui $v0, 0x800b -/* 1E9C4 800435C4 80420F2C */ lb $v0, 0xf2c($v0) +/* 1E9C0 800435C0 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x1C) +/* 1E9C4 800435C4 80420F2C */ lb $v0, %lo(gCurrentEncounter+0x1C)($v0) /* 1E9C8 800435C8 26B50001 */ addiu $s5, $s5, 1 /* 1E9CC 800435CC 02A2102A */ slt $v0, $s5, $v0 /* 1E9D0 800435D0 1440FF4B */ bnez $v0, .L80043300 @@ -289,17 +289,17 @@ glabel func_800431DC /* 1EA24 80043624 00000000 */ nop /* 1EA28 80043628 24020001 */ addiu $v0, $zero, 1 /* 1EA2C 8004362C 24030005 */ addiu $v1, $zero, 5 -/* 1EA30 80043630 3C01800B */ lui $at, 0x800b -/* 1EA34 80043634 A0230F15 */ sb $v1, 0xf15($at) +/* 1EA30 80043630 3C01800B */ lui $at, %hi(gCurrentEncounter+0x5) +/* 1EA34 80043634 A0230F15 */ sb $v1, %lo(gCurrentEncounter+0x5)($at) /* 1EA38 80043638 A2C30005 */ sb $v1, 5($s6) /* 1EA3C 8004363C 8FA8002C */ lw $t0, 0x2c($sp) /* 1EA40 80043640 0040182D */ daddu $v1, $v0, $zero -/* 1EA44 80043644 3C01800B */ lui $at, 0x800b -/* 1EA48 80043648 AC360F9C */ sw $s6, 0xf9c($at) -/* 1EA4C 8004364C 3C01800B */ lui $at, 0x800b -/* 1EA50 80043650 A0230F14 */ sb $v1, 0xf14($at) -/* 1EA54 80043654 3C01800B */ lui $at, 0x800b -/* 1EA58 80043658 AC280F98 */ sw $t0, 0xf98($at) +/* 1EA44 80043644 3C01800B */ lui $at, %hi(gCurrentEncounter+0x8C) +/* 1EA48 80043648 AC360F9C */ sw $s6, %lo(gCurrentEncounter+0x8C)($at) +/* 1EA4C 8004364C 3C01800B */ lui $at, %hi(gCurrentEncounter+0x4) +/* 1EA50 80043650 A0230F14 */ sb $v1, %lo(gCurrentEncounter+0x4)($at) +/* 1EA54 80043654 3C01800B */ lui $at, %hi(gCurrentEncounter+0x88) +/* 1EA58 80043658 AC280F98 */ sw $t0, %lo(gCurrentEncounter+0x88)($at) /* 1EA5C 8004365C 08010D9A */ j .L80043668 /* 1EA60 80043660 00000000 */ nop .L80043664: diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s index ae5a24ac34..031fe72248 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s +++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s @@ -192,8 +192,8 @@ glabel spawn_drops /* 23948 80048548 0C051514 */ jal set_global_flag /* 2394C 8004854C 24840715 */ addiu $a0, $a0, 0x715 .L80048550: -/* 23950 80048550 3C02800B */ lui $v0, 0x800b -/* 23954 80048554 80420F23 */ lb $v0, 0xf23($v0) +/* 23950 80048550 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x13) +/* 23954 80048554 80420F23 */ lb $v0, %lo(gCurrentEncounter+0x13)($v0) /* 23958 80048558 10400026 */ beqz $v0, .L800485F4 /* 2395C 8004855C 24040093 */ addiu $a0, $zero, 0x93 /* 23960 80048560 24020004 */ addiu $v0, $zero, 4 @@ -208,8 +208,8 @@ glabel spawn_drops /* 23984 80048584 4407F000 */ mfc1 $a3, $f30 /* 23988 80048588 8FA80024 */ lw $t0, 0x24($sp) /* 2398C 8004858C 02C21021 */ addu $v0, $s6, $v0 -/* 23990 80048590 3C01800B */ lui $at, 0x800b -/* 23994 80048594 A0200F23 */ sb $zero, 0xf23($at) +/* 23990 80048590 3C01800B */ lui $at, %hi(gCurrentEncounter+0x13) +/* 23994 80048594 A0200F23 */ sb $zero, %lo(gCurrentEncounter+0x13)($at) /* 23998 80048598 AFA20018 */ sw $v0, 0x18($sp) /* 2399C 8004859C AFA0001C */ sw $zero, 0x1c($sp) /* 239A0 800485A0 0C04C4FD */ jal make_item_entity @@ -636,26 +636,26 @@ glabel spawn_drops /* 23FA8 80048BA8 06220001 */ bltzl $s1, .L80048BB0 /* 23FAC 80048BAC 0000882D */ daddu $s1, $zero, $zero .L80048BB0: -/* 23FB0 80048BB0 3C02800B */ lui $v0, 0x800b -/* 23FB4 80048BB4 84420F1E */ lh $v0, 0xf1e($v0) +/* 23FB0 80048BB0 3C02800B */ lui $v0, %hi(gCurrentEncounter+0xE) +/* 23FB4 80048BB4 84420F1E */ lh $v0, %lo(gCurrentEncounter+0xE)($v0) /* 23FB8 80048BB8 24040019 */ addiu $a0, $zero, 0x19 /* 23FBC 80048BBC 0C03A752 */ jal is_ability_active /* 23FC0 80048BC0 02228821 */ addu $s1, $s1, $v0 /* 23FC4 80048BC4 10400007 */ beqz $v0, .L80048BE4 /* 23FC8 80048BC8 00000000 */ nop -/* 23FCC 80048BCC 3C02800B */ lui $v0, 0x800b -/* 23FD0 80048BD0 90420F1C */ lbu $v0, 0xf1c($v0) -/* 23FD4 80048BD4 3C01800B */ lui $at, 0x800b -/* 23FD8 80048BD8 A0200F1C */ sb $zero, 0xf1c($at) +/* 23FCC 80048BCC 3C02800B */ lui $v0, %hi(gCurrentEncounter+0xC) +/* 23FD0 80048BD0 90420F1C */ lbu $v0, %lo(gCurrentEncounter+0xC)($v0) +/* 23FD4 80048BD4 3C01800B */ lui $at, %hi(gCurrentEncounter+0xC) +/* 23FD8 80048BD8 A0200F1C */ sb $zero, %lo(gCurrentEncounter+0xC)($at) /* 23FDC 80048BDC 00021042 */ srl $v0, $v0, 1 /* 23FE0 80048BE0 02228821 */ addu $s1, $s1, $v0 .L80048BE4: -/* 23FE4 80048BE4 3C02800B */ lui $v0, 0x800b -/* 23FE8 80048BE8 80420F1B */ lb $v0, 0xf1b($v0) +/* 23FE4 80048BE4 3C02800B */ lui $v0, %hi(gCurrentEncounter+0xB) +/* 23FE8 80048BE8 80420F1B */ lb $v0, %lo(gCurrentEncounter+0xB)($v0) /* 23FEC 80048BEC 10400004 */ beqz $v0, .L80048C00 /* 23FF0 80048BF0 00111040 */ sll $v0, $s1, 1 -/* 23FF4 80048BF4 3C01800B */ lui $at, 0x800b -/* 23FF8 80048BF8 A0200F1B */ sb $zero, 0xf1b($at) +/* 23FF4 80048BF4 3C01800B */ lui $at, %hi(gCurrentEncounter+0xB) +/* 23FF8 80048BF8 A0200F1B */ sb $zero, %lo(gCurrentEncounter+0xB)($at) /* 23FFC 80048BFC 02228821 */ addu $s1, $s1, $v0 .L80048C00: /* 24000 80048C00 0C03A752 */ jal is_ability_active diff --git a/asm/nonmatchings/code_317E50/func_802BD758.s b/asm/nonmatchings/code_317E50/func_802BD758.s index 96df531688..3613a3a96b 100644 --- a/asm/nonmatchings/code_317E50/func_802BD758.s +++ b/asm/nonmatchings/code_317E50/func_802BD758.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802BD758 -/* 3184A8 802BD758 3C02800B */ lui $v0, 0x800b -/* 3184AC 802BD75C 80420F18 */ lb $v0, 0xf18($v0) +/* 3184A8 802BD758 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x8) +/* 3184AC 802BD75C 80420F18 */ lb $v0, %lo(gCurrentEncounter+0x8)($v0) /* 3184B0 802BD760 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 3184B4 802BD764 AFB20038 */ sw $s2, 0x38($sp) /* 3184B8 802BD768 0080902D */ daddu $s2, $a0, $zero diff --git a/asm/nonmatchings/code_319670/func_802BD660.s b/asm/nonmatchings/code_319670/func_802BD660.s index 60464d1e94..6711f880f2 100644 --- a/asm/nonmatchings/code_319670/func_802BD660.s +++ b/asm/nonmatchings/code_319670/func_802BD660.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802BD660 -/* 319BD0 802BD660 3C02800B */ lui $v0, 0x800b -/* 319BD4 802BD664 80420F18 */ lb $v0, 0xf18($v0) +/* 319BD0 802BD660 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x8) +/* 319BD4 802BD664 80420F18 */ lb $v0, %lo(gCurrentEncounter+0x8)($v0) /* 319BD8 802BD668 27BDFF80 */ addiu $sp, $sp, -0x80 /* 319BDC 802BD66C AFB20040 */ sw $s2, 0x40($sp) /* 319BE0 802BD670 0080902D */ daddu $s2, $a0, $zero diff --git a/asm/nonmatchings/code_31B120/func_802BD638.s b/asm/nonmatchings/code_31B120/func_802BD638.s index 5790f6fb82..eb39dddfb6 100644 --- a/asm/nonmatchings/code_31B120/func_802BD638.s +++ b/asm/nonmatchings/code_31B120/func_802BD638.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802BD638 -/* 31B658 802BD638 3C02800B */ lui $v0, 0x800b -/* 31B65C 802BD63C 80420F18 */ lb $v0, 0xf18($v0) +/* 31B658 802BD638 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x8) +/* 31B65C 802BD63C 80420F18 */ lb $v0, %lo(gCurrentEncounter+0x8)($v0) /* 31B660 802BD640 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 31B664 802BD644 AFB50044 */ sw $s5, 0x44($sp) /* 31B668 802BD648 0080A82D */ daddu $s5, $a0, $zero diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s b/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s index 0d471f39fc..9569fa17a3 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s +++ b/asm/nonmatchings/code_362a0_len_2f70/func_8005DDF0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8005DDF0 -/* 391F0 8005DDF0 3C02800B */ lui $v0, 0x800b -/* 391F4 8005DDF4 80420F18 */ lb $v0, 0xf18($v0) +/* 391F0 8005DDF0 3C02800B */ lui $v0, %hi(gCurrentEncounter+0x8) +/* 391F4 8005DDF4 80420F18 */ lb $v0, %lo(gCurrentEncounter+0x8)($v0) /* 391F8 8005DDF8 00021027 */ nor $v0, $zero, $v0 /* 391FC 8005DDFC 03E00008 */ jr $ra /* 39200 8005DE00 0002102B */ sltu $v0, $zero, $v0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s index 380bfad5c4..0807b080c8 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s @@ -6,8 +6,8 @@ glabel func_8024228C_91193C /* 911940 80242290 3C05FE36 */ lui $a1, 0xfe36 /* 911944 80242294 AFBF0010 */ sw $ra, 0x10($sp) /* 911948 80242298 8C820148 */ lw $v0, 0x148($a0) -/* 91194C 8024229C 3C06800B */ lui $a2, 0x800b -/* 911950 802422A0 8CC60F9C */ lw $a2, 0xf9c($a2) +/* 91194C 8024229C 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* 911950 802422A0 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* 911954 802422A4 34A53C80 */ ori $a1, $a1, 0x3c80 /* 911958 802422A8 00C23026 */ xor $a2, $a2, $v0 /* 91195C 802422AC 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s deleted file mode 100644 index 6118f6f058..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_8AC514 -/* 8AC514 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC518 80240588 0000202D */ daddu $a0, $zero, $zero -/* 8AC51C 8024058C AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC520 80240590 0C01554F */ jal func_8005553C -/* 8AC524 80240594 240507D0 */ addiu $a1, $zero, 0x7d0 -/* 8AC528 80240598 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC52C 8024059C 24020002 */ addiu $v0, $zero, 2 -/* 8AC530 802405A0 03E00008 */ jr $ra -/* 8AC534 802405A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s deleted file mode 100644 index c88ac530ac..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_8AC538 -/* 8AC538 802405A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC53C 802405AC 0000202D */ daddu $a0, $zero, $zero -/* 8AC540 802405B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC544 802405B4 0C015564 */ jal func_80055590 -/* 8AC548 802405B8 240507D0 */ addiu $a1, $zero, 0x7d0 -/* 8AC54C 802405BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC550 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 8AC554 802405C4 03E00008 */ jr $ra -/* 8AC558 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s deleted file mode 100644 index e16eb9d325..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405CC_8AC55C -/* 8AC55C 802405CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC560 802405D0 0000202D */ daddu $a0, $zero, $zero -/* 8AC564 802405D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC568 802405D8 0C01553A */ jal func_800554E8 -/* 8AC56C 802405DC 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8AC570 802405E0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC574 802405E4 24020002 */ addiu $v0, $zero, 2 -/* 8AC578 802405E8 03E00008 */ jr $ra -/* 8AC57C 802405EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s index 17a0ee80ea..fc4c63b986 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s @@ -6,8 +6,8 @@ glabel func_80241DC4_A4A384 /* A4A388 80241DC8 3C05FE36 */ lui $a1, 0xfe36 /* A4A38C 80241DCC AFBF0010 */ sw $ra, 0x10($sp) /* A4A390 80241DD0 8C820148 */ lw $v0, 0x148($a0) -/* A4A394 80241DD4 3C06800B */ lui $a2, 0x800b -/* A4A398 80241DD8 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A4A394 80241DD4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A4A398 80241DD8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A4A39C 80241DDC 34A53C80 */ ori $a1, $a1, 0x3c80 /* A4A3A0 80241DE0 00C23026 */ xor $a2, $a2, $v0 /* A4A3A4 80241DE4 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s index 04075a251d..210996abf8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s @@ -6,8 +6,8 @@ glabel func_8024141C_A4DE3C /* A4DE40 80241420 3C05FE36 */ lui $a1, 0xfe36 /* A4DE44 80241424 AFBF0010 */ sw $ra, 0x10($sp) /* A4DE48 80241428 8C820148 */ lw $v0, 0x148($a0) -/* A4DE4C 8024142C 3C06800B */ lui $a2, 0x800b -/* A4DE50 80241430 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A4DE4C 8024142C 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A4DE50 80241430 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A4DE54 80241434 34A53C80 */ ori $a1, $a1, 0x3c80 /* A4DE58 80241438 00C23026 */ xor $a2, $a2, $v0 /* A4DE5C 8024143C 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s index c0ac05a300..e123baebee 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s @@ -6,8 +6,8 @@ glabel func_802412B4_A502B4 /* A502B8 802412B8 3C05FE36 */ lui $a1, 0xfe36 /* A502BC 802412BC AFBF0010 */ sw $ra, 0x10($sp) /* A502C0 802412C0 8C820148 */ lw $v0, 0x148($a0) -/* A502C4 802412C4 3C06800B */ lui $a2, 0x800b -/* A502C8 802412C8 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A502C4 802412C4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A502C8 802412C8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A502CC 802412CC 34A53C80 */ ori $a1, $a1, 0x3c80 /* A502D0 802412D0 00C23026 */ xor $a2, $a2, $v0 /* A502D4 802412D4 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s index d207d590a6..2c0932f688 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s @@ -6,8 +6,8 @@ glabel func_80241524_A94C64 /* A94C68 80241528 3C05FE36 */ lui $a1, 0xfe36 /* A94C6C 8024152C AFBF0010 */ sw $ra, 0x10($sp) /* A94C70 80241530 8C820148 */ lw $v0, 0x148($a0) -/* A94C74 80241534 3C06800B */ lui $a2, 0x800b -/* A94C78 80241538 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A94C74 80241534 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A94C78 80241538 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A94C7C 8024153C 34A53C80 */ ori $a1, $a1, 0x3c80 /* A94C80 80241540 00C23026 */ xor $a2, $a2, $v0 /* A94C84 80241544 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s index 3c386d2a3b..4e840b1c7a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s @@ -6,8 +6,8 @@ glabel func_80243504_A96C44 /* A96C48 80243508 3C05FE36 */ lui $a1, 0xfe36 /* A96C4C 8024350C AFBF0010 */ sw $ra, 0x10($sp) /* A96C50 80243510 8C820148 */ lw $v0, 0x148($a0) -/* A96C54 80243514 3C06800B */ lui $a2, 0x800b -/* A96C58 80243518 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A96C54 80243514 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A96C58 80243518 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A96C5C 8024351C 34A53C80 */ ori $a1, $a1, 0x3c80 /* A96C60 80243520 00C23026 */ xor $a2, $a2, $v0 /* A96C64 80243524 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s index 698e374971..4aff6c4dfa 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s @@ -6,8 +6,8 @@ glabel func_80241384_A9A914 /* A9A918 80241388 3C05FE36 */ lui $a1, 0xfe36 /* A9A91C 8024138C AFBF0010 */ sw $ra, 0x10($sp) /* A9A920 80241390 8C820148 */ lw $v0, 0x148($a0) -/* A9A924 80241394 3C06800B */ lui $a2, 0x800b -/* A9A928 80241398 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A9A924 80241394 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A9A928 80241398 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A9A92C 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 /* A9A930 802413A0 00C23026 */ xor $a2, $a2, $v0 /* A9A934 802413A4 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s index e4c0d0d364..6446b26c99 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s @@ -6,8 +6,8 @@ glabel func_80241384_AA00C4 /* AA00C8 80241388 3C05FE36 */ lui $a1, 0xfe36 /* AA00CC 8024138C AFBF0010 */ sw $ra, 0x10($sp) /* AA00D0 80241390 8C820148 */ lw $v0, 0x148($a0) -/* AA00D4 80241394 3C06800B */ lui $a2, 0x800b -/* AA00D8 80241398 8CC60F9C */ lw $a2, 0xf9c($a2) +/* AA00D4 80241394 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* AA00D8 80241398 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* AA00DC 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 /* AA00E0 802413A0 00C23026 */ xor $a2, $a2, $v0 /* AA00E4 802413A4 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s index dd0c30bb0c..8bc4b14a03 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s @@ -6,8 +6,8 @@ glabel func_80241214_A61BE4 /* A61BE8 80241218 3C05FE36 */ lui $a1, 0xfe36 /* A61BEC 8024121C AFBF0010 */ sw $ra, 0x10($sp) /* A61BF0 80241220 8C820148 */ lw $v0, 0x148($a0) -/* A61BF4 80241224 3C06800B */ lui $a2, 0x800b -/* A61BF8 80241228 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A61BF4 80241224 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A61BF8 80241228 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A61BFC 8024122C 34A53C80 */ ori $a1, $a1, 0x3c80 /* A61C00 80241230 00C23026 */ xor $a2, $a2, $v0 /* A61C04 80241234 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s index 7d73155db4..614677514b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s @@ -6,8 +6,8 @@ glabel func_802413CC_A6545C /* A65460 802413D0 3C05FE36 */ lui $a1, 0xfe36 /* A65464 802413D4 AFBF0010 */ sw $ra, 0x10($sp) /* A65468 802413D8 8C820148 */ lw $v0, 0x148($a0) -/* A6546C 802413DC 3C06800B */ lui $a2, 0x800b -/* A65470 802413E0 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A6546C 802413DC 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A65470 802413E0 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A65474 802413E4 34A53C80 */ ori $a1, $a1, 0x3c80 /* A65478 802413E8 00C23026 */ xor $a2, $a2, $v0 /* A6547C 802413EC 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s index b62c620db6..2b4c656970 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s @@ -6,8 +6,8 @@ glabel func_802412F4_A683F4 /* A683F8 802412F8 3C05FE36 */ lui $a1, 0xfe36 /* A683FC 802412FC AFBF0010 */ sw $ra, 0x10($sp) /* A68400 80241300 8C820148 */ lw $v0, 0x148($a0) -/* A68404 80241304 3C06800B */ lui $a2, 0x800b -/* A68408 80241308 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A68404 80241304 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A68408 80241308 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A6840C 8024130C 34A53C80 */ ori $a1, $a1, 0x3c80 /* A68410 80241310 00C23026 */ xor $a2, $a2, $v0 /* A68414 80241314 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s index cb6166a364..5a1b21582d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s @@ -6,8 +6,8 @@ glabel func_802422B8_A70698 /* A7069C 802422BC 3C05FE36 */ lui $a1, 0xfe36 /* A706A0 802422C0 AFBF0010 */ sw $ra, 0x10($sp) /* A706A4 802422C4 8C820148 */ lw $v0, 0x148($a0) -/* A706A8 802422C8 3C06800B */ lui $a2, 0x800b -/* A706AC 802422CC 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A706A8 802422C8 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* A706AC 802422CC 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* A706B0 802422D0 34A53C80 */ ori $a1, $a1, 0x3c80 /* A706B4 802422D4 00C23026 */ xor $a2, $a2, $v0 /* A706B8 802422D8 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s index 7c54ad6355..42740fe5b5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s @@ -301,8 +301,8 @@ glabel func_80241050_C69180 /* C695F8 802414C8 0C052757 */ jal play_sound_at_position /* C695FC 802414CC E7A00010 */ swc1 $f0, 0x10($sp) /* C69600 802414D0 2402002D */ addiu $v0, $zero, 0x2d -/* C69604 802414D4 3C01800B */ lui $at, 0x800b -/* C69608 802414D8 A0220F1A */ sb $v0, 0xf1a($at) +/* C69604 802414D4 3C01800B */ lui $at, %hi(gCurrentEncounter+0xA) +/* C69608 802414D8 A0220F1A */ sb $v0, %lo(gCurrentEncounter+0xA)($at) /* C6960C 802414DC C6600028 */ lwc1 $f0, 0x28($s3) /* C69610 802414E0 C6620030 */ lwc1 $f2, 0x30($s3) /* C69614 802414E4 2402002D */ addiu $v0, $zero, 0x2d diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s index 155f31cbe9..1720787c8e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s @@ -301,8 +301,8 @@ glabel func_80241F4C_C820EC /* C82564 802423C4 0C052757 */ jal play_sound_at_position /* C82568 802423C8 E7A00010 */ swc1 $f0, 0x10($sp) /* C8256C 802423CC 2402002D */ addiu $v0, $zero, 0x2d -/* C82570 802423D0 3C01800B */ lui $at, 0x800b -/* C82574 802423D4 A0220F1A */ sb $v0, 0xf1a($at) +/* C82570 802423D0 3C01800B */ lui $at, %hi(gCurrentEncounter+0xA) +/* C82574 802423D4 A0220F1A */ sb $v0, %lo(gCurrentEncounter+0xA)($at) /* C82578 802423D8 C6600028 */ lwc1 $f0, 0x28($s3) /* C8257C 802423DC C6620030 */ lwc1 $f2, 0x30($s3) /* C82580 802423E0 2402002D */ addiu $v0, $zero, 0x2d diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s index b57040463b..07727a23ba 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s @@ -12,9 +12,9 @@ glabel func_80242178_7ECE88 /* 7ECEA4 80242194 82030004 */ lb $v1, 4($s0) /* 7ECEA8 80242198 00021080 */ sll $v0, $v0, 2 /* 7ECEAC 8024219C 00031880 */ sll $v1, $v1, 2 -/* 7ECEB0 802421A0 3C04800B */ lui $a0, 0x800b +/* 7ECEB0 802421A0 3C04800B */ lui $a0, %hi(gCurrentEncounter+0x28) /* 7ECEB4 802421A4 00832021 */ addu $a0, $a0, $v1 -/* 7ECEB8 802421A8 8C840F38 */ lw $a0, 0xf38($a0) +/* 7ECEB8 802421A8 8C840F38 */ lw $a0, %lo(gCurrentEncounter+0x28)($a0) /* 7ECEBC 802421AC 3C038025 */ lui $v1, 0x8025 /* 7ECEC0 802421B0 00621821 */ addu $v1, $v1, $v0 /* 7ECEC4 802421B4 9463A632 */ lhu $v1, -0x59ce($v1) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s index 5eaa0dbc89..434e29bc59 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s @@ -6,8 +6,8 @@ glabel func_80242B70_DA0040 /* DA0044 80242B74 3C05FE36 */ lui $a1, 0xfe36 /* DA0048 80242B78 AFBF0010 */ sw $ra, 0x10($sp) /* DA004C 80242B7C 8C820148 */ lw $v0, 0x148($a0) -/* DA0050 80242B80 3C06800B */ lui $a2, 0x800b -/* DA0054 80242B84 8CC60F9C */ lw $a2, 0xf9c($a2) +/* DA0050 80242B80 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* DA0054 80242B84 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* DA0058 80242B88 34A53C80 */ ori $a1, $a1, 0x3c80 /* DA005C 80242B8C 00C23026 */ xor $a2, $a2, $v0 /* DA0060 80242B90 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s index 3d833e26e1..f7a949c140 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s @@ -6,8 +6,8 @@ glabel func_80243580_DD0250 /* DD0254 80243584 3C05FE36 */ lui $a1, 0xfe36 /* DD0258 80243588 AFBF0010 */ sw $ra, 0x10($sp) /* DD025C 8024358C 8C820148 */ lw $v0, 0x148($a0) -/* DD0260 80243590 3C06800B */ lui $a2, 0x800b -/* DD0264 80243594 8CC60F9C */ lw $a2, 0xf9c($a2) +/* DD0260 80243590 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* DD0264 80243594 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* DD0268 80243598 34A53C80 */ ori $a1, $a1, 0x3c80 /* DD026C 8024359C 00C23026 */ xor $a2, $a2, $v0 /* DD0270 802435A0 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s index 951f2cf354..770626c909 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s @@ -6,8 +6,8 @@ glabel func_802436D4_DF2574 /* DF2578 802436D8 3C05FE36 */ lui $a1, 0xfe36 /* DF257C 802436DC AFBF0010 */ sw $ra, 0x10($sp) /* DF2580 802436E0 8C820148 */ lw $v0, 0x148($a0) -/* DF2584 802436E4 3C06800B */ lui $a2, 0x800b -/* DF2588 802436E8 8CC60F9C */ lw $a2, 0xf9c($a2) +/* DF2584 802436E4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) +/* DF2588 802436E8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) /* DF258C 802436EC 34A53C80 */ ori $a1, $a1, 0x3c80 /* DF2590 802436F0 00C23026 */ xor $a2, $a2, $v0 /* DF2594 802436F4 0C0B2026 */ jal set_variable diff --git a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s index b168610476..a304b0b80f 100644 --- a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s +++ b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s @@ -12,9 +12,9 @@ glabel func_80240A30_869EE0 /* 869EFC 80240A4C 82030004 */ lb $v1, 4($s0) /* 869F00 80240A50 00021080 */ sll $v0, $v0, 2 /* 869F04 80240A54 00031880 */ sll $v1, $v1, 2 -/* 869F08 80240A58 3C04800B */ lui $a0, 0x800b +/* 869F08 80240A58 3C04800B */ lui $a0, %hi(gCurrentEncounter+0x28) /* 869F0C 80240A5C 00832021 */ addu $a0, $a0, $v1 -/* 869F10 80240A60 8C840F38 */ lw $a0, 0xf38($a0) +/* 869F10 80240A60 8C840F38 */ lw $a0, %lo(gCurrentEncounter+0x28)($a0) /* 869F14 80240A64 3C038024 */ lui $v1, 0x8024 /* 869F18 80240A68 00621821 */ addu $v1, $v1, $v0 /* 869F1C 80240A6C 94632B7E */ lhu $v1, 0x2b7e($v1) diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s index c9d206cdd5..e6b187648d 100644 --- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s +++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s @@ -12,9 +12,9 @@ glabel func_80240940_86D080 /* 86D09C 8024095C 82030004 */ lb $v1, 4($s0) /* 86D0A0 80240960 00021080 */ sll $v0, $v0, 2 /* 86D0A4 80240964 00031880 */ sll $v1, $v1, 2 -/* 86D0A8 80240968 3C04800B */ lui $a0, 0x800b +/* 86D0A8 80240968 3C04800B */ lui $a0, %hi(gCurrentEncounter+0x28) /* 86D0AC 8024096C 00832021 */ addu $a0, $a0, $v1 -/* 86D0B0 80240970 8C840F38 */ lw $a0, 0xf38($a0) +/* 86D0B0 80240970 8C840F38 */ lw $a0, %lo(gCurrentEncounter+0x28)($a0) /* 86D0B4 80240974 3C038024 */ lui $v1, 0x8024 /* 86D0B8 80240978 00621821 */ addu $v1, $v1, $v0 /* 86D0BC 8024097C 94631BAE */ lhu $v1, 0x1bae($v1) diff --git a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s index a057ce03b6..be91c4398a 100644 --- a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s +++ b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s @@ -12,9 +12,9 @@ glabel func_80240A5C_87F84C /* 87F868 80240A78 82030004 */ lb $v1, 4($s0) /* 87F86C 80240A7C 00021080 */ sll $v0, $v0, 2 /* 87F870 80240A80 00031880 */ sll $v1, $v1, 2 -/* 87F874 80240A84 3C04800B */ lui $a0, 0x800b +/* 87F874 80240A84 3C04800B */ lui $a0, %hi(gCurrentEncounter+0x28) /* 87F878 80240A88 00832021 */ addu $a0, $a0, $v1 -/* 87F87C 80240A8C 8C840F38 */ lw $a0, 0xf38($a0) +/* 87F87C 80240A8C 8C840F38 */ lw $a0, %lo(gCurrentEncounter+0x28)($a0) /* 87F880 80240A90 3C038024 */ lui $v1, 0x8024 /* 87F884 80240A94 00621821 */ addu $v1, $v1, $v0 /* 87F888 80240A98 94632C0E */ lhu $v1, 0x2c0e($v1) diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s index 3734e8eab1..c2ac3c39df 100644 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s +++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s @@ -301,8 +301,8 @@ glabel func_80240310_9BB5B0 /* 9BBA28 80240788 0C052757 */ jal play_sound_at_position /* 9BBA2C 8024078C E7A00010 */ swc1 $f0, 0x10($sp) /* 9BBA30 80240790 2402002D */ addiu $v0, $zero, 0x2d -/* 9BBA34 80240794 3C01800B */ lui $at, 0x800b -/* 9BBA38 80240798 A0220F1A */ sb $v0, 0xf1a($at) +/* 9BBA34 80240794 3C01800B */ lui $at, %hi(gCurrentEncounter+0xA) +/* 9BBA38 80240798 A0220F1A */ sb $v0, %lo(gCurrentEncounter+0xA)($at) /* 9BBA3C 8024079C C6600028 */ lwc1 $f0, 0x28($s3) /* 9BBA40 802407A0 C6620030 */ lwc1 $f2, 0x30($s3) /* 9BBA44 802407A4 2402002D */ addiu $v0, $zero, 0x2d diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s new file mode 100644 index 0000000000..a65ddabbd8 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s @@ -0,0 +1,233 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel MakeShop +/* 7E26E0 80281860 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 7E26E4 80281864 AFB10044 */ sw $s1, 0x44($sp) +/* 7E26E8 80281868 0080882D */ daddu $s1, $a0, $zero +/* 7E26EC 8028186C AFBF0064 */ sw $ra, 0x64($sp) +/* 7E26F0 80281870 AFBE0060 */ sw $fp, 0x60($sp) +/* 7E26F4 80281874 AFB7005C */ sw $s7, 0x5c($sp) +/* 7E26F8 80281878 AFB60058 */ sw $s6, 0x58($sp) +/* 7E26FC 8028187C AFB50054 */ sw $s5, 0x54($sp) +/* 7E2700 80281880 AFB40050 */ sw $s4, 0x50($sp) +/* 7E2704 80281884 AFB3004C */ sw $s3, 0x4c($sp) +/* 7E2708 80281888 AFB20048 */ sw $s2, 0x48($sp) +/* 7E270C 8028188C AFB00040 */ sw $s0, 0x40($sp) +/* 7E2710 80281890 8E30000C */ lw $s0, 0xc($s1) +/* 7E2714 80281894 8E050000 */ lw $a1, ($s0) +/* 7E2718 80281898 0C0B1EAF */ jal get_variable +/* 7E271C 8028189C 26100004 */ addiu $s0, $s0, 4 +/* 7E2720 802818A0 8E050000 */ lw $a1, ($s0) +/* 7E2724 802818A4 26100004 */ addiu $s0, $s0, 4 +/* 7E2728 802818A8 0220202D */ daddu $a0, $s1, $zero +/* 7E272C 802818AC 0C0B1EAF */ jal get_variable +/* 7E2730 802818B0 0040A82D */ daddu $s5, $v0, $zero +/* 7E2734 802818B4 8E050000 */ lw $a1, ($s0) +/* 7E2738 802818B8 26100004 */ addiu $s0, $s0, 4 +/* 7E273C 802818BC 0220202D */ daddu $a0, $s1, $zero +/* 7E2740 802818C0 0C0B1EAF */ jal get_variable +/* 7E2744 802818C4 0040982D */ daddu $s3, $v0, $zero +/* 7E2748 802818C8 0220202D */ daddu $a0, $s1, $zero +/* 7E274C 802818CC 8E050000 */ lw $a1, ($s0) +/* 7E2750 802818D0 0C0B1EAF */ jal get_variable +/* 7E2754 802818D4 0040882D */ daddu $s1, $v0, $zero +/* 7E2758 802818D8 2404035C */ addiu $a0, $zero, 0x35c +/* 7E275C 802818DC 0C00AB39 */ jal heap_malloc +/* 7E2760 802818E0 0040802D */ daddu $s0, $v0, $zero +/* 7E2764 802818E4 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 7E2768 802818E8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 7E276C 802818EC 0040A02D */ daddu $s4, $v0, $zero +/* 7E2770 802818F0 AC740144 */ sw $s4, 0x144($v1) +/* 7E2774 802818F4 AE950014 */ sw $s5, 0x14($s4) +/* 7E2778 802818F8 AE930018 */ sw $s3, 0x18($s4) +/* 7E277C 802818FC AE91001C */ sw $s1, 0x1c($s4) +/* 7E2780 80281900 AE900024 */ sw $s0, 0x24($s4) +/* 7E2784 80281904 8E620000 */ lw $v0, ($s3) +/* 7E2788 80281908 10400005 */ beqz $v0, .L80281920 +/* 7E278C 8028190C 0000902D */ daddu $s2, $zero, $zero +.L80281910: +/* 7E2790 80281910 2673000C */ addiu $s3, $s3, 0xc +/* 7E2794 80281914 8E620000 */ lw $v0, ($s3) +/* 7E2798 80281918 1440FFFD */ bnez $v0, .L80281910 +/* 7E279C 8028191C 26520001 */ addiu $s2, $s2, 1 +.L80281920: +/* 7E27A0 80281920 A6920002 */ sh $s2, 2($s4) +/* 7E27A4 80281924 12200008 */ beqz $s1, .L80281948 +/* 7E27A8 80281928 0000902D */ daddu $s2, $zero, $zero +/* 7E27AC 8028192C 8E220000 */ lw $v0, ($s1) +/* 7E27B0 80281930 10400005 */ beqz $v0, .L80281948 +/* 7E27B4 80281934 00000000 */ nop +.L80281938: +/* 7E27B8 80281938 2631000C */ addiu $s1, $s1, 0xc +/* 7E27BC 8028193C 8E220000 */ lw $v0, ($s1) +/* 7E27C0 80281940 1440FFFD */ bnez $v0, .L80281938 +/* 7E27C4 80281944 26520001 */ addiu $s2, $s2, 1 +.L80281948: +/* 7E27C8 80281948 86840002 */ lh $a0, 2($s4) +/* 7E27CC 8028194C 18800006 */ blez $a0, .L80281968 +/* 7E27D0 80281950 A6920004 */ sh $s2, 4($s4) +/* 7E27D4 80281954 0C00AB39 */ jal heap_malloc +/* 7E27D8 80281958 00042100 */ sll $a0, $a0, 4 +/* 7E27DC 8028195C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 7E27E0 80281960 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 7E27E4 80281964 AC620140 */ sw $v0, 0x140($v1) +.L80281968: +/* 7E27E8 80281968 8E930018 */ lw $s3, 0x18($s4) +/* 7E27EC 8028196C 8E620000 */ lw $v0, ($s3) +/* 7E27F0 80281970 8E950014 */ lw $s5, 0x14($s4) +/* 7E27F4 80281974 10400055 */ beqz $v0, .L80281ACC +/* 7E27F8 80281978 0000902D */ daddu $s2, $zero, $zero +/* 7E27FC 8028197C 3C1E8007 */ lui $fp, %hi(gGameStatusPtr) +/* 7E2800 80281980 27DE419C */ addiu $fp, $fp, %lo(gGameStatusPtr) +/* 7E2804 80281984 3C178028 */ lui $s7, 0x8028 +/* 7E2808 80281988 26F73F58 */ addiu $s7, $s7, 0x3f58 +/* 7E280C 8028198C 24160003 */ addiu $s6, $zero, 3 +/* 7E2810 80281990 26B10002 */ addiu $s1, $s5, 2 +.L80281994: +/* 7E2814 80281994 27A50028 */ addiu $a1, $sp, 0x28 +/* 7E2818 80281998 27A6002C */ addiu $a2, $sp, 0x2c +/* 7E281C 8028199C 27A70030 */ addiu $a3, $sp, 0x30 +/* 7E2820 802819A0 96A40000 */ lhu $a0, ($s5) +/* 7E2824 802819A4 27A20034 */ addiu $v0, $sp, 0x34 +/* 7E2828 802819A8 AFA20010 */ sw $v0, 0x10($sp) +/* 7E282C 802819AC 27A20038 */ addiu $v0, $sp, 0x38 +/* 7E2830 802819B0 AFA20014 */ sw $v0, 0x14($sp) +/* 7E2834 802819B4 27A2003C */ addiu $v0, $sp, 0x3c +/* 7E2838 802819B8 0C046C3B */ jal get_model_center_and_size +/* 7E283C 802819BC AFA20018 */ sw $v0, 0x18($sp) +/* 7E2840 802819C0 00128100 */ sll $s0, $s2, 4 +/* 7E2844 802819C4 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* 7E2848 802819C8 8FC30000 */ lw $v1, ($fp) +/* 7E284C 802819CC 3C0140C0 */ lui $at, 0x40c0 +/* 7E2850 802819D0 44812000 */ mtc1 $at, $f4 +/* 7E2854 802819D4 C7A00028 */ lwc1 $f0, 0x28($sp) +/* 7E2858 802819D8 8C620140 */ lw $v0, 0x140($v1) +/* 7E285C 802819DC 46041080 */ add.s $f2, $f2, $f4 +/* 7E2860 802819E0 02021021 */ addu $v0, $s0, $v0 +/* 7E2864 802819E4 E4400004 */ swc1 $f0, 4($v0) +/* 7E2868 802819E8 8C620140 */ lw $v0, 0x140($v1) +/* 7E286C 802819EC 02021021 */ addu $v0, $s0, $v0 +/* 7E2870 802819F0 E4420008 */ swc1 $f2, 8($v0) +/* 7E2874 802819F4 8C620140 */ lw $v0, 0x140($v1) +/* 7E2878 802819F8 C7A00030 */ lwc1 $f0, 0x30($sp) +/* 7E287C 802819FC 02021021 */ addu $v0, $s0, $v0 +/* 7E2880 80281A00 E440000C */ swc1 $f0, 0xc($v0) +/* 7E2884 80281A04 96A40000 */ lhu $a0, ($s5) +/* 7E2888 80281A08 0C046C04 */ jal get_model_list_index_from_tree_index +/* 7E288C 80281A0C E7A2002C */ swc1 $f2, 0x2c($sp) +/* 7E2890 80281A10 0C046B4C */ jal get_model_from_list_index +/* 7E2894 80281A14 0040202D */ daddu $a0, $v0, $zero +/* 7E2898 80281A18 C7A00028 */ lwc1 $f0, 0x28($sp) +/* 7E289C 80281A1C C7A2002C */ lwc1 $f2, 0x2c($sp) +/* 7E28A0 80281A20 94430000 */ lhu $v1, ($v0) +/* 7E28A4 80281A24 44050000 */ mfc1 $a1, $f0 +/* 7E28A8 80281A28 44061000 */ mfc1 $a2, $f2 +/* 7E28AC 80281A2C C7A00030 */ lwc1 $f0, 0x30($sp) +/* 7E28B0 80281A30 34630004 */ ori $v1, $v1, 4 +/* 7E28B4 80281A34 A4430000 */ sh $v1, ($v0) +/* 7E28B8 80281A38 8E630000 */ lw $v1, ($s3) +/* 7E28BC 80281A3C 8E840024 */ lw $a0, 0x24($s4) +/* 7E28C0 80281A40 24020001 */ addiu $v0, $zero, 1 +/* 7E28C4 80281A44 AFA20010 */ sw $v0, 0x10($sp) +/* 7E28C8 80281A48 AFA00014 */ sw $zero, 0x14($sp) +/* 7E28CC 80281A4C 44070000 */ mfc1 $a3, $f0 +/* 7E28D0 80281A50 0C04C6A5 */ jal make_item_entity_nodelay +/* 7E28D4 80281A54 00642025 */ or $a0, $v1, $a0 +/* 7E28D8 80281A58 8FC40000 */ lw $a0, ($fp) +/* 7E28DC 80281A5C 8C830140 */ lw $v1, 0x140($a0) +/* 7E28E0 80281A60 26B50004 */ addiu $s5, $s5, 4 +/* 7E28E4 80281A64 02031821 */ addu $v1, $s0, $v1 +/* 7E28E8 80281A68 AC620000 */ sw $v0, ($v1) +/* 7E28EC 80281A6C 8C820140 */ lw $v0, 0x140($a0) +/* 7E28F0 80281A70 2673000C */ addiu $s3, $s3, 0xc +/* 7E28F4 80281A74 02028021 */ addu $s0, $s0, $v0 +/* 7E28F8 80281A78 8E040000 */ lw $a0, ($s0) +/* 7E28FC 80281A7C 0C04D052 */ jal set_item_entity_flags +/* 7E2900 80281A80 24054000 */ addiu $a1, $zero, 0x4000 +/* 7E2904 80281A84 02E0202D */ daddu $a0, $s7, $zero +/* 7E2908 80281A88 24050080 */ addiu $a1, $zero, 0x80 +/* 7E290C 80281A8C 96260000 */ lhu $a2, ($s1) +/* 7E2910 80281A90 0240382D */ daddu $a3, $s2, $zero +/* 7E2914 80281A94 AFA00010 */ sw $zero, 0x10($sp) +/* 7E2918 80281A98 0C0B10AA */ jal bind_trigger_1 +/* 7E291C 80281A9C AFB60014 */ sw $s6, 0x14($sp) +/* 7E2920 80281AA0 02E0202D */ daddu $a0, $s7, $zero +/* 7E2924 80281AA4 24050800 */ addiu $a1, $zero, 0x800 +/* 7E2928 80281AA8 0240382D */ daddu $a3, $s2, $zero +/* 7E292C 80281AAC 96260000 */ lhu $a2, ($s1) +/* 7E2930 80281AB0 26310004 */ addiu $s1, $s1, 4 +/* 7E2934 80281AB4 AFA00010 */ sw $zero, 0x10($sp) +/* 7E2938 80281AB8 0C0B10AA */ jal bind_trigger_1 +/* 7E293C 80281ABC AFB60014 */ sw $s6, 0x14($sp) +/* 7E2940 80281AC0 8E620000 */ lw $v0, ($s3) +/* 7E2944 80281AC4 1440FFB3 */ bnez $v0, .L80281994 +/* 7E2948 80281AC8 26520001 */ addiu $s2, $s2, 1 +.L80281ACC: +/* 7E294C 80281ACC 3C048008 */ lui $a0, 0x8008 +/* 7E2950 80281AD0 24840868 */ addiu $a0, $a0, 0x868 +/* 7E2954 80281AD4 0C050529 */ jal create_icon +/* 7E2958 80281AD8 2410FFFF */ addiu $s0, $zero, -1 +/* 7E295C 80281ADC 0040202D */ daddu $a0, $v0, $zero +/* 7E2960 80281AE0 24050080 */ addiu $a1, $zero, 0x80 +/* 7E2964 80281AE4 0C051280 */ jal set_icon_flags +/* 7E2968 80281AE8 AE840020 */ sw $a0, 0x20($s4) +/* 7E296C 80281AEC 8E840020 */ lw $a0, 0x20($s4) +/* 7E2970 80281AF0 0C05128B */ jal clear_icon_flags +/* 7E2974 80281AF4 34058000 */ ori $a1, $zero, 0x8000 +/* 7E2978 80281AF8 3C058028 */ lui $a1, %hi(draw_shop_items) +/* 7E297C 80281AFC 24A51524 */ addiu $a1, $a1, %lo(draw_shop_items) +/* 7E2980 80281B00 0C048C8F */ jal bind_dynamic_entity_7 +/* 7E2984 80281B04 0000202D */ daddu $a0, $zero, $zero +/* 7E2988 80281B08 0C048D8F */ jal get_dynamic_entity +/* 7E298C 80281B0C 0040202D */ daddu $a0, $v0, $zero +/* 7E2990 80281B10 2404000A */ addiu $a0, $zero, 0xa +/* 7E2994 80281B14 24050064 */ addiu $a1, $zero, 0x64 +/* 7E2998 80281B18 24060042 */ addiu $a2, $zero, 0x42 +/* 7E299C 80281B1C 24070078 */ addiu $a3, $zero, 0x78 +/* 7E29A0 80281B20 2402001C */ addiu $v0, $zero, 0x1c +/* 7E29A4 80281B24 AFA20010 */ sw $v0, 0x10($sp) +/* 7E29A8 80281B28 3C028028 */ lui $v0, 0x8028 +/* 7E29AC 80281B2C 24421434 */ addiu $v0, $v0, 0x1434 +/* 7E29B0 80281B30 AFA00014 */ sw $zero, 0x14($sp) +/* 7E29B4 80281B34 AFA20018 */ sw $v0, 0x18($sp) +/* 7E29B8 80281B38 AFA0001C */ sw $zero, 0x1c($sp) +/* 7E29BC 80281B3C 0C051F32 */ jal set_ui_panel_properties +/* 7E29C0 80281B40 AFB00020 */ sw $s0, 0x20($sp) +/* 7E29C4 80281B44 2404000B */ addiu $a0, $zero, 0xb +/* 7E29C8 80281B48 24050020 */ addiu $a1, $zero, 0x20 +/* 7E29CC 80281B4C 240600B8 */ addiu $a2, $zero, 0xb8 +/* 7E29D0 80281B50 24070100 */ addiu $a3, $zero, 0x100 +/* 7E29D4 80281B54 00A0102D */ daddu $v0, $a1, $zero +/* 7E29D8 80281B58 AFA20010 */ sw $v0, 0x10($sp) +/* 7E29DC 80281B5C 24020001 */ addiu $v0, $zero, 1 +/* 7E29E0 80281B60 AFA20014 */ sw $v0, 0x14($sp) +/* 7E29E4 80281B64 3C028028 */ lui $v0, 0x8028 +/* 7E29E8 80281B68 244214D0 */ addiu $v0, $v0, 0x14d0 +/* 7E29EC 80281B6C AFA20018 */ sw $v0, 0x18($sp) +/* 7E29F0 80281B70 AFA0001C */ sw $zero, 0x1c($sp) +/* 7E29F4 80281B74 0C051F32 */ jal set_ui_panel_properties +/* 7E29F8 80281B78 AFB00020 */ sw $s0, 0x20($sp) +/* 7E29FC 80281B7C 3C048015 */ lui $a0, 0x8015 +/* 7E2A00 80281B80 2484F150 */ addiu $a0, $a0, -0xeb0 +/* 7E2A04 80281B84 24030009 */ addiu $v1, $zero, 9 +/* 7E2A08 80281B88 AC830028 */ sw $v1, 0x28($a0) +/* 7E2A0C 80281B8C 24030003 */ addiu $v1, $zero, 3 +/* 7E2A10 80281B90 AC83002C */ sw $v1, 0x2c($a0) +/* 7E2A14 80281B94 AE800008 */ sw $zero, 8($s4) +/* 7E2A18 80281B98 AE80000C */ sw $zero, 0xc($s4) +/* 7E2A1C 80281B9C A6800000 */ sh $zero, ($s4) +/* 7E2A20 80281BA0 AE800010 */ sw $zero, 0x10($s4) +/* 7E2A24 80281BA4 8FBF0064 */ lw $ra, 0x64($sp) +/* 7E2A28 80281BA8 8FBE0060 */ lw $fp, 0x60($sp) +/* 7E2A2C 80281BAC 8FB7005C */ lw $s7, 0x5c($sp) +/* 7E2A30 80281BB0 8FB60058 */ lw $s6, 0x58($sp) +/* 7E2A34 80281BB4 8FB50054 */ lw $s5, 0x54($sp) +/* 7E2A38 80281BB8 8FB40050 */ lw $s4, 0x50($sp) +/* 7E2A3C 80281BBC 8FB3004C */ lw $s3, 0x4c($sp) +/* 7E2A40 80281BC0 8FB20048 */ lw $s2, 0x48($sp) +/* 7E2A44 80281BC4 8FB10044 */ lw $s1, 0x44($sp) +/* 7E2A48 80281BC8 8FB00040 */ lw $s0, 0x40($sp) +/* 7E2A4C 80281BCC 24020002 */ addiu $v0, $zero, 2 +/* 7E2A50 80281BD0 03E00008 */ jr $ra +/* 7E2A54 80281BD4 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s new file mode 100644 index 0000000000..f2774454e3 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel MakeShopOwner +/* 7E2A58 80281BD8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E2A5C 80281BDC AFBF0014 */ sw $ra, 0x14($sp) +/* 7E2A60 80281BE0 AFB00010 */ sw $s0, 0x10($sp) +/* 7E2A64 80281BE4 8C82000C */ lw $v0, 0xc($a0) +/* 7E2A68 80281BE8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 7E2A6C 80281BEC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 7E2A70 80281BF0 8C450000 */ lw $a1, ($v0) +/* 7E2A74 80281BF4 0C0B1EAF */ jal get_variable +/* 7E2A78 80281BF8 8C700144 */ lw $s0, 0x144($v1) +/* 7E2A7C 80281BFC AE020010 */ sw $v0, 0x10($s0) +/* 7E2A80 80281C00 8FBF0014 */ lw $ra, 0x14($sp) +/* 7E2A84 80281C04 8FB00010 */ lw $s0, 0x10($sp) +/* 7E2A88 80281C08 24020002 */ addiu $v0, $zero, 2 +/* 7E2A8C 80281C0C 03E00008 */ jr $ra +/* 7E2A90 80281C10 27BD0018 */ addiu $sp, $sp, 0x18 +/* 7E2A94 80281C14 00000000 */ nop +/* 7E2A98 80281C18 00000000 */ nop +/* 7E2A9C 80281C1C 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s new file mode 100644 index 0000000000..89553acca3 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s @@ -0,0 +1,221 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel draw_shop_items +/* 7E23A4 80281524 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E23A8 80281528 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E23AC 8028152C 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 7E23B0 80281530 AFBF005C */ sw $ra, 0x5c($sp) +/* 7E23B4 80281534 AFBE0058 */ sw $fp, 0x58($sp) +/* 7E23B8 80281538 AFB70054 */ sw $s7, 0x54($sp) +/* 7E23BC 8028153C AFB60050 */ sw $s6, 0x50($sp) +/* 7E23C0 80281540 AFB5004C */ sw $s5, 0x4c($sp) +/* 7E23C4 80281544 AFB40048 */ sw $s4, 0x48($sp) +/* 7E23C8 80281548 AFB30044 */ sw $s3, 0x44($sp) +/* 7E23CC 8028154C AFB20040 */ sw $s2, 0x40($sp) +/* 7E23D0 80281550 AFB1003C */ sw $s1, 0x3c($sp) +/* 7E23D4 80281554 AFB00038 */ sw $s0, 0x38($sp) +/* 7E23D8 80281558 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 7E23DC 8028155C F7B40060 */ sdc1 $f20, 0x60($sp) +/* 7E23E0 80281560 8C520144 */ lw $s2, 0x144($v0) +/* 7E23E4 80281564 96420000 */ lhu $v0, ($s2) +/* 7E23E8 80281568 30420001 */ andi $v0, $v0, 1 +/* 7E23EC 8028156C 10400005 */ beqz $v0, .L80281584 +/* 7E23F0 80281570 2404000A */ addiu $a0, $zero, 0xa +/* 7E23F4 80281574 3C108014 */ lui $s0, %hi(D_80147474) +/* 7E23F8 80281578 26107474 */ addiu $s0, $s0, %lo(D_80147474) +/* 7E23FC 8028157C 080A0563 */ j .L8028158C +/* 7E2400 80281580 00000000 */ nop +.L80281584: +/* 7E2404 80281584 3C108014 */ lui $s0, %hi(D_80147574) +/* 7E2408 80281588 26107574 */ addiu $s0, $s0, %lo(D_80147574) +.L8028158C: +/* 7E240C 8028158C 0C051F9F */ jal func_80147E7C +/* 7E2410 80281590 0200282D */ daddu $a1, $s0, $zero +/* 7E2414 80281594 2404000B */ addiu $a0, $zero, 0xb +/* 7E2418 80281598 0C051F9F */ jal func_80147E7C +/* 7E241C 8028159C 0200282D */ daddu $a1, $s0, $zero +/* 7E2420 802815A0 96420000 */ lhu $v0, ($s2) +/* 7E2424 802815A4 30420001 */ andi $v0, $v0, 1 +/* 7E2428 802815A8 10400096 */ beqz $v0, .L80281804 +/* 7E242C 802815AC 00000000 */ nop +/* 7E2430 802815B0 3C04800B */ lui $a0, %hi(gCameras) +/* 7E2434 802815B4 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* 7E2438 802815B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E243C 802815BC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E2440 802815C0 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 7E2444 802815C4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 7E2448 802815C8 8C5E0140 */ lw $fp, 0x140($v0) +/* 7E244C 802815CC 00031080 */ sll $v0, $v1, 2 +/* 7E2450 802815D0 00431021 */ addu $v0, $v0, $v1 +/* 7E2454 802815D4 00021080 */ sll $v0, $v0, 2 +/* 7E2458 802815D8 00431023 */ subu $v0, $v0, $v1 +/* 7E245C 802815DC 000218C0 */ sll $v1, $v0, 3 +/* 7E2460 802815E0 00431021 */ addu $v0, $v0, $v1 +/* 7E2464 802815E4 000210C0 */ sll $v0, $v0, 3 +/* 7E2468 802815E8 0044A821 */ addu $s5, $v0, $a0 +/* 7E246C 802815EC 86420002 */ lh $v0, 2($s2) +/* 7E2470 802815F0 8E440018 */ lw $a0, 0x18($s2) +/* 7E2474 802815F4 18400083 */ blez $v0, .L80281804 +/* 7E2478 802815F8 0000B82D */ daddu $s7, $zero, $zero +/* 7E247C 802815FC 27D4000C */ addiu $s4, $fp, 0xc +/* 7E2480 80281600 24960004 */ addiu $s6, $a0, 4 +/* 7E2484 80281604 3C013F80 */ lui $at, 0x3f80 +/* 7E2488 80281608 4481B000 */ mtc1 $at, $f22 +/* 7E248C 8028160C 3C013FE0 */ lui $at, 0x3fe0 +/* 7E2490 80281610 4481A800 */ mtc1 $at, $f21 +/* 7E2494 80281614 4480A000 */ mtc1 $zero, $f20 +.L80281618: +/* 7E2498 80281618 26A400D4 */ addiu $a0, $s5, 0xd4 +/* 7E249C 8028161C C686FFF8 */ lwc1 $f6, -8($s4) +/* 7E24A0 80281620 C682FFFC */ lwc1 $f2, -4($s4) +/* 7E24A4 80281624 C6840000 */ lwc1 $f4, ($s4) +/* 7E24A8 80281628 3C0141F0 */ lui $at, 0x41f0 +/* 7E24AC 8028162C 44810000 */ mtc1 $at, $f0 +/* 7E24B0 80281630 27A20028 */ addiu $v0, $sp, 0x28 +/* 7E24B4 80281634 AFA20014 */ sw $v0, 0x14($sp) +/* 7E24B8 80281638 27A2002C */ addiu $v0, $sp, 0x2c +/* 7E24BC 8028163C AFA20018 */ sw $v0, 0x18($sp) +/* 7E24C0 80281640 27A20030 */ addiu $v0, $sp, 0x30 +/* 7E24C4 80281644 AFA2001C */ sw $v0, 0x1c($sp) +/* 7E24C8 80281648 46001080 */ add.s $f2, $f2, $f0 +/* 7E24CC 8028164C 44053000 */ mfc1 $a1, $f6 +/* 7E24D0 80281650 44072000 */ mfc1 $a3, $f4 +/* 7E24D4 80281654 44061000 */ mfc1 $a2, $f2 +/* 7E24D8 80281658 27A20034 */ addiu $v0, $sp, 0x34 +/* 7E24DC 8028165C E7B60010 */ swc1 $f22, 0x10($sp) +/* 7E24E0 80281660 0C00A588 */ jal transform_point +/* 7E24E4 80281664 AFA20020 */ sw $v0, 0x20($sp) +/* 7E24E8 80281668 C7A60034 */ lwc1 $f6, 0x34($sp) +/* 7E24EC 8028166C C7A00030 */ lwc1 $f0, 0x30($sp) +/* 7E24F0 80281670 4606B183 */ div.s $f6, $f22, $f6 +/* 7E24F4 80281674 46060002 */ mul.s $f0, $f0, $f6 +/* 7E24F8 80281678 00000000 */ nop +/* 7E24FC 8028167C 46160000 */ add.s $f0, $f0, $f22 +/* 7E2500 80281680 46000021 */ cvt.d.s $f0, $f0 +/* 7E2504 80281684 46340002 */ mul.d $f0, $f0, $f20 +/* 7E2508 80281688 00000000 */ nop +/* 7E250C 8028168C C7A20028 */ lwc1 $f2, 0x28($sp) +/* 7E2510 80281690 46061202 */ mul.s $f8, $f2, $f6 +/* 7E2514 80281694 00000000 */ nop +/* 7E2518 80281698 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* 7E251C 8028169C 46003087 */ neg.s $f2, $f6 +/* 7E2520 802816A0 46022282 */ mul.s $f10, $f4, $f2 +/* 7E2524 802816A4 00000000 */ nop +/* 7E2528 802816A8 44801000 */ mtc1 $zero, $f2 +/* 7E252C 802816AC E7A60034 */ swc1 $f6, 0x34($sp) +/* 7E2530 802816B0 E7A80028 */ swc1 $f8, 0x28($sp) +/* 7E2534 802816B4 E7AA002C */ swc1 $f10, 0x2c($sp) +/* 7E2538 802816B8 46200020 */ cvt.s.d $f0, $f0 +/* 7E253C 802816BC 4600103C */ c.lt.s $f2, $f0 +/* 7E2540 802816C0 00000000 */ nop +/* 7E2544 802816C4 45000048 */ bc1f .L802817E8 +/* 7E2548 802816C8 E7A00030 */ swc1 $f0, 0x30($sp) +/* 7E254C 802816CC 4616003C */ c.lt.s $f0, $f22 +/* 7E2550 802816D0 00000000 */ nop +/* 7E2554 802816D4 45020045 */ bc1fl .L802817EC +/* 7E2558 802816D8 26F70001 */ addiu $s7, $s7, 1 +/* 7E255C 802816DC 86A2000A */ lh $v0, 0xa($s5) +/* 7E2560 802816E0 44820000 */ mtc1 $v0, $f0 +/* 7E2564 802816E4 00000000 */ nop +/* 7E2568 802816E8 46800020 */ cvt.s.w $f0, $f0 +/* 7E256C 802816EC 46004102 */ mul.s $f4, $f8, $f0 +/* 7E2570 802816F0 00000000 */ nop +/* 7E2574 802816F4 46002100 */ add.s $f4, $f4, $f0 +/* 7E2578 802816F8 46002121 */ cvt.d.s $f4, $f4 +/* 7E257C 802816FC 46342102 */ mul.d $f4, $f4, $f20 +/* 7E2580 80281700 00000000 */ nop +/* 7E2584 80281704 86A2000C */ lh $v0, 0xc($s5) +/* 7E2588 80281708 44820000 */ mtc1 $v0, $f0 +/* 7E258C 8028170C 00000000 */ nop +/* 7E2590 80281710 46800020 */ cvt.s.w $f0, $f0 +/* 7E2594 80281714 46005082 */ mul.s $f2, $f10, $f0 +/* 7E2598 80281718 00000000 */ nop +/* 7E259C 8028171C 46001080 */ add.s $f2, $f2, $f0 +/* 7E25A0 80281720 460010A1 */ cvt.d.s $f2, $f2 +/* 7E25A4 80281724 46341082 */ mul.d $f2, $f2, $f20 +/* 7E25A8 80281728 00000000 */ nop +/* 7E25AC 8028172C 86A2000E */ lh $v0, 0xe($s5) +/* 7E25B0 80281730 44820000 */ mtc1 $v0, $f0 +/* 7E25B4 80281734 00000000 */ nop +/* 7E25B8 80281738 46800021 */ cvt.d.w $f0, $f0 +/* 7E25BC 8028173C 86A20010 */ lh $v0, 0x10($s5) +/* 7E25C0 80281740 46202100 */ add.d $f4, $f4, $f0 +/* 7E25C4 80281744 44820000 */ mtc1 $v0, $f0 +/* 7E25C8 80281748 00000000 */ nop +/* 7E25CC 8028174C 46800021 */ cvt.d.w $f0, $f0 +/* 7E25D0 80281750 8EC20000 */ lw $v0, ($s6) +/* 7E25D4 80281754 46201080 */ add.d $f2, $f2, $f0 +/* 7E25D8 80281758 28420064 */ slti $v0, $v0, 0x64 +/* 7E25DC 8028175C 4620230D */ trunc.w.d $f12, $f4 +/* 7E25E0 80281760 44116000 */ mfc1 $s1, $f12 +/* 7E25E4 80281764 4620130D */ trunc.w.d $f12, $f2 +/* 7E25E8 80281768 44136000 */ mfc1 $s3, $f12 +/* 7E25EC 8028176C 10400002 */ beqz $v0, .L80281778 +/* 7E25F0 80281770 0000802D */ daddu $s0, $zero, $zero +/* 7E25F4 80281774 2410FFFC */ addiu $s0, $zero, -4 +.L80281778: +/* 7E25F8 80281778 0C04C3D6 */ jal get_item_entity +/* 7E25FC 8028177C 8FC40000 */ lw $a0, ($fp) +/* 7E2600 80281780 8C420000 */ lw $v0, ($v0) +/* 7E2604 80281784 30420040 */ andi $v0, $v0, 0x40 +/* 7E2608 80281788 14400009 */ bnez $v0, .L802817B0 +/* 7E260C 8028178C 02302821 */ addu $a1, $s1, $s0 +/* 7E2610 80281790 0260302D */ daddu $a2, $s3, $zero +/* 7E2614 80281794 240200FF */ addiu $v0, $zero, 0xff +/* 7E2618 80281798 AFA00010 */ sw $zero, 0x10($sp) +/* 7E261C 8028179C AFA20014 */ sw $v0, 0x14($sp) +/* 7E2620 802817A0 AFA00018 */ sw $zero, 0x18($sp) +/* 7E2624 802817A4 8EC40000 */ lw $a0, ($s6) +/* 7E2628 802817A8 0C049DA7 */ jal draw_number +/* 7E262C 802817AC 24070001 */ addiu $a3, $zero, 1 +.L802817B0: +/* 7E2630 802817B0 8E420008 */ lw $v0, 8($s2) +/* 7E2634 802817B4 56E2000D */ bnel $s7, $v0, .L802817EC +/* 7E2638 802817B8 26F70001 */ addiu $s7, $s7, 1 +/* 7E263C 802817BC 02302821 */ addu $a1, $s1, $s0 +/* 7E2640 802817C0 24A5FFFA */ addiu $a1, $a1, -6 +/* 7E2644 802817C4 8E440020 */ lw $a0, 0x20($s2) +/* 7E2648 802817C8 0C051261 */ jal set_icon_render_pos +/* 7E264C 802817CC 26660005 */ addiu $a2, $s3, 5 +/* 7E2650 802817D0 8E440020 */ lw $a0, 0x20($s2) +/* 7E2654 802817D4 3C053F33 */ lui $a1, 0x3f33 +/* 7E2658 802817D8 0C051308 */ jal func_80144C20 +/* 7E265C 802817DC 34A53333 */ ori $a1, $a1, 0x3333 +/* 7E2660 802817E0 0C0511EA */ jal draw_icon_0 +/* 7E2664 802817E4 8E440020 */ lw $a0, 0x20($s2) +.L802817E8: +/* 7E2668 802817E8 26F70001 */ addiu $s7, $s7, 1 +.L802817EC: +/* 7E266C 802817EC 26D6000C */ addiu $s6, $s6, 0xc +/* 7E2670 802817F0 26940010 */ addiu $s4, $s4, 0x10 +/* 7E2674 802817F4 86420002 */ lh $v0, 2($s2) +/* 7E2678 802817F8 02E2102A */ slt $v0, $s7, $v0 +/* 7E267C 802817FC 1440FF86 */ bnez $v0, .L80281618 +/* 7E2680 80281800 27DE0010 */ addiu $fp, $fp, 0x10 +.L80281804: +/* 7E2684 80281804 8E420358 */ lw $v0, 0x358($s2) +/* 7E2688 80281808 18400003 */ blez $v0, .L80281818 +/* 7E268C 8028180C 2442FFFF */ addiu $v0, $v0, -1 +/* 7E2690 80281810 080A060A */ j .L80281828 +/* 7E2694 80281814 AE420358 */ sw $v0, 0x358($s2) +.L80281818: +/* 7E2698 80281818 96420000 */ lhu $v0, ($s2) +/* 7E269C 8028181C 3042FFFE */ andi $v0, $v0, 0xfffe +/* 7E26A0 80281820 0C03A640 */ jal func_800E9900 +/* 7E26A4 80281824 A6420000 */ sh $v0, ($s2) +.L80281828: +/* 7E26A8 80281828 8FBF005C */ lw $ra, 0x5c($sp) +/* 7E26AC 8028182C 8FBE0058 */ lw $fp, 0x58($sp) +/* 7E26B0 80281830 8FB70054 */ lw $s7, 0x54($sp) +/* 7E26B4 80281834 8FB60050 */ lw $s6, 0x50($sp) +/* 7E26B8 80281838 8FB5004C */ lw $s5, 0x4c($sp) +/* 7E26BC 8028183C 8FB40048 */ lw $s4, 0x48($sp) +/* 7E26C0 80281840 8FB30044 */ lw $s3, 0x44($sp) +/* 7E26C4 80281844 8FB20040 */ lw $s2, 0x40($sp) +/* 7E26C8 80281848 8FB1003C */ lw $s1, 0x3c($sp) +/* 7E26CC 8028184C 8FB00038 */ lw $s0, 0x38($sp) +/* 7E26D0 80281850 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 7E26D4 80281854 D7B40060 */ ldc1 $f20, 0x60($sp) +/* 7E26D8 80281858 03E00008 */ jr $ra +/* 7E26DC 8028185C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s new file mode 100644 index 0000000000..ce58438f1d --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280000 +/* 7E0E80 80280000 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E0E84 80280004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E0E88 80280008 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E0E8C 8028000C AFBF0018 */ sw $ra, 0x18($sp) +/* 7E0E90 80280010 AFB10014 */ sw $s1, 0x14($sp) +/* 7E0E94 80280014 AFB00010 */ sw $s0, 0x10($sp) +/* 7E0E98 80280018 8C510144 */ lw $s1, 0x144($v0) +/* 7E0E9C 8028001C 24050001 */ addiu $a1, $zero, 1 +/* 7E0EA0 80280020 8E220010 */ lw $v0, 0x10($s1) +/* 7E0EA4 80280024 8C430018 */ lw $v1, 0x18($v0) +/* 7E0EA8 80280028 00041080 */ sll $v0, $a0, 2 +/* 7E0EAC 8028002C 3C048028 */ lui $a0, 0x8028 +/* 7E0EB0 80280030 24843E80 */ addiu $a0, $a0, 0x3e80 +/* 7E0EB4 80280034 00431021 */ addu $v0, $v0, $v1 +/* 7E0EB8 80280038 8C500000 */ lw $s0, ($v0) +/* 7E0EBC 8028003C 0C0B0CF8 */ jal start_script +/* 7E0EC0 80280040 0000302D */ daddu $a2, $zero, $zero +/* 7E0EC4 80280044 0040202D */ daddu $a0, $v0, $zero +/* 7E0EC8 80280048 AC900084 */ sw $s0, 0x84($a0) +/* 7E0ECC 8028004C 8E220010 */ lw $v0, 0x10($s1) +/* 7E0ED0 80280050 8C420000 */ lw $v0, ($v0) +/* 7E0ED4 80280054 AC820088 */ sw $v0, 0x88($a0) +/* 7E0ED8 80280058 8E220010 */ lw $v0, 0x10($s1) +/* 7E0EDC 8028005C 8C420008 */ lw $v0, 8($v0) +/* 7E0EE0 80280060 AC82008C */ sw $v0, 0x8c($a0) +/* 7E0EE4 80280064 8E230010 */ lw $v1, 0x10($s1) +/* 7E0EE8 80280068 8C820144 */ lw $v0, 0x144($a0) +/* 7E0EEC 8028006C 8C630004 */ lw $v1, 4($v1) +/* 7E0EF0 80280070 AC830090 */ sw $v1, 0x90($a0) +/* 7E0EF4 80280074 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E0EF8 80280078 8FB10014 */ lw $s1, 0x14($sp) +/* 7E0EFC 8028007C 8FB00010 */ lw $s0, 0x10($sp) +/* 7E0F00 80280080 03E00008 */ jr $ra +/* 7E0F04 80280084 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s new file mode 100644 index 0000000000..4a75caa116 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280088 +/* 7E0F08 80280088 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E0F0C 8028008C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E0F10 80280090 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E0F14 80280094 AFB20018 */ sw $s2, 0x18($sp) +/* 7E0F18 80280098 00C0902D */ daddu $s2, $a2, $zero +/* 7E0F1C 8028009C AFB10014 */ sw $s1, 0x14($sp) +/* 7E0F20 802800A0 00E0882D */ daddu $s1, $a3, $zero +/* 7E0F24 802800A4 AFBF0020 */ sw $ra, 0x20($sp) +/* 7E0F28 802800A8 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E0F2C 802800AC AFB00010 */ sw $s0, 0x10($sp) +/* 7E0F30 802800B0 8C500144 */ lw $s0, 0x144($v0) +/* 7E0F34 802800B4 00041080 */ sll $v0, $a0, 2 +/* 7E0F38 802800B8 8E030010 */ lw $v1, 0x10($s0) +/* 7E0F3C 802800BC 00A0202D */ daddu $a0, $a1, $zero +/* 7E0F40 802800C0 8C630018 */ lw $v1, 0x18($v1) +/* 7E0F44 802800C4 00431021 */ addu $v0, $v0, $v1 +/* 7E0F48 802800C8 8C530000 */ lw $s3, ($v0) +/* 7E0F4C 802800CC 0C0496CF */ jal set_message_string +/* 7E0F50 802800D0 0000282D */ daddu $a1, $zero, $zero +/* 7E0F54 802800D4 0240202D */ daddu $a0, $s2, $zero +/* 7E0F58 802800D8 0C0496FA */ jal set_message_value +/* 7E0F5C 802800DC 24050001 */ addiu $a1, $zero, 1 +/* 7E0F60 802800E0 1A200005 */ blez $s1, .L802800F8 +/* 7E0F64 802800E4 0220202D */ daddu $a0, $s1, $zero +/* 7E0F68 802800E8 0C0496FA */ jal set_message_value +/* 7E0F6C 802800EC 24050002 */ addiu $a1, $zero, 2 +/* 7E0F70 802800F0 080A0047 */ j .L8028011C +/* 7E0F74 802800F4 00000000 */ nop +.L802800F8: +/* 7E0F78 802800F8 3C048015 */ lui $a0, 0x8015 +/* 7E0F7C 802800FC 2484C290 */ addiu $a0, $a0, -0x3d70 +/* 7E0F80 80280100 24020001 */ addiu $v0, $zero, 1 +/* 7E0F84 80280104 16420003 */ bne $s2, $v0, .L80280114 +/* 7E0F88 80280108 00000000 */ nop +/* 7E0F8C 8028010C 3C048015 */ lui $a0, 0x8015 +/* 7E0F90 80280110 2484C294 */ addiu $a0, $a0, -0x3d6c +.L80280114: +/* 7E0F94 80280114 0C0496CF */ jal set_message_string +/* 7E0F98 80280118 24050002 */ addiu $a1, $zero, 2 +.L8028011C: +/* 7E0F9C 8028011C 3C048028 */ lui $a0, 0x8028 +/* 7E0FA0 80280120 24843E80 */ addiu $a0, $a0, 0x3e80 +/* 7E0FA4 80280124 24050001 */ addiu $a1, $zero, 1 +/* 7E0FA8 80280128 0C0B0CF8 */ jal start_script +/* 7E0FAC 8028012C 0000302D */ daddu $a2, $zero, $zero +/* 7E0FB0 80280130 0040202D */ daddu $a0, $v0, $zero +/* 7E0FB4 80280134 AC930084 */ sw $s3, 0x84($a0) +/* 7E0FB8 80280138 8E020010 */ lw $v0, 0x10($s0) +/* 7E0FBC 8028013C 8C420000 */ lw $v0, ($v0) +/* 7E0FC0 80280140 AC820088 */ sw $v0, 0x88($a0) +/* 7E0FC4 80280144 8E020010 */ lw $v0, 0x10($s0) +/* 7E0FC8 80280148 8C420008 */ lw $v0, 8($v0) +/* 7E0FCC 8028014C AC82008C */ sw $v0, 0x8c($a0) +/* 7E0FD0 80280150 8E030010 */ lw $v1, 0x10($s0) +/* 7E0FD4 80280154 8C820144 */ lw $v0, 0x144($a0) +/* 7E0FD8 80280158 8C630004 */ lw $v1, 4($v1) +/* 7E0FDC 8028015C AC830090 */ sw $v1, 0x90($a0) +/* 7E0FE0 80280160 8FBF0020 */ lw $ra, 0x20($sp) +/* 7E0FE4 80280164 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E0FE8 80280168 8FB20018 */ lw $s2, 0x18($sp) +/* 7E0FEC 8028016C 8FB10014 */ lw $s1, 0x14($sp) +/* 7E0FF0 80280170 8FB00010 */ lw $s0, 0x10($sp) +/* 7E0FF4 80280174 03E00008 */ jr $ra +/* 7E0FF8 80280178 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s new file mode 100644 index 0000000000..9095827655 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8028017C +/* 7E0FFC 8028017C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E1000 80280180 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E1004 80280184 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E1008 80280188 AFBF0018 */ sw $ra, 0x18($sp) +/* 7E100C 8028018C AFB10014 */ sw $s1, 0x14($sp) +/* 7E1010 80280190 AFB00010 */ sw $s0, 0x10($sp) +/* 7E1014 80280194 8C510144 */ lw $s1, 0x144($v0) +/* 7E1018 80280198 24050001 */ addiu $a1, $zero, 1 +/* 7E101C 8028019C 8E220010 */ lw $v0, 0x10($s1) +/* 7E1020 802801A0 8C430018 */ lw $v1, 0x18($v0) +/* 7E1024 802801A4 00041080 */ sll $v0, $a0, 2 +/* 7E1028 802801A8 3C048028 */ lui $a0, 0x8028 +/* 7E102C 802801AC 24843EB0 */ addiu $a0, $a0, 0x3eb0 +/* 7E1030 802801B0 00431021 */ addu $v0, $v0, $v1 +/* 7E1034 802801B4 8C500000 */ lw $s0, ($v0) +/* 7E1038 802801B8 0C0B0CF8 */ jal start_script +/* 7E103C 802801BC 0000302D */ daddu $a2, $zero, $zero +/* 7E1040 802801C0 0040202D */ daddu $a0, $v0, $zero +/* 7E1044 802801C4 AC900084 */ sw $s0, 0x84($a0) +/* 7E1048 802801C8 8E220010 */ lw $v0, 0x10($s1) +/* 7E104C 802801CC 8C420000 */ lw $v0, ($v0) +/* 7E1050 802801D0 AC820088 */ sw $v0, 0x88($a0) +/* 7E1054 802801D4 8E220010 */ lw $v0, 0x10($s1) +/* 7E1058 802801D8 8C420008 */ lw $v0, 8($v0) +/* 7E105C 802801DC AC82008C */ sw $v0, 0x8c($a0) +/* 7E1060 802801E0 8E230010 */ lw $v1, 0x10($s1) +/* 7E1064 802801E4 8C820144 */ lw $v0, 0x144($a0) +/* 7E1068 802801E8 8C630004 */ lw $v1, 4($v1) +/* 7E106C 802801EC AC830090 */ sw $v1, 0x90($a0) +/* 7E1070 802801F0 AC83007C */ sw $v1, 0x7c($a0) +/* 7E1074 802801F4 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E1078 802801F8 8FB10014 */ lw $s1, 0x14($sp) +/* 7E107C 802801FC 8FB00010 */ lw $s0, 0x10($sp) +/* 7E1080 80280200 03E00008 */ jr $ra +/* 7E1084 80280204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s new file mode 100644 index 0000000000..46bbd922c6 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280208 +/* 7E1088 80280208 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E108C 8028020C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E1090 80280210 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E1094 80280214 AFB00010 */ sw $s0, 0x10($sp) +/* 7E1098 80280218 00A0802D */ daddu $s0, $a1, $zero +/* 7E109C 8028021C AFBF001C */ sw $ra, 0x1c($sp) +/* 7E10A0 80280220 AFB20018 */ sw $s2, 0x18($sp) +/* 7E10A4 80280224 AFB10014 */ sw $s1, 0x14($sp) +/* 7E10A8 80280228 8C510144 */ lw $s1, 0x144($v0) +/* 7E10AC 8028022C 0000282D */ daddu $a1, $zero, $zero +/* 7E10B0 80280230 8E230010 */ lw $v1, 0x10($s1) +/* 7E10B4 80280234 00041080 */ sll $v0, $a0, 2 +/* 7E10B8 80280238 8C630018 */ lw $v1, 0x18($v1) +/* 7E10BC 8028023C 00431021 */ addu $v0, $v0, $v1 +/* 7E10C0 80280240 8C520000 */ lw $s2, ($v0) +/* 7E10C4 80280244 0C0496FA */ jal set_message_value +/* 7E10C8 80280248 0200202D */ daddu $a0, $s0, $zero +/* 7E10CC 8028024C 3C048015 */ lui $a0, 0x8015 +/* 7E10D0 80280250 2484C290 */ addiu $a0, $a0, -0x3d70 +/* 7E10D4 80280254 24020001 */ addiu $v0, $zero, 1 +/* 7E10D8 80280258 16020003 */ bne $s0, $v0, .L80280268 +/* 7E10DC 8028025C 00000000 */ nop +/* 7E10E0 80280260 3C048015 */ lui $a0, 0x8015 +/* 7E10E4 80280264 2484C294 */ addiu $a0, $a0, -0x3d6c +.L80280268: +/* 7E10E8 80280268 0C0496CF */ jal set_message_string +/* 7E10EC 8028026C 24050001 */ addiu $a1, $zero, 1 +/* 7E10F0 80280270 3C048028 */ lui $a0, 0x8028 +/* 7E10F4 80280274 24843EB0 */ addiu $a0, $a0, 0x3eb0 +/* 7E10F8 80280278 24050001 */ addiu $a1, $zero, 1 +/* 7E10FC 8028027C 0C0B0CF8 */ jal start_script +/* 7E1100 80280280 0000302D */ daddu $a2, $zero, $zero +/* 7E1104 80280284 0040202D */ daddu $a0, $v0, $zero +/* 7E1108 80280288 AC920084 */ sw $s2, 0x84($a0) +/* 7E110C 8028028C 8E220010 */ lw $v0, 0x10($s1) +/* 7E1110 80280290 8C420000 */ lw $v0, ($v0) +/* 7E1114 80280294 AC820088 */ sw $v0, 0x88($a0) +/* 7E1118 80280298 8E220010 */ lw $v0, 0x10($s1) +/* 7E111C 8028029C 8C420008 */ lw $v0, 8($v0) +/* 7E1120 802802A0 AC82008C */ sw $v0, 0x8c($a0) +/* 7E1124 802802A4 8E230010 */ lw $v1, 0x10($s1) +/* 7E1128 802802A8 8C820144 */ lw $v0, 0x144($a0) +/* 7E112C 802802AC 8C630004 */ lw $v1, 4($v1) +/* 7E1130 802802B0 AC830090 */ sw $v1, 0x90($a0) +/* 7E1134 802802B4 AC83007C */ sw $v1, 0x7c($a0) +/* 7E1138 802802B8 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E113C 802802BC 8FB20018 */ lw $s2, 0x18($sp) +/* 7E1140 802802C0 8FB10014 */ lw $s1, 0x14($sp) +/* 7E1144 802802C4 8FB00010 */ lw $s0, 0x10($sp) +/* 7E1148 802802C8 03E00008 */ jr $ra +/* 7E114C 802802CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s new file mode 100644 index 0000000000..906857ef51 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802802D0 +/* 7E1150 802802D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E1154 802802D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E1158 802802D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E115C 802802DC AFBF0018 */ sw $ra, 0x18($sp) +/* 7E1160 802802E0 AFB10014 */ sw $s1, 0x14($sp) +/* 7E1164 802802E4 AFB00010 */ sw $s0, 0x10($sp) +/* 7E1168 802802E8 8C510144 */ lw $s1, 0x144($v0) +/* 7E116C 802802EC 24050001 */ addiu $a1, $zero, 1 +/* 7E1170 802802F0 8E220010 */ lw $v0, 0x10($s1) +/* 7E1174 802802F4 8C430018 */ lw $v1, 0x18($v0) +/* 7E1178 802802F8 00041080 */ sll $v0, $a0, 2 +/* 7E117C 802802FC 3C048028 */ lui $a0, 0x8028 +/* 7E1180 80280300 24843EE0 */ addiu $a0, $a0, 0x3ee0 +/* 7E1184 80280304 00431021 */ addu $v0, $v0, $v1 +/* 7E1188 80280308 8C500000 */ lw $s0, ($v0) +/* 7E118C 8028030C 0C0B0CF8 */ jal start_script +/* 7E1190 80280310 0000302D */ daddu $a2, $zero, $zero +/* 7E1194 80280314 0040202D */ daddu $a0, $v0, $zero +/* 7E1198 80280318 AC900084 */ sw $s0, 0x84($a0) +/* 7E119C 8028031C 8E220010 */ lw $v0, 0x10($s1) +/* 7E11A0 80280320 8C420000 */ lw $v0, ($v0) +/* 7E11A4 80280324 AC820088 */ sw $v0, 0x88($a0) +/* 7E11A8 80280328 8E220010 */ lw $v0, 0x10($s1) +/* 7E11AC 8028032C 8C420008 */ lw $v0, 8($v0) +/* 7E11B0 80280330 AC82008C */ sw $v0, 0x8c($a0) +/* 7E11B4 80280334 8E230010 */ lw $v1, 0x10($s1) +/* 7E11B8 80280338 8C820144 */ lw $v0, 0x144($a0) +/* 7E11BC 8028033C 8C630004 */ lw $v1, 4($v1) +/* 7E11C0 80280340 AC830090 */ sw $v1, 0x90($a0) +/* 7E11C4 80280344 AC83007C */ sw $v1, 0x7c($a0) +/* 7E11C8 80280348 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E11CC 8028034C 8FB10014 */ lw $s1, 0x14($sp) +/* 7E11D0 80280350 8FB00010 */ lw $s0, 0x10($sp) +/* 7E11D4 80280354 03E00008 */ jr $ra +/* 7E11D8 80280358 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s new file mode 100644 index 0000000000..148c98a96a --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8028035C +/* 7E11DC 8028035C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E11E0 80280360 3C048028 */ lui $a0, 0x8028 +/* 7E11E4 80280364 24843F2C */ addiu $a0, $a0, 0x3f2c +/* 7E11E8 80280368 24050001 */ addiu $a1, $zero, 1 +/* 7E11EC 8028036C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E11F0 80280370 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E11F4 80280374 AFBF0014 */ sw $ra, 0x14($sp) +/* 7E11F8 80280378 AFB00010 */ sw $s0, 0x10($sp) +/* 7E11FC 8028037C 8C500144 */ lw $s0, 0x144($v0) +/* 7E1200 80280380 0C0B0CF8 */ jal start_script +/* 7E1204 80280384 0000302D */ daddu $a2, $zero, $zero +/* 7E1208 80280388 8E030010 */ lw $v1, 0x10($s0) +/* 7E120C 8028038C 8C630000 */ lw $v1, ($v1) +/* 7E1210 80280390 0040202D */ daddu $a0, $v0, $zero +/* 7E1214 80280394 AC830084 */ sw $v1, 0x84($a0) +/* 7E1218 80280398 8E020010 */ lw $v0, 0x10($s0) +/* 7E121C 8028039C 8C420008 */ lw $v0, 8($v0) +/* 7E1220 802803A0 AC820088 */ sw $v0, 0x88($a0) +/* 7E1224 802803A4 8E030010 */ lw $v1, 0x10($s0) +/* 7E1228 802803A8 8C820144 */ lw $v0, 0x144($a0) +/* 7E122C 802803AC 8C630004 */ lw $v1, 4($v1) +/* 7E1230 802803B0 AC83008C */ sw $v1, 0x8c($a0) +/* 7E1234 802803B4 AC83007C */ sw $v1, 0x7c($a0) +/* 7E1238 802803B8 8FBF0014 */ lw $ra, 0x14($sp) +/* 7E123C 802803BC 8FB00010 */ lw $s0, 0x10($sp) +/* 7E1240 802803C0 03E00008 */ jr $ra +/* 7E1244 802803C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s b/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s new file mode 100644 index 0000000000..64650b0886 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802803C8 +/* 7E1248 802803C8 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* 7E124C 802803CC 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* 7E1250 802803D0 AC80008C */ sw $zero, 0x8c($a0) +/* 7E1254 802803D4 80A300B4 */ lb $v1, 0xb4($a1) +/* 7E1258 802803D8 24020004 */ addiu $v0, $zero, 4 +/* 7E125C 802803DC 10620008 */ beq $v1, $v0, .L80280400 +/* 7E1260 802803E0 24020008 */ addiu $v0, $zero, 8 +/* 7E1264 802803E4 10620006 */ beq $v1, $v0, .L80280400 +/* 7E1268 802803E8 00000000 */ nop +/* 7E126C 802803EC 8CA20000 */ lw $v0, ($a1) +/* 7E1270 802803F0 30420100 */ andi $v0, $v0, 0x100 +/* 7E1274 802803F4 14400004 */ bnez $v0, .L80280408 +/* 7E1278 802803F8 24020001 */ addiu $v0, $zero, 1 +/* 7E127C 802803FC AC82008C */ sw $v0, 0x8c($a0) +.L80280400: +/* 7E1280 80280400 03E00008 */ jr $ra +/* 7E1284 80280404 24020002 */ addiu $v0, $zero, 2 +.L80280408: +/* 7E1288 80280408 03E00008 */ jr $ra +/* 7E128C 8028040C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s new file mode 100644 index 0000000000..72a3308614 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s @@ -0,0 +1,73 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280410 +/* 7E1290 80280410 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E1294 80280414 AFB20018 */ sw $s2, 0x18($sp) +/* 7E1298 80280418 3C128007 */ lui $s2, %hi(gGameStatusPtr) +/* 7E129C 8028041C 2652419C */ addiu $s2, $s2, %lo(gGameStatusPtr) +/* 7E12A0 80280420 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E12A4 80280424 AFB10014 */ sw $s1, 0x14($sp) +/* 7E12A8 80280428 AFB00010 */ sw $s0, 0x10($sp) +/* 7E12AC 8028042C 8C82000C */ lw $v0, 0xc($a0) +/* 7E12B0 80280430 8E430000 */ lw $v1, ($s2) +/* 7E12B4 80280434 8C450000 */ lw $a1, ($v0) +/* 7E12B8 80280438 0C0B1EAF */ jal get_variable +/* 7E12BC 8028043C 8C700144 */ lw $s0, 0x144($v1) +/* 7E12C0 80280440 96030000 */ lhu $v1, ($s0) +/* 7E12C4 80280444 30630008 */ andi $v1, $v1, 8 +/* 7E12C8 80280448 14600022 */ bnez $v1, .L802804D4 +/* 7E12CC 8028044C 0040882D */ daddu $s1, $v0, $zero +/* 7E12D0 80280450 96020000 */ lhu $v0, ($s0) +/* 7E12D4 80280454 AE110008 */ sw $s1, 8($s0) +/* 7E12D8 80280458 34420001 */ ori $v0, $v0, 1 +/* 7E12DC 8028045C 0C03A63B */ jal func_800E98EC +/* 7E12E0 80280460 A6020000 */ sh $v0, ($s0) +/* 7E12E4 80280464 8E430000 */ lw $v1, ($s2) +/* 7E12E8 80280468 24020005 */ addiu $v0, $zero, 5 +/* 7E12EC 8028046C AE020358 */ sw $v0, 0x358($s0) +/* 7E12F0 80280470 8C620010 */ lw $v0, 0x10($v1) +/* 7E12F4 80280474 30428000 */ andi $v0, $v0, 0x8000 +/* 7E12F8 80280478 10400022 */ beqz $v0, .L80280504 +/* 7E12FC 8028047C 24020002 */ addiu $v0, $zero, 2 +/* 7E1300 80280480 0C03805E */ jal disable_player_input +/* 7E1304 80280484 00000000 */ nop +/* 7E1308 80280488 0C038045 */ jal disable_player_static_collisions +/* 7E130C 8028048C 00000000 */ nop +/* 7E1310 80280490 3C048028 */ lui $a0, 0x8028 +/* 7E1314 80280494 24844034 */ addiu $a0, $a0, 0x4034 +/* 7E1318 80280498 24050001 */ addiu $a1, $zero, 1 +/* 7E131C 8028049C 0C0B0CF8 */ jal start_script +/* 7E1320 802804A0 0000302D */ daddu $a2, $zero, $zero +/* 7E1324 802804A4 0040182D */ daddu $v1, $v0, $zero +/* 7E1328 802804A8 8C650144 */ lw $a1, 0x144($v1) +/* 7E132C 802804AC AC710084 */ sw $s1, 0x84($v1) +/* 7E1330 802804B0 96040000 */ lhu $a0, ($s0) +/* 7E1334 802804B4 0000102D */ daddu $v0, $zero, $zero +/* 7E1338 802804B8 3C018028 */ lui $at, 0x8028 +/* 7E133C 802804BC AC236520 */ sw $v1, 0x6520($at) +/* 7E1340 802804C0 34840008 */ ori $a0, $a0, 8 +/* 7E1344 802804C4 3C018028 */ lui $at, 0x8028 +/* 7E1348 802804C8 AC256524 */ sw $a1, 0x6524($at) +/* 7E134C 802804CC 080A0141 */ j .L80280504 +/* 7E1350 802804D0 A6040000 */ sh $a0, ($s0) +.L802804D4: +/* 7E1354 802804D4 3C048028 */ lui $a0, 0x8028 +/* 7E1358 802804D8 0C0B1059 */ jal does_script_exist +/* 7E135C 802804DC 8C846524 */ lw $a0, 0x6524($a0) +/* 7E1360 802804E0 54400008 */ bnel $v0, $zero, .L80280504 +/* 7E1364 802804E4 0000102D */ daddu $v0, $zero, $zero +/* 7E1368 802804E8 96020000 */ lhu $v0, ($s0) +/* 7E136C 802804EC 3042FFF7 */ andi $v0, $v0, 0xfff7 +/* 7E1370 802804F0 0C038050 */ jal enable_player_static_collisions +/* 7E1374 802804F4 A6020000 */ sh $v0, ($s0) +/* 7E1378 802804F8 0C038069 */ jal enable_player_input +/* 7E137C 802804FC 00000000 */ nop +/* 7E1380 80280500 24020002 */ addiu $v0, $zero, 2 +.L80280504: +/* 7E1384 80280504 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E1388 80280508 8FB20018 */ lw $s2, 0x18($sp) +/* 7E138C 8028050C 8FB10014 */ lw $s1, 0x14($sp) +/* 7E1390 80280510 8FB00010 */ lw $s0, 0x10($sp) +/* 7E1394 80280514 03E00008 */ jr $ra +/* 7E1398 80280518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s new file mode 100644 index 0000000000..404aecf0a1 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s @@ -0,0 +1,297 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8028051C +/* 7E139C 8028051C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 7E13A0 80280520 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E13A4 80280524 0080982D */ daddu $s3, $a0, $zero +/* 7E13A8 80280528 AFB00010 */ sw $s0, 0x10($sp) +/* 7E13AC 8028052C 00A0802D */ daddu $s0, $a1, $zero +/* 7E13B0 80280530 AFB60028 */ sw $s6, 0x28($sp) +/* 7E13B4 80280534 3C168011 */ lui $s6, %hi(gPlayerData) +/* 7E13B8 80280538 26D6F290 */ addiu $s6, $s6, %lo(gPlayerData) +/* 7E13BC 8028053C AFBF002C */ sw $ra, 0x2c($sp) +/* 7E13C0 80280540 AFB50024 */ sw $s5, 0x24($sp) +/* 7E13C4 80280544 AFB40020 */ sw $s4, 0x20($sp) +/* 7E13C8 80280548 AFB20018 */ sw $s2, 0x18($sp) +/* 7E13CC 8028054C AFB10014 */ sw $s1, 0x14($sp) +/* 7E13D0 80280550 8E750084 */ lw $s5, 0x84($s3) +/* 7E13D4 80280554 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 7E13D8 80280558 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 7E13DC 8028055C 00151040 */ sll $v0, $s5, 1 +/* 7E13E0 80280560 8C740144 */ lw $s4, 0x144($v1) +/* 7E13E4 80280564 00551021 */ addu $v0, $v0, $s5 +/* 7E13E8 80280568 8E830018 */ lw $v1, 0x18($s4) +/* 7E13EC 8028056C 00021080 */ sll $v0, $v0, 2 +/* 7E13F0 80280570 00629021 */ addu $s2, $v1, $v0 +/* 7E13F4 80280574 96820000 */ lhu $v0, ($s4) +/* 7E13F8 80280578 8E430000 */ lw $v1, ($s2) +/* 7E13FC 8028057C 3042FFFE */ andi $v0, $v0, 0xfffe +/* 7E1400 80280580 A6820000 */ sh $v0, ($s4) +/* 7E1404 80280584 3C028008 */ lui $v0, %hi(gItemTable) +/* 7E1408 80280588 244278E0 */ addiu $v0, $v0, %lo(gItemTable) +/* 7E140C 8028058C 00031940 */ sll $v1, $v1, 5 +/* 7E1410 80280590 0C03A640 */ jal func_800E9900 +/* 7E1414 80280594 00628821 */ addu $s1, $v1, $v0 +/* 7E1418 80280598 1200001B */ beqz $s0, .L80280608 +/* 7E141C 8028059C 00000000 */ nop +/* 7E1420 802805A0 96220018 */ lhu $v0, 0x18($s1) +/* 7E1424 802805A4 3C018028 */ lui $at, 0x8028 +/* 7E1428 802805A8 AC206530 */ sw $zero, 0x6530($at) +/* 7E142C 802805AC 3C018028 */ lui $at, 0x8028 +/* 7E1430 802805B0 AC206534 */ sw $zero, 0x6534($at) +/* 7E1434 802805B4 30420040 */ andi $v0, $v0, 0x40 +/* 7E1438 802805B8 10400008 */ beqz $v0, .L802805DC +/* 7E143C 802805BC 2407FFFF */ addiu $a3, $zero, -1 +/* 7E1440 802805C0 9223001A */ lbu $v1, 0x1a($s1) +/* 7E1444 802805C4 00031080 */ sll $v0, $v1, 2 +/* 7E1448 802805C8 00431021 */ addu $v0, $v0, $v1 +/* 7E144C 802805CC 00021080 */ sll $v0, $v0, 2 +/* 7E1450 802805D0 3C078009 */ lui $a3, 0x8009 +/* 7E1454 802805D4 00E23821 */ addu $a3, $a3, $v0 +/* 7E1458 802805D8 80E7F072 */ lb $a3, -0xf8e($a3) +.L802805DC: +/* 7E145C 802805DC 8E250000 */ lw $a1, ($s1) +/* 7E1460 802805E0 8E460004 */ lw $a2, 4($s2) +/* 7E1464 802805E4 0C0A0022 */ jal func_80280088 +/* 7E1468 802805E8 0000202D */ daddu $a0, $zero, $zero +/* 7E146C 802805EC AE620074 */ sw $v0, 0x74($s3) +/* 7E1470 802805F0 0C03A6D5 */ jal increment_status_menu_disabled +/* 7E1474 802805F4 AE600070 */ sw $zero, 0x70($s3) +/* 7E1478 802805F8 0C03A640 */ jal func_800E9900 +/* 7E147C 802805FC 00000000 */ nop +/* 7E1480 80280600 0C03A546 */ jal show_coin_counter +/* 7E1484 80280604 00000000 */ nop +.L80280608: +/* 7E1488 80280608 8E630070 */ lw $v1, 0x70($s3) +/* 7E148C 8028060C 24100005 */ addiu $s0, $zero, 5 +/* 7E1490 80280610 10700085 */ beq $v1, $s0, .L80280828 +/* 7E1494 80280614 28620006 */ slti $v0, $v1, 6 +/* 7E1498 80280618 1040000D */ beqz $v0, .L80280650 +/* 7E149C 8028061C 24020001 */ addiu $v0, $zero, 1 +/* 7E14A0 80280620 1062006D */ beq $v1, $v0, .L802807D8 +/* 7E14A4 80280624 28620002 */ slti $v0, $v1, 2 +/* 7E14A8 80280628 10400005 */ beqz $v0, .L80280640 +/* 7E14AC 8028062C 24020004 */ addiu $v0, $zero, 4 +/* 7E14B0 80280630 10600017 */ beqz $v1, .L80280690 +/* 7E14B4 80280634 0000102D */ daddu $v0, $zero, $zero +/* 7E14B8 80280638 080A024B */ j .L8028092C +/* 7E14BC 8028063C 00000000 */ nop +.L80280640: +/* 7E14C0 80280640 1062006F */ beq $v1, $v0, .L80280800 +/* 7E14C4 80280644 0000102D */ daddu $v0, $zero, $zero +/* 7E14C8 80280648 080A024B */ j .L8028092C +/* 7E14CC 8028064C 00000000 */ nop +.L80280650: +/* 7E14D0 80280650 2410000A */ addiu $s0, $zero, 0xa +/* 7E14D4 80280654 10700091 */ beq $v1, $s0, .L8028089C +/* 7E14D8 80280658 2862000B */ slti $v0, $v1, 0xb +/* 7E14DC 8028065C 10400005 */ beqz $v0, .L80280674 +/* 7E14E0 80280660 24020006 */ addiu $v0, $zero, 6 +/* 7E14E4 80280664 1062007F */ beq $v1, $v0, .L80280864 +/* 7E14E8 80280668 0000102D */ daddu $v0, $zero, $zero +/* 7E14EC 8028066C 080A024B */ j .L8028092C +/* 7E14F0 80280670 00000000 */ nop +.L80280674: +/* 7E14F4 80280674 2402000B */ addiu $v0, $zero, 0xb +/* 7E14F8 80280678 1062009D */ beq $v1, $v0, .L802808F0 +/* 7E14FC 8028067C 24020064 */ addiu $v0, $zero, 0x64 +/* 7E1500 80280680 10620012 */ beq $v1, $v0, .L802806CC +/* 7E1504 80280684 0000102D */ daddu $v0, $zero, $zero +/* 7E1508 80280688 080A024B */ j .L8028092C +/* 7E150C 8028068C 00000000 */ nop +.L80280690: +/* 7E1510 80280690 0C0B1059 */ jal does_script_exist +/* 7E1514 80280694 8E640074 */ lw $a0, 0x74($s3) +/* 7E1518 80280698 144000A4 */ bnez $v0, .L8028092C +/* 7E151C 8028069C 0000102D */ daddu $v0, $zero, $zero +/* 7E1520 802806A0 3C04001E */ lui $a0, 0x1e +/* 7E1524 802806A4 34840001 */ ori $a0, $a0, 1 +/* 7E1528 802806A8 26650078 */ addiu $a1, $s3, 0x78 +/* 7E152C 802806AC 24020064 */ addiu $v0, $zero, 0x64 +/* 7E1530 802806B0 AE620070 */ sw $v0, 0x70($s3) +/* 7E1534 802806B4 0C049640 */ jal load_string +/* 7E1538 802806B8 AE600078 */ sw $zero, 0x78($s3) +/* 7E153C 802806BC 3C018028 */ lui $at, 0x8028 +/* 7E1540 802806C0 AC226528 */ sw $v0, 0x6528($at) +/* 7E1544 802806C4 080A024B */ j .L8028092C +/* 7E1548 802806C8 0000102D */ daddu $v0, $zero, $zero +.L802806CC: +/* 7E154C 802806CC 8E700078 */ lw $s0, 0x78($s3) +/* 7E1550 802806D0 24020001 */ addiu $v0, $zero, 1 +/* 7E1554 802806D4 16020095 */ bne $s0, $v0, .L8028092C +/* 7E1558 802806D8 0000102D */ daddu $v0, $zero, $zero +/* 7E155C 802806DC 3C028028 */ lui $v0, 0x8028 +/* 7E1560 802806E0 8C426528 */ lw $v0, 0x6528($v0) +/* 7E1564 802806E4 904204E8 */ lbu $v0, 0x4e8($v0) +/* 7E1568 802806E8 14400035 */ bnez $v0, .L802807C0 +/* 7E156C 802806EC 00000000 */ nop +/* 7E1570 802806F0 86C2000C */ lh $v0, 0xc($s6) +/* 7E1574 802806F4 8E430004 */ lw $v1, 4($s2) +/* 7E1578 802806F8 0043102A */ slt $v0, $v0, $v1 +/* 7E157C 802806FC 10400006 */ beqz $v0, .L80280718 +/* 7E1580 80280700 00000000 */ nop +/* 7E1584 80280704 0C0A005F */ jal func_8028017C +/* 7E1588 80280708 24040001 */ addiu $a0, $zero, 1 +/* 7E158C 8028070C AE620074 */ sw $v0, 0x74($s3) +/* 7E1590 80280710 080A024A */ j .L80280928 +/* 7E1594 80280714 AE700070 */ sw $s0, 0x70($s3) +.L80280718: +/* 7E1598 80280718 8E420000 */ lw $v0, ($s2) +/* 7E159C 8028071C 2442FF20 */ addiu $v0, $v0, -0xe0 +/* 7E15A0 80280720 2C420075 */ sltiu $v0, $v0, 0x75 +/* 7E15A4 80280724 1440000C */ bnez $v0, .L80280758 +/* 7E15A8 80280728 00000000 */ nop +/* 7E15AC 8028072C 0C039D5D */ jal add_item +/* 7E15B0 80280730 0000202D */ daddu $a0, $zero, $zero +/* 7E15B4 80280734 2403FFFF */ addiu $v1, $zero, -1 +/* 7E15B8 80280738 14430007 */ bne $v0, $v1, .L80280758 +/* 7E15BC 8028073C 00000000 */ nop +/* 7E15C0 80280740 0C0A005F */ jal func_8028017C +/* 7E15C4 80280744 24040002 */ addiu $a0, $zero, 2 +/* 7E15C8 80280748 AE620074 */ sw $v0, 0x74($s3) +/* 7E15CC 8028074C 24020004 */ addiu $v0, $zero, 4 +/* 7E15D0 80280750 080A024A */ j .L80280928 +/* 7E15D4 80280754 AE620070 */ sw $v0, 0x70($s3) +.L80280758: +/* 7E15D8 80280758 96C2000C */ lhu $v0, 0xc($s6) +/* 7E15DC 8028075C 96430006 */ lhu $v1, 6($s2) +/* 7E15E0 80280760 00431023 */ subu $v0, $v0, $v1 +/* 7E15E4 80280764 A6C2000C */ sh $v0, 0xc($s6) +/* 7E15E8 80280768 8E440000 */ lw $a0, ($s2) +/* 7E15EC 8028076C 2482FF20 */ addiu $v0, $a0, -0xe0 +/* 7E15F0 80280770 2C420075 */ sltiu $v0, $v0, 0x75 +/* 7E15F4 80280774 1040000A */ beqz $v0, .L802807A0 +/* 7E15F8 80280778 00000000 */ nop +/* 7E15FC 8028077C 0C039DCF */ jal add_badge +/* 7E1600 80280780 00000000 */ nop +/* 7E1604 80280784 0000202D */ daddu $a0, $zero, $zero +/* 7E1608 80280788 3C05F840 */ lui $a1, 0xf840 +/* 7E160C 8028078C 34A55CF0 */ ori $a1, $a1, 0x5cf0 +/* 7E1610 80280790 0C0B2026 */ jal set_variable +/* 7E1614 80280794 24060001 */ addiu $a2, $zero, 1 +/* 7E1618 80280798 080A01EA */ j .L802807A8 +/* 7E161C 8028079C 00000000 */ nop +.L802807A0: +/* 7E1620 802807A0 0C039D5D */ jal add_item +/* 7E1624 802807A4 00000000 */ nop +.L802807A8: +/* 7E1628 802807A8 0C0A005F */ jal func_8028017C +/* 7E162C 802807AC 24040003 */ addiu $a0, $zero, 3 +/* 7E1630 802807B0 AE620074 */ sw $v0, 0x74($s3) +/* 7E1634 802807B4 24020005 */ addiu $v0, $zero, 5 +/* 7E1638 802807B8 080A024A */ j .L80280928 +/* 7E163C 802807BC AE620070 */ sw $v0, 0x70($s3) +.L802807C0: +/* 7E1640 802807C0 0C0A00B4 */ jal func_802802D0 +/* 7E1644 802807C4 24040016 */ addiu $a0, $zero, 0x16 +/* 7E1648 802807C8 AE620074 */ sw $v0, 0x74($s3) +/* 7E164C 802807CC 24020006 */ addiu $v0, $zero, 6 +/* 7E1650 802807D0 080A024A */ j .L80280928 +/* 7E1654 802807D4 AE620070 */ sw $v0, 0x70($s3) +.L802807D8: +/* 7E1658 802807D8 8E640074 */ lw $a0, 0x74($s3) +/* 7E165C 802807DC 0C0B1059 */ jal does_script_exist +/* 7E1660 802807E0 00000000 */ nop +/* 7E1664 802807E4 14400051 */ bnez $v0, .L8028092C +/* 7E1668 802807E8 0000102D */ daddu $v0, $zero, $zero +/* 7E166C 802807EC 8E430000 */ lw $v1, ($s2) +/* 7E1670 802807F0 3C018028 */ lui $at, 0x8028 +/* 7E1674 802807F4 AC206534 */ sw $zero, 0x6534($at) +/* 7E1678 802807F8 080A0214 */ j .L80280850 +/* 7E167C 802807FC 2402000A */ addiu $v0, $zero, 0xa +.L80280800: +/* 7E1680 80280800 8E640074 */ lw $a0, 0x74($s3) +/* 7E1684 80280804 0C0B1059 */ jal does_script_exist +/* 7E1688 80280808 00000000 */ nop +/* 7E168C 8028080C 14400047 */ bnez $v0, .L8028092C +/* 7E1690 80280810 0000102D */ daddu $v0, $zero, $zero +/* 7E1694 80280814 8E430000 */ lw $v1, ($s2) +/* 7E1698 80280818 3C018028 */ lui $at, 0x8028 +/* 7E169C 8028081C AC306534 */ sw $s0, 0x6534($at) +/* 7E16A0 80280820 080A0214 */ j .L80280850 +/* 7E16A4 80280824 2402000A */ addiu $v0, $zero, 0xa +.L80280828: +/* 7E16A8 80280828 8E640074 */ lw $a0, 0x74($s3) +/* 7E16AC 8028082C 0C0B1059 */ jal does_script_exist +/* 7E16B0 80280830 00000000 */ nop +/* 7E16B4 80280834 1440003D */ bnez $v0, .L8028092C +/* 7E16B8 80280838 0000102D */ daddu $v0, $zero, $zero +/* 7E16BC 8028083C 8E430000 */ lw $v1, ($s2) +/* 7E16C0 80280840 24020001 */ addiu $v0, $zero, 1 +/* 7E16C4 80280844 3C018028 */ lui $at, 0x8028 +/* 7E16C8 80280848 AC226534 */ sw $v0, 0x6534($at) +/* 7E16CC 8028084C 2402000A */ addiu $v0, $zero, 0xa +.L80280850: +/* 7E16D0 80280850 AE620070 */ sw $v0, 0x70($s3) +/* 7E16D4 80280854 3C018028 */ lui $at, 0x8028 +/* 7E16D8 80280858 AC236530 */ sw $v1, 0x6530($at) +/* 7E16DC 8028085C 080A024B */ j .L8028092C +/* 7E16E0 80280860 0000102D */ daddu $v0, $zero, $zero +.L80280864: +/* 7E16E4 80280864 8E640074 */ lw $a0, 0x74($s3) +/* 7E16E8 80280868 0C0B1059 */ jal does_script_exist +/* 7E16EC 8028086C 00000000 */ nop +/* 7E16F0 80280870 1440002E */ bnez $v0, .L8028092C +/* 7E16F4 80280874 0000102D */ daddu $v0, $zero, $zero +/* 7E16F8 80280878 8E430000 */ lw $v1, ($s2) +/* 7E16FC 8028087C 24020003 */ addiu $v0, $zero, 3 +/* 7E1700 80280880 3C018028 */ lui $at, 0x8028 +/* 7E1704 80280884 AC226534 */ sw $v0, 0x6534($at) +/* 7E1708 80280888 AE700070 */ sw $s0, 0x70($s3) +/* 7E170C 8028088C 3C018028 */ lui $at, 0x8028 +/* 7E1710 80280890 AC236530 */ sw $v1, 0x6530($at) +/* 7E1714 80280894 080A024B */ j .L8028092C +/* 7E1718 80280898 0000102D */ daddu $v0, $zero, $zero +.L8028089C: +/* 7E171C 8028089C 8E820010 */ lw $v0, 0x10($s4) +/* 7E1720 802808A0 3C108028 */ lui $s0, 0x8028 +/* 7E1724 802808A4 2610652C */ addiu $s0, $s0, 0x652c +/* 7E1728 802808A8 1040000E */ beqz $v0, .L802808E4 +/* 7E172C 802808AC AE000000 */ sw $zero, ($s0) +/* 7E1730 802808B0 8C44000C */ lw $a0, 0xc($v0) +/* 7E1734 802808B4 1080000B */ beqz $a0, .L802808E4 +/* 7E1738 802808B8 24050001 */ addiu $a1, $zero, 1 +/* 7E173C 802808BC 0C0B0CF8 */ jal start_script +/* 7E1740 802808C0 0000302D */ daddu $a2, $zero, $zero +/* 7E1744 802808C4 3C038028 */ lui $v1, 0x8028 +/* 7E1748 802808C8 8C636534 */ lw $v1, 0x6534($v1) +/* 7E174C 802808CC 3C048028 */ lui $a0, 0x8028 +/* 7E1750 802808D0 8C846530 */ lw $a0, 0x6530($a0) +/* 7E1754 802808D4 AE020000 */ sw $v0, ($s0) +/* 7E1758 802808D8 AC55008C */ sw $s5, 0x8c($v0) +/* 7E175C 802808DC AC430084 */ sw $v1, 0x84($v0) +/* 7E1760 802808E0 AC440088 */ sw $a0, 0x88($v0) +.L802808E4: +/* 7E1764 802808E4 2402000B */ addiu $v0, $zero, 0xb +/* 7E1768 802808E8 080A024A */ j .L80280928 +/* 7E176C 802808EC AE620070 */ sw $v0, 0x70($s3) +.L802808F0: +/* 7E1770 802808F0 3C028028 */ lui $v0, 0x8028 +/* 7E1774 802808F4 8C42652C */ lw $v0, 0x652c($v0) +/* 7E1778 802808F8 10400005 */ beqz $v0, .L80280910 +/* 7E177C 802808FC 00000000 */ nop +/* 7E1780 80280900 0C0B1059 */ jal does_script_exist +/* 7E1784 80280904 8C440144 */ lw $a0, 0x144($v0) +/* 7E1788 80280908 14400008 */ bnez $v0, .L8028092C +/* 7E178C 8028090C 0000102D */ daddu $v0, $zero, $zero +.L80280910: +/* 7E1790 80280910 0C03A6CC */ jal decrement_status_menu_disabled +/* 7E1794 80280914 00000000 */ nop +/* 7E1798 80280918 0C03A5B2 */ jal func_800E96C8 +/* 7E179C 8028091C 00000000 */ nop +/* 7E17A0 80280920 080A024B */ j .L8028092C +/* 7E17A4 80280924 24020001 */ addiu $v0, $zero, 1 +.L80280928: +/* 7E17A8 80280928 0000102D */ daddu $v0, $zero, $zero +.L8028092C: +/* 7E17AC 8028092C 8FBF002C */ lw $ra, 0x2c($sp) +/* 7E17B0 80280930 8FB60028 */ lw $s6, 0x28($sp) +/* 7E17B4 80280934 8FB50024 */ lw $s5, 0x24($sp) +/* 7E17B8 80280938 8FB40020 */ lw $s4, 0x20($sp) +/* 7E17BC 8028093C 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E17C0 80280940 8FB20018 */ lw $s2, 0x18($sp) +/* 7E17C4 80280944 8FB10014 */ lw $s1, 0x14($sp) +/* 7E17C8 80280948 8FB00010 */ lw $s0, 0x10($sp) +/* 7E17CC 8028094C 03E00008 */ jr $ra +/* 7E17D0 80280950 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s new file mode 100644 index 0000000000..17da75e86e --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s @@ -0,0 +1,104 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280954 +/* 7E17D4 80280954 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E17D8 80280958 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E17DC 8028095C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 7E17E0 80280960 AFBF003C */ sw $ra, 0x3c($sp) +/* 7E17E4 80280964 AFBE0038 */ sw $fp, 0x38($sp) +/* 7E17E8 80280968 AFB70034 */ sw $s7, 0x34($sp) +/* 7E17EC 8028096C AFB60030 */ sw $s6, 0x30($sp) +/* 7E17F0 80280970 AFB5002C */ sw $s5, 0x2c($sp) +/* 7E17F4 80280974 AFB40028 */ sw $s4, 0x28($sp) +/* 7E17F8 80280978 AFB30024 */ sw $s3, 0x24($sp) +/* 7E17FC 8028097C AFB20020 */ sw $s2, 0x20($sp) +/* 7E1800 80280980 AFB1001C */ sw $s1, 0x1c($sp) +/* 7E1804 80280984 AFB00018 */ sw $s0, 0x18($sp) +/* 7E1808 80280988 8C420144 */ lw $v0, 0x144($v0) +/* 7E180C 8028098C 0080B82D */ daddu $s7, $a0, $zero +/* 7E1810 80280990 24420028 */ addiu $v0, $v0, 0x28 +/* 7E1814 80280994 12E00006 */ beqz $s7, .L802809B0 +/* 7E1818 80280998 AFA20010 */ sw $v0, 0x10($sp) +/* 7E181C 8028099C 24020001 */ addiu $v0, $zero, 1 +/* 7E1820 802809A0 12E20006 */ beq $s7, $v0, .L802809BC +/* 7E1824 802809A4 24150007 */ addiu $s5, $zero, 7 +/* 7E1828 802809A8 080A0271 */ j .L802809C4 +/* 7E182C 802809AC 24140020 */ addiu $s4, $zero, 0x20 +.L802809B0: +/* 7E1830 802809B0 24150005 */ addiu $s5, $zero, 5 +/* 7E1834 802809B4 080A0271 */ j .L802809C4 +/* 7E1838 802809B8 2414000A */ addiu $s4, $zero, 0xa +.L802809BC: +/* 7E183C 802809BC 24150006 */ addiu $s5, $zero, 6 +/* 7E1840 802809C0 2414000A */ addiu $s4, $zero, 0xa +.L802809C4: +/* 7E1844 802809C4 0000902D */ daddu $s2, $zero, $zero +/* 7E1848 802809C8 12800027 */ beqz $s4, .L80280A68 +/* 7E184C 802809CC 0240982D */ daddu $s3, $s2, $zero +/* 7E1850 802809D0 2AFE0002 */ slti $fp, $s7, 2 +/* 7E1854 802809D4 3C168008 */ lui $s6, %hi(gItemTable) +/* 7E1858 802809D8 26D678E0 */ addiu $s6, $s6, %lo(gItemTable) +/* 7E185C 802809DC 3C118011 */ lui $s1, %hi(gPlayerData) +/* 7E1860 802809E0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) +/* 7E1864 802809E4 8FB00010 */ lw $s0, 0x10($sp) +.L802809E8: +/* 7E1868 802809E8 13C00005 */ beqz $fp, .L80280A00 +/* 7E186C 802809EC 00000000 */ nop +/* 7E1870 802809F0 06E00003 */ bltz $s7, .L80280A00 +/* 7E1874 802809F4 00000000 */ nop +/* 7E1878 802809F8 080A0281 */ j .L80280A04 +/* 7E187C 802809FC 862401B4 */ lh $a0, 0x1b4($s1) +.L80280A00: +/* 7E1880 80280A00 862401C8 */ lh $a0, 0x1c8($s1) +.L80280A04: +/* 7E1884 80280A04 10800014 */ beqz $a0, .L80280A58 +/* 7E1888 80280A08 00041140 */ sll $v0, $a0, 5 +/* 7E188C 80280A0C 00561821 */ addu $v1, $v0, $s6 +/* 7E1890 80280A10 84620004 */ lh $v0, 4($v1) +/* 7E1894 80280A14 3C058009 */ lui $a1, 0x8009 +/* 7E1898 80280A18 24A5A680 */ addiu $a1, $a1, -0x5980 +/* 7E189C 80280A1C 000210C0 */ sll $v0, $v0, 3 +/* 7E18A0 80280A20 00451021 */ addu $v0, $v0, $a1 +/* 7E18A4 80280A24 8C420000 */ lw $v0, ($v0) +/* 7E18A8 80280A28 24050001 */ addiu $a1, $zero, 1 +/* 7E18AC 80280A2C AE120108 */ sw $s2, 0x108($s0) +/* 7E18B0 80280A30 AE05018C */ sw $a1, 0x18c($s0) +/* 7E18B4 80280A34 AE020000 */ sw $v0, ($s0) +/* 7E18B8 80280A38 8C620000 */ lw $v0, ($v1) +/* 7E18BC 80280A3C AE020084 */ sw $v0, 0x84($s0) +/* 7E18C0 80280A40 8C620014 */ lw $v0, 0x14($v1) +/* 7E18C4 80280A44 02659821 */ addu $s3, $s3, $a1 +/* 7E18C8 80280A48 0C0A02DE */ jal func_80280B78 +/* 7E18CC 80280A4C AE020294 */ sw $v0, 0x294($s0) +/* 7E18D0 80280A50 AE020210 */ sw $v0, 0x210($s0) +/* 7E18D4 80280A54 26100004 */ addiu $s0, $s0, 4 +.L80280A58: +/* 7E18D8 80280A58 26520001 */ addiu $s2, $s2, 1 +/* 7E18DC 80280A5C 0254102A */ slt $v0, $s2, $s4 +/* 7E18E0 80280A60 1440FFE1 */ bnez $v0, .L802809E8 +/* 7E18E4 80280A64 26310002 */ addiu $s1, $s1, 2 +.L80280A68: +/* 7E18E8 80280A68 8FA40010 */ lw $a0, 0x10($sp) +/* 7E18EC 80280A6C AC950318 */ sw $s5, 0x318($a0) +/* 7E18F0 80280A70 AC930324 */ sw $s3, 0x324($a0) +/* 7E18F4 80280A74 0C03D3F1 */ jal func_800F4FC4 +/* 7E18F8 80280A78 AC800328 */ sw $zero, 0x328($a0) +/* 7E18FC 80280A7C 0C03A625 */ jal func_800E9894 +/* 7E1900 80280A80 00000000 */ nop +/* 7E1904 80280A84 0C03A63B */ jal func_800E98EC +/* 7E1908 80280A88 00000000 */ nop +/* 7E190C 80280A8C 0C03A5E3 */ jal open_status_menu_short +/* 7E1910 80280A90 00000000 */ nop +/* 7E1914 80280A94 8FBF003C */ lw $ra, 0x3c($sp) +/* 7E1918 80280A98 8FBE0038 */ lw $fp, 0x38($sp) +/* 7E191C 80280A9C 8FB70034 */ lw $s7, 0x34($sp) +/* 7E1920 80280AA0 8FB60030 */ lw $s6, 0x30($sp) +/* 7E1924 80280AA4 8FB5002C */ lw $s5, 0x2c($sp) +/* 7E1928 80280AA8 8FB40028 */ lw $s4, 0x28($sp) +/* 7E192C 80280AAC 8FB30024 */ lw $s3, 0x24($sp) +/* 7E1930 80280AB0 8FB20020 */ lw $s2, 0x20($sp) +/* 7E1934 80280AB4 8FB1001C */ lw $s1, 0x1c($sp) +/* 7E1938 80280AB8 8FB00018 */ lw $s0, 0x18($sp) +/* 7E193C 80280ABC 03E00008 */ jr $ra +/* 7E1940 80280AC0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s new file mode 100644 index 0000000000..d2636a902e --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280AC4 +/* 7E1944 80280AC4 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E1948 80280AC8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E194C 80280ACC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E1950 80280AD0 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E1954 80280AD4 AFB20018 */ sw $s2, 0x18($sp) +/* 7E1958 80280AD8 AFB10014 */ sw $s1, 0x14($sp) +/* 7E195C 80280ADC AFB00010 */ sw $s0, 0x10($sp) +/* 7E1960 80280AE0 8C420144 */ lw $v0, 0x144($v0) +/* 7E1964 80280AE4 0080902D */ daddu $s2, $a0, $zero +/* 7E1968 80280AE8 84500354 */ lh $s0, 0x354($v0) +/* 7E196C 80280AEC 16000003 */ bnez $s0, .L80280AFC +/* 7E1970 80280AF0 24510028 */ addiu $s1, $v0, 0x28 +/* 7E1974 80280AF4 080A02CB */ j .L80280B2C +/* 7E1978 80280AF8 0000102D */ daddu $v0, $zero, $zero +.L80280AFC: +/* 7E197C 80280AFC 0C03C4EC */ jal func_800F13B0 +/* 7E1980 80280B00 00000000 */ nop +/* 7E1984 80280B04 240200FF */ addiu $v0, $zero, 0xff +/* 7E1988 80280B08 16020003 */ bne $s0, $v0, .L80280B18 +/* 7E198C 80280B0C 2602FFFF */ addiu $v0, $s0, -1 +/* 7E1990 80280B10 080A02C9 */ j .L80280B24 +/* 7E1994 80280B14 2402FFFF */ addiu $v0, $zero, -1 +.L80280B18: +/* 7E1998 80280B18 00021080 */ sll $v0, $v0, 2 +/* 7E199C 80280B1C 02221021 */ addu $v0, $s1, $v0 +/* 7E19A0 80280B20 8C420108 */ lw $v0, 0x108($v0) +.L80280B24: +/* 7E19A4 80280B24 AE420000 */ sw $v0, ($s2) +/* 7E19A8 80280B28 24020001 */ addiu $v0, $zero, 1 +.L80280B2C: +/* 7E19AC 80280B2C 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E19B0 80280B30 8FB20018 */ lw $s2, 0x18($sp) +/* 7E19B4 80280B34 8FB10014 */ lw $s1, 0x14($sp) +/* 7E19B8 80280B38 8FB00010 */ lw $s0, 0x10($sp) +/* 7E19BC 80280B3C 03E00008 */ jr $ra +/* 7E19C0 80280B40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s new file mode 100644 index 0000000000..7f6e120ee0 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280B44 +/* 7E19C4 80280B44 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E19C8 80280B48 AFBF0010 */ sw $ra, 0x10($sp) +/* 7E19CC 80280B4C 0C03C54E */ jal func_800F1538 +/* 7E19D0 80280B50 00000000 */ nop +/* 7E19D4 80280B54 0C03A640 */ jal func_800E9900 +/* 7E19D8 80280B58 00000000 */ nop +/* 7E19DC 80280B5C 0C03A631 */ jal func_800E98C4 +/* 7E19E0 80280B60 00000000 */ nop +/* 7E19E4 80280B64 0C03A5EE */ jal func_800E97B8 +/* 7E19E8 80280B68 00000000 */ nop +/* 7E19EC 80280B6C 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E19F0 80280B70 03E00008 */ jr $ra +/* 7E19F4 80280B74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s new file mode 100644 index 0000000000..9f96c4c9fa --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280B78 +/* 7E19F8 80280B78 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E19FC 80280B7C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E1A00 80280B80 8C420144 */ lw $v0, 0x144($v0) +/* 7E1A04 80280B84 84460004 */ lh $a2, 4($v0) +/* 7E1A08 80280B88 8C43001C */ lw $v1, 0x1c($v0) +/* 7E1A0C 80280B8C 18C0000A */ blez $a2, .L80280BB8 +/* 7E1A10 80280B90 0000282D */ daddu $a1, $zero, $zero +.L80280B94: +/* 7E1A14 80280B94 8C620000 */ lw $v0, ($v1) +/* 7E1A18 80280B98 14440004 */ bne $v0, $a0, .L80280BAC +/* 7E1A1C 80280B9C 24A50001 */ addiu $a1, $a1, 1 +/* 7E1A20 80280BA0 8C620004 */ lw $v0, 4($v1) +/* 7E1A24 80280BA4 03E00008 */ jr $ra +/* 7E1A28 80280BA8 00000000 */ nop +.L80280BAC: +/* 7E1A2C 80280BAC 00A6102A */ slt $v0, $a1, $a2 +/* 7E1A30 80280BB0 1440FFF8 */ bnez $v0, .L80280B94 +/* 7E1A34 80280BB4 2463000C */ addiu $v1, $v1, 0xc +.L80280BB8: +/* 7E1A38 80280BB8 00041140 */ sll $v0, $a0, 5 +/* 7E1A3C 80280BBC 3C018008 */ lui $at, 0x8008 +/* 7E1A40 80280BC0 00220821 */ addu $at, $at, $v0 +/* 7E1A44 80280BC4 842278EC */ lh $v0, 0x78ec($at) +/* 7E1A48 80280BC8 03E00008 */ jr $ra +/* 7E1A4C 80280BCC 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s new file mode 100644 index 0000000000..b4e4d7c2fd --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s @@ -0,0 +1,604 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80280BD0 +/* 7E1A50 80280BD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E1A54 80280BD4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E1A58 80280BD8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E1A5C 80280BDC AFB10014 */ sw $s1, 0x14($sp) +/* 7E1A60 80280BE0 AFB20018 */ sw $s2, 0x18($sp) +/* 7E1A64 80280BE4 3C128011 */ lui $s2, %hi(gPlayerData) +/* 7E1A68 80280BE8 2652F290 */ addiu $s2, $s2, %lo(gPlayerData) +/* 7E1A6C 80280BEC AFBF0020 */ sw $ra, 0x20($sp) +/* 7E1A70 80280BF0 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E1A74 80280BF4 AFB00010 */ sw $s0, 0x10($sp) +/* 7E1A78 80280BF8 8C500144 */ lw $s0, 0x144($v0) +/* 7E1A7C 80280BFC 10A00006 */ beqz $a1, .L80280C18 +/* 7E1A80 80280C00 0080882D */ daddu $s1, $a0, $zero +/* 7E1A84 80280C04 0C0A0000 */ jal func_80280000 +/* 7E1A88 80280C08 24040004 */ addiu $a0, $zero, 4 +/* 7E1A8C 80280C0C AE220074 */ sw $v0, 0x74($s1) +/* 7E1A90 80280C10 24020004 */ addiu $v0, $zero, 4 +/* 7E1A94 80280C14 AE220070 */ sw $v0, 0x70($s1) +.L80280C18: +/* 7E1A98 80280C18 8E230070 */ lw $v1, 0x70($s1) +/* 7E1A9C 80280C1C 24130020 */ addiu $s3, $zero, 0x20 +/* 7E1AA0 80280C20 10730117 */ beq $v1, $s3, .L80281080 +/* 7E1AA4 80280C24 28620021 */ slti $v0, $v1, 0x21 +/* 7E1AA8 80280C28 10400027 */ beqz $v0, .L80280CC8 +/* 7E1AAC 80280C2C 24020007 */ addiu $v0, $zero, 7 +/* 7E1AB0 80280C30 1062018C */ beq $v1, $v0, .L80281264 +/* 7E1AB4 80280C34 28620008 */ slti $v0, $v1, 8 +/* 7E1AB8 80280C38 10400011 */ beqz $v0, .L80280C80 +/* 7E1ABC 80280C3C 24020003 */ addiu $v0, $zero, 3 +/* 7E1AC0 80280C40 106200D9 */ beq $v1, $v0, .L80280FA8 +/* 7E1AC4 80280C44 28620004 */ slti $v0, $v1, 4 +/* 7E1AC8 80280C48 10400007 */ beqz $v0, .L80280C68 +/* 7E1ACC 80280C4C 24020004 */ addiu $v0, $zero, 4 +/* 7E1AD0 80280C50 106001DC */ beqz $v1, .L802813C4 +/* 7E1AD4 80280C54 24020002 */ addiu $v0, $zero, 2 +/* 7E1AD8 80280C58 106200AF */ beq $v1, $v0, .L80280F18 +/* 7E1ADC 80280C5C 0000102D */ daddu $v0, $zero, $zero +/* 7E1AE0 80280C60 080A0506 */ j .L80281418 +/* 7E1AE4 80280C64 00000000 */ nop +.L80280C68: +/* 7E1AE8 80280C68 1062003F */ beq $v1, $v0, .L80280D68 +/* 7E1AEC 80280C6C 24020005 */ addiu $v0, $zero, 5 +/* 7E1AF0 80280C70 1062012B */ beq $v1, $v0, .L80281120 +/* 7E1AF4 80280C74 0000102D */ daddu $v0, $zero, $zero +/* 7E1AF8 80280C78 080A0506 */ j .L80281418 +/* 7E1AFC 80280C7C 00000000 */ nop +.L80280C80: +/* 7E1B00 80280C80 2402000C */ addiu $v0, $zero, 0xc +/* 7E1B04 80280C84 10620108 */ beq $v1, $v0, .L802810A8 +/* 7E1B08 80280C88 2862000D */ slti $v0, $v1, 0xd +/* 7E1B0C 80280C8C 10400007 */ beqz $v0, .L80280CAC +/* 7E1B10 80280C90 24020009 */ addiu $v0, $zero, 9 +/* 7E1B14 80280C94 106201CB */ beq $v1, $v0, .L802813C4 +/* 7E1B18 80280C98 2402000A */ addiu $v0, $zero, 0xa +/* 7E1B1C 80280C9C 106201D1 */ beq $v1, $v0, .L802813E4 +/* 7E1B20 80280CA0 0000102D */ daddu $v0, $zero, $zero +/* 7E1B24 80280CA4 080A0506 */ j .L80281418 +/* 7E1B28 80280CA8 00000000 */ nop +.L80280CAC: +/* 7E1B2C 80280CAC 24020015 */ addiu $v0, $zero, 0x15 +/* 7E1B30 80280CB0 106200A0 */ beq $v1, $v0, .L80280F34 +/* 7E1B34 80280CB4 2402001F */ addiu $v0, $zero, 0x1f +/* 7E1B38 80280CB8 106200C5 */ beq $v1, $v0, .L80280FD0 +/* 7E1B3C 80280CBC 0000102D */ daddu $v0, $zero, $zero +/* 7E1B40 80280CC0 080A0506 */ j .L80281418 +/* 7E1B44 80280CC4 00000000 */ nop +.L80280CC8: +/* 7E1B48 80280CC8 24020047 */ addiu $v0, $zero, 0x47 +/* 7E1B4C 80280CCC 1062016F */ beq $v1, $v0, .L8028128C +/* 7E1B50 80280CD0 28620048 */ slti $v0, $v1, 0x48 +/* 7E1B54 80280CD4 10400012 */ beqz $v0, .L80280D20 +/* 7E1B58 80280CD8 24020033 */ addiu $v0, $zero, 0x33 +/* 7E1B5C 80280CDC 10620117 */ beq $v1, $v0, .L8028113C +/* 7E1B60 80280CE0 28620034 */ slti $v0, $v1, 0x34 +/* 7E1B64 80280CE4 10400007 */ beqz $v0, .L80280D04 +/* 7E1B68 80280CE8 24020029 */ addiu $v0, $zero, 0x29 +/* 7E1B6C 80280CEC 10620027 */ beq $v1, $v0, .L80280D8C +/* 7E1B70 80280CF0 2402002A */ addiu $v0, $zero, 0x2a +/* 7E1B74 80280CF4 106201B3 */ beq $v1, $v0, .L802813C4 +/* 7E1B78 80280CF8 0000102D */ daddu $v0, $zero, $zero +/* 7E1B7C 80280CFC 080A0506 */ j .L80281418 +/* 7E1B80 80280D00 00000000 */ nop +.L80280D04: +/* 7E1B84 80280D04 24020034 */ addiu $v0, $zero, 0x34 +/* 7E1B88 80280D08 10620133 */ beq $v1, $v0, .L802811D8 +/* 7E1B8C 80280D0C 24020035 */ addiu $v0, $zero, 0x35 +/* 7E1B90 80280D10 1062013B */ beq $v1, $v0, .L80281200 +/* 7E1B94 80280D14 0000102D */ daddu $v0, $zero, $zero +/* 7E1B98 80280D18 080A0506 */ j .L80281418 +/* 7E1B9C 80280D1C 00000000 */ nop +.L80280D20: +/* 7E1BA0 80280D20 240200C9 */ addiu $v0, $zero, 0xc9 +/* 7E1BA4 80280D24 10620072 */ beq $v1, $v0, .L80280EF0 +/* 7E1BA8 80280D28 286200CA */ slti $v0, $v1, 0xca +/* 7E1BAC 80280D2C 10400007 */ beqz $v0, .L80280D4C +/* 7E1BB0 80280D30 24020048 */ addiu $v0, $zero, 0x48 +/* 7E1BB4 80280D34 1062017E */ beq $v1, $v0, .L80281330 +/* 7E1BB8 80280D38 24020049 */ addiu $v0, $zero, 0x49 +/* 7E1BBC 80280D3C 1062018C */ beq $v1, $v0, .L80281370 +/* 7E1BC0 80280D40 0000102D */ daddu $v0, $zero, $zero +/* 7E1BC4 80280D44 080A0506 */ j .L80281418 +/* 7E1BC8 80280D48 00000000 */ nop +.L80280D4C: +/* 7E1BCC 80280D4C 240201F5 */ addiu $v0, $zero, 0x1f5 +/* 7E1BD0 80280D50 106200EA */ beq $v1, $v0, .L802810FC +/* 7E1BD4 80280D54 240202BD */ addiu $v0, $zero, 0x2bd +/* 7E1BD8 80280D58 10620138 */ beq $v1, $v0, .L8028123C +/* 7E1BDC 80280D5C 0000102D */ daddu $v0, $zero, $zero +/* 7E1BE0 80280D60 080A0506 */ j .L80281418 +/* 7E1BE4 80280D64 00000000 */ nop +.L80280D68: +/* 7E1BE8 80280D68 0C0B1059 */ jal does_script_exist +/* 7E1BEC 80280D6C 8E240074 */ lw $a0, 0x74($s1) +/* 7E1BF0 80280D70 144001A9 */ bnez $v0, .L80281418 +/* 7E1BF4 80280D74 0000102D */ daddu $v0, $zero, $zero +/* 7E1BF8 80280D78 3C04001E */ lui $a0, 0x1e +/* 7E1BFC 80280D7C 34840003 */ ori $a0, $a0, 3 +/* 7E1C00 80280D80 26250078 */ addiu $a1, $s1, 0x78 +/* 7E1C04 80280D84 080A04D5 */ j .L80281354 +/* 7E1C08 80280D88 24020029 */ addiu $v0, $zero, 0x29 +.L80280D8C: +/* 7E1C0C 80280D8C 8E240078 */ lw $a0, 0x78($s1) +/* 7E1C10 80280D90 24020001 */ addiu $v0, $zero, 1 +/* 7E1C14 80280D94 148201A0 */ bne $a0, $v0, .L80281418 +/* 7E1C18 80280D98 0000102D */ daddu $v0, $zero, $zero +/* 7E1C1C 80280D9C 3C028028 */ lui $v0, 0x8028 +/* 7E1C20 80280DA0 8C426538 */ lw $v0, 0x6538($v0) +/* 7E1C24 80280DA4 904304E8 */ lbu $v1, 0x4e8($v0) +/* 7E1C28 80280DA8 10640012 */ beq $v1, $a0, .L80280DF4 +/* 7E1C2C 80280DAC 28620002 */ slti $v0, $v1, 2 +/* 7E1C30 80280DB0 10400005 */ beqz $v0, .L80280DC8 +/* 7E1C34 80280DB4 24020002 */ addiu $v0, $zero, 2 +/* 7E1C38 80280DB8 10600009 */ beqz $v1, .L80280DE0 +/* 7E1C3C 80280DBC 00000000 */ nop +/* 7E1C40 80280DC0 080A03B6 */ j .L80280ED8 +/* 7E1C44 80280DC4 00000000 */ nop +.L80280DC8: +/* 7E1C48 80280DC8 10620018 */ beq $v1, $v0, .L80280E2C +/* 7E1C4C 80280DCC 24020003 */ addiu $v0, $zero, 3 +/* 7E1C50 80280DD0 1062002D */ beq $v1, $v0, .L80280E88 +/* 7E1C54 80280DD4 00000000 */ nop +/* 7E1C58 80280DD8 080A03B6 */ j .L80280ED8 +/* 7E1C5C 80280DDC 00000000 */ nop +.L80280DE0: +/* 7E1C60 80280DE0 0C0A005F */ jal func_8028017C +/* 7E1C64 80280DE4 24040005 */ addiu $a0, $zero, 5 +/* 7E1C68 80280DE8 AE220074 */ sw $v0, 0x74($s1) +/* 7E1C6C 80280DEC 080A0505 */ j .L80281414 +/* 7E1C70 80280DF0 AE200070 */ sw $zero, 0x70($s1) +.L80280DF4: +/* 7E1C74 80280DF4 0C039D7B */ jal get_item_count +/* 7E1C78 80280DF8 00000000 */ nop +/* 7E1C7C 80280DFC 14400005 */ bnez $v0, .L80280E14 +/* 7E1C80 80280E00 00000000 */ nop +/* 7E1C84 80280E04 0C0A005F */ jal func_8028017C +/* 7E1C88 80280E08 24040006 */ addiu $a0, $zero, 6 +/* 7E1C8C 80280E0C 080A04EE */ j .L802813B8 +/* 7E1C90 80280E10 AE220074 */ sw $v0, 0x74($s1) +.L80280E14: +/* 7E1C94 80280E14 0C0A005F */ jal func_8028017C +/* 7E1C98 80280E18 24040007 */ addiu $a0, $zero, 7 +/* 7E1C9C 80280E1C AE220074 */ sw $v0, 0x74($s1) +/* 7E1CA0 80280E20 240200C9 */ addiu $v0, $zero, 0xc9 +/* 7E1CA4 80280E24 080A0505 */ j .L80281414 +/* 7E1CA8 80280E28 AE220070 */ sw $v0, 0x70($s1) +.L80280E2C: +/* 7E1CAC 80280E2C 0C039D7B */ jal get_item_count +/* 7E1CB0 80280E30 00000000 */ nop +/* 7E1CB4 80280E34 14400005 */ bnez $v0, .L80280E4C +/* 7E1CB8 80280E38 00000000 */ nop +/* 7E1CBC 80280E3C 0C0A005F */ jal func_8028017C +/* 7E1CC0 80280E40 2404000C */ addiu $a0, $zero, 0xc +/* 7E1CC4 80280E44 080A04EE */ j .L802813B8 +/* 7E1CC8 80280E48 AE220074 */ sw $v0, 0x74($s1) +.L80280E4C: +/* 7E1CCC 80280E4C 0C039E12 */ jal get_stored_empty_count +/* 7E1CD0 80280E50 00000000 */ nop +/* 7E1CD4 80280E54 14400005 */ bnez $v0, .L80280E6C +/* 7E1CD8 80280E58 00000000 */ nop +/* 7E1CDC 80280E5C 0C0A005F */ jal func_8028017C +/* 7E1CE0 80280E60 2404000D */ addiu $a0, $zero, 0xd +/* 7E1CE4 80280E64 080A04EE */ j .L802813B8 +/* 7E1CE8 80280E68 AE220074 */ sw $v0, 0x74($s1) +.L80280E6C: +/* 7E1CEC 80280E6C 0C039E12 */ jal get_stored_empty_count +/* 7E1CF0 80280E70 00000000 */ nop +/* 7E1CF4 80280E74 2404000E */ addiu $a0, $zero, 0xe +/* 7E1CF8 80280E78 0C0A0082 */ jal func_80280208 +/* 7E1CFC 80280E7C 0040282D */ daddu $a1, $v0, $zero +/* 7E1D00 80280E80 080A048C */ j .L80281230 +/* 7E1D04 80280E84 AE220074 */ sw $v0, 0x74($s1) +.L80280E88: +/* 7E1D08 80280E88 0C039E05 */ jal get_stored_count +/* 7E1D0C 80280E8C 00000000 */ nop +/* 7E1D10 80280E90 14400005 */ bnez $v0, .L80280EA8 +/* 7E1D14 80280E94 00000000 */ nop +/* 7E1D18 80280E98 0C0A005F */ jal func_8028017C +/* 7E1D1C 80280E9C 24040011 */ addiu $a0, $zero, 0x11 +/* 7E1D20 80280EA0 080A04EE */ j .L802813B8 +/* 7E1D24 80280EA4 AE220074 */ sw $v0, 0x74($s1) +.L80280EA8: +/* 7E1D28 80280EA8 0C039D88 */ jal get_item_empty_count +/* 7E1D2C 80280EAC 00000000 */ nop +/* 7E1D30 80280EB0 14400005 */ bnez $v0, .L80280EC8 +/* 7E1D34 80280EB4 00000000 */ nop +/* 7E1D38 80280EB8 0C0A005F */ jal func_8028017C +/* 7E1D3C 80280EBC 24040012 */ addiu $a0, $zero, 0x12 +/* 7E1D40 80280EC0 080A04EE */ j .L802813B8 +/* 7E1D44 80280EC4 AE220074 */ sw $v0, 0x74($s1) +.L80280EC8: +/* 7E1D48 80280EC8 0C0A005F */ jal func_8028017C +/* 7E1D4C 80280ECC 24040013 */ addiu $a0, $zero, 0x13 +/* 7E1D50 80280ED0 080A04E8 */ j .L802813A0 +/* 7E1D54 80280ED4 AE220074 */ sw $v0, 0x74($s1) +.L80280ED8: +/* 7E1D58 80280ED8 0C0A00D7 */ jal func_8028035C +/* 7E1D5C 80280EDC 00000000 */ nop +/* 7E1D60 80280EE0 AE220074 */ sw $v0, 0x74($s1) +/* 7E1D64 80280EE4 2402002A */ addiu $v0, $zero, 0x2a +/* 7E1D68 80280EE8 080A0505 */ j .L80281414 +/* 7E1D6C 80280EEC AE220070 */ sw $v0, 0x70($s1) +.L80280EF0: +/* 7E1D70 80280EF0 8E240074 */ lw $a0, 0x74($s1) +/* 7E1D74 80280EF4 0C0B1059 */ jal does_script_exist +/* 7E1D78 80280EF8 00000000 */ nop +/* 7E1D7C 80280EFC 14400146 */ bnez $v0, .L80281418 +/* 7E1D80 80280F00 0000102D */ daddu $v0, $zero, $zero +/* 7E1D84 80280F04 0C0A0255 */ jal func_80280954 +/* 7E1D88 80280F08 0000202D */ daddu $a0, $zero, $zero +/* 7E1D8C 80280F0C 24020002 */ addiu $v0, $zero, 2 +/* 7E1D90 80280F10 080A0505 */ j .L80281414 +/* 7E1D94 80280F14 AE220070 */ sw $v0, 0x70($s1) +.L80280F18: +/* 7E1D98 80280F18 0C0A02B1 */ jal func_80280AC4 +/* 7E1D9C 80280F1C 2604000C */ addiu $a0, $s0, 0xc +/* 7E1DA0 80280F20 24030001 */ addiu $v1, $zero, 1 +/* 7E1DA4 80280F24 1443013C */ bne $v0, $v1, .L80281418 +/* 7E1DA8 80280F28 0000102D */ daddu $v0, $zero, $zero +/* 7E1DAC 80280F2C 080A049F */ j .L8028127C +/* 7E1DB0 80280F30 24020015 */ addiu $v0, $zero, 0x15 +.L80280F34: +/* 7E1DB4 80280F34 8E220074 */ lw $v0, 0x74($s1) +/* 7E1DB8 80280F38 1C4000D7 */ bgtz $v0, .L80281298 +/* 7E1DBC 80280F3C 2442FFFF */ addiu $v0, $v0, -1 +/* 7E1DC0 80280F40 0C0A02D1 */ jal func_80280B44 +/* 7E1DC4 80280F44 00000000 */ nop +/* 7E1DC8 80280F48 8E02000C */ lw $v0, 0xc($s0) +/* 7E1DCC 80280F4C 04400012 */ bltz $v0, .L80280F98 +/* 7E1DD0 80280F50 00021040 */ sll $v0, $v0, 1 +/* 7E1DD4 80280F54 00521021 */ addu $v0, $v0, $s2 +/* 7E1DD8 80280F58 844401B4 */ lh $a0, 0x1b4($v0) +/* 7E1DDC 80280F5C 3C028008 */ lui $v0, %hi(gItemTable) +/* 7E1DE0 80280F60 244278E0 */ addiu $v0, $v0, %lo(gItemTable) +/* 7E1DE4 80280F64 00048140 */ sll $s0, $a0, 5 +/* 7E1DE8 80280F68 0C0A02DE */ jal func_80280B78 +/* 7E1DEC 80280F6C 02028021 */ addu $s0, $s0, $v0 +/* 7E1DF0 80280F70 24040008 */ addiu $a0, $zero, 8 +/* 7E1DF4 80280F74 0040302D */ daddu $a2, $v0, $zero +/* 7E1DF8 80280F78 8E050000 */ lw $a1, ($s0) +/* 7E1DFC 80280F7C 0C0A0022 */ jal func_80280088 +/* 7E1E00 80280F80 2407FFFF */ addiu $a3, $zero, -1 +/* 7E1E04 80280F84 0C03A546 */ jal show_coin_counter +/* 7E1E08 80280F88 AE220074 */ sw $v0, 0x74($s1) +/* 7E1E0C 80280F8C 24020003 */ addiu $v0, $zero, 3 +/* 7E1E10 80280F90 080A0505 */ j .L80281414 +/* 7E1E14 80280F94 AE220070 */ sw $v0, 0x70($s1) +.L80280F98: +/* 7E1E18 80280F98 0C0A0000 */ jal func_80280000 +/* 7E1E1C 80280F9C 24040016 */ addiu $a0, $zero, 0x16 +/* 7E1E20 80280FA0 080A04EE */ j .L802813B8 +/* 7E1E24 80280FA4 AE220074 */ sw $v0, 0x74($s1) +.L80280FA8: +/* 7E1E28 80280FA8 8E240074 */ lw $a0, 0x74($s1) +/* 7E1E2C 80280FAC 0C0B1059 */ jal does_script_exist +/* 7E1E30 80280FB0 00000000 */ nop +/* 7E1E34 80280FB4 14400118 */ bnez $v0, .L80281418 +/* 7E1E38 80280FB8 0000102D */ daddu $v0, $zero, $zero +/* 7E1E3C 80280FBC 3C04001E */ lui $a0, 0x1e +/* 7E1E40 80280FC0 34840002 */ ori $a0, $a0, 2 +/* 7E1E44 80280FC4 26250078 */ addiu $a1, $s1, 0x78 +/* 7E1E48 80280FC8 080A04D5 */ j .L80281354 +/* 7E1E4C 80280FCC 2402001F */ addiu $v0, $zero, 0x1f +.L80280FD0: +/* 7E1E50 80280FD0 8E230078 */ lw $v1, 0x78($s1) +/* 7E1E54 80280FD4 24020001 */ addiu $v0, $zero, 1 +/* 7E1E58 80280FD8 1462010F */ bne $v1, $v0, .L80281418 +/* 7E1E5C 80280FDC 0000102D */ daddu $v0, $zero, $zero +/* 7E1E60 80280FE0 3C028028 */ lui $v0, 0x8028 +/* 7E1E64 80280FE4 8C426538 */ lw $v0, 0x6538($v0) +/* 7E1E68 80280FE8 904204E8 */ lbu $v0, 0x4e8($v0) +/* 7E1E6C 80280FEC 1440001D */ bnez $v0, .L80281064 +/* 7E1E70 80280FF0 00000000 */ nop +/* 7E1E74 80280FF4 8E02000C */ lw $v0, 0xc($s0) +/* 7E1E78 80280FF8 00021040 */ sll $v0, $v0, 1 +/* 7E1E7C 80280FFC 00521021 */ addu $v0, $v0, $s2 +/* 7E1E80 80281000 0C0A02DE */ jal func_80280B78 +/* 7E1E84 80281004 844401B4 */ lh $a0, 0x1b4($v0) +/* 7E1E88 80281008 0C03A830 */ jal add_coins +/* 7E1E8C 8028100C 0040202D */ daddu $a0, $v0, $zero +/* 7E1E90 80281010 8E02000C */ lw $v0, 0xc($s0) +/* 7E1E94 80281014 00021040 */ sll $v0, $v0, 1 +/* 7E1E98 80281018 00521021 */ addu $v0, $v0, $s2 +/* 7E1E9C 8028101C 0C039D7B */ jal get_item_count +/* 7E1EA0 80281020 A44001B4 */ sh $zero, 0x1b4($v0) +/* 7E1EA4 80281024 14400009 */ bnez $v0, .L8028104C +/* 7E1EA8 80281028 00000000 */ nop +/* 7E1EAC 8028102C 0C0A00B4 */ jal func_802802D0 +/* 7E1EB0 80281030 2404000B */ addiu $a0, $zero, 0xb +/* 7E1EB4 80281034 AE220074 */ sw $v0, 0x74($s1) +/* 7E1EB8 80281038 24020009 */ addiu $v0, $zero, 9 +/* 7E1EBC 8028103C 0C03A5A6 */ jal hide_coin_counter +/* 7E1EC0 80281040 AE220070 */ sw $v0, 0x70($s1) +/* 7E1EC4 80281044 080A0506 */ j .L80281418 +/* 7E1EC8 80281048 0000102D */ daddu $v0, $zero, $zero +.L8028104C: +/* 7E1ECC 8028104C 0C0A00B4 */ jal func_802802D0 +/* 7E1ED0 80281050 2404000A */ addiu $a0, $zero, 0xa +/* 7E1ED4 80281054 AE220074 */ sw $v0, 0x74($s1) +/* 7E1ED8 80281058 24020020 */ addiu $v0, $zero, 0x20 +/* 7E1EDC 8028105C 080A0505 */ j .L80281414 +/* 7E1EE0 80281060 AE220070 */ sw $v0, 0x70($s1) +.L80281064: +/* 7E1EE4 80281064 0C0A00B4 */ jal func_802802D0 +/* 7E1EE8 80281068 24040009 */ addiu $a0, $zero, 9 +/* 7E1EEC 8028106C AE220074 */ sw $v0, 0x74($s1) +/* 7E1EF0 80281070 0C03A5A6 */ jal hide_coin_counter +/* 7E1EF4 80281074 AE330070 */ sw $s3, 0x70($s1) +/* 7E1EF8 80281078 080A0506 */ j .L80281418 +/* 7E1EFC 8028107C 0000102D */ daddu $v0, $zero, $zero +.L80281080: +/* 7E1F00 80281080 8E240074 */ lw $a0, 0x74($s1) +/* 7E1F04 80281084 0C0B1059 */ jal does_script_exist +/* 7E1F08 80281088 00000000 */ nop +/* 7E1F0C 8028108C 144000E2 */ bnez $v0, .L80281418 +/* 7E1F10 80281090 0000102D */ daddu $v0, $zero, $zero +/* 7E1F14 80281094 3C04001E */ lui $a0, 0x1e +/* 7E1F18 80281098 34840004 */ ori $a0, $a0, 4 +/* 7E1F1C 8028109C 26250078 */ addiu $a1, $s1, 0x78 +/* 7E1F20 802810A0 080A04D5 */ j .L80281354 +/* 7E1F24 802810A4 2402000C */ addiu $v0, $zero, 0xc +.L802810A8: +/* 7E1F28 802810A8 8E230078 */ lw $v1, 0x78($s1) +/* 7E1F2C 802810AC 24020001 */ addiu $v0, $zero, 1 +/* 7E1F30 802810B0 146200D9 */ bne $v1, $v0, .L80281418 +/* 7E1F34 802810B4 0000102D */ daddu $v0, $zero, $zero +/* 7E1F38 802810B8 3C028028 */ lui $v0, 0x8028 +/* 7E1F3C 802810BC 8C426538 */ lw $v0, 0x6538($v0) +/* 7E1F40 802810C0 904204E8 */ lbu $v0, 0x4e8($v0) +/* 7E1F44 802810C4 14400009 */ bnez $v0, .L802810EC +/* 7E1F48 802810C8 00000000 */ nop +/* 7E1F4C 802810CC 0C0A00D7 */ jal func_8028035C +/* 7E1F50 802810D0 00000000 */ nop +/* 7E1F54 802810D4 AE220074 */ sw $v0, 0x74($s1) +/* 7E1F58 802810D8 240200C9 */ addiu $v0, $zero, 0xc9 +/* 7E1F5C 802810DC 0C03A5B2 */ jal func_800E96C8 +/* 7E1F60 802810E0 AE220070 */ sw $v0, 0x70($s1) +/* 7E1F64 802810E4 080A0506 */ j .L80281418 +/* 7E1F68 802810E8 0000102D */ daddu $v0, $zero, $zero +.L802810EC: +/* 7E1F6C 802810EC 0C03A5B2 */ jal func_800E96C8 +/* 7E1F70 802810F0 00000000 */ nop +/* 7E1F74 802810F4 080A04EB */ j .L802813AC +/* 7E1F78 802810F8 00000000 */ nop +.L802810FC: +/* 7E1F7C 802810FC 0C0B1059 */ jal does_script_exist +/* 7E1F80 80281100 8E240074 */ lw $a0, 0x74($s1) +/* 7E1F84 80281104 144000C4 */ bnez $v0, .L80281418 +/* 7E1F88 80281108 0000102D */ daddu $v0, $zero, $zero +/* 7E1F8C 8028110C 0C0A0255 */ jal func_80280954 +/* 7E1F90 80281110 24040001 */ addiu $a0, $zero, 1 +/* 7E1F94 80281114 24020005 */ addiu $v0, $zero, 5 +/* 7E1F98 80281118 080A0505 */ j .L80281414 +/* 7E1F9C 8028111C AE220070 */ sw $v0, 0x70($s1) +.L80281120: +/* 7E1FA0 80281120 0C0A02B1 */ jal func_80280AC4 +/* 7E1FA4 80281124 2604000C */ addiu $a0, $s0, 0xc +/* 7E1FA8 80281128 24030001 */ addiu $v1, $zero, 1 +/* 7E1FAC 8028112C 144300BA */ bne $v0, $v1, .L80281418 +/* 7E1FB0 80281130 0000102D */ daddu $v0, $zero, $zero +/* 7E1FB4 80281134 080A049F */ j .L8028127C +/* 7E1FB8 80281138 24020033 */ addiu $v0, $zero, 0x33 +.L8028113C: +/* 7E1FBC 8028113C 8E220074 */ lw $v0, 0x74($s1) +/* 7E1FC0 80281140 1C400055 */ bgtz $v0, .L80281298 +/* 7E1FC4 80281144 2442FFFF */ addiu $v0, $v0, -1 +/* 7E1FC8 80281148 0C0A02D1 */ jal func_80280B44 +/* 7E1FCC 8028114C 00000000 */ nop +/* 7E1FD0 80281150 8E02000C */ lw $v0, 0xc($s0) +/* 7E1FD4 80281154 0440001C */ bltz $v0, .L802811C8 +/* 7E1FD8 80281158 00021040 */ sll $v0, $v0, 1 +/* 7E1FDC 8028115C 00521021 */ addu $v0, $v0, $s2 +/* 7E1FE0 80281160 0C039DF1 */ jal store_item +/* 7E1FE4 80281164 844401B4 */ lh $a0, 0x1b4($v0) +/* 7E1FE8 80281168 04400005 */ bltz $v0, .L80281180 +/* 7E1FEC 8028116C 00000000 */ nop +/* 7E1FF0 80281170 8E02000C */ lw $v0, 0xc($s0) +/* 7E1FF4 80281174 00021040 */ sll $v0, $v0, 1 +/* 7E1FF8 80281178 00521021 */ addu $v0, $v0, $s2 +/* 7E1FFC 8028117C A44001B4 */ sh $zero, 0x1b4($v0) +.L80281180: +/* 7E2000 80281180 0C039D7B */ jal get_item_count +/* 7E2004 80281184 00000000 */ nop +/* 7E2008 80281188 10400005 */ beqz $v0, .L802811A0 +/* 7E200C 8028118C 00000000 */ nop +/* 7E2010 80281190 0C039E12 */ jal get_stored_empty_count +/* 7E2014 80281194 00000000 */ nop +/* 7E2018 80281198 14400005 */ bnez $v0, .L802811B0 +/* 7E201C 8028119C 00000000 */ nop +.L802811A0: +/* 7E2020 802811A0 0C0A0000 */ jal func_80280000 +/* 7E2024 802811A4 2404000F */ addiu $a0, $zero, 0xf +/* 7E2028 802811A8 080A04EE */ j .L802813B8 +/* 7E202C 802811AC AE220074 */ sw $v0, 0x74($s1) +.L802811B0: +/* 7E2030 802811B0 0C0A0000 */ jal func_80280000 +/* 7E2034 802811B4 24040010 */ addiu $a0, $zero, 0x10 +/* 7E2038 802811B8 AE220074 */ sw $v0, 0x74($s1) +/* 7E203C 802811BC 24020034 */ addiu $v0, $zero, 0x34 +/* 7E2040 802811C0 080A0505 */ j .L80281414 +/* 7E2044 802811C4 AE220070 */ sw $v0, 0x70($s1) +.L802811C8: +/* 7E2048 802811C8 0C0A0000 */ jal func_80280000 +/* 7E204C 802811CC 24040016 */ addiu $a0, $zero, 0x16 +/* 7E2050 802811D0 080A04EE */ j .L802813B8 +/* 7E2054 802811D4 AE220074 */ sw $v0, 0x74($s1) +.L802811D8: +/* 7E2058 802811D8 8E240074 */ lw $a0, 0x74($s1) +/* 7E205C 802811DC 0C0B1059 */ jal does_script_exist +/* 7E2060 802811E0 00000000 */ nop +/* 7E2064 802811E4 1440008C */ bnez $v0, .L80281418 +/* 7E2068 802811E8 0000102D */ daddu $v0, $zero, $zero +/* 7E206C 802811EC 3C04001E */ lui $a0, 0x1e +/* 7E2070 802811F0 34840005 */ ori $a0, $a0, 5 +/* 7E2074 802811F4 26250078 */ addiu $a1, $s1, 0x78 +/* 7E2078 802811F8 080A04D5 */ j .L80281354 +/* 7E207C 802811FC 24020035 */ addiu $v0, $zero, 0x35 +.L80281200: +/* 7E2080 80281200 8E230078 */ lw $v1, 0x78($s1) +/* 7E2084 80281204 24020001 */ addiu $v0, $zero, 1 +/* 7E2088 80281208 14620083 */ bne $v1, $v0, .L80281418 +/* 7E208C 8028120C 0000102D */ daddu $v0, $zero, $zero +/* 7E2090 80281210 3C028028 */ lui $v0, 0x8028 +/* 7E2094 80281214 8C426538 */ lw $v0, 0x6538($v0) +/* 7E2098 80281218 904204E8 */ lbu $v0, 0x4e8($v0) +/* 7E209C 8028121C 14400063 */ bnez $v0, .L802813AC +/* 7E20A0 80281220 00000000 */ nop +/* 7E20A4 80281224 0C0A00D7 */ jal func_8028035C +/* 7E20A8 80281228 00000000 */ nop +/* 7E20AC 8028122C AE220074 */ sw $v0, 0x74($s1) +.L80281230: +/* 7E20B0 80281230 240201F5 */ addiu $v0, $zero, 0x1f5 +/* 7E20B4 80281234 080A0505 */ j .L80281414 +/* 7E20B8 80281238 AE220070 */ sw $v0, 0x70($s1) +.L8028123C: +/* 7E20BC 8028123C 8E240074 */ lw $a0, 0x74($s1) +/* 7E20C0 80281240 0C0B1059 */ jal does_script_exist +/* 7E20C4 80281244 00000000 */ nop +/* 7E20C8 80281248 14400073 */ bnez $v0, .L80281418 +/* 7E20CC 8028124C 0000102D */ daddu $v0, $zero, $zero +/* 7E20D0 80281250 0C0A0255 */ jal func_80280954 +/* 7E20D4 80281254 24040002 */ addiu $a0, $zero, 2 +/* 7E20D8 80281258 24020007 */ addiu $v0, $zero, 7 +/* 7E20DC 8028125C 080A0505 */ j .L80281414 +/* 7E20E0 80281260 AE220070 */ sw $v0, 0x70($s1) +.L80281264: +/* 7E20E4 80281264 0C0A02B1 */ jal func_80280AC4 +/* 7E20E8 80281268 2604000C */ addiu $a0, $s0, 0xc +/* 7E20EC 8028126C 24030001 */ addiu $v1, $zero, 1 +/* 7E20F0 80281270 14430069 */ bne $v0, $v1, .L80281418 +/* 7E20F4 80281274 0000102D */ daddu $v0, $zero, $zero +/* 7E20F8 80281278 24020047 */ addiu $v0, $zero, 0x47 +.L8028127C: +/* 7E20FC 8028127C AE220070 */ sw $v0, 0x70($s1) +/* 7E2100 80281280 2402000F */ addiu $v0, $zero, 0xf +/* 7E2104 80281284 080A0505 */ j .L80281414 +/* 7E2108 80281288 AE220074 */ sw $v0, 0x74($s1) +.L8028128C: +/* 7E210C 8028128C 8E220074 */ lw $v0, 0x74($s1) +/* 7E2110 80281290 18400003 */ blez $v0, .L802812A0 +/* 7E2114 80281294 2442FFFF */ addiu $v0, $v0, -1 +.L80281298: +/* 7E2118 80281298 080A0505 */ j .L80281414 +/* 7E211C 8028129C AE220074 */ sw $v0, 0x74($s1) +.L802812A0: +/* 7E2120 802812A0 0C0A02D1 */ jal func_80280B44 +/* 7E2124 802812A4 00000000 */ nop +/* 7E2128 802812A8 8E02000C */ lw $v0, 0xc($s0) +/* 7E212C 802812AC 0440001C */ bltz $v0, .L80281320 +/* 7E2130 802812B0 00021040 */ sll $v0, $v0, 1 +/* 7E2134 802812B4 00521021 */ addu $v0, $v0, $s2 +/* 7E2138 802812B8 0C039D5D */ jal add_item +/* 7E213C 802812BC 844401C8 */ lh $a0, 0x1c8($v0) +/* 7E2140 802812C0 04400005 */ bltz $v0, .L802812D8 +/* 7E2144 802812C4 00000000 */ nop +/* 7E2148 802812C8 8E02000C */ lw $v0, 0xc($s0) +/* 7E214C 802812CC 00021040 */ sll $v0, $v0, 1 +/* 7E2150 802812D0 00521021 */ addu $v0, $v0, $s2 +/* 7E2154 802812D4 A44001C8 */ sh $zero, 0x1c8($v0) +.L802812D8: +/* 7E2158 802812D8 0C039D88 */ jal get_item_empty_count +/* 7E215C 802812DC 00000000 */ nop +/* 7E2160 802812E0 10400005 */ beqz $v0, .L802812F8 +/* 7E2164 802812E4 00000000 */ nop +/* 7E2168 802812E8 0C039E05 */ jal get_stored_count +/* 7E216C 802812EC 00000000 */ nop +/* 7E2170 802812F0 14400005 */ bnez $v0, .L80281308 +/* 7E2174 802812F4 00000000 */ nop +.L802812F8: +/* 7E2178 802812F8 0C0A0000 */ jal func_80280000 +/* 7E217C 802812FC 24040014 */ addiu $a0, $zero, 0x14 +/* 7E2180 80281300 080A04EE */ j .L802813B8 +/* 7E2184 80281304 AE220074 */ sw $v0, 0x74($s1) +.L80281308: +/* 7E2188 80281308 0C0A0000 */ jal func_80280000 +/* 7E218C 8028130C 24040015 */ addiu $a0, $zero, 0x15 +/* 7E2190 80281310 AE220074 */ sw $v0, 0x74($s1) +/* 7E2194 80281314 24020048 */ addiu $v0, $zero, 0x48 +/* 7E2198 80281318 080A0505 */ j .L80281414 +/* 7E219C 8028131C AE220070 */ sw $v0, 0x70($s1) +.L80281320: +/* 7E21A0 80281320 0C0A0000 */ jal func_80280000 +/* 7E21A4 80281324 24040016 */ addiu $a0, $zero, 0x16 +/* 7E21A8 80281328 080A04EE */ j .L802813B8 +/* 7E21AC 8028132C AE220074 */ sw $v0, 0x74($s1) +.L80281330: +/* 7E21B0 80281330 8E240074 */ lw $a0, 0x74($s1) +/* 7E21B4 80281334 0C0B1059 */ jal does_script_exist +/* 7E21B8 80281338 00000000 */ nop +/* 7E21BC 8028133C 14400036 */ bnez $v0, .L80281418 +/* 7E21C0 80281340 0000102D */ daddu $v0, $zero, $zero +/* 7E21C4 80281344 3C04001E */ lui $a0, 0x1e +/* 7E21C8 80281348 34840005 */ ori $a0, $a0, 5 +/* 7E21CC 8028134C 26250078 */ addiu $a1, $s1, 0x78 +/* 7E21D0 80281350 24020049 */ addiu $v0, $zero, 0x49 +.L80281354: +/* 7E21D4 80281354 AE220070 */ sw $v0, 0x70($s1) +/* 7E21D8 80281358 0C049640 */ jal load_string +/* 7E21DC 8028135C AE200078 */ sw $zero, 0x78($s1) +/* 7E21E0 80281360 3C018028 */ lui $at, 0x8028 +/* 7E21E4 80281364 AC226538 */ sw $v0, 0x6538($at) +/* 7E21E8 80281368 080A0506 */ j .L80281418 +/* 7E21EC 8028136C 0000102D */ daddu $v0, $zero, $zero +.L80281370: +/* 7E21F0 80281370 8E230078 */ lw $v1, 0x78($s1) +/* 7E21F4 80281374 24020001 */ addiu $v0, $zero, 1 +/* 7E21F8 80281378 14620027 */ bne $v1, $v0, .L80281418 +/* 7E21FC 8028137C 0000102D */ daddu $v0, $zero, $zero +/* 7E2200 80281380 3C028028 */ lui $v0, 0x8028 +/* 7E2204 80281384 8C426538 */ lw $v0, 0x6538($v0) +/* 7E2208 80281388 904204E8 */ lbu $v0, 0x4e8($v0) +/* 7E220C 8028138C 14400007 */ bnez $v0, .L802813AC +/* 7E2210 80281390 00000000 */ nop +/* 7E2214 80281394 0C0A00D7 */ jal func_8028035C +/* 7E2218 80281398 00000000 */ nop +/* 7E221C 8028139C AE220074 */ sw $v0, 0x74($s1) +.L802813A0: +/* 7E2220 802813A0 240202BD */ addiu $v0, $zero, 0x2bd +/* 7E2224 802813A4 080A0505 */ j .L80281414 +/* 7E2228 802813A8 AE220070 */ sw $v0, 0x70($s1) +.L802813AC: +/* 7E222C 802813AC 0C0A00B4 */ jal func_802802D0 +/* 7E2230 802813B0 24040016 */ addiu $a0, $zero, 0x16 +/* 7E2234 802813B4 AE220074 */ sw $v0, 0x74($s1) +.L802813B8: +/* 7E2238 802813B8 24020009 */ addiu $v0, $zero, 9 +/* 7E223C 802813BC 080A0505 */ j .L80281414 +/* 7E2240 802813C0 AE220070 */ sw $v0, 0x70($s1) +.L802813C4: +/* 7E2244 802813C4 8E240074 */ lw $a0, 0x74($s1) +/* 7E2248 802813C8 0C0B1059 */ jal does_script_exist +/* 7E224C 802813CC 00000000 */ nop +/* 7E2250 802813D0 14400011 */ bnez $v0, .L80281418 +/* 7E2254 802813D4 0000102D */ daddu $v0, $zero, $zero +/* 7E2258 802813D8 2402000A */ addiu $v0, $zero, 0xa +/* 7E225C 802813DC 080A0505 */ j .L80281414 +/* 7E2260 802813E0 AE220070 */ sw $v0, 0x70($s1) +.L802813E4: +/* 7E2264 802813E4 8E020010 */ lw $v0, 0x10($s0) +/* 7E2268 802813E8 10400006 */ beqz $v0, .L80281404 +/* 7E226C 802813EC 00000000 */ nop +/* 7E2270 802813F0 8C440014 */ lw $a0, 0x14($v0) +/* 7E2274 802813F4 10800003 */ beqz $a0, .L80281404 +/* 7E2278 802813F8 24050001 */ addiu $a1, $zero, 1 +/* 7E227C 802813FC 0C0B0CF8 */ jal start_script +/* 7E2280 80281400 0000302D */ daddu $a2, $zero, $zero +.L80281404: +/* 7E2284 80281404 0C03A5E3 */ jal open_status_menu_short +/* 7E2288 80281408 00000000 */ nop +/* 7E228C 8028140C 080A0506 */ j .L80281418 +/* 7E2290 80281410 24020001 */ addiu $v0, $zero, 1 +.L80281414: +/* 7E2294 80281414 0000102D */ daddu $v0, $zero, $zero +.L80281418: +/* 7E2298 80281418 8FBF0020 */ lw $ra, 0x20($sp) +/* 7E229C 8028141C 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E22A0 80281420 8FB20018 */ lw $s2, 0x18($sp) +/* 7E22A4 80281424 8FB10014 */ lw $s1, 0x14($sp) +/* 7E22A8 80281428 8FB00010 */ lw $s0, 0x10($sp) +/* 7E22AC 8028142C 03E00008 */ jr $ra +/* 7E22B0 80281430 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s new file mode 100644 index 0000000000..5dcd366f21 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80281434 +/* 7E22B4 80281434 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E22B8 80281438 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E22BC 8028143C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E22C0 80281440 AFBF0024 */ sw $ra, 0x24($sp) +/* 7E22C4 80281444 AFB20020 */ sw $s2, 0x20($sp) +/* 7E22C8 80281448 AFB1001C */ sw $s1, 0x1c($sp) +/* 7E22CC 8028144C AFB00018 */ sw $s0, 0x18($sp) +/* 7E22D0 80281450 8C440144 */ lw $a0, 0x144($v0) +/* 7E22D4 80281454 00A0882D */ daddu $s1, $a1, $zero +/* 7E22D8 80281458 8C830008 */ lw $v1, 8($a0) +/* 7E22DC 8028145C 00C0902D */ daddu $s2, $a2, $zero +/* 7E22E0 80281460 00031040 */ sll $v0, $v1, 1 +/* 7E22E4 80281464 00431021 */ addu $v0, $v0, $v1 +/* 7E22E8 80281468 8C830018 */ lw $v1, 0x18($a0) +/* 7E22EC 8028146C 00021080 */ sll $v0, $v0, 2 +/* 7E22F0 80281470 00621821 */ addu $v1, $v1, $v0 +/* 7E22F4 80281474 8C700000 */ lw $s0, ($v1) +/* 7E22F8 80281478 3C028008 */ lui $v0, %hi(gItemTable) +/* 7E22FC 8028147C 244278E0 */ addiu $v0, $v0, %lo(gItemTable) +/* 7E2300 80281480 00108140 */ sll $s0, $s0, 5 +/* 7E2304 80281484 02028021 */ addu $s0, $s0, $v0 +/* 7E2308 80281488 8E040000 */ lw $a0, ($s0) +/* 7E230C 8028148C 0C04991D */ jal get_string_width +/* 7E2310 80281490 0000282D */ daddu $a1, $zero, $zero +/* 7E2314 80281494 00021043 */ sra $v0, $v0, 1 +/* 7E2318 80281498 2442FFC4 */ addiu $v0, $v0, -0x3c +/* 7E231C 8028149C 02222823 */ subu $a1, $s1, $v0 +/* 7E2320 802814A0 26460006 */ addiu $a2, $s2, 6 +/* 7E2324 802814A4 AFA00010 */ sw $zero, 0x10($sp) +/* 7E2328 802814A8 AFA00014 */ sw $zero, 0x14($sp) +/* 7E232C 802814AC 8E040000 */ lw $a0, ($s0) +/* 7E2330 802814B0 0C04993B */ jal draw_string +/* 7E2334 802814B4 240700FF */ addiu $a3, $zero, 0xff +/* 7E2338 802814B8 8FBF0024 */ lw $ra, 0x24($sp) +/* 7E233C 802814BC 8FB20020 */ lw $s2, 0x20($sp) +/* 7E2340 802814C0 8FB1001C */ lw $s1, 0x1c($sp) +/* 7E2344 802814C4 8FB00018 */ lw $s0, 0x18($sp) +/* 7E2348 802814C8 03E00008 */ jr $ra +/* 7E234C 802814CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s new file mode 100644 index 0000000000..663497bde0 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802814D0 +/* 7E2350 802814D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7E2354 802814D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7E2358 802814D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E235C 802814DC AFBF0018 */ sw $ra, 0x18($sp) +/* 7E2360 802814E0 8C420144 */ lw $v0, 0x144($v0) +/* 7E2364 802814E4 24A50008 */ addiu $a1, $a1, 8 +/* 7E2368 802814E8 8C440008 */ lw $a0, 8($v0) +/* 7E236C 802814EC 8C430018 */ lw $v1, 0x18($v0) +/* 7E2370 802814F0 2402000A */ addiu $v0, $zero, 0xa +/* 7E2374 802814F4 AFA20010 */ sw $v0, 0x10($sp) +/* 7E2378 802814F8 AFA00014 */ sw $zero, 0x14($sp) +/* 7E237C 802814FC 00041040 */ sll $v0, $a0, 1 +/* 7E2380 80281500 00441021 */ addu $v0, $v0, $a0 +/* 7E2384 80281504 00021080 */ sll $v0, $v0, 2 +/* 7E2388 80281508 00621821 */ addu $v1, $v1, $v0 +/* 7E238C 8028150C 8C640008 */ lw $a0, 8($v1) +/* 7E2390 80281510 0C04993B */ jal draw_string +/* 7E2394 80281514 240700FF */ addiu $a3, $zero, 0xff +/* 7E2398 80281518 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E239C 8028151C 03E00008 */ jr $ra +/* 7E23A0 80281520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s new file mode 100644 index 0000000000..96d43f70bf --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s @@ -0,0 +1,394 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel MakeDoorAdvanced +/* 7E2B2C 80281CAC 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 7E2B30 80281CB0 AFB10034 */ sw $s1, 0x34($sp) +/* 7E2B34 80281CB4 0080882D */ daddu $s1, $a0, $zero +/* 7E2B38 80281CB8 AFBF0054 */ sw $ra, 0x54($sp) +/* 7E2B3C 80281CBC AFBE0050 */ sw $fp, 0x50($sp) +/* 7E2B40 80281CC0 AFB7004C */ sw $s7, 0x4c($sp) +/* 7E2B44 80281CC4 AFB60048 */ sw $s6, 0x48($sp) +/* 7E2B48 80281CC8 AFB50044 */ sw $s5, 0x44($sp) +/* 7E2B4C 80281CCC AFB40040 */ sw $s4, 0x40($sp) +/* 7E2B50 80281CD0 AFB3003C */ sw $s3, 0x3c($sp) +/* 7E2B54 80281CD4 AFB20038 */ sw $s2, 0x38($sp) +/* 7E2B58 80281CD8 AFB00030 */ sw $s0, 0x30($sp) +/* 7E2B5C 80281CDC 8E30000C */ lw $s0, 0xc($s1) +/* 7E2B60 80281CE0 0C00AB39 */ jal heap_malloc +/* 7E2B64 80281CE4 24040064 */ addiu $a0, $zero, 0x64 +/* 7E2B68 80281CE8 0220202D */ daddu $a0, $s1, $zero +/* 7E2B6C 80281CEC 0040902D */ daddu $s2, $v0, $zero +/* 7E2B70 80281CF0 AE400000 */ sw $zero, ($s2) +/* 7E2B74 80281CF4 8E050000 */ lw $a1, ($s0) +/* 7E2B78 80281CF8 0C0B1EAF */ jal get_variable +/* 7E2B7C 80281CFC 26100004 */ addiu $s0, $s0, 4 +/* 7E2B80 80281D00 0040982D */ daddu $s3, $v0, $zero +/* 7E2B84 80281D04 32620FFF */ andi $v0, $s3, 0xfff +/* 7E2B88 80281D08 AE420004 */ sw $v0, 4($s2) +/* 7E2B8C 80281D0C 3262F000 */ andi $v0, $s3, 0xf000 +/* 7E2B90 80281D10 00021303 */ sra $v0, $v0, 0xc +/* 7E2B94 80281D14 A6420008 */ sh $v0, 8($s2) +/* 7E2B98 80281D18 A640000A */ sh $zero, 0xa($s2) +/* 7E2B9C 80281D1C 8E050000 */ lw $a1, ($s0) +/* 7E2BA0 80281D20 26100004 */ addiu $s0, $s0, 4 +/* 7E2BA4 80281D24 0C0B1EAF */ jal get_variable +/* 7E2BA8 80281D28 0220202D */ daddu $a0, $s1, $zero +/* 7E2BAC 80281D2C 8E050000 */ lw $a1, ($s0) +/* 7E2BB0 80281D30 26100004 */ addiu $s0, $s0, 4 +/* 7E2BB4 80281D34 0220202D */ daddu $a0, $s1, $zero +/* 7E2BB8 80281D38 0C0B1EAF */ jal get_variable +/* 7E2BBC 80281D3C AFA2002C */ sw $v0, 0x2c($sp) +/* 7E2BC0 80281D40 8E050000 */ lw $a1, ($s0) +/* 7E2BC4 80281D44 26100004 */ addiu $s0, $s0, 4 +/* 7E2BC8 80281D48 0220202D */ daddu $a0, $s1, $zero +/* 7E2BCC 80281D4C 0C0B1EAF */ jal get_variable +/* 7E2BD0 80281D50 0040F02D */ daddu $fp, $v0, $zero +/* 7E2BD4 80281D54 8E050000 */ lw $a1, ($s0) +/* 7E2BD8 80281D58 26100004 */ addiu $s0, $s0, 4 +/* 7E2BDC 80281D5C 0220202D */ daddu $a0, $s1, $zero +/* 7E2BE0 80281D60 0C0B1EAF */ jal get_variable +/* 7E2BE4 80281D64 0040A82D */ daddu $s5, $v0, $zero +/* 7E2BE8 80281D68 8E050000 */ lw $a1, ($s0) +/* 7E2BEC 80281D6C 26100004 */ addiu $s0, $s0, 4 +/* 7E2BF0 80281D70 0220202D */ daddu $a0, $s1, $zero +/* 7E2BF4 80281D74 0C0B1EAF */ jal get_variable +/* 7E2BF8 80281D78 0040B82D */ daddu $s7, $v0, $zero +/* 7E2BFC 80281D7C 0040A02D */ daddu $s4, $v0, $zero +/* 7E2C00 80281D80 AE540060 */ sw $s4, 0x60($s2) +/* 7E2C04 80281D84 8E050000 */ lw $a1, ($s0) +/* 7E2C08 80281D88 26100004 */ addiu $s0, $s0, 4 +/* 7E2C0C 80281D8C 0C0B1EAF */ jal get_variable +/* 7E2C10 80281D90 0220202D */ daddu $a0, $s1, $zero +/* 7E2C14 80281D94 8E050000 */ lw $a1, ($s0) +/* 7E2C18 80281D98 26100004 */ addiu $s0, $s0, 4 +/* 7E2C1C 80281D9C 0220202D */ daddu $a0, $s1, $zero +/* 7E2C20 80281DA0 0C0B1EAF */ jal get_variable +/* 7E2C24 80281DA4 0040B02D */ daddu $s6, $v0, $zero +/* 7E2C28 80281DA8 AE42003C */ sw $v0, 0x3c($s2) +/* 7E2C2C 80281DAC 8E050000 */ lw $a1, ($s0) +/* 7E2C30 80281DB0 0C0B1EAF */ jal get_variable +/* 7E2C34 80281DB4 0220202D */ daddu $a0, $s1, $zero +/* 7E2C38 80281DB8 12A00003 */ beqz $s5, .L80281DC8 +/* 7E2C3C 80281DBC AE42005C */ sw $v0, 0x5c($s2) +/* 7E2C40 80281DC0 36730800 */ ori $s3, $s3, 0x800 +/* 7E2C44 80281DC4 AE530004 */ sw $s3, 4($s2) +.L80281DC8: +/* 7E2C48 80281DC8 0280202D */ daddu $a0, $s4, $zero +/* 7E2C4C 80281DCC 27A50018 */ addiu $a1, $sp, 0x18 +/* 7E2C50 80281DD0 27B0001C */ addiu $s0, $sp, 0x1c +/* 7E2C54 80281DD4 0200302D */ daddu $a2, $s0, $zero +/* 7E2C58 80281DD8 0C016F84 */ jal get_collider_center +/* 7E2C5C 80281DDC 27A70020 */ addiu $a3, $sp, 0x20 +/* 7E2C60 80281DE0 0280202D */ daddu $a0, $s4, $zero +/* 7E2C64 80281DE4 27A50024 */ addiu $a1, $sp, 0x24 +/* 7E2C68 80281DE8 0200302D */ daddu $a2, $s0, $zero +/* 7E2C6C 80281DEC 0C016F76 */ jal func_8005BDD8 +/* 7E2C70 80281DF0 27A70028 */ addiu $a3, $sp, 0x28 +/* 7E2C74 80281DF4 326300FF */ andi $v1, $s3, 0xff +/* 7E2C78 80281DF8 2C620008 */ sltiu $v0, $v1, 8 +/* 7E2C7C 80281DFC 104000F0 */ beqz $v0, .L802821C0 +/* 7E2C80 80281E00 00031080 */ sll $v0, $v1, 2 +/* 7E2C84 80281E04 3C018028 */ lui $at, 0x8028 +/* 7E2C88 80281E08 00220821 */ addu $at, $at, $v0 +/* 7E2C8C 80281E0C 8C226500 */ lw $v0, 0x6500($at) +/* 7E2C90 80281E10 00400008 */ jr $v0 +/* 7E2C94 80281E14 00000000 */ nop +/* 7E2C98 80281E18 C7AA0024 */ lwc1 $f10, 0x24($sp) +/* 7E2C9C 80281E1C 3C0141F0 */ lui $at, 0x41f0 +/* 7E2CA0 80281E20 44811000 */ mtc1 $at, $f2 +/* 7E2CA4 80281E24 00000000 */ nop +/* 7E2CA8 80281E28 46025302 */ mul.s $f12, $f10, $f2 +/* 7E2CAC 80281E2C 00000000 */ nop +/* 7E2CB0 80281E30 C7A60028 */ lwc1 $f6, 0x28($sp) +/* 7E2CB4 80281E34 3C0141A0 */ lui $at, 0x41a0 +/* 7E2CB8 80281E38 44810000 */ mtc1 $at, $f0 +/* 7E2CBC 80281E3C 00000000 */ nop +/* 7E2CC0 80281E40 46003102 */ mul.s $f4, $f6, $f0 +/* 7E2CC4 80281E44 00000000 */ nop +/* 7E2CC8 80281E48 46023182 */ mul.s $f6, $f6, $f2 +/* 7E2CCC 80281E4C 00000000 */ nop +/* 7E2CD0 80281E50 46005282 */ mul.s $f10, $f10, $f0 +/* 7E2CD4 80281E54 00000000 */ nop +/* 7E2CD8 80281E58 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2CDC 80281E5C 460C1200 */ add.s $f8, $f2, $f12 +/* 7E2CE0 80281E60 460C1081 */ sub.s $f2, $f2, $f12 +/* 7E2CE4 80281E64 46044201 */ sub.s $f8, $f8, $f4 +/* 7E2CE8 80281E68 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2CEC 80281E6C 46060100 */ add.s $f4, $f0, $f6 +/* 7E2CF0 80281E70 46060001 */ sub.s $f0, $f0, $f6 +/* 7E2CF4 80281E74 E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2CF8 80281E78 080A0819 */ j .L80282064 +/* 7E2CFC 80281E7C 460A2100 */ add.s $f4, $f4, $f10 +/* 7E2D00 80281E80 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 7E2D04 80281E84 3C014270 */ lui $at, 0x4270 +/* 7E2D08 80281E88 44812000 */ mtc1 $at, $f4 +/* 7E2D0C 80281E8C 00000000 */ nop +/* 7E2D10 80281E90 46044302 */ mul.s $f12, $f8, $f4 +/* 7E2D14 80281E94 00000000 */ nop +/* 7E2D18 80281E98 C7A60028 */ lwc1 $f6, 0x28($sp) +/* 7E2D1C 80281E9C 3C0141A0 */ lui $at, 0x41a0 +/* 7E2D20 80281EA0 44815000 */ mtc1 $at, $f10 +/* 7E2D24 80281EA4 00000000 */ nop +/* 7E2D28 80281EA8 460A3382 */ mul.s $f14, $f6, $f10 +/* 7E2D2C 80281EAC 00000000 */ nop +/* 7E2D30 80281EB0 46043102 */ mul.s $f4, $f6, $f4 +/* 7E2D34 80281EB4 00000000 */ nop +/* 7E2D38 80281EB8 460A4282 */ mul.s $f10, $f8, $f10 +/* 7E2D3C 80281EBC 00000000 */ nop +/* 7E2D40 80281EC0 3C0141F0 */ lui $at, 0x41f0 +/* 7E2D44 80281EC4 44810000 */ mtc1 $at, $f0 +/* 7E2D48 80281EC8 00000000 */ nop +/* 7E2D4C 80281ECC 46004202 */ mul.s $f8, $f8, $f0 +/* 7E2D50 80281ED0 00000000 */ nop +/* 7E2D54 80281ED4 46003182 */ mul.s $f6, $f6, $f0 +/* 7E2D58 80281ED8 00000000 */ nop +/* 7E2D5C 80281EDC C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2D60 80281EE0 460C1300 */ add.s $f12, $f2, $f12 +/* 7E2D64 80281EE4 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2D68 80281EE8 46040100 */ add.s $f4, $f0, $f4 +/* 7E2D6C 80281EEC 46081081 */ sub.s $f2, $f2, $f8 +/* 7E2D70 80281EF0 46060001 */ sub.s $f0, $f0, $f6 +/* 7E2D74 80281EF4 460E6301 */ sub.s $f12, $f12, $f14 +/* 7E2D78 80281EF8 E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2D7C 80281EFC 080A083D */ j .L802820F4 +/* 7E2D80 80281F00 460A2100 */ add.s $f4, $f4, $f10 +/* 7E2D84 80281F04 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 7E2D88 80281F08 3C0141F0 */ lui $at, 0x41f0 +/* 7E2D8C 80281F0C 44813000 */ mtc1 $at, $f6 +/* 7E2D90 80281F10 00000000 */ nop +/* 7E2D94 80281F14 46064282 */ mul.s $f10, $f8, $f6 +/* 7E2D98 80281F18 00000000 */ nop +/* 7E2D9C 80281F1C C7A40028 */ lwc1 $f4, 0x28($sp) +/* 7E2DA0 80281F20 46062182 */ mul.s $f6, $f4, $f6 +/* 7E2DA4 80281F24 00000000 */ nop +/* 7E2DA8 80281F28 3C0141A0 */ lui $at, 0x41a0 +/* 7E2DAC 80281F2C 44810000 */ mtc1 $at, $f0 +/* 7E2DB0 80281F30 00000000 */ nop +/* 7E2DB4 80281F34 46002102 */ mul.s $f4, $f4, $f0 +/* 7E2DB8 80281F38 00000000 */ nop +/* 7E2DBC 80281F3C 46004202 */ mul.s $f8, $f8, $f0 +/* 7E2DC0 80281F40 00000000 */ nop +/* 7E2DC4 80281F44 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2DC8 80281F48 460A1300 */ add.s $f12, $f2, $f10 +/* 7E2DCC 80281F4C 460A1081 */ sub.s $f2, $f2, $f10 +/* 7E2DD0 80281F50 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2DD4 80281F54 46060280 */ add.s $f10, $f0, $f6 +/* 7E2DD8 80281F58 46060001 */ sub.s $f0, $f0, $f6 +/* 7E2DDC 80281F5C 46041081 */ sub.s $f2, $f2, $f4 +/* 7E2DE0 80281F60 E64C000C */ swc1 $f12, 0xc($s2) +/* 7E2DE4 80281F64 46080001 */ sub.s $f0, $f0, $f8 +/* 7E2DE8 80281F68 E64A0010 */ swc1 $f10, 0x10($s2) +/* 7E2DEC 80281F6C 080A086F */ j .L802821BC +/* 7E2DF0 80281F70 E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2DF4 80281F74 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 7E2DF8 80281F78 3C0141F0 */ lui $at, 0x41f0 +/* 7E2DFC 80281F7C 44813000 */ mtc1 $at, $f6 +/* 7E2E00 80281F80 00000000 */ nop +/* 7E2E04 80281F84 46064282 */ mul.s $f10, $f8, $f6 +/* 7E2E08 80281F88 00000000 */ nop +/* 7E2E0C 80281F8C C7A40028 */ lwc1 $f4, 0x28($sp) +/* 7E2E10 80281F90 46062182 */ mul.s $f6, $f4, $f6 +/* 7E2E14 80281F94 00000000 */ nop +/* 7E2E18 80281F98 3C014270 */ lui $at, 0x4270 +/* 7E2E1C 80281F9C 44811000 */ mtc1 $at, $f2 +/* 7E2E20 80281FA0 00000000 */ nop +/* 7E2E24 80281FA4 46024302 */ mul.s $f12, $f8, $f2 +/* 7E2E28 80281FA8 00000000 */ nop +/* 7E2E2C 80281FAC 3C0141A0 */ lui $at, 0x41a0 +/* 7E2E30 80281FB0 44810000 */ mtc1 $at, $f0 +/* 7E2E34 80281FB4 00000000 */ nop +/* 7E2E38 80281FB8 46002382 */ mul.s $f14, $f4, $f0 +/* 7E2E3C 80281FBC 00000000 */ nop +/* 7E2E40 80281FC0 46022102 */ mul.s $f4, $f4, $f2 +/* 7E2E44 80281FC4 00000000 */ nop +/* 7E2E48 80281FC8 46004202 */ mul.s $f8, $f8, $f0 +/* 7E2E4C 80281FCC 00000000 */ nop +/* 7E2E50 80281FD0 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2E54 80281FD4 460A1280 */ add.s $f10, $f2, $f10 +/* 7E2E58 80281FD8 460C1081 */ sub.s $f2, $f2, $f12 +/* 7E2E5C 80281FDC C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2E60 80281FE0 46060180 */ add.s $f6, $f0, $f6 +/* 7E2E64 80281FE4 46040001 */ sub.s $f0, $f0, $f4 +/* 7E2E68 80281FE8 460E1081 */ sub.s $f2, $f2, $f14 +/* 7E2E6C 80281FEC E64A000C */ swc1 $f10, 0xc($s2) +/* 7E2E70 80281FF0 46080001 */ sub.s $f0, $f0, $f8 +/* 7E2E74 80281FF4 E6460010 */ swc1 $f6, 0x10($s2) +/* 7E2E78 80281FF8 080A086F */ j .L802821BC +/* 7E2E7C 80281FFC E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2E80 80282000 C7AA0024 */ lwc1 $f10, 0x24($sp) +/* 7E2E84 80282004 3C0141F0 */ lui $at, 0x41f0 +/* 7E2E88 80282008 44811000 */ mtc1 $at, $f2 +/* 7E2E8C 8028200C 00000000 */ nop +/* 7E2E90 80282010 46025302 */ mul.s $f12, $f10, $f2 +/* 7E2E94 80282014 00000000 */ nop +/* 7E2E98 80282018 C7A60028 */ lwc1 $f6, 0x28($sp) +/* 7E2E9C 8028201C 3C0141A0 */ lui $at, 0x41a0 +/* 7E2EA0 80282020 44810000 */ mtc1 $at, $f0 +/* 7E2EA4 80282024 00000000 */ nop +/* 7E2EA8 80282028 46003102 */ mul.s $f4, $f6, $f0 +/* 7E2EAC 8028202C 00000000 */ nop +/* 7E2EB0 80282030 46023182 */ mul.s $f6, $f6, $f2 +/* 7E2EB4 80282034 00000000 */ nop +/* 7E2EB8 80282038 46005282 */ mul.s $f10, $f10, $f0 +/* 7E2EBC 8028203C 00000000 */ nop +/* 7E2EC0 80282040 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2EC4 80282044 460C1200 */ add.s $f8, $f2, $f12 +/* 7E2EC8 80282048 460C1081 */ sub.s $f2, $f2, $f12 +/* 7E2ECC 8028204C 46044200 */ add.s $f8, $f8, $f4 +/* 7E2ED0 80282050 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2ED4 80282054 46060100 */ add.s $f4, $f0, $f6 +/* 7E2ED8 80282058 46060001 */ sub.s $f0, $f0, $f6 +/* 7E2EDC 8028205C E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2EE0 80282060 460A2101 */ sub.s $f4, $f4, $f10 +.L80282064: +/* 7E2EE4 80282064 E6400018 */ swc1 $f0, 0x18($s2) +/* 7E2EE8 80282068 E648000C */ swc1 $f8, 0xc($s2) +/* 7E2EEC 8028206C 080A0870 */ j .L802821C0 +/* 7E2EF0 80282070 E6440010 */ swc1 $f4, 0x10($s2) +/* 7E2EF4 80282074 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 7E2EF8 80282078 3C014270 */ lui $at, 0x4270 +/* 7E2EFC 8028207C 44812000 */ mtc1 $at, $f4 +/* 7E2F00 80282080 00000000 */ nop +/* 7E2F04 80282084 46044302 */ mul.s $f12, $f8, $f4 +/* 7E2F08 80282088 00000000 */ nop +/* 7E2F0C 8028208C C7A60028 */ lwc1 $f6, 0x28($sp) +/* 7E2F10 80282090 3C0141A0 */ lui $at, 0x41a0 +/* 7E2F14 80282094 44815000 */ mtc1 $at, $f10 +/* 7E2F18 80282098 00000000 */ nop +/* 7E2F1C 8028209C 460A3382 */ mul.s $f14, $f6, $f10 +/* 7E2F20 802820A0 00000000 */ nop +/* 7E2F24 802820A4 46043102 */ mul.s $f4, $f6, $f4 +/* 7E2F28 802820A8 00000000 */ nop +/* 7E2F2C 802820AC 460A4282 */ mul.s $f10, $f8, $f10 +/* 7E2F30 802820B0 00000000 */ nop +/* 7E2F34 802820B4 3C0141F0 */ lui $at, 0x41f0 +/* 7E2F38 802820B8 44810000 */ mtc1 $at, $f0 +/* 7E2F3C 802820BC 00000000 */ nop +/* 7E2F40 802820C0 46004202 */ mul.s $f8, $f8, $f0 +/* 7E2F44 802820C4 00000000 */ nop +/* 7E2F48 802820C8 46003182 */ mul.s $f6, $f6, $f0 +/* 7E2F4C 802820CC 00000000 */ nop +/* 7E2F50 802820D0 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2F54 802820D4 460C1300 */ add.s $f12, $f2, $f12 +/* 7E2F58 802820D8 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2F5C 802820DC 46040100 */ add.s $f4, $f0, $f4 +/* 7E2F60 802820E0 46081081 */ sub.s $f2, $f2, $f8 +/* 7E2F64 802820E4 46060001 */ sub.s $f0, $f0, $f6 +/* 7E2F68 802820E8 460E6300 */ add.s $f12, $f12, $f14 +/* 7E2F6C 802820EC E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2F70 802820F0 460A2101 */ sub.s $f4, $f4, $f10 +.L802820F4: +/* 7E2F74 802820F4 E6400018 */ swc1 $f0, 0x18($s2) +/* 7E2F78 802820F8 E64C000C */ swc1 $f12, 0xc($s2) +/* 7E2F7C 802820FC 080A0870 */ j .L802821C0 +/* 7E2F80 80282100 E6440010 */ swc1 $f4, 0x10($s2) +/* 7E2F84 80282104 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 7E2F88 80282108 3C0141F0 */ lui $at, 0x41f0 +/* 7E2F8C 8028210C 44813000 */ mtc1 $at, $f6 +/* 7E2F90 80282110 00000000 */ nop +/* 7E2F94 80282114 46064282 */ mul.s $f10, $f8, $f6 +/* 7E2F98 80282118 00000000 */ nop +/* 7E2F9C 8028211C C7A40028 */ lwc1 $f4, 0x28($sp) +/* 7E2FA0 80282120 46062182 */ mul.s $f6, $f4, $f6 +/* 7E2FA4 80282124 00000000 */ nop +/* 7E2FA8 80282128 3C0141A0 */ lui $at, 0x41a0 +/* 7E2FAC 8028212C 44810000 */ mtc1 $at, $f0 +/* 7E2FB0 80282130 00000000 */ nop +/* 7E2FB4 80282134 46002102 */ mul.s $f4, $f4, $f0 +/* 7E2FB8 80282138 00000000 */ nop +/* 7E2FBC 8028213C 46004202 */ mul.s $f8, $f8, $f0 +/* 7E2FC0 80282140 00000000 */ nop +/* 7E2FC4 80282144 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 7E2FC8 80282148 460A1300 */ add.s $f12, $f2, $f10 +/* 7E2FCC 8028214C 460A1081 */ sub.s $f2, $f2, $f10 +/* 7E2FD0 80282150 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E2FD4 80282154 46060280 */ add.s $f10, $f0, $f6 +/* 7E2FD8 80282158 46060001 */ sub.s $f0, $f0, $f6 +/* 7E2FDC 8028215C 46041080 */ add.s $f2, $f2, $f4 +/* 7E2FE0 80282160 E64C000C */ swc1 $f12, 0xc($s2) +/* 7E2FE4 80282164 46080000 */ add.s $f0, $f0, $f8 +/* 7E2FE8 80282168 E64A0010 */ swc1 $f10, 0x10($s2) +/* 7E2FEC 8028216C 080A086F */ j .L802821BC +/* 7E2FF0 80282170 E6420014 */ swc1 $f2, 0x14($s2) +/* 7E2FF4 80282174 C7A60024 */ lwc1 $f6, 0x24($sp) +/* 7E2FF8 80282178 3C0141F0 */ lui $at, 0x41f0 +/* 7E2FFC 8028217C 44810000 */ mtc1 $at, $f0 +/* 7E3000 80282180 00000000 */ nop +/* 7E3004 80282184 46003182 */ mul.s $f6, $f6, $f0 +/* 7E3008 80282188 00000000 */ nop +/* 7E300C 8028218C C7A20028 */ lwc1 $f2, 0x28($sp) +/* 7E3010 80282190 46001082 */ mul.s $f2, $f2, $f0 +/* 7E3014 80282194 00000000 */ nop +/* 7E3018 80282198 C7A40018 */ lwc1 $f4, 0x18($sp) +/* 7E301C 8028219C 46062200 */ add.s $f8, $f4, $f6 +/* 7E3020 802821A0 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E3024 802821A4 46020280 */ add.s $f10, $f0, $f2 +/* 7E3028 802821A8 46062101 */ sub.s $f4, $f4, $f6 +/* 7E302C 802821AC 46020001 */ sub.s $f0, $f0, $f2 +/* 7E3030 802821B0 E648000C */ swc1 $f8, 0xc($s2) +/* 7E3034 802821B4 E64A0010 */ swc1 $f10, 0x10($s2) +/* 7E3038 802821B8 E6440014 */ swc1 $f4, 0x14($s2) +.L802821BC: +/* 7E303C 802821BC E6400018 */ swc1 $f0, 0x18($s2) +.L802821C0: +/* 7E3040 802821C0 3C048028 */ lui $a0, 0x8028 +/* 7E3044 802821C4 248447D4 */ addiu $a0, $a0, 0x47d4 +/* 7E3048 802821C8 3C02800B */ lui $v0, %hi(gCameras) +/* 7E304C 802821CC 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 7E3050 802821D0 C6400014 */ lwc1 $f0, 0x14($s2) +/* 7E3054 802821D4 C6420018 */ lwc1 $f2, 0x18($s2) +/* 7E3058 802821D8 C644000C */ lwc1 $f4, 0xc($s2) +/* 7E305C 802821DC C6460010 */ lwc1 $f6, 0x10($s2) +/* 7E3060 802821E0 8FA8002C */ lw $t0, 0x2c($sp) +/* 7E3064 802821E4 24050100 */ addiu $a1, $zero, 0x100 +/* 7E3068 802821E8 AE48002C */ sw $t0, 0x2c($s2) +/* 7E306C 802821EC AE5E0030 */ sw $fp, 0x30($s2) +/* 7E3070 802821F0 AE550034 */ sw $s5, 0x34($s2) +/* 7E3074 802821F4 AE570038 */ sw $s7, 0x38($s2) +/* 7E3078 802821F8 E640001C */ swc1 $f0, 0x1c($s2) +/* 7E307C 802821FC E6420020 */ swc1 $f2, 0x20($s2) +/* 7E3080 80282200 E6440024 */ swc1 $f4, 0x24($s2) +/* 7E3084 80282204 E6460028 */ swc1 $f6, 0x28($s2) +/* 7E3088 80282208 8443002C */ lh $v1, 0x2c($v0) +/* 7E308C 8028220C 0280302D */ daddu $a2, $s4, $zero +/* 7E3090 80282210 AE430040 */ sw $v1, 0x40($s2) +/* 7E3094 80282214 8443002E */ lh $v1, 0x2e($v0) +/* 7E3098 80282218 0000382D */ daddu $a3, $zero, $zero +/* 7E309C 8028221C AE430044 */ sw $v1, 0x44($s2) +/* 7E30A0 80282220 84420030 */ lh $v0, 0x30($v0) +/* 7E30A4 80282224 24100003 */ addiu $s0, $zero, 3 +/* 7E30A8 80282228 AE420048 */ sw $v0, 0x48($s2) +/* 7E30AC 8028222C AFB20010 */ sw $s2, 0x10($sp) +/* 7E30B0 80282230 0C0B10AA */ jal bind_trigger_1 +/* 7E30B4 80282234 AFB00014 */ sw $s0, 0x14($sp) +/* 7E30B8 80282238 32620800 */ andi $v0, $s3, 0x800 +/* 7E30BC 8028223C 10400005 */ beqz $v0, .L80282254 +/* 7E30C0 80282240 24050040 */ addiu $a1, $zero, 0x40 +/* 7E30C4 80282244 3C048028 */ lui $a0, 0x8028 +/* 7E30C8 80282248 24844F80 */ addiu $a0, $a0, 0x4f80 +/* 7E30CC 8028224C 080A0899 */ j .L80282264 +/* 7E30D0 80282250 02C0302D */ daddu $a2, $s6, $zero +.L80282254: +/* 7E30D4 80282254 3C048028 */ lui $a0, 0x8028 +/* 7E30D8 80282258 24844F80 */ addiu $a0, $a0, 0x4f80 +/* 7E30DC 8028225C 24050100 */ addiu $a1, $zero, 0x100 +/* 7E30E0 80282260 02C0302D */ daddu $a2, $s6, $zero +.L80282264: +/* 7E30E4 80282264 24070001 */ addiu $a3, $zero, 1 +/* 7E30E8 80282268 AFB20010 */ sw $s2, 0x10($sp) +/* 7E30EC 8028226C 0C0B10AA */ jal bind_trigger_1 +/* 7E30F0 80282270 AFB00014 */ sw $s0, 0x14($sp) +/* 7E30F4 80282274 8FBF0054 */ lw $ra, 0x54($sp) +/* 7E30F8 80282278 8FBE0050 */ lw $fp, 0x50($sp) +/* 7E30FC 8028227C 8FB7004C */ lw $s7, 0x4c($sp) +/* 7E3100 80282280 8FB60048 */ lw $s6, 0x48($sp) +/* 7E3104 80282284 8FB50044 */ lw $s5, 0x44($sp) +/* 7E3108 80282288 8FB40040 */ lw $s4, 0x40($sp) +/* 7E310C 8028228C 8FB3003C */ lw $s3, 0x3c($sp) +/* 7E3110 80282290 8FB20038 */ lw $s2, 0x38($sp) +/* 7E3114 80282294 8FB10034 */ lw $s1, 0x34($sp) +/* 7E3118 80282298 8FB00030 */ lw $s0, 0x30($sp) +/* 7E311C 8028229C 24020002 */ addiu $v0, $zero, 2 +/* 7E3120 802822A0 03E00008 */ jr $ra +/* 7E3124 802822A4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s b/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s new file mode 100644 index 0000000000..ab3b55dccd --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802822A8 +/* 7E3128 802822A8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 7E312C 802822AC AFBF002C */ sw $ra, 0x2c($sp) +/* 7E3130 802822B0 AFB00028 */ sw $s0, 0x28($sp) +/* 7E3134 802822B4 8C82000C */ lw $v0, 0xc($a0) +/* 7E3138 802822B8 8C450000 */ lw $a1, ($v0) +/* 7E313C 802822BC 0C0B1EAF */ jal get_variable +/* 7E3140 802822C0 8C900074 */ lw $s0, 0x74($a0) +/* 7E3144 802822C4 27A50018 */ addiu $a1, $sp, 0x18 +/* 7E3148 802822C8 27A6001C */ addiu $a2, $sp, 0x1c +/* 7E314C 802822CC 27A70020 */ addiu $a3, $sp, 0x20 +/* 7E3150 802822D0 8E040060 */ lw $a0, 0x60($s0) +/* 7E3154 802822D4 0C016F84 */ jal get_collider_center +/* 7E3158 802822D8 0040802D */ daddu $s0, $v0, $zero +/* 7E315C 802822DC 0200202D */ daddu $a0, $s0, $zero +/* 7E3160 802822E0 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 7E3164 802822E4 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 7E3168 802822E8 44060000 */ mfc1 $a2, $f0 +/* 7E316C 802822EC 44071000 */ mfc1 $a3, $f2 +/* 7E3170 802822F0 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 7E3174 802822F4 0000282D */ daddu $a1, $zero, $zero +/* 7E3178 802822F8 0C052757 */ jal play_sound_at_position +/* 7E317C 802822FC E7A00010 */ swc1 $f0, 0x10($sp) +/* 7E3180 80282300 8FBF002C */ lw $ra, 0x2c($sp) +/* 7E3184 80282304 8FB00028 */ lw $s0, 0x28($sp) +/* 7E3188 80282308 24020002 */ addiu $v0, $zero, 2 +/* 7E318C 8028230C 03E00008 */ jr $ra +/* 7E3190 80282310 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s b/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s new file mode 100644 index 0000000000..81bfaff00a --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8028236C +/* 7E31EC 8028236C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E31F0 80282370 AFBF0014 */ sw $ra, 0x14($sp) +/* 7E31F4 80282374 AFB00010 */ sw $s0, 0x10($sp) +/* 7E31F8 80282378 8C82000C */ lw $v0, 0xc($a0) +/* 7E31FC 8028237C 8C450000 */ lw $a1, ($v0) +/* 7E3200 80282380 0C0B1EAF */ jal get_variable +/* 7E3204 80282384 8C900074 */ lw $s0, 0x74($a0) +/* 7E3208 80282388 00021080 */ sll $v0, $v0, 2 +/* 7E320C 8028238C 02028021 */ addu $s0, $s0, $v0 +/* 7E3210 80282390 0C0B1059 */ jal does_script_exist +/* 7E3214 80282394 8E04004C */ lw $a0, 0x4c($s0) +/* 7E3218 80282398 2C420001 */ sltiu $v0, $v0, 1 +/* 7E321C 8028239C 8FBF0014 */ lw $ra, 0x14($sp) +/* 7E3220 802823A0 8FB00010 */ lw $s0, 0x10($sp) +/* 7E3224 802823A4 00021040 */ sll $v0, $v0, 1 +/* 7E3228 802823A8 03E00008 */ jr $ra +/* 7E322C 802823AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s b/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s new file mode 100644 index 0000000000..0bb756e36c --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802823B0 +/* 7E3230 802823B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E3234 802823B4 AFB00010 */ sw $s0, 0x10($sp) +/* 7E3238 802823B8 0080802D */ daddu $s0, $a0, $zero +/* 7E323C 802823BC AFBF001C */ sw $ra, 0x1c($sp) +/* 7E3240 802823C0 AFB20018 */ sw $s2, 0x18($sp) +/* 7E3244 802823C4 AFB10014 */ sw $s1, 0x14($sp) +/* 7E3248 802823C8 8E11000C */ lw $s1, 0xc($s0) +/* 7E324C 802823CC 8E120074 */ lw $s2, 0x74($s0) +/* 7E3250 802823D0 8E250000 */ lw $a1, ($s1) +/* 7E3254 802823D4 0C0B1EAF */ jal get_variable +/* 7E3258 802823D8 26310004 */ addiu $s1, $s1, 4 +/* 7E325C 802823DC 0200202D */ daddu $a0, $s0, $zero +/* 7E3260 802823E0 8E250000 */ lw $a1, ($s1) +/* 7E3264 802823E4 0C0B1EAF */ jal get_variable +/* 7E3268 802823E8 0040802D */ daddu $s0, $v0, $zero +/* 7E326C 802823EC 00108080 */ sll $s0, $s0, 2 +/* 7E3270 802823F0 02509021 */ addu $s2, $s2, $s0 +/* 7E3274 802823F4 AE42004C */ sw $v0, 0x4c($s2) +/* 7E3278 802823F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E327C 802823FC 8FB20018 */ lw $s2, 0x18($sp) +/* 7E3280 80282400 8FB10014 */ lw $s1, 0x14($sp) +/* 7E3284 80282404 8FB00010 */ lw $s0, 0x10($sp) +/* 7E3288 80282408 24020002 */ addiu $v0, $zero, 2 +/* 7E328C 8028240C 03E00008 */ jr $ra +/* 7E3290 80282410 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s new file mode 100644 index 0000000000..b59342864a --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80282414 +/* 7E3294 80282414 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E3298 80282418 AFB10014 */ sw $s1, 0x14($sp) +/* 7E329C 8028241C 0080882D */ daddu $s1, $a0, $zero +/* 7E32A0 80282420 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E32A4 80282424 AFB20018 */ sw $s2, 0x18($sp) +/* 7E32A8 80282428 AFB00010 */ sw $s0, 0x10($sp) +/* 7E32AC 8028242C 10A0000A */ beqz $a1, .L80282458 +/* 7E32B0 80282430 8E320088 */ lw $s2, 0x88($s1) +/* 7E32B4 80282434 8E220084 */ lw $v0, 0x84($s1) +/* 7E32B8 80282438 54400007 */ bnel $v0, $zero, .L80282458 +/* 7E32BC 8028243C AE200074 */ sw $zero, 0x74($s1) +/* 7E32C0 80282440 962400C2 */ lhu $a0, 0xc2($s1) +/* 7E32C4 80282444 2405FFFF */ addiu $a1, $zero, -1 +/* 7E32C8 80282448 24060001 */ addiu $a2, $zero, 1 +/* 7E32CC 8028244C 0C046E54 */ jal func_8011B950 +/* 7E32D0 80282450 00C0382D */ daddu $a3, $a2, $zero +/* 7E32D4 80282454 AE200074 */ sw $zero, 0x74($s1) +.L80282458: +/* 7E32D8 80282458 8E220074 */ lw $v0, 0x74($s1) +/* 7E32DC 8028245C 24420020 */ addiu $v0, $v0, 0x20 +/* 7E32E0 80282460 AE220074 */ sw $v0, 0x74($s1) +/* 7E32E4 80282464 28420100 */ slti $v0, $v0, 0x100 +/* 7E32E8 80282468 14400002 */ bnez $v0, .L80282474 +/* 7E32EC 8028246C 240200FF */ addiu $v0, $zero, 0xff +/* 7E32F0 80282470 AE220074 */ sw $v0, 0x74($s1) +.L80282474: +/* 7E32F4 80282474 8E220084 */ lw $v0, 0x84($s1) +/* 7E32F8 80282478 14400004 */ bnez $v0, .L8028248C +/* 7E32FC 8028247C 240200FF */ addiu $v0, $zero, 0xff +/* 7E3300 80282480 8E300074 */ lw $s0, 0x74($s1) +/* 7E3304 80282484 080A0926 */ j .L80282498 +/* 7E3308 80282488 0000202D */ daddu $a0, $zero, $zero +.L8028248C: +/* 7E330C 8028248C 8E230074 */ lw $v1, 0x74($s1) +/* 7E3310 80282490 00438023 */ subu $s0, $v0, $v1 +/* 7E3314 80282494 0000202D */ daddu $a0, $zero, $zero +.L80282498: +/* 7E3318 80282498 0080282D */ daddu $a1, $a0, $zero +/* 7E331C 8028249C 0080302D */ daddu $a2, $a0, $zero +/* 7E3320 802824A0 0C046F97 */ jal set_background_color_blend +/* 7E3324 802824A4 320700FF */ andi $a3, $s0, 0xff +/* 7E3328 802824A8 240600FF */ addiu $a2, $zero, 0xff +/* 7E332C 802824AC 8E420040 */ lw $v0, 0x40($s2) +/* 7E3330 802824B0 00D03023 */ subu $a2, $a2, $s0 +/* 7E3334 802824B4 00460018 */ mult $v0, $a2 +/* 7E3338 802824B8 00001012 */ mflo $v0 +/* 7E333C 802824BC 8E450044 */ lw $a1, 0x44($s2) +/* 7E3340 802824C0 00000000 */ nop +/* 7E3344 802824C4 00A60018 */ mult $a1, $a2 +/* 7E3348 802824C8 00002812 */ mflo $a1 +/* 7E334C 802824CC 3C078080 */ lui $a3, 0x8080 +/* 7E3350 802824D0 34E78081 */ ori $a3, $a3, 0x8081 +/* 7E3354 802824D4 00470018 */ mult $v0, $a3 +/* 7E3358 802824D8 00001810 */ mfhi $v1 +/* 7E335C 802824DC 00000000 */ nop +/* 7E3360 802824E0 00000000 */ nop +/* 7E3364 802824E4 00A70018 */ mult $a1, $a3 +/* 7E3368 802824E8 00004010 */ mfhi $t0 +/* 7E336C 802824EC 8E440048 */ lw $a0, 0x48($s2) +/* 7E3370 802824F0 00621821 */ addu $v1, $v1, $v0 +/* 7E3374 802824F4 00860018 */ mult $a0, $a2 +/* 7E3378 802824F8 000319C3 */ sra $v1, $v1, 7 +/* 7E337C 802824FC 000217C3 */ sra $v0, $v0, 0x1f +/* 7E3380 80282500 00621823 */ subu $v1, $v1, $v0 +/* 7E3384 80282504 3C06800B */ lui $a2, %hi(gCameras) +/* 7E3388 80282508 24C61D80 */ addiu $a2, $a2, %lo(gCameras) +/* 7E338C 8028250C 00002012 */ mflo $a0 +/* 7E3390 80282510 01051021 */ addu $v0, $t0, $a1 +/* 7E3394 80282514 000211C3 */ sra $v0, $v0, 7 +/* 7E3398 80282518 00870018 */ mult $a0, $a3 +/* 7E339C 8028251C 00052FC3 */ sra $a1, $a1, 0x1f +/* 7E33A0 80282520 00451023 */ subu $v0, $v0, $a1 +/* 7E33A4 80282524 A4C3002C */ sh $v1, 0x2c($a2) +/* 7E33A8 80282528 A4C2002E */ sh $v0, 0x2e($a2) +/* 7E33AC 8028252C 00001810 */ mfhi $v1 +/* 7E33B0 80282530 00641021 */ addu $v0, $v1, $a0 +/* 7E33B4 80282534 000211C3 */ sra $v0, $v0, 7 +/* 7E33B8 80282538 000427C3 */ sra $a0, $a0, 0x1f +/* 7E33BC 8028253C 00441023 */ subu $v0, $v0, $a0 +/* 7E33C0 80282540 A4C20030 */ sh $v0, 0x30($a2) +/* 7E33C4 80282544 8E220074 */ lw $v0, 0x74($s1) +/* 7E33C8 80282548 284200FF */ slti $v0, $v0, 0xff +/* 7E33CC 8028254C 1440000B */ bnez $v0, .L8028257C +/* 7E33D0 80282550 0000102D */ daddu $v0, $zero, $zero +/* 7E33D4 80282554 8E230084 */ lw $v1, 0x84($s1) +/* 7E33D8 80282558 24020003 */ addiu $v0, $zero, 3 +/* 7E33DC 8028255C 14620007 */ bne $v1, $v0, .L8028257C +/* 7E33E0 80282560 24020002 */ addiu $v0, $zero, 2 +/* 7E33E4 80282564 962400C2 */ lhu $a0, 0xc2($s1) +/* 7E33E8 80282568 2405FFFF */ addiu $a1, $zero, -1 +/* 7E33EC 8028256C 0000302D */ daddu $a2, $zero, $zero +/* 7E33F0 80282570 0C046E54 */ jal func_8011B950 +/* 7E33F4 80282574 24070001 */ addiu $a3, $zero, 1 +/* 7E33F8 80282578 24020002 */ addiu $v0, $zero, 2 +.L8028257C: +/* 7E33FC 8028257C 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E3400 80282580 8FB20018 */ lw $s2, 0x18($sp) +/* 7E3404 80282584 8FB10014 */ lw $s1, 0x14($sp) +/* 7E3408 80282588 8FB00010 */ lw $s0, 0x10($sp) +/* 7E340C 8028258C 03E00008 */ jr $ra +/* 7E3410 80282590 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s new file mode 100644 index 0000000000..b6ca262f0c --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80282634 +/* 7E34B4 80282634 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E34B8 80282638 AFBF0020 */ sw $ra, 0x20($sp) +/* 7E34BC 8028263C AFB3001C */ sw $s3, 0x1c($sp) +/* 7E34C0 80282640 AFB20018 */ sw $s2, 0x18($sp) +/* 7E34C4 80282644 AFB10014 */ sw $s1, 0x14($sp) +/* 7E34C8 80282648 AFB00010 */ sw $s0, 0x10($sp) +/* 7E34CC 8028264C 8C820074 */ lw $v0, 0x74($a0) +/* 7E34D0 80282650 8C51005C */ lw $s1, 0x5c($v0) +/* 7E34D4 80282654 12200022 */ beqz $s1, .L802826E0 +/* 7E34D8 80282658 0000802D */ daddu $s0, $zero, $zero +/* 7E34DC 8028265C 2413FFFC */ addiu $s3, $zero, -4 +/* 7E34E0 80282660 3C120080 */ lui $s2, 0x80 +.L80282664: +/* 7E34E4 80282664 0C00E2B7 */ jal get_npc_by_index +/* 7E34E8 80282668 0200202D */ daddu $a0, $s0, $zero +/* 7E34EC 8028266C 0040182D */ daddu $v1, $v0, $zero +/* 7E34F0 80282670 50600009 */ beql $v1, $zero, .L80282698 +/* 7E34F4 80282674 26100001 */ addiu $s0, $s0, 1 +/* 7E34F8 80282678 8C640000 */ lw $a0, ($v1) +/* 7E34FC 8028267C 10800006 */ beqz $a0, .L80282698 +/* 7E3500 80282680 26100001 */ addiu $s0, $s0, 1 +/* 7E3504 80282684 806200A4 */ lb $v0, 0xa4($v1) +/* 7E3508 80282688 10530003 */ beq $v0, $s3, .L80282698 +/* 7E350C 8028268C 00000000 */ nop +/* 7E3510 80282690 00921025 */ or $v0, $a0, $s2 +/* 7E3514 80282694 AC620000 */ sw $v0, ($v1) +.L80282698: +/* 7E3518 80282698 2A020040 */ slti $v0, $s0, 0x40 +/* 7E351C 8028269C 1440FFF1 */ bnez $v0, .L80282664 +/* 7E3520 802826A0 00000000 */ nop +/* 7E3524 802826A4 2412FFFF */ addiu $s2, $zero, -1 +/* 7E3528 802826A8 3C10FF7F */ lui $s0, 0xff7f +/* 7E352C 802826AC 3610FFFF */ ori $s0, $s0, 0xffff +.L802826B0: +/* 7E3530 802826B0 8E240000 */ lw $a0, ($s1) +/* 7E3534 802826B4 1092000B */ beq $a0, $s2, .L802826E4 +/* 7E3538 802826B8 24020002 */ addiu $v0, $zero, 2 +/* 7E353C 802826BC 0C00EAD2 */ jal get_npc_safe +/* 7E3540 802826C0 26310004 */ addiu $s1, $s1, 4 +/* 7E3544 802826C4 0040182D */ daddu $v1, $v0, $zero +/* 7E3548 802826C8 1060FFF9 */ beqz $v1, .L802826B0 +/* 7E354C 802826CC 00000000 */ nop +/* 7E3550 802826D0 8C620000 */ lw $v0, ($v1) +/* 7E3554 802826D4 00501024 */ and $v0, $v0, $s0 +/* 7E3558 802826D8 080A09AC */ j .L802826B0 +/* 7E355C 802826DC AC620000 */ sw $v0, ($v1) +.L802826E0: +/* 7E3560 802826E0 24020002 */ addiu $v0, $zero, 2 +.L802826E4: +/* 7E3564 802826E4 8FBF0020 */ lw $ra, 0x20($sp) +/* 7E3568 802826E8 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E356C 802826EC 8FB20018 */ lw $s2, 0x18($sp) +/* 7E3570 802826F0 8FB10014 */ lw $s1, 0x14($sp) +/* 7E3574 802826F4 8FB00010 */ lw $s0, 0x10($sp) +/* 7E3578 802826F8 03E00008 */ jr $ra +/* 7E357C 802826FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s new file mode 100644 index 0000000000..43648b447a --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80282700 +/* 7E3580 80282700 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E3584 80282704 AFBF0018 */ sw $ra, 0x18($sp) +/* 7E3588 80282708 AFB10014 */ sw $s1, 0x14($sp) +/* 7E358C 8028270C AFB00010 */ sw $s0, 0x10($sp) +/* 7E3590 80282710 8C820074 */ lw $v0, 0x74($a0) +/* 7E3594 80282714 8C42005C */ lw $v0, 0x5c($v0) +/* 7E3598 80282718 10400010 */ beqz $v0, .L8028275C +/* 7E359C 8028271C 0000802D */ daddu $s0, $zero, $zero +/* 7E35A0 80282720 3C11FF7F */ lui $s1, 0xff7f +/* 7E35A4 80282724 3631FFFF */ ori $s1, $s1, 0xffff +.L80282728: +/* 7E35A8 80282728 0C00E2B7 */ jal get_npc_by_index +/* 7E35AC 8028272C 0200202D */ daddu $a0, $s0, $zero +/* 7E35B0 80282730 0040182D */ daddu $v1, $v0, $zero +/* 7E35B4 80282734 10600006 */ beqz $v1, .L80282750 +/* 7E35B8 80282738 26100001 */ addiu $s0, $s0, 1 +/* 7E35BC 8028273C 8C620000 */ lw $v0, ($v1) +/* 7E35C0 80282740 10400003 */ beqz $v0, .L80282750 +/* 7E35C4 80282744 00000000 */ nop +/* 7E35C8 80282748 00511024 */ and $v0, $v0, $s1 +/* 7E35CC 8028274C AC620000 */ sw $v0, ($v1) +.L80282750: +/* 7E35D0 80282750 2A020040 */ slti $v0, $s0, 0x40 +/* 7E35D4 80282754 1440FFF4 */ bnez $v0, .L80282728 +/* 7E35D8 80282758 00000000 */ nop +.L8028275C: +/* 7E35DC 8028275C 24020002 */ addiu $v0, $zero, 2 +/* 7E35E0 80282760 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E35E4 80282764 8FB10014 */ lw $s1, 0x14($sp) +/* 7E35E8 80282768 8FB00010 */ lw $s0, 0x10($sp) +/* 7E35EC 8028276C 03E00008 */ jr $ra +/* 7E35F0 80282770 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s new file mode 100644 index 0000000000..bafb271ef5 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel CreatePushBlockGrid +/* 7E4160 802832E0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 7E4164 802832E4 AFB10014 */ sw $s1, 0x14($sp) +/* 7E4168 802832E8 0080882D */ daddu $s1, $a0, $zero +/* 7E416C 802832EC AFBF0034 */ sw $ra, 0x34($sp) +/* 7E4170 802832F0 AFBE0030 */ sw $fp, 0x30($sp) +/* 7E4174 802832F4 AFB7002C */ sw $s7, 0x2c($sp) +/* 7E4178 802832F8 AFB60028 */ sw $s6, 0x28($sp) +/* 7E417C 802832FC AFB50024 */ sw $s5, 0x24($sp) +/* 7E4180 80283300 AFB40020 */ sw $s4, 0x20($sp) +/* 7E4184 80283304 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E4188 80283308 AFB20018 */ sw $s2, 0x18($sp) +/* 7E418C 8028330C AFB00010 */ sw $s0, 0x10($sp) +/* 7E4190 80283310 8E30000C */ lw $s0, 0xc($s1) +/* 7E4194 80283314 8E050000 */ lw $a1, ($s0) +/* 7E4198 80283318 0C0B1EAF */ jal get_variable +/* 7E419C 8028331C 26100004 */ addiu $s0, $s0, 4 +/* 7E41A0 80283320 8E050000 */ lw $a1, ($s0) +/* 7E41A4 80283324 26100004 */ addiu $s0, $s0, 4 +/* 7E41A8 80283328 0220202D */ daddu $a0, $s1, $zero +/* 7E41AC 8028332C 0C0B1EAF */ jal get_variable +/* 7E41B0 80283330 0040902D */ daddu $s2, $v0, $zero +/* 7E41B4 80283334 8E050000 */ lw $a1, ($s0) +/* 7E41B8 80283338 26100004 */ addiu $s0, $s0, 4 +/* 7E41BC 8028333C 0220202D */ daddu $a0, $s1, $zero +/* 7E41C0 80283340 0C0B1EAF */ jal get_variable +/* 7E41C4 80283344 0040A82D */ daddu $s5, $v0, $zero +/* 7E41C8 80283348 8E050000 */ lw $a1, ($s0) +/* 7E41CC 8028334C 26100004 */ addiu $s0, $s0, 4 +/* 7E41D0 80283350 0220202D */ daddu $a0, $s1, $zero +/* 7E41D4 80283354 0C0B1EAF */ jal get_variable +/* 7E41D8 80283358 0040A02D */ daddu $s4, $v0, $zero +/* 7E41DC 8028335C 8E050000 */ lw $a1, ($s0) +/* 7E41E0 80283360 26100004 */ addiu $s0, $s0, 4 +/* 7E41E4 80283364 0220202D */ daddu $a0, $s1, $zero +/* 7E41E8 80283368 0C0B1EAF */ jal get_variable +/* 7E41EC 8028336C 0040F02D */ daddu $fp, $v0, $zero +/* 7E41F0 80283370 0220202D */ daddu $a0, $s1, $zero +/* 7E41F4 80283374 8E050000 */ lw $a1, ($s0) +/* 7E41F8 80283378 0C0B1EAF */ jal get_variable +/* 7E41FC 8028337C 0040B82D */ daddu $s7, $v0, $zero +/* 7E4200 80283380 02B40018 */ mult $s5, $s4 +/* 7E4204 80283384 26100004 */ addiu $s0, $s0, 4 +/* 7E4208 80283388 0220202D */ daddu $a0, $s1, $zero +/* 7E420C 8028338C 8E050000 */ lw $a1, ($s0) +/* 7E4210 80283390 00008812 */ mflo $s1 +/* 7E4214 80283394 0C0B1EAF */ jal get_variable +/* 7E4218 80283398 0040B02D */ daddu $s6, $v0, $zero +/* 7E421C 8028339C 2404001C */ addiu $a0, $zero, 0x1c +/* 7E4220 802833A0 0C00AB0A */ jal general_heap_malloc +/* 7E4224 802833A4 0040982D */ daddu $s3, $v0, $zero +/* 7E4228 802833A8 00129080 */ sll $s2, $s2, 2 +/* 7E422C 802833AC 0040802D */ daddu $s0, $v0, $zero +/* 7E4230 802833B0 3C01802E */ lui $at, 0x802e +/* 7E4234 802833B4 00320821 */ addu $at, $at, $s2 +/* 7E4238 802833B8 AC30BC88 */ sw $s0, -0x4378($at) +/* 7E423C 802833BC 0C00AB0A */ jal general_heap_malloc +/* 7E4240 802833C0 0220202D */ daddu $a0, $s1, $zero +/* 7E4244 802833C4 1660000D */ bnez $s3, .L802833FC +/* 7E4248 802833C8 AE020000 */ sw $v0, ($s0) +/* 7E424C 802833CC 1A200018 */ blez $s1, .L80283430 +/* 7E4250 802833D0 0000282D */ daddu $a1, $zero, $zero +/* 7E4254 802833D4 0220202D */ daddu $a0, $s1, $zero +.L802833D8: +/* 7E4258 802833D8 8E020000 */ lw $v0, ($s0) +/* 7E425C 802833DC 00451021 */ addu $v0, $v0, $a1 +/* 7E4260 802833E0 24A50001 */ addiu $a1, $a1, 1 +/* 7E4264 802833E4 A0400000 */ sb $zero, ($v0) +/* 7E4268 802833E8 00A4102A */ slt $v0, $a1, $a0 +/* 7E426C 802833EC 1440FFFA */ bnez $v0, .L802833D8 +/* 7E4270 802833F0 00000000 */ nop +/* 7E4274 802833F4 080A0D0D */ j .L80283434 +/* 7E4278 802833F8 A2150004 */ sb $s5, 4($s0) +.L802833FC: +/* 7E427C 802833FC 0000282D */ daddu $a1, $zero, $zero +/* 7E4280 80283400 1A20000B */ blez $s1, .L80283430 +/* 7E4284 80283404 0260302D */ daddu $a2, $s3, $zero +/* 7E4288 80283408 0220202D */ daddu $a0, $s1, $zero +/* 7E428C 8028340C 00C51021 */ addu $v0, $a2, $a1 +.L80283410: +/* 7E4290 80283410 8E030000 */ lw $v1, ($s0) +/* 7E4294 80283414 90420000 */ lbu $v0, ($v0) +/* 7E4298 80283418 00651821 */ addu $v1, $v1, $a1 +/* 7E429C 8028341C 24A50001 */ addiu $a1, $a1, 1 +/* 7E42A0 80283420 A0620000 */ sb $v0, ($v1) +/* 7E42A4 80283424 00A4102A */ slt $v0, $a1, $a0 +/* 7E42A8 80283428 1440FFF9 */ bnez $v0, .L80283410 +/* 7E42AC 8028342C 00C51021 */ addu $v0, $a2, $a1 +.L80283430: +/* 7E42B0 80283430 A2150004 */ sb $s5, 4($s0) +.L80283434: +/* 7E42B4 80283434 A2140005 */ sb $s4, 5($s0) +/* 7E42B8 80283438 AE1E0008 */ sw $fp, 8($s0) +/* 7E42BC 8028343C AE17000C */ sw $s7, 0xc($s0) +/* 7E42C0 80283440 AE160010 */ sw $s6, 0x10($s0) +/* 7E42C4 80283444 AE000014 */ sw $zero, 0x14($s0) +/* 7E42C8 80283448 8FBF0034 */ lw $ra, 0x34($sp) +/* 7E42CC 8028344C 8FBE0030 */ lw $fp, 0x30($sp) +/* 7E42D0 80283450 8FB7002C */ lw $s7, 0x2c($sp) +/* 7E42D4 80283454 8FB60028 */ lw $s6, 0x28($sp) +/* 7E42D8 80283458 8FB50024 */ lw $s5, 0x24($sp) +/* 7E42DC 8028345C 8FB40020 */ lw $s4, 0x20($sp) +/* 7E42E0 80283460 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E42E4 80283464 8FB20018 */ lw $s2, 0x18($sp) +/* 7E42E8 80283468 8FB10014 */ lw $s1, 0x14($sp) +/* 7E42EC 8028346C 8FB00010 */ lw $s0, 0x10($sp) +/* 7E42F0 80283470 24020002 */ addiu $v0, $zero, 2 +/* 7E42F4 80283474 03E00008 */ jr $ra +/* 7E42F8 80283478 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s new file mode 100644 index 0000000000..659b71eac8 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel GetGridIndexFromPos +/* 7E4538 802836B8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E453C 802836BC AFB3001C */ sw $s3, 0x1c($sp) +/* 7E4540 802836C0 0080982D */ daddu $s3, $a0, $zero +/* 7E4544 802836C4 AFBF0020 */ sw $ra, 0x20($sp) +/* 7E4548 802836C8 AFB20018 */ sw $s2, 0x18($sp) +/* 7E454C 802836CC AFB10014 */ sw $s1, 0x14($sp) +/* 7E4550 802836D0 AFB00010 */ sw $s0, 0x10($sp) +/* 7E4554 802836D4 8E70000C */ lw $s0, 0xc($s3) +/* 7E4558 802836D8 8E050000 */ lw $a1, ($s0) +/* 7E455C 802836DC 0C0B1EAF */ jal get_variable +/* 7E4560 802836E0 26100004 */ addiu $s0, $s0, 4 +/* 7E4564 802836E4 8E050000 */ lw $a1, ($s0) +/* 7E4568 802836E8 26100004 */ addiu $s0, $s0, 4 +/* 7E456C 802836EC 0260202D */ daddu $a0, $s3, $zero +/* 7E4570 802836F0 0C0B1EAF */ jal get_variable +/* 7E4574 802836F4 0040882D */ daddu $s1, $v0, $zero +/* 7E4578 802836F8 0040902D */ daddu $s2, $v0, $zero +/* 7E457C 802836FC 8E050000 */ lw $a1, ($s0) +/* 7E4580 80283700 26100004 */ addiu $s0, $s0, 4 +/* 7E4584 80283704 0C0B1EAF */ jal get_variable +/* 7E4588 80283708 0260202D */ daddu $a0, $s3, $zero +/* 7E458C 8028370C 8E050000 */ lw $a1, ($s0) +/* 7E4590 80283710 0C0B1EAF */ jal get_variable +/* 7E4594 80283714 0260202D */ daddu $a0, $s3, $zero +/* 7E4598 80283718 00118880 */ sll $s1, $s1, 2 +/* 7E459C 8028371C 3C04802E */ lui $a0, 0x802e +/* 7E45A0 80283720 00912021 */ addu $a0, $a0, $s1 +/* 7E45A4 80283724 8C84BC88 */ lw $a0, -0x4378($a0) +/* 7E45A8 80283728 3C0651EB */ lui $a2, 0x51eb +/* 7E45AC 8028372C 8C830008 */ lw $v1, 8($a0) +/* 7E45B0 80283730 34C6851F */ ori $a2, $a2, 0x851f +/* 7E45B4 80283734 02439023 */ subu $s2, $s2, $v1 +/* 7E45B8 80283738 02460018 */ mult $s2, $a2 +/* 7E45BC 8028373C 26100004 */ addiu $s0, $s0, 4 +/* 7E45C0 80283740 8E050000 */ lw $a1, ($s0) +/* 7E45C4 80283744 8E100004 */ lw $s0, 4($s0) +/* 7E45C8 80283748 8C830010 */ lw $v1, 0x10($a0) +/* 7E45CC 8028374C 00003810 */ mfhi $a3 +/* 7E45D0 80283750 0260202D */ daddu $a0, $s3, $zero +/* 7E45D4 80283754 00431023 */ subu $v0, $v0, $v1 +/* 7E45D8 80283758 00460018 */ mult $v0, $a2 +/* 7E45DC 8028375C 001297C3 */ sra $s2, $s2, 0x1f +/* 7E45E0 80283760 000730C3 */ sra $a2, $a3, 3 +/* 7E45E4 80283764 00D23023 */ subu $a2, $a2, $s2 +/* 7E45E8 80283768 000217C3 */ sra $v0, $v0, 0x1f +/* 7E45EC 8028376C 00001810 */ mfhi $v1 +/* 7E45F0 80283770 000388C3 */ sra $s1, $v1, 3 +/* 7E45F4 80283774 0C0B2026 */ jal set_variable +/* 7E45F8 80283778 02228823 */ subu $s1, $s1, $v0 +/* 7E45FC 8028377C 0260202D */ daddu $a0, $s3, $zero +/* 7E4600 80283780 0200282D */ daddu $a1, $s0, $zero +/* 7E4604 80283784 0C0B2026 */ jal set_variable +/* 7E4608 80283788 0220302D */ daddu $a2, $s1, $zero +/* 7E460C 8028378C 8FBF0020 */ lw $ra, 0x20($sp) +/* 7E4610 80283790 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E4614 80283794 8FB20018 */ lw $s2, 0x18($sp) +/* 7E4618 80283798 8FB10014 */ lw $s1, 0x14($sp) +/* 7E461C 8028379C 8FB00010 */ lw $s0, 0x10($sp) +/* 7E4620 802837A0 24020002 */ addiu $v0, $zero, 2 +/* 7E4624 802837A4 03E00008 */ jr $ra +/* 7E4628 802837A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s new file mode 100644 index 0000000000..a977ae3e7f --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel GetPushBlock +/* 7E4440 802835C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E4444 802835C4 AFB40020 */ sw $s4, 0x20($sp) +/* 7E4448 802835C8 0080A02D */ daddu $s4, $a0, $zero +/* 7E444C 802835CC AFBF0024 */ sw $ra, 0x24($sp) +/* 7E4450 802835D0 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E4454 802835D4 AFB20018 */ sw $s2, 0x18($sp) +/* 7E4458 802835D8 AFB10014 */ sw $s1, 0x14($sp) +/* 7E445C 802835DC AFB00010 */ sw $s0, 0x10($sp) +/* 7E4460 802835E0 8E90000C */ lw $s0, 0xc($s4) +/* 7E4464 802835E4 8E050000 */ lw $a1, ($s0) +/* 7E4468 802835E8 0C0B1EAF */ jal get_variable +/* 7E446C 802835EC 26100004 */ addiu $s0, $s0, 4 +/* 7E4470 802835F0 8E050000 */ lw $a1, ($s0) +/* 7E4474 802835F4 26100004 */ addiu $s0, $s0, 4 +/* 7E4478 802835F8 0280202D */ daddu $a0, $s4, $zero +/* 7E447C 802835FC 0C0B1EAF */ jal get_variable +/* 7E4480 80283600 0040882D */ daddu $s1, $v0, $zero +/* 7E4484 80283604 0280202D */ daddu $a0, $s4, $zero +/* 7E4488 80283608 8E050000 */ lw $a1, ($s0) +/* 7E448C 8028360C 0C0B1EAF */ jal get_variable +/* 7E4490 80283610 0040982D */ daddu $s3, $v0, $zero +/* 7E4494 80283614 00118880 */ sll $s1, $s1, 2 +/* 7E4498 80283618 26100004 */ addiu $s0, $s0, 4 +/* 7E449C 8028361C 3C12802E */ lui $s2, 0x802e +/* 7E44A0 80283620 02519021 */ addu $s2, $s2, $s1 +/* 7E44A4 80283624 8E52BC88 */ lw $s2, -0x4378($s2) +/* 7E44A8 80283628 92430004 */ lbu $v1, 4($s2) +/* 7E44AC 8028362C 8E100000 */ lw $s0, ($s0) +/* 7E44B0 80283630 0263182A */ slt $v1, $s3, $v1 +/* 7E44B4 80283634 10600009 */ beqz $v1, .L8028365C +/* 7E44B8 80283638 0040882D */ daddu $s1, $v0, $zero +/* 7E44BC 8028363C 06600008 */ bltz $s3, .L80283660 +/* 7E44C0 80283640 0280202D */ daddu $a0, $s4, $zero +/* 7E44C4 80283644 92420005 */ lbu $v0, 5($s2) +/* 7E44C8 80283648 0222102A */ slt $v0, $s1, $v0 +/* 7E44CC 8028364C 10400005 */ beqz $v0, .L80283664 +/* 7E44D0 80283650 0200282D */ daddu $a1, $s0, $zero +/* 7E44D4 80283654 06210005 */ bgez $s1, .L8028366C +/* 7E44D8 80283658 00000000 */ nop +.L8028365C: +/* 7E44DC 8028365C 0280202D */ daddu $a0, $s4, $zero +.L80283660: +/* 7E44E0 80283660 0200282D */ daddu $a1, $s0, $zero +.L80283664: +/* 7E44E4 80283664 0C0B2026 */ jal set_variable +/* 7E44E8 80283668 24060003 */ addiu $a2, $zero, 3 +.L8028366C: +/* 7E44EC 8028366C 92420004 */ lbu $v0, 4($s2) +/* 7E44F0 80283670 02220018 */ mult $s1, $v0 +/* 7E44F4 80283674 0280202D */ daddu $a0, $s4, $zero +/* 7E44F8 80283678 8E420000 */ lw $v0, ($s2) +/* 7E44FC 8028367C 00003812 */ mflo $a3 +/* 7E4500 80283680 02671821 */ addu $v1, $s3, $a3 +/* 7E4504 80283684 00431021 */ addu $v0, $v0, $v1 +/* 7E4508 80283688 90460000 */ lbu $a2, ($v0) +/* 7E450C 8028368C 0C0B2026 */ jal set_variable +/* 7E4510 80283690 0200282D */ daddu $a1, $s0, $zero +/* 7E4514 80283694 8FBF0024 */ lw $ra, 0x24($sp) +/* 7E4518 80283698 8FB40020 */ lw $s4, 0x20($sp) +/* 7E451C 8028369C 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E4520 802836A0 8FB20018 */ lw $s2, 0x18($sp) +/* 7E4524 802836A4 8FB10014 */ lw $s1, 0x14($sp) +/* 7E4528 802836A8 8FB00010 */ lw $s0, 0x10($sp) +/* 7E452C 802836AC 24020002 */ addiu $v0, $zero, 2 +/* 7E4530 802836B0 03E00008 */ jr $ra +/* 7E4534 802836B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s new file mode 100644 index 0000000000..6be07e2913 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel SetPushBlock +/* 7E42FC 8028347C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 7E4300 80283480 AFB30034 */ sw $s3, 0x34($sp) +/* 7E4304 80283484 0080982D */ daddu $s3, $a0, $zero +/* 7E4308 80283488 AFBF0038 */ sw $ra, 0x38($sp) +/* 7E430C 8028348C AFB20030 */ sw $s2, 0x30($sp) +/* 7E4310 80283490 AFB1002C */ sw $s1, 0x2c($sp) +/* 7E4314 80283494 AFB00028 */ sw $s0, 0x28($sp) +/* 7E4318 80283498 8E70000C */ lw $s0, 0xc($s3) +/* 7E431C 8028349C 8E050000 */ lw $a1, ($s0) +/* 7E4320 802834A0 0C0B1EAF */ jal get_variable +/* 7E4324 802834A4 26100004 */ addiu $s0, $s0, 4 +/* 7E4328 802834A8 8E050000 */ lw $a1, ($s0) +/* 7E432C 802834AC 26100004 */ addiu $s0, $s0, 4 +/* 7E4330 802834B0 0260202D */ daddu $a0, $s3, $zero +/* 7E4334 802834B4 0C0B1EAF */ jal get_variable +/* 7E4338 802834B8 0040882D */ daddu $s1, $v0, $zero +/* 7E433C 802834BC 8E050000 */ lw $a1, ($s0) +/* 7E4340 802834C0 26100004 */ addiu $s0, $s0, 4 +/* 7E4344 802834C4 0260202D */ daddu $a0, $s3, $zero +/* 7E4348 802834C8 0C0B1EAF */ jal get_variable +/* 7E434C 802834CC 0040902D */ daddu $s2, $v0, $zero +/* 7E4350 802834D0 0260202D */ daddu $a0, $s3, $zero +/* 7E4354 802834D4 8E050000 */ lw $a1, ($s0) +/* 7E4358 802834D8 0C0B1EAF */ jal get_variable +/* 7E435C 802834DC 0040802D */ daddu $s0, $v0, $zero +/* 7E4360 802834E0 00118880 */ sll $s1, $s1, 2 +/* 7E4364 802834E4 3C01802E */ lui $at, 0x802e +/* 7E4368 802834E8 00310821 */ addu $at, $at, $s1 +/* 7E436C 802834EC 8C31BC88 */ lw $s1, -0x4378($at) +/* 7E4370 802834F0 92230004 */ lbu $v1, 4($s1) +/* 7E4374 802834F4 02030018 */ mult $s0, $v1 +/* 7E4378 802834F8 8E230000 */ lw $v1, ($s1) +/* 7E437C 802834FC 00004012 */ mflo $t0 +/* 7E4380 80283500 02482021 */ addu $a0, $s2, $t0 +/* 7E4384 80283504 00641821 */ addu $v1, $v1, $a0 +/* 7E4388 80283508 A0620000 */ sb $v0, ($v1) +/* 7E438C 8028350C 24030001 */ addiu $v1, $zero, 1 +/* 7E4390 80283510 14430023 */ bne $v0, $v1, .L802835A0 +/* 7E4394 80283514 3C028000 */ lui $v0, 0x8000 +/* 7E4398 80283518 3C04802F */ lui $a0, 0x802f +/* 7E439C 8028351C 2484A2BC */ addiu $a0, $a0, -0x5d44 +/* 7E43A0 80283520 8E250008 */ lw $a1, 8($s1) +/* 7E43A4 80283524 8E26000C */ lw $a2, 0xc($s1) +/* 7E43A8 80283528 8E270010 */ lw $a3, 0x10($s1) +/* 7E43AC 8028352C AFA20020 */ sw $v0, 0x20($sp) +/* 7E43B0 80283530 00721004 */ sllv $v0, $s2, $v1 +/* 7E43B4 80283534 00521021 */ addu $v0, $v0, $s2 +/* 7E43B8 80283538 000210C0 */ sll $v0, $v0, 3 +/* 7E43BC 8028353C 00521021 */ addu $v0, $v0, $s2 +/* 7E43C0 80283540 AFA00010 */ sw $zero, 0x10($sp) +/* 7E43C4 80283544 AFA00014 */ sw $zero, 0x14($sp) +/* 7E43C8 80283548 AFA00018 */ sw $zero, 0x18($sp) +/* 7E43CC 8028354C AFA0001C */ sw $zero, 0x1c($sp) +/* 7E43D0 80283550 00A22821 */ addu $a1, $a1, $v0 +/* 7E43D4 80283554 24A5000C */ addiu $a1, $a1, 0xc +/* 7E43D8 80283558 00701004 */ sllv $v0, $s0, $v1 +/* 7E43DC 8028355C 00501021 */ addu $v0, $v0, $s0 +/* 7E43E0 80283560 000210C0 */ sll $v0, $v0, 3 +/* 7E43E4 80283564 00501021 */ addu $v0, $v0, $s0 +/* 7E43E8 80283568 00E23821 */ addu $a3, $a3, $v0 +/* 7E43EC 8028356C 0C044631 */ jal create_entity +/* 7E43F0 80283570 24E7000C */ addiu $a3, $a3, 0xc +/* 7E43F4 80283574 3C048028 */ lui $a0, 0x8028 +/* 7E43F8 80283578 24845674 */ addiu $a0, $a0, 0x5674 +/* 7E43FC 8028357C 24050040 */ addiu $a1, $zero, 0x40 +/* 7E4400 80283580 0040802D */ daddu $s0, $v0, $zero +/* 7E4404 80283584 26064000 */ addiu $a2, $s0, 0x4000 +/* 7E4408 80283588 0220382D */ daddu $a3, $s1, $zero +/* 7E440C 8028358C 24020003 */ addiu $v0, $zero, 3 +/* 7E4410 80283590 AFB00010 */ sw $s0, 0x10($sp) +/* 7E4414 80283594 0C0B10AA */ jal bind_trigger_1 +/* 7E4418 80283598 AFA20014 */ sw $v0, 0x14($sp) +/* 7E441C 8028359C AE700084 */ sw $s0, 0x84($s3) +.L802835A0: +/* 7E4420 802835A0 8FBF0038 */ lw $ra, 0x38($sp) +/* 7E4424 802835A4 8FB30034 */ lw $s3, 0x34($sp) +/* 7E4428 802835A8 8FB20030 */ lw $s2, 0x30($sp) +/* 7E442C 802835AC 8FB1002C */ lw $s1, 0x2c($sp) +/* 7E4430 802835B0 8FB00028 */ lw $s0, 0x28($sp) +/* 7E4434 802835B4 24020002 */ addiu $v0, $zero, 2 +/* 7E4438 802835B8 03E00008 */ jr $ra +/* 7E443C 802835BC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s new file mode 100644 index 0000000000..2060f0f909 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel SetPushBlockFallEffect +/* 7E462C 802837AC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E4630 802837B0 AFB10014 */ sw $s1, 0x14($sp) +/* 7E4634 802837B4 0080882D */ daddu $s1, $a0, $zero +/* 7E4638 802837B8 AFBF0018 */ sw $ra, 0x18($sp) +/* 7E463C 802837BC AFB00010 */ sw $s0, 0x10($sp) +/* 7E4640 802837C0 8E30000C */ lw $s0, 0xc($s1) +/* 7E4644 802837C4 8E050000 */ lw $a1, ($s0) +/* 7E4648 802837C8 0C0B1EAF */ jal get_variable +/* 7E464C 802837CC 26100004 */ addiu $s0, $s0, 4 +/* 7E4650 802837D0 0220202D */ daddu $a0, $s1, $zero +/* 7E4654 802837D4 8E050000 */ lw $a1, ($s0) +/* 7E4658 802837D8 0C0B1EAF */ jal get_variable +/* 7E465C 802837DC 0040802D */ daddu $s0, $v0, $zero +/* 7E4660 802837E0 00108080 */ sll $s0, $s0, 2 +/* 7E4664 802837E4 3C03802E */ lui $v1, 0x802e +/* 7E4668 802837E8 00701821 */ addu $v1, $v1, $s0 +/* 7E466C 802837EC 8C63BC88 */ lw $v1, -0x4378($v1) +/* 7E4670 802837F0 AC620014 */ sw $v0, 0x14($v1) +/* 7E4674 802837F4 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E4678 802837F8 8FB10014 */ lw $s1, 0x14($sp) +/* 7E467C 802837FC 8FB00010 */ lw $s0, 0x10($sp) +/* 7E4680 80283800 24020002 */ addiu $v0, $zero, 2 +/* 7E4684 80283804 03E00008 */ jr $ra +/* 7E4688 80283808 27BD0020 */ addiu $sp, $sp, 0x20 +/* 7E468C 8028380C 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s new file mode 100644 index 0000000000..3af1e3c00a --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel TeleportPartnerToPlayer +/* 7E46FC 8028387C 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 7E4700 80283880 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) +/* 7E4704 80283884 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E4708 80283888 AFB10014 */ sw $s1, 0x14($sp) +/* 7E470C 8028388C 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 7E4710 80283890 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 7E4714 80283894 AFB20018 */ sw $s2, 0x18($sp) +/* 7E4718 80283898 0220902D */ daddu $s2, $s1, $zero +/* 7E471C 8028389C AFBF001C */ sw $ra, 0x1c($sp) +/* 7E4720 802838A0 10400012 */ beqz $v0, .L802838EC +/* 7E4724 802838A4 AFB00010 */ sw $s0, 0x10($sp) +/* 7E4728 802838A8 0C00EABB */ jal get_npc_unsafe +/* 7E472C 802838AC 2404FFFC */ addiu $a0, $zero, -4 +/* 7E4730 802838B0 C6200028 */ lwc1 $f0, 0x28($s1) +/* 7E4734 802838B4 0040802D */ daddu $s0, $v0, $zero +/* 7E4738 802838B8 E6000038 */ swc1 $f0, 0x38($s0) +/* 7E473C 802838BC C6200030 */ lwc1 $f0, 0x30($s1) +/* 7E4740 802838C0 0C03A969 */ jal is_current_partner_flying +/* 7E4744 802838C4 E6000040 */ swc1 $f0, 0x40($s0) +/* 7E4748 802838C8 10400003 */ beqz $v0, .L802838D8 +/* 7E474C 802838CC 00000000 */ nop +/* 7E4750 802838D0 C620002C */ lwc1 $f0, 0x2c($s1) +/* 7E4754 802838D4 E600003C */ swc1 $f0, 0x3c($s0) +.L802838D8: +/* 7E4758 802838D8 8E450080 */ lw $a1, 0x80($s2) +/* 7E475C 802838DC 0C00ECD0 */ jal set_npc_yaw +/* 7E4760 802838E0 0200202D */ daddu $a0, $s0, $zero +/* 7E4764 802838E4 0C03BD17 */ jal clear_partner_move_history +/* 7E4768 802838E8 0200202D */ daddu $a0, $s0, $zero +.L802838EC: +/* 7E476C 802838EC 24020002 */ addiu $v0, $zero, 2 +/* 7E4770 802838F0 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E4774 802838F4 8FB20018 */ lw $s2, 0x18($sp) +/* 7E4778 802838F8 8FB10014 */ lw $s1, 0x14($sp) +/* 7E477C 802838FC 8FB00010 */ lw $s0, 0x10($sp) +/* 7E4780 80283900 03E00008 */ jr $ra +/* 7E4784 80283904 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282880.s b/asm/nonmatchings/world/script_api/7E3700/func_80282880.s new file mode 100644 index 0000000000..f06a66e3ff --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80282880.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80282880 +/* 7E3700 80282880 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 7E3704 80282884 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 7E3708 80282888 C4420028 */ lwc1 $f2, 0x28($v0) +/* 7E370C 8028288C C4800084 */ lwc1 $f0, 0x84($a0) +/* 7E3710 80282890 46800020 */ cvt.s.w $f0, $f0 +/* 7E3714 80282894 46020001 */ sub.s $f0, $f0, $f2 +/* 7E3718 80282898 3C013F00 */ lui $at, 0x3f00 +/* 7E371C 8028289C 44812000 */ mtc1 $at, $f4 +/* 7E3720 802828A0 00000000 */ nop +/* 7E3724 802828A4 46040002 */ mul.s $f0, $f0, $f4 +/* 7E3728 802828A8 00000000 */ nop +/* 7E372C 802828AC 46001080 */ add.s $f2, $f2, $f0 +/* 7E3730 802828B0 E4420028 */ swc1 $f2, 0x28($v0) +/* 7E3734 802828B4 C4420030 */ lwc1 $f2, 0x30($v0) +/* 7E3738 802828B8 C480008C */ lwc1 $f0, 0x8c($a0) +/* 7E373C 802828BC 46800020 */ cvt.s.w $f0, $f0 +/* 7E3740 802828C0 46020001 */ sub.s $f0, $f0, $f2 +/* 7E3744 802828C4 46040002 */ mul.s $f0, $f0, $f4 +/* 7E3748 802828C8 00000000 */ nop +/* 7E374C 802828CC 46001080 */ add.s $f2, $f2, $f0 +/* 7E3750 802828D0 E4420030 */ swc1 $f2, 0x30($v0) +/* 7E3754 802828D4 03E00008 */ jr $ra +/* 7E3758 802828D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s new file mode 100644 index 0000000000..bf3521561b --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s @@ -0,0 +1,224 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802828DC +/* 7E375C 802828DC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 7E3760 802828E0 AFB20018 */ sw $s2, 0x18($sp) +/* 7E3764 802828E4 0080902D */ daddu $s2, $a0, $zero +/* 7E3768 802828E8 AFBF0020 */ sw $ra, 0x20($sp) +/* 7E376C 802828EC AFB3001C */ sw $s3, 0x1c($sp) +/* 7E3770 802828F0 AFB10014 */ sw $s1, 0x14($sp) +/* 7E3774 802828F4 AFB00010 */ sw $s0, 0x10($sp) +/* 7E3778 802828F8 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 7E377C 802828FC F7B60030 */ sdc1 $f22, 0x30($sp) +/* 7E3780 80282900 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 7E3784 80282904 8E4400B0 */ lw $a0, 0xb0($s2) +/* 7E3788 80282908 0C04417A */ jal get_entity_by_index +/* 7E378C 8028290C 00A0802D */ daddu $s0, $a1, $zero +/* 7E3790 80282910 3C138011 */ lui $s3, %hi(gPlayerStatus) +/* 7E3794 80282914 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) +/* 7E3798 80282918 1200001A */ beqz $s0, .L80282984 +/* 7E379C 8028291C 0040882D */ daddu $s1, $v0, $zero +/* 7E37A0 80282920 AE400070 */ sw $zero, 0x70($s2) +/* 7E37A4 80282924 C6600028 */ lwc1 $f0, 0x28($s3) +/* 7E37A8 80282928 4600018D */ trunc.w.s $f6, $f0 +/* 7E37AC 8028292C E6460084 */ swc1 $f6, 0x84($s2) +/* 7E37B0 80282930 C660002C */ lwc1 $f0, 0x2c($s3) +/* 7E37B4 80282934 4600018D */ trunc.w.s $f6, $f0 +/* 7E37B8 80282938 E6460088 */ swc1 $f6, 0x88($s2) +/* 7E37BC 8028293C C6600030 */ lwc1 $f0, 0x30($s3) +/* 7E37C0 80282940 4600018D */ trunc.w.s $f6, $f0 +/* 7E37C4 80282944 E646008C */ swc1 $f6, 0x8c($s2) +/* 7E37C8 80282948 C6200048 */ lwc1 $f0, 0x48($s1) +/* 7E37CC 8028294C 4600018D */ trunc.w.s $f6, $f0 +/* 7E37D0 80282950 E6460090 */ swc1 $f6, 0x90($s2) +/* 7E37D4 80282954 C620004C */ lwc1 $f0, 0x4c($s1) +/* 7E37D8 80282958 4600018D */ trunc.w.s $f6, $f0 +/* 7E37DC 8028295C E6460094 */ swc1 $f6, 0x94($s2) +/* 7E37E0 80282960 C6200050 */ lwc1 $f0, 0x50($s1) +/* 7E37E4 80282964 4600018D */ trunc.w.s $f6, $f0 +/* 7E37E8 80282968 E6460098 */ swc1 $f6, 0x98($s2) +/* 7E37EC 8028296C C6200060 */ lwc1 $f0, 0x60($s1) +/* 7E37F0 80282970 4600018D */ trunc.w.s $f6, $f0 +/* 7E37F4 80282974 E64600A8 */ swc1 $f6, 0xa8($s2) +/* 7E37F8 80282978 C6200068 */ lwc1 $f0, 0x68($s1) +/* 7E37FC 8028297C 4600018D */ trunc.w.s $f6, $f0 +/* 7E3800 80282980 E64600B4 */ swc1 $f6, 0xb4($s2) +.L80282984: +/* 7E3804 80282984 8E420070 */ lw $v0, 0x70($s2) +/* 7E3808 80282988 00021080 */ sll $v0, $v0, 2 +/* 7E380C 8028298C 3C018028 */ lui $at, 0x8028 +/* 7E3810 80282990 00220821 */ addu $at, $at, $v0 +/* 7E3814 80282994 C4245640 */ lwc1 $f4, 0x5640($at) +/* 7E3818 80282998 C642009C */ lwc1 $f2, 0x9c($s2) +/* 7E381C 8028299C 468010A0 */ cvt.s.w $f2, $f2 +/* 7E3820 802829A0 46041082 */ mul.s $f2, $f2, $f4 +/* 7E3824 802829A4 00000000 */ nop +/* 7E3828 802829A8 3C0141C8 */ lui $at, 0x41c8 +/* 7E382C 802829AC 4481C000 */ mtc1 $at, $f24 +/* 7E3830 802829B0 00000000 */ nop +/* 7E3834 802829B4 46181082 */ mul.s $f2, $f2, $f24 +/* 7E3838 802829B8 00000000 */ nop +/* 7E383C 802829BC C6400084 */ lwc1 $f0, 0x84($s2) +/* 7E3840 802829C0 46800020 */ cvt.s.w $f0, $f0 +/* 7E3844 802829C4 46020000 */ add.s $f0, $f0, $f2 +/* 7E3848 802829C8 E6600028 */ swc1 $f0, 0x28($s3) +/* 7E384C 802829CC C64200A0 */ lwc1 $f2, 0xa0($s2) +/* 7E3850 802829D0 468010A0 */ cvt.s.w $f2, $f2 +/* 7E3854 802829D4 46041082 */ mul.s $f2, $f2, $f4 +/* 7E3858 802829D8 00000000 */ nop +/* 7E385C 802829DC 46181082 */ mul.s $f2, $f2, $f24 +/* 7E3860 802829E0 00000000 */ nop +/* 7E3864 802829E4 C6400088 */ lwc1 $f0, 0x88($s2) +/* 7E3868 802829E8 46800020 */ cvt.s.w $f0, $f0 +/* 7E386C 802829EC 46020000 */ add.s $f0, $f0, $f2 +/* 7E3870 802829F0 E660002C */ swc1 $f0, 0x2c($s3) +/* 7E3874 802829F4 C64200A4 */ lwc1 $f2, 0xa4($s2) +/* 7E3878 802829F8 468010A0 */ cvt.s.w $f2, $f2 +/* 7E387C 802829FC 46041082 */ mul.s $f2, $f2, $f4 +/* 7E3880 80282A00 00000000 */ nop +/* 7E3884 80282A04 46181082 */ mul.s $f2, $f2, $f24 +/* 7E3888 80282A08 00000000 */ nop +/* 7E388C 80282A0C C640008C */ lwc1 $f0, 0x8c($s2) +/* 7E3890 80282A10 46800020 */ cvt.s.w $f0, $f0 +/* 7E3894 80282A14 46020000 */ add.s $f0, $f0, $f2 +/* 7E3898 80282A18 E6600030 */ swc1 $f0, 0x30($s3) +/* 7E389C 80282A1C C642009C */ lwc1 $f2, 0x9c($s2) +/* 7E38A0 80282A20 468010A0 */ cvt.s.w $f2, $f2 +/* 7E38A4 80282A24 46041082 */ mul.s $f2, $f2, $f4 +/* 7E38A8 80282A28 00000000 */ nop +/* 7E38AC 80282A2C 46181082 */ mul.s $f2, $f2, $f24 +/* 7E38B0 80282A30 00000000 */ nop +/* 7E38B4 80282A34 C6400090 */ lwc1 $f0, 0x90($s2) +/* 7E38B8 80282A38 46800020 */ cvt.s.w $f0, $f0 +/* 7E38BC 80282A3C 46020000 */ add.s $f0, $f0, $f2 +/* 7E38C0 80282A40 E6200048 */ swc1 $f0, 0x48($s1) +/* 7E38C4 80282A44 C64200A0 */ lwc1 $f2, 0xa0($s2) +/* 7E38C8 80282A48 468010A0 */ cvt.s.w $f2, $f2 +/* 7E38CC 80282A4C 46041082 */ mul.s $f2, $f2, $f4 +/* 7E38D0 80282A50 00000000 */ nop +/* 7E38D4 80282A54 46181082 */ mul.s $f2, $f2, $f24 +/* 7E38D8 80282A58 00000000 */ nop +/* 7E38DC 80282A5C C6400094 */ lwc1 $f0, 0x94($s2) +/* 7E38E0 80282A60 46800020 */ cvt.s.w $f0, $f0 +/* 7E38E4 80282A64 46020000 */ add.s $f0, $f0, $f2 +/* 7E38E8 80282A68 E620004C */ swc1 $f0, 0x4c($s1) +/* 7E38EC 80282A6C C64200A4 */ lwc1 $f2, 0xa4($s2) +/* 7E38F0 80282A70 468010A0 */ cvt.s.w $f2, $f2 +/* 7E38F4 80282A74 46041082 */ mul.s $f2, $f2, $f4 +/* 7E38F8 80282A78 00000000 */ nop +/* 7E38FC 80282A7C 46181082 */ mul.s $f2, $f2, $f24 +/* 7E3900 80282A80 00000000 */ nop +/* 7E3904 80282A84 C6400098 */ lwc1 $f0, 0x98($s2) +/* 7E3908 80282A88 46800020 */ cvt.s.w $f0, $f0 +/* 7E390C 80282A8C 46020000 */ add.s $f0, $f0, $f2 +/* 7E3910 80282A90 E6200050 */ swc1 $f0, 0x50($s1) +/* 7E3914 80282A94 8E420070 */ lw $v0, 0x70($s2) +/* 7E3918 80282A98 2842000C */ slti $v0, $v0, 0xc +/* 7E391C 80282A9C 1040004D */ beqz $v0, .L80282BD4 +/* 7E3920 80282AA0 00000000 */ nop +/* 7E3924 80282AA4 C642009C */ lwc1 $f2, 0x9c($s2) +/* 7E3928 80282AA8 468010A0 */ cvt.s.w $f2, $f2 +/* 7E392C 80282AAC 46041082 */ mul.s $f2, $f2, $f4 +/* 7E3930 80282AB0 00000000 */ nop +/* 7E3934 80282AB4 3C01C2B4 */ lui $at, 0xc2b4 +/* 7E3938 80282AB8 44810000 */ mtc1 $at, $f0 +/* 7E393C 80282ABC 00000000 */ nop +/* 7E3940 80282AC0 46001082 */ mul.s $f2, $f2, $f0 +/* 7E3944 80282AC4 00000000 */ nop +/* 7E3948 80282AC8 C64000B4 */ lwc1 $f0, 0xb4($s2) +/* 7E394C 80282ACC 46800020 */ cvt.s.w $f0, $f0 +/* 7E3950 80282AD0 46020000 */ add.s $f0, $f0, $f2 +/* 7E3954 80282AD4 E6200068 */ swc1 $f0, 0x68($s1) +/* 7E3958 80282AD8 C64200A4 */ lwc1 $f2, 0xa4($s2) +/* 7E395C 80282ADC 468010A0 */ cvt.s.w $f2, $f2 +/* 7E3960 80282AE0 46041082 */ mul.s $f2, $f2, $f4 +/* 7E3964 80282AE4 00000000 */ nop +/* 7E3968 80282AE8 3C0142B4 */ lui $at, 0x42b4 +/* 7E396C 80282AEC 4481B000 */ mtc1 $at, $f22 +/* 7E3970 80282AF0 00000000 */ nop +/* 7E3974 80282AF4 46161082 */ mul.s $f2, $f2, $f22 +/* 7E3978 80282AF8 00000000 */ nop +/* 7E397C 80282AFC 46162582 */ mul.s $f22, $f4, $f22 +/* 7E3980 80282B00 00000000 */ nop +/* 7E3984 80282B04 C64000A8 */ lwc1 $f0, 0xa8($s2) +/* 7E3988 80282B08 46800020 */ cvt.s.w $f0, $f0 +/* 7E398C 80282B0C 46020000 */ add.s $f0, $f0, $f2 +/* 7E3990 80282B10 4600B306 */ mov.s $f12, $f22 +/* 7E3994 80282B14 0C00A8BB */ jal sin_deg +/* 7E3998 80282B18 E6200060 */ swc1 $f0, 0x60($s1) +/* 7E399C 80282B1C 46180002 */ mul.s $f0, $f0, $f24 +/* 7E39A0 80282B20 00000000 */ nop +/* 7E39A4 80282B24 3C013FE0 */ lui $at, 0x3fe0 +/* 7E39A8 80282B28 4481A800 */ mtc1 $at, $f21 +/* 7E39AC 80282B2C 4480A000 */ mtc1 $zero, $f20 +/* 7E39B0 80282B30 46000021 */ cvt.d.s $f0, $f0 +/* 7E39B4 80282B34 46340002 */ mul.d $f0, $f0, $f20 +/* 7E39B8 80282B38 00000000 */ nop +/* 7E39BC 80282B3C C622004C */ lwc1 $f2, 0x4c($s1) +/* 7E39C0 80282B40 460010A1 */ cvt.d.s $f2, $f2 +/* 7E39C4 80282B44 46201080 */ add.d $f2, $f2, $f0 +/* 7E39C8 80282B48 4600B306 */ mov.s $f12, $f22 +/* 7E39CC 80282B4C 462010A0 */ cvt.s.d $f2, $f2 +/* 7E39D0 80282B50 0C00A8BB */ jal sin_deg +/* 7E39D4 80282B54 E622004C */ swc1 $f2, 0x4c($s1) +/* 7E39D8 80282B58 C642009C */ lwc1 $f2, 0x9c($s2) +/* 7E39DC 80282B5C 468010A0 */ cvt.s.w $f2, $f2 +/* 7E39E0 80282B60 46001082 */ mul.s $f2, $f2, $f0 +/* 7E39E4 80282B64 00000000 */ nop +/* 7E39E8 80282B68 46181082 */ mul.s $f2, $f2, $f24 +/* 7E39EC 80282B6C 00000000 */ nop +/* 7E39F0 80282B70 460010A1 */ cvt.d.s $f2, $f2 +/* 7E39F4 80282B74 46341082 */ mul.d $f2, $f2, $f20 +/* 7E39F8 80282B78 00000000 */ nop +/* 7E39FC 80282B7C C6200048 */ lwc1 $f0, 0x48($s1) +/* 7E3A00 80282B80 46000021 */ cvt.d.s $f0, $f0 +/* 7E3A04 80282B84 46220001 */ sub.d $f0, $f0, $f2 +/* 7E3A08 80282B88 4600B306 */ mov.s $f12, $f22 +/* 7E3A0C 80282B8C 46200020 */ cvt.s.d $f0, $f0 +/* 7E3A10 80282B90 0C00A8BB */ jal sin_deg +/* 7E3A14 80282B94 E6200048 */ swc1 $f0, 0x48($s1) +/* 7E3A18 80282B98 C64200A4 */ lwc1 $f2, 0xa4($s2) +/* 7E3A1C 80282B9C 468010A0 */ cvt.s.w $f2, $f2 +/* 7E3A20 80282BA0 46001082 */ mul.s $f2, $f2, $f0 +/* 7E3A24 80282BA4 00000000 */ nop +/* 7E3A28 80282BA8 46181082 */ mul.s $f2, $f2, $f24 +/* 7E3A2C 80282BAC 00000000 */ nop +/* 7E3A30 80282BB0 460010A1 */ cvt.d.s $f2, $f2 +/* 7E3A34 80282BB4 46341082 */ mul.d $f2, $f2, $f20 +/* 7E3A38 80282BB8 00000000 */ nop +/* 7E3A3C 80282BBC C6200050 */ lwc1 $f0, 0x50($s1) +/* 7E3A40 80282BC0 46000021 */ cvt.d.s $f0, $f0 +/* 7E3A44 80282BC4 46220001 */ sub.d $f0, $f0, $f2 +/* 7E3A48 80282BC8 46200020 */ cvt.s.d $f0, $f0 +/* 7E3A4C 80282BCC 080A0AF9 */ j .L80282BE4 +/* 7E3A50 80282BD0 E6200050 */ swc1 $f0, 0x50($s1) +.L80282BD4: +/* 7E3A54 80282BD4 44800000 */ mtc1 $zero, $f0 +/* 7E3A58 80282BD8 00000000 */ nop +/* 7E3A5C 80282BDC E6200060 */ swc1 $f0, 0x60($s1) +/* 7E3A60 80282BE0 E6200068 */ swc1 $f0, 0x68($s1) +.L80282BE4: +/* 7E3A64 80282BE4 C6600028 */ lwc1 $f0, 0x28($s3) +/* 7E3A68 80282BE8 C662002C */ lwc1 $f2, 0x2c($s3) +/* 7E3A6C 80282BEC C6640030 */ lwc1 $f4, 0x30($s3) +/* 7E3A70 80282BF0 3C02800B */ lui $v0, %hi(gCameras) +/* 7E3A74 80282BF4 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 7E3A78 80282BF8 E4400060 */ swc1 $f0, 0x60($v0) +/* 7E3A7C 80282BFC E4420064 */ swc1 $f2, 0x64($v0) +/* 7E3A80 80282C00 E4440068 */ swc1 $f4, 0x68($v0) +/* 7E3A84 80282C04 8E430070 */ lw $v1, 0x70($s2) +/* 7E3A88 80282C08 24630001 */ addiu $v1, $v1, 1 +/* 7E3A8C 80282C0C 3862000D */ xori $v0, $v1, 0xd +/* 7E3A90 80282C10 AE430070 */ sw $v1, 0x70($s2) +/* 7E3A94 80282C14 8FBF0020 */ lw $ra, 0x20($sp) +/* 7E3A98 80282C18 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E3A9C 80282C1C 8FB20018 */ lw $s2, 0x18($sp) +/* 7E3AA0 80282C20 8FB10014 */ lw $s1, 0x14($sp) +/* 7E3AA4 80282C24 8FB00010 */ lw $s0, 0x10($sp) +/* 7E3AA8 80282C28 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 7E3AAC 80282C2C D7B60030 */ ldc1 $f22, 0x30($sp) +/* 7E3AB0 80282C30 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 7E3AB4 80282C34 2C420001 */ sltiu $v0, $v0, 1 +/* 7E3AB8 80282C38 03E00008 */ jr $ra +/* 7E3ABC 80282C3C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s new file mode 100644 index 0000000000..23ea3d1d15 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s @@ -0,0 +1,133 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80282C40 +/* 7E3AC0 80282C40 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 7E3AC4 80282C44 AFB30034 */ sw $s3, 0x34($sp) +/* 7E3AC8 80282C48 0080982D */ daddu $s3, $a0, $zero +/* 7E3ACC 80282C4C AFB00028 */ sw $s0, 0x28($sp) +/* 7E3AD0 80282C50 AFBF0038 */ sw $ra, 0x38($sp) +/* 7E3AD4 80282C54 AFB20030 */ sw $s2, 0x30($sp) +/* 7E3AD8 80282C58 AFB1002C */ sw $s1, 0x2c($sp) +/* 7E3ADC 80282C5C 8E6400B0 */ lw $a0, 0xb0($s3) +/* 7E3AE0 80282C60 8E7200AC */ lw $s2, 0xac($s3) +/* 7E3AE4 80282C64 0C04417A */ jal get_entity_by_index +/* 7E3AE8 80282C68 00A0802D */ daddu $s0, $a1, $zero +/* 7E3AEC 80282C6C 12000023 */ beqz $s0, .L80282CFC +/* 7E3AF0 80282C70 0040882D */ daddu $s1, $v0, $zero +/* 7E3AF4 80282C74 0000202D */ daddu $a0, $zero, $zero +/* 7E3AF8 80282C78 27A50018 */ addiu $a1, $sp, 0x18 +/* 7E3AFC 80282C7C 27A20024 */ addiu $v0, $sp, 0x24 +/* 7E3B00 80282C80 27A6001C */ addiu $a2, $sp, 0x1c +/* 7E3B04 80282C84 27A70020 */ addiu $a3, $sp, 0x20 +/* 7E3B08 80282C88 AE600070 */ sw $zero, 0x70($s3) +/* 7E3B0C 80282C8C C620004C */ lwc1 $f0, 0x4c($s1) +/* 7E3B10 80282C90 3C01420C */ lui $at, 0x420c +/* 7E3B14 80282C94 44811000 */ mtc1 $at, $f2 +/* 7E3B18 80282C98 4600020D */ trunc.w.s $f8, $f0 +/* 7E3B1C 80282C9C E6680084 */ swc1 $f8, 0x84($s3) +/* 7E3B20 80282CA0 E7A20024 */ swc1 $f2, 0x24($sp) +/* 7E3B24 80282CA4 C6260048 */ lwc1 $f6, 0x48($s1) +/* 7E3B28 80282CA8 C620004C */ lwc1 $f0, 0x4c($s1) +/* 7E3B2C 80282CAC 3C0140A0 */ lui $at, 0x40a0 +/* 7E3B30 80282CB0 44811000 */ mtc1 $at, $f2 +/* 7E3B34 80282CB4 C6240050 */ lwc1 $f4, 0x50($s1) +/* 7E3B38 80282CB8 46020000 */ add.s $f0, $f0, $f2 +/* 7E3B3C 80282CBC E7A60018 */ swc1 $f6, 0x18($sp) +/* 7E3B40 80282CC0 E7A40020 */ swc1 $f4, 0x20($sp) +/* 7E3B44 80282CC4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 7E3B48 80282CC8 0C0372DF */ jal func_800DCB7C +/* 7E3B4C 80282CCC AFA20010 */ sw $v0, 0x10($sp) +/* 7E3B50 80282CD0 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 7E3B54 80282CD4 4600120D */ trunc.w.s $f8, $f2 +/* 7E3B58 80282CD8 10400008 */ beqz $v0, .L80282CFC +/* 7E3B5C 80282CDC E6680074 */ swc1 $f8, 0x74($s3) +/* 7E3B60 80282CE0 3C0140C0 */ lui $at, 0x40c0 +/* 7E3B64 80282CE4 44810000 */ mtc1 $at, $f0 +/* 7E3B68 80282CE8 00000000 */ nop +/* 7E3B6C 80282CEC 4600103E */ c.le.s $f2, $f0 +/* 7E3B70 80282CF0 00000000 */ nop +/* 7E3B74 80282CF4 45010047 */ bc1t .L80282E14 +/* 7E3B78 80282CF8 24020002 */ addiu $v0, $zero, 2 +.L80282CFC: +/* 7E3B7C 80282CFC 8E420014 */ lw $v0, 0x14($s2) +/* 7E3B80 80282D00 10400019 */ beqz $v0, .L80282D68 +/* 7E3B84 80282D04 0220202D */ daddu $a0, $s1, $zero +/* 7E3B88 80282D08 0040F809 */ jalr $v0 +/* 7E3B8C 80282D0C 0260282D */ daddu $a1, $s3, $zero +/* 7E3B90 80282D10 10400040 */ beqz $v0, .L80282E14 +/* 7E3B94 80282D14 0000102D */ daddu $v0, $zero, $zero +/* 7E3B98 80282D18 C6460008 */ lwc1 $f6, 8($s2) +/* 7E3B9C 80282D1C 468031A0 */ cvt.s.w $f6, $f6 +/* 7E3BA0 80282D20 C6400010 */ lwc1 $f0, 0x10($s2) +/* 7E3BA4 80282D24 46800020 */ cvt.s.w $f0, $f0 +/* 7E3BA8 80282D28 C6220050 */ lwc1 $f2, 0x50($s1) +/* 7E3BAC 80282D2C 3C0141C8 */ lui $at, 0x41c8 +/* 7E3BB0 80282D30 44812000 */ mtc1 $at, $f4 +/* 7E3BB4 80282D34 46001081 */ sub.s $f2, $f2, $f0 +/* 7E3BB8 80282D38 C6200048 */ lwc1 $f0, 0x48($s1) +/* 7E3BBC 80282D3C 92420004 */ lbu $v0, 4($s2) +/* 7E3BC0 80282D40 46060001 */ sub.s $f0, $f0, $f6 +/* 7E3BC4 80282D44 46041083 */ div.s $f2, $f2, $f4 +/* 7E3BC8 80282D48 4600120D */ trunc.w.s $f8, $f2 +/* 7E3BCC 80282D4C 44034000 */ mfc1 $v1, $f8 +/* 7E3BD0 80282D50 00000000 */ nop +/* 7E3BD4 80282D54 00620018 */ mult $v1, $v0 +/* 7E3BD8 80282D58 24020001 */ addiu $v0, $zero, 1 +/* 7E3BDC 80282D5C 8E430000 */ lw $v1, ($s2) +/* 7E3BE0 80282D60 080A0B7D */ j .L80282DF4 +/* 7E3BE4 80282D64 46040003 */ div.s $f0, $f0, $f4 +.L80282D68: +/* 7E3BE8 80282D68 8E620070 */ lw $v0, 0x70($s3) +/* 7E3BEC 80282D6C 3C0141C8 */ lui $at, 0x41c8 +/* 7E3BF0 80282D70 44813000 */ mtc1 $at, $f6 +/* 7E3BF4 80282D74 00021080 */ sll $v0, $v0, 2 +/* 7E3BF8 80282D78 3C018028 */ lui $at, 0x8028 +/* 7E3BFC 80282D7C 00220821 */ addu $at, $at, $v0 +/* 7E3C00 80282D80 C4225640 */ lwc1 $f2, 0x5640($at) +/* 7E3C04 80282D84 46061082 */ mul.s $f2, $f2, $f6 +/* 7E3C08 80282D88 00000000 */ nop +/* 7E3C0C 80282D8C C6600084 */ lwc1 $f0, 0x84($s3) +/* 7E3C10 80282D90 46800020 */ cvt.s.w $f0, $f0 +/* 7E3C14 80282D94 46020001 */ sub.s $f0, $f0, $f2 +/* 7E3C18 80282D98 E620004C */ swc1 $f0, 0x4c($s1) +/* 7E3C1C 80282D9C 8E620070 */ lw $v0, 0x70($s3) +/* 7E3C20 80282DA0 2403000D */ addiu $v1, $zero, 0xd +/* 7E3C24 80282DA4 24420001 */ addiu $v0, $v0, 1 +/* 7E3C28 80282DA8 14430019 */ bne $v0, $v1, .L80282E10 +/* 7E3C2C 80282DAC AE620070 */ sw $v0, 0x70($s3) +/* 7E3C30 80282DB0 C6400010 */ lwc1 $f0, 0x10($s2) +/* 7E3C34 80282DB4 46800020 */ cvt.s.w $f0, $f0 +/* 7E3C38 80282DB8 C6220050 */ lwc1 $f2, 0x50($s1) +/* 7E3C3C 80282DBC C6440008 */ lwc1 $f4, 8($s2) +/* 7E3C40 80282DC0 46802120 */ cvt.s.w $f4, $f4 +/* 7E3C44 80282DC4 46001081 */ sub.s $f2, $f2, $f0 +/* 7E3C48 80282DC8 C6200048 */ lwc1 $f0, 0x48($s1) +/* 7E3C4C 80282DCC 92420004 */ lbu $v0, 4($s2) +/* 7E3C50 80282DD0 46040001 */ sub.s $f0, $f0, $f4 +/* 7E3C54 80282DD4 46061083 */ div.s $f2, $f2, $f6 +/* 7E3C58 80282DD8 4600120D */ trunc.w.s $f8, $f2 +/* 7E3C5C 80282DDC 44034000 */ mfc1 $v1, $f8 +/* 7E3C60 80282DE0 00000000 */ nop +/* 7E3C64 80282DE4 00620018 */ mult $v1, $v0 +/* 7E3C68 80282DE8 24020001 */ addiu $v0, $zero, 1 +/* 7E3C6C 80282DEC 8E430000 */ lw $v1, ($s2) +/* 7E3C70 80282DF0 46060003 */ div.s $f0, $f0, $f6 +.L80282DF4: +/* 7E3C74 80282DF4 4600020D */ trunc.w.s $f8, $f0 +/* 7E3C78 80282DF8 44044000 */ mfc1 $a0, $f8 +/* 7E3C7C 80282DFC 00004012 */ mflo $t0 +/* 7E3C80 80282E00 00882021 */ addu $a0, $a0, $t0 +/* 7E3C84 80282E04 00641821 */ addu $v1, $v1, $a0 +/* 7E3C88 80282E08 080A0B85 */ j .L80282E14 +/* 7E3C8C 80282E0C A0600000 */ sb $zero, ($v1) +.L80282E10: +/* 7E3C90 80282E10 0000102D */ daddu $v0, $zero, $zero +.L80282E14: +/* 7E3C94 80282E14 8FBF0038 */ lw $ra, 0x38($sp) +/* 7E3C98 80282E18 8FB30034 */ lw $s3, 0x34($sp) +/* 7E3C9C 80282E1C 8FB20030 */ lw $s2, 0x30($sp) +/* 7E3CA0 80282E20 8FB1002C */ lw $s1, 0x2c($sp) +/* 7E3CA4 80282E24 8FB00028 */ lw $s0, 0x28($sp) +/* 7E3CA8 80282E28 03E00008 */ jr $ra +/* 7E3CAC 80282E2C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s new file mode 100644 index 0000000000..c76b40eceb --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s @@ -0,0 +1,160 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80282E30 +/* 7E3CB0 80282E30 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E3CB4 80282E34 AFB00010 */ sw $s0, 0x10($sp) +/* 7E3CB8 80282E38 0080802D */ daddu $s0, $a0, $zero +/* 7E3CBC 80282E3C AFBF0018 */ sw $ra, 0x18($sp) +/* 7E3CC0 80282E40 AFB10014 */ sw $s1, 0x14($sp) +/* 7E3CC4 80282E44 8E0400B0 */ lw $a0, 0xb0($s0) +/* 7E3CC8 80282E48 0C04417A */ jal get_entity_by_index +/* 7E3CCC 80282E4C 8E1100AC */ lw $s1, 0xac($s0) +/* 7E3CD0 80282E50 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 7E3CD4 80282E54 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 7E3CD8 80282E58 0040502D */ daddu $t2, $v0, $zero +/* 7E3CDC 80282E5C C4600028 */ lwc1 $f0, 0x28($v1) +/* 7E3CE0 80282E60 C462002C */ lwc1 $f2, 0x2c($v1) +/* 7E3CE4 80282E64 8E2D0008 */ lw $t5, 8($s1) +/* 7E3CE8 80282E68 8E2B000C */ lw $t3, 0xc($s1) +/* 7E3CEC 80282E6C 8E2C0010 */ lw $t4, 0x10($s1) +/* 7E3CF0 80282E70 4600010D */ trunc.w.s $f4, $f0 +/* 7E3CF4 80282E74 44042000 */ mfc1 $a0, $f4 +/* 7E3CF8 80282E78 4600110D */ trunc.w.s $f4, $f2 +/* 7E3CFC 80282E7C 44092000 */ mfc1 $t1, $f4 +/* 7E3D00 80282E80 008D2023 */ subu $a0, $a0, $t5 +/* 7E3D04 80282E84 C4600030 */ lwc1 $f0, 0x30($v1) +/* 7E3D08 80282E88 012B4823 */ subu $t1, $t1, $t3 +/* 7E3D0C 80282E8C 4600010D */ trunc.w.s $f4, $f0 +/* 7E3D10 80282E90 44082000 */ mfc1 $t0, $f4 +/* 7E3D14 80282E94 04810002 */ bgez $a0, .L80282EA0 +/* 7E3D18 80282E98 010C4023 */ subu $t0, $t0, $t4 +/* 7E3D1C 80282E9C 2484FFE7 */ addiu $a0, $a0, -0x19 +.L80282EA0: +/* 7E3D20 80282EA0 05020001 */ bltzl $t0, .L80282EA8 +/* 7E3D24 80282EA4 2508FFE7 */ addiu $t0, $t0, -0x19 +.L80282EA8: +/* 7E3D28 80282EA8 3C0551EB */ lui $a1, 0x51eb +/* 7E3D2C 80282EAC 34A5851F */ ori $a1, $a1, 0x851f +/* 7E3D30 80282EB0 00850018 */ mult $a0, $a1 +/* 7E3D34 80282EB4 00001810 */ mfhi $v1 +/* 7E3D38 80282EB8 00000000 */ nop +/* 7E3D3C 80282EBC 00000000 */ nop +/* 7E3D40 80282EC0 01250018 */ mult $t1, $a1 +/* 7E3D44 80282EC4 000417C3 */ sra $v0, $a0, 0x1f +/* 7E3D48 80282EC8 00003010 */ mfhi $a2 +/* 7E3D4C 80282ECC 000318C3 */ sra $v1, $v1, 3 +/* 7E3D50 80282ED0 00622023 */ subu $a0, $v1, $v0 +/* 7E3D54 80282ED4 01050018 */ mult $t0, $a1 +/* 7E3D58 80282ED8 000917C3 */ sra $v0, $t1, 0x1f +/* 7E3D5C 80282EDC 000618C3 */ sra $v1, $a2, 3 +/* 7E3D60 80282EE0 00624823 */ subu $t1, $v1, $v0 +/* 7E3D64 80282EE4 000817C3 */ sra $v0, $t0, 0x1f +/* 7E3D68 80282EE8 00003810 */ mfhi $a3 +/* 7E3D6C 80282EEC 000718C3 */ sra $v1, $a3, 3 +/* 7E3D70 80282EF0 00624023 */ subu $t0, $v1, $v0 +/* 7E3D74 80282EF4 0080382D */ daddu $a3, $a0, $zero +/* 7E3D78 80282EF8 00041040 */ sll $v0, $a0, 1 +/* 7E3D7C 80282EFC 00441021 */ addu $v0, $v0, $a0 +/* 7E3D80 80282F00 000210C0 */ sll $v0, $v0, 3 +/* 7E3D84 80282F04 00822021 */ addu $a0, $a0, $v0 +/* 7E3D88 80282F08 00091040 */ sll $v0, $t1, 1 +/* 7E3D8C 80282F0C 00491021 */ addu $v0, $v0, $t1 +/* 7E3D90 80282F10 000210C0 */ sll $v0, $v0, 3 +/* 7E3D94 80282F14 01224821 */ addu $t1, $t1, $v0 +/* 7E3D98 80282F18 0100302D */ daddu $a2, $t0, $zero +/* 7E3D9C 80282F1C 00081040 */ sll $v0, $t0, 1 +/* 7E3DA0 80282F20 00481021 */ addu $v0, $v0, $t0 +/* 7E3DA4 80282F24 000210C0 */ sll $v0, $v0, 3 +/* 7E3DA8 80282F28 01024021 */ addu $t0, $t0, $v0 +/* 7E3DAC 80282F2C 2482000C */ addiu $v0, $a0, 0xc +/* 7E3DB0 80282F30 004D2021 */ addu $a0, $v0, $t5 +/* 7E3DB4 80282F34 012B4821 */ addu $t1, $t1, $t3 +/* 7E3DB8 80282F38 2502000C */ addiu $v0, $t0, 0xc +/* 7E3DBC 80282F3C 004C4021 */ addu $t0, $v0, $t4 +/* 7E3DC0 80282F40 AE040084 */ sw $a0, 0x84($s0) +/* 7E3DC4 80282F44 AE090088 */ sw $t1, 0x88($s0) +/* 7E3DC8 80282F48 AE08008C */ sw $t0, 0x8c($s0) +/* 7E3DCC 80282F4C C5400048 */ lwc1 $f0, 0x48($t2) +/* 7E3DD0 80282F50 4600010D */ trunc.w.s $f4, $f0 +/* 7E3DD4 80282F54 44042000 */ mfc1 $a0, $f4 +/* 7E3DD8 80282F58 00000000 */ nop +/* 7E3DDC 80282F5C AE040090 */ sw $a0, 0x90($s0) +/* 7E3DE0 80282F60 C540004C */ lwc1 $f0, 0x4c($t2) +/* 7E3DE4 80282F64 4600010D */ trunc.w.s $f4, $f0 +/* 7E3DE8 80282F68 E6040094 */ swc1 $f4, 0x94($s0) +/* 7E3DEC 80282F6C C5400050 */ lwc1 $f0, 0x50($t2) +/* 7E3DF0 80282F70 4600010D */ trunc.w.s $f4, $f0 +/* 7E3DF4 80282F74 44032000 */ mfc1 $v1, $f4 +/* 7E3DF8 80282F78 00000000 */ nop +/* 7E3DFC 80282F7C AE030098 */ sw $v1, 0x98($s0) +/* 7E3E00 80282F80 8E220008 */ lw $v0, 8($s1) +/* 7E3E04 80282F84 00822023 */ subu $a0, $a0, $v0 +/* 7E3E08 80282F88 00850018 */ mult $a0, $a1 +/* 7E3E0C 80282F8C 8E220010 */ lw $v0, 0x10($s1) +/* 7E3E10 80282F90 00005010 */ mfhi $t2 +/* 7E3E14 80282F94 00624023 */ subu $t0, $v1, $v0 +/* 7E3E18 80282F98 000417C3 */ sra $v0, $a0, 0x1f +/* 7E3E1C 80282F9C 01050018 */ mult $t0, $a1 +/* 7E3E20 80282FA0 000A18C3 */ sra $v1, $t2, 3 +/* 7E3E24 80282FA4 00625023 */ subu $t2, $v1, $v0 +/* 7E3E28 80282FA8 01472823 */ subu $a1, $t2, $a3 +/* 7E3E2C 80282FAC 000817C3 */ sra $v0, $t0, 0x1f +/* 7E3E30 80282FB0 00004810 */ mfhi $t1 +/* 7E3E34 80282FB4 000918C3 */ sra $v1, $t1, 3 +/* 7E3E38 80282FB8 00621023 */ subu $v0, $v1, $v0 +/* 7E3E3C 80282FBC 10A00005 */ beqz $a1, .L80282FD4 +/* 7E3E40 80282FC0 00462023 */ subu $a0, $v0, $a2 +/* 7E3E44 80282FC4 10800004 */ beqz $a0, .L80282FD8 +/* 7E3E48 80282FC8 01453021 */ addu $a2, $t2, $a1 +/* 7E3E4C 80282FCC 0000202D */ daddu $a0, $zero, $zero +/* 7E3E50 80282FD0 0080282D */ daddu $a1, $a0, $zero +.L80282FD4: +/* 7E3E54 80282FD4 01453021 */ addu $a2, $t2, $a1 +.L80282FD8: +/* 7E3E58 80282FD8 00441821 */ addu $v1, $v0, $a0 +/* 7E3E5C 80282FDC AE05009C */ sw $a1, 0x9c($s0) +/* 7E3E60 80282FE0 AE0000A0 */ sw $zero, 0xa0($s0) +/* 7E3E64 80282FE4 14A00005 */ bnez $a1, .L80282FFC +/* 7E3E68 80282FE8 AE0400A4 */ sw $a0, 0xa4($s0) +/* 7E3E6C 80282FEC 14800003 */ bnez $a0, .L80282FFC +/* 7E3E70 80282FF0 24020002 */ addiu $v0, $zero, 2 +/* 7E3E74 80282FF4 080A0C1B */ j .L8028306C +/* 7E3E78 80282FF8 AE0200A8 */ sw $v0, 0xa8($s0) +.L80282FFC: +/* 7E3E7C 80282FFC 92240004 */ lbu $a0, 4($s1) +/* 7E3E80 80283000 00C4102A */ slt $v0, $a2, $a0 +/* 7E3E84 80283004 10400017 */ beqz $v0, .L80283064 +/* 7E3E88 80283008 24020001 */ addiu $v0, $zero, 1 +/* 7E3E8C 8028300C 04C20016 */ bltzl $a2, .L80283068 +/* 7E3E90 80283010 AE0200A8 */ sw $v0, 0xa8($s0) +/* 7E3E94 80283014 92220005 */ lbu $v0, 5($s1) +/* 7E3E98 80283018 0062102A */ slt $v0, $v1, $v0 +/* 7E3E9C 8028301C 10400011 */ beqz $v0, .L80283064 +/* 7E3EA0 80283020 24020001 */ addiu $v0, $zero, 1 +/* 7E3EA4 80283024 0460000F */ bltz $v1, .L80283064 +/* 7E3EA8 80283028 00640018 */ mult $v1, $a0 +/* 7E3EAC 8028302C 8E220000 */ lw $v0, ($s1) +/* 7E3EB0 80283030 00007012 */ mflo $t6 +/* 7E3EB4 80283034 00CE1821 */ addu $v1, $a2, $t6 +/* 7E3EB8 80283038 00431021 */ addu $v0, $v0, $v1 +/* 7E3EBC 8028303C 90420000 */ lbu $v0, ($v0) +/* 7E3EC0 80283040 14400008 */ bnez $v0, .L80283064 +/* 7E3EC4 80283044 24020001 */ addiu $v0, $zero, 1 +/* 7E3EC8 80283048 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 7E3ECC 8028304C 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) +/* 7E3ED0 80283050 2402FFFF */ addiu $v0, $zero, -1 +/* 7E3ED4 80283054 10620003 */ beq $v1, $v0, .L80283064 +/* 7E3ED8 80283058 24020001 */ addiu $v0, $zero, 1 +/* 7E3EDC 8028305C 080A0C1A */ j .L80283068 +/* 7E3EE0 80283060 AE0000A8 */ sw $zero, 0xa8($s0) +.L80283064: +/* 7E3EE4 80283064 AE0200A8 */ sw $v0, 0xa8($s0) +.L80283068: +/* 7E3EE8 80283068 24020002 */ addiu $v0, $zero, 2 +.L8028306C: +/* 7E3EEC 8028306C 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E3EF0 80283070 8FB10014 */ lw $s1, 0x14($sp) +/* 7E3EF4 80283074 8FB00010 */ lw $s0, 0x10($sp) +/* 7E3EF8 80283078 03E00008 */ jr $ra +/* 7E3EFC 8028307C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283080.s b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s new file mode 100644 index 0000000000..f3ad6ab99a --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283080 +/* 7E3F00 80283080 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E3F04 80283084 AFB00010 */ sw $s0, 0x10($sp) +/* 7E3F08 80283088 0080802D */ daddu $s0, $a0, $zero +/* 7E3F0C 8028308C AFBF0018 */ sw $ra, 0x18($sp) +/* 7E3F10 80283090 AFB10014 */ sw $s1, 0x14($sp) +/* 7E3F14 80283094 8E0400B0 */ lw $a0, 0xb0($s0) +/* 7E3F18 80283098 0C04417A */ jal get_entity_by_index +/* 7E3F1C 8028309C 8E1100AC */ lw $s1, 0xac($s0) +/* 7E3F20 802830A0 3C0551EB */ lui $a1, 0x51eb +/* 7E3F24 802830A4 34A5851F */ ori $a1, $a1, 0x851f +/* 7E3F28 802830A8 C4400050 */ lwc1 $f0, 0x50($v0) +/* 7E3F2C 802830AC 8E240010 */ lw $a0, 0x10($s1) +/* 7E3F30 802830B0 4600008D */ trunc.w.s $f2, $f0 +/* 7E3F34 802830B4 44031000 */ mfc1 $v1, $f2 +/* 7E3F38 802830B8 00000000 */ nop +/* 7E3F3C 802830BC 00641823 */ subu $v1, $v1, $a0 +/* 7E3F40 802830C0 00650018 */ mult $v1, $a1 +/* 7E3F44 802830C4 C4400048 */ lwc1 $f0, 0x48($v0) +/* 7E3F48 802830C8 8E220008 */ lw $v0, 8($s1) +/* 7E3F4C 802830CC 00003810 */ mfhi $a3 +/* 7E3F50 802830D0 4600008D */ trunc.w.s $f2, $f0 +/* 7E3F54 802830D4 44061000 */ mfc1 $a2, $f2 +/* 7E3F58 802830D8 00000000 */ nop +/* 7E3F5C 802830DC 00C23023 */ subu $a2, $a2, $v0 +/* 7E3F60 802830E0 00C50018 */ mult $a2, $a1 +/* 7E3F64 802830E4 00031FC3 */ sra $v1, $v1, 0x1f +/* 7E3F68 802830E8 8E0200A4 */ lw $v0, 0xa4($s0) +/* 7E3F6C 802830EC 000738C3 */ sra $a3, $a3, 3 +/* 7E3F70 802830F0 00E33823 */ subu $a3, $a3, $v1 +/* 7E3F74 802830F4 00002810 */ mfhi $a1 +/* 7E3F78 802830F8 92230004 */ lbu $v1, 4($s1) +/* 7E3F7C 802830FC 00E21021 */ addu $v0, $a3, $v0 +/* 7E3F80 80283100 00430018 */ mult $v0, $v1 +/* 7E3F84 80283104 8E04009C */ lw $a0, 0x9c($s0) +/* 7E3F88 80283108 00001012 */ mflo $v0 +/* 7E3F8C 8028310C 000637C3 */ sra $a2, $a2, 0x1f +/* 7E3F90 80283110 000528C3 */ sra $a1, $a1, 3 +/* 7E3F94 80283114 00E30018 */ mult $a3, $v1 +/* 7E3F98 80283118 00A62823 */ subu $a1, $a1, $a2 +/* 7E3F9C 8028311C 00A42021 */ addu $a0, $a1, $a0 +/* 7E3FA0 80283120 00822021 */ addu $a0, $a0, $v0 +/* 7E3FA4 80283124 8E230000 */ lw $v1, ($s1) +/* 7E3FA8 80283128 00004812 */ mflo $t1 +/* 7E3FAC 8028312C 00A91021 */ addu $v0, $a1, $t1 +/* 7E3FB0 80283130 00621021 */ addu $v0, $v1, $v0 +/* 7E3FB4 80283134 90420000 */ lbu $v0, ($v0) +/* 7E3FB8 80283138 00641821 */ addu $v1, $v1, $a0 +/* 7E3FBC 8028313C A0620000 */ sb $v0, ($v1) +/* 7E3FC0 80283140 92220004 */ lbu $v0, 4($s1) +/* 7E3FC4 80283144 00E20018 */ mult $a3, $v0 +/* 7E3FC8 80283148 8E230000 */ lw $v1, ($s1) +/* 7E3FCC 8028314C 00003012 */ mflo $a2 +/* 7E3FD0 80283150 00A62821 */ addu $a1, $a1, $a2 +/* 7E3FD4 80283154 00651821 */ addu $v1, $v1, $a1 +/* 7E3FD8 80283158 A0600000 */ sb $zero, ($v1) +/* 7E3FDC 8028315C 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E3FE0 80283160 8FB10014 */ lw $s1, 0x14($sp) +/* 7E3FE4 80283164 8FB00010 */ lw $s0, 0x10($sp) +/* 7E3FE8 80283168 24020002 */ addiu $v0, $zero, 2 +/* 7E3FEC 8028316C 03E00008 */ jr $ra +/* 7E3FF0 80283170 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283174.s b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s new file mode 100644 index 0000000000..9ba84c5043 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283174 +/* 7E3FF4 80283174 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* 7E3FF8 80283178 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* 7E3FFC 8028317C 8C8200B0 */ lw $v0, 0xb0($a0) +/* 7E4000 80283180 3C038016 */ lui $v1, %hi(gCollisionStatus) +/* 7E4004 80283184 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) +/* 7E4008 80283188 24424000 */ addiu $v0, $v0, 0x4000 +/* 7E400C 8028318C 5462000F */ bnel $v1, $v0, .L802831CC +/* 7E4010 80283190 AC8000B8 */ sw $zero, 0xb8($a0) +/* 7E4014 80283194 80A300B4 */ lb $v1, 0xb4($a1) +/* 7E4018 80283198 24020014 */ addiu $v0, $zero, 0x14 +/* 7E401C 8028319C 10620005 */ beq $v1, $v0, .L802831B4 +/* 7E4020 802831A0 24020001 */ addiu $v0, $zero, 1 +/* 7E4024 802831A4 10620003 */ beq $v1, $v0, .L802831B4 +/* 7E4028 802831A8 24020002 */ addiu $v0, $zero, 2 +/* 7E402C 802831AC 54620009 */ bnel $v1, $v0, .L802831D4 +/* 7E4030 802831B0 AC8000B8 */ sw $zero, 0xb8($a0) +.L802831B4: +/* 7E4034 802831B4 8CA20004 */ lw $v0, 4($a1) +/* 7E4038 802831B8 30420001 */ andi $v0, $v0, 1 +/* 7E403C 802831BC 54400003 */ bnel $v0, $zero, .L802831CC +/* 7E4040 802831C0 AC8000B8 */ sw $zero, 0xb8($a0) +/* 7E4044 802831C4 24020001 */ addiu $v0, $zero, 1 +/* 7E4048 802831C8 AC8200B8 */ sw $v0, 0xb8($a0) +.L802831CC: +/* 7E404C 802831CC 03E00008 */ jr $ra +/* 7E4050 802831D0 24020002 */ addiu $v0, $zero, 2 +.L802831D4: +/* 7E4054 802831D4 03E00008 */ jr $ra +/* 7E4058 802831D8 00000000 */ nop diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283240.s b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s new file mode 100644 index 0000000000..9ed41dd265 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283240 +/* 7E40C0 80283240 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E40C4 80283244 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E40C8 80283248 0080982D */ daddu $s3, $a0, $zero +/* 7E40CC 8028324C AFB10014 */ sw $s1, 0x14($sp) +/* 7E40D0 80283250 0000882D */ daddu $s1, $zero, $zero +/* 7E40D4 80283254 AFBF0024 */ sw $ra, 0x24($sp) +/* 7E40D8 80283258 AFB40020 */ sw $s4, 0x20($sp) +/* 7E40DC 8028325C AFB20018 */ sw $s2, 0x18($sp) +/* 7E40E0 80283260 AFB00010 */ sw $s0, 0x10($sp) +/* 7E40E4 80283264 8E62000C */ lw $v0, 0xc($s3) +/* 7E40E8 80283268 8C450004 */ lw $a1, 4($v0) +/* 7E40EC 8028326C 8C540000 */ lw $s4, ($v0) +/* 7E40F0 80283270 0C0B1EAF */ jal get_variable +/* 7E40F4 80283274 0220802D */ daddu $s0, $s1, $zero +/* 7E40F8 80283278 0040902D */ daddu $s2, $v0, $zero +.L8028327C: +/* 7E40FC 8028327C 0C0B11E4 */ jal get_script_by_index +/* 7E4100 80283280 0200202D */ daddu $a0, $s0, $zero +/* 7E4104 80283284 10400006 */ beqz $v0, .L802832A0 +/* 7E4108 80283288 26100001 */ addiu $s0, $s0, 1 +/* 7E410C 8028328C 8C42015C */ lw $v0, 0x15c($v0) +/* 7E4110 80283290 14520004 */ bne $v0, $s2, .L802832A4 +/* 7E4114 80283294 2A020080 */ slti $v0, $s0, 0x80 +/* 7E4118 80283298 080A0CAB */ j .L802832AC +/* 7E411C 8028329C 24110001 */ addiu $s1, $zero, 1 +.L802832A0: +/* 7E4120 802832A0 2A020080 */ slti $v0, $s0, 0x80 +.L802832A4: +/* 7E4124 802832A4 1440FFF5 */ bnez $v0, .L8028327C +/* 7E4128 802832A8 00000000 */ nop +.L802832AC: +/* 7E412C 802832AC 0260202D */ daddu $a0, $s3, $zero +/* 7E4130 802832B0 0280282D */ daddu $a1, $s4, $zero +/* 7E4134 802832B4 0C0B2026 */ jal set_variable +/* 7E4138 802832B8 0220302D */ daddu $a2, $s1, $zero +/* 7E413C 802832BC 8FBF0024 */ lw $ra, 0x24($sp) +/* 7E4140 802832C0 8FB40020 */ lw $s4, 0x20($sp) +/* 7E4144 802832C4 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E4148 802832C8 8FB20018 */ lw $s2, 0x18($sp) +/* 7E414C 802832CC 8FB10014 */ lw $s1, 0x14($sp) +/* 7E4150 802832D0 8FB00010 */ lw $s0, 0x10($sp) +/* 7E4154 802832D4 24020002 */ addiu $v0, $zero, 2 +/* 7E4158 802832D8 03E00008 */ jr $ra +/* 7E415C 802832DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283810.s b/asm/nonmatchings/world/script_api/7E3700/func_80283810.s new file mode 100644 index 0000000000..6059f9801d --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283810.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283810 +/* 7E4690 80283810 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E4694 80283814 AFB00010 */ sw $s0, 0x10($sp) +/* 7E4698 80283818 0080802D */ daddu $s0, $a0, $zero +/* 7E469C 8028381C AFBF0014 */ sw $ra, 0x14($sp) +/* 7E46A0 80283820 0C03AD8E */ jal partner_get_ride_script +/* 7E46A4 80283824 AE0000AC */ sw $zero, 0xac($s0) +/* 7E46A8 80283828 1040000F */ beqz $v0, .L80283868 +/* 7E46AC 8028382C 00000000 */ nop +/* 7E46B0 80283830 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* 7E46B4 80283834 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* 7E46B8 80283838 14400003 */ bnez $v0, .L80283848 +/* 7E46BC 8028383C 24020001 */ addiu $v0, $zero, 1 +/* 7E46C0 80283840 080A0E1A */ j .L80283868 +/* 7E46C4 80283844 AE0000AC */ sw $zero, 0xac($s0) +.L80283848: +/* 7E46C8 80283848 0C03AD8E */ jal partner_get_ride_script +/* 7E46CC 8028384C AE0200AC */ sw $v0, 0xac($s0) +/* 7E46D0 80283850 AE0200B0 */ sw $v0, 0xb0($s0) +/* 7E46D4 80283854 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 7E46D8 80283858 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 7E46DC 8028385C C4400080 */ lwc1 $f0, 0x80($v0) +/* 7E46E0 80283860 4600008D */ trunc.w.s $f2, $f0 +/* 7E46E4 80283864 E60200B8 */ swc1 $f2, 0xb8($s0) +.L80283868: +/* 7E46E8 80283868 8FBF0014 */ lw $ra, 0x14($sp) +/* 7E46EC 8028386C 8FB00010 */ lw $s0, 0x10($sp) +/* 7E46F0 80283870 24020002 */ addiu $v0, $zero, 2 +/* 7E46F4 80283874 03E00008 */ jr $ra +/* 7E46F8 80283878 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283908.s b/asm/nonmatchings/world/script_api/7E3700/func_80283908.s new file mode 100644 index 0000000000..e00af2cf6e --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283908.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283908 +/* 7E4788 80283908 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 7E478C 8028390C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 7E4790 80283910 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E4794 80283914 AFB00010 */ sw $s0, 0x10($sp) +/* 7E4798 80283918 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* 7E479C 8028391C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* 7E47A0 80283920 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E47A4 80283924 AFB20018 */ sw $s2, 0x18($sp) +/* 7E47A8 80283928 AFB10014 */ sw $s1, 0x14($sp) +/* 7E47AC 8028392C 84620160 */ lh $v0, 0x160($v1) +/* 7E47B0 80283930 0200882D */ daddu $s1, $s0, $zero +/* 7E47B4 80283934 44820000 */ mtc1 $v0, $f0 +/* 7E47B8 80283938 00000000 */ nop +/* 7E47BC 8028393C 46800020 */ cvt.s.w $f0, $f0 +/* 7E47C0 80283940 E6000028 */ swc1 $f0, 0x28($s0) +/* 7E47C4 80283944 84620162 */ lh $v0, 0x162($v1) +/* 7E47C8 80283948 3C04800B */ lui $a0, %hi(gCameras) +/* 7E47CC 8028394C 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* 7E47D0 80283950 44820000 */ mtc1 $v0, $f0 +/* 7E47D4 80283954 00000000 */ nop +/* 7E47D8 80283958 46800020 */ cvt.s.w $f0, $f0 +/* 7E47DC 8028395C E600002C */ swc1 $f0, 0x2c($s0) +/* 7E47E0 80283960 84620164 */ lh $v0, 0x164($v1) +/* 7E47E4 80283964 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 7E47E8 80283968 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 7E47EC 8028396C 44820000 */ mtc1 $v0, $f0 +/* 7E47F0 80283970 00000000 */ nop +/* 7E47F4 80283974 46800020 */ cvt.s.w $f0, $f0 +/* 7E47F8 80283978 00031080 */ sll $v0, $v1, 2 +/* 7E47FC 8028397C 00431021 */ addu $v0, $v0, $v1 +/* 7E4800 80283980 00021080 */ sll $v0, $v0, 2 +/* 7E4804 80283984 00431023 */ subu $v0, $v0, $v1 +/* 7E4808 80283988 000218C0 */ sll $v1, $v0, 3 +/* 7E480C 8028398C 00431021 */ addu $v0, $v0, $v1 +/* 7E4810 80283990 000210C0 */ sll $v0, $v0, 3 +/* 7E4814 80283994 E6000030 */ swc1 $f0, 0x30($s0) +/* 7E4818 80283998 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 7E481C 8028399C 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) +/* 7E4820 802839A0 10600022 */ beqz $v1, .L80283A2C +/* 7E4824 802839A4 00449021 */ addu $s2, $v0, $a0 +/* 7E4828 802839A8 0C00EABB */ jal get_npc_unsafe +/* 7E482C 802839AC 2404FFFC */ addiu $a0, $zero, -4 +/* 7E4830 802839B0 C60200A8 */ lwc1 $f2, 0xa8($s0) +/* 7E4834 802839B4 3C014334 */ lui $at, 0x4334 +/* 7E4838 802839B8 44810000 */ mtc1 $at, $f0 +/* 7E483C 802839BC 3C01C2B4 */ lui $at, 0xc2b4 +/* 7E4840 802839C0 44816000 */ mtc1 $at, $f12 +/* 7E4844 802839C4 4600103C */ c.lt.s $f2, $f0 +/* 7E4848 802839C8 00000000 */ nop +/* 7E484C 802839CC 45000003 */ bc1f .L802839DC +/* 7E4850 802839D0 0040802D */ daddu $s0, $v0, $zero +/* 7E4854 802839D4 3C0142B4 */ lui $at, 0x42b4 +/* 7E4858 802839D8 44816000 */ mtc1 $at, $f12 +.L802839DC: +/* 7E485C 802839DC 0C00A6C9 */ jal clamp_angle +/* 7E4860 802839E0 00000000 */ nop +/* 7E4864 802839E4 C6220028 */ lwc1 $f2, 0x28($s1) +/* 7E4868 802839E8 E6020038 */ swc1 $f2, 0x38($s0) +/* 7E486C 802839EC C622002C */ lwc1 $f2, 0x2c($s1) +/* 7E4870 802839F0 E602003C */ swc1 $f2, 0x3c($s0) +/* 7E4874 802839F4 C6220030 */ lwc1 $f2, 0x30($s1) +/* 7E4878 802839F8 26040038 */ addiu $a0, $s0, 0x38 +/* 7E487C 802839FC E6020040 */ swc1 $f2, 0x40($s0) +/* 7E4880 80283A00 862200B2 */ lh $v0, 0xb2($s1) +/* 7E4884 80283A04 44070000 */ mfc1 $a3, $f0 +/* 7E4888 80283A08 24420005 */ addiu $v0, $v0, 5 +/* 7E488C 80283A0C 44822000 */ mtc1 $v0, $f4 +/* 7E4890 80283A10 00000000 */ nop +/* 7E4894 80283A14 46802120 */ cvt.s.w $f4, $f4 +/* 7E4898 80283A18 44062000 */ mfc1 $a2, $f4 +/* 7E489C 80283A1C 0C00A7E7 */ jal add_vec2D_polar +/* 7E48A0 80283A20 26050040 */ addiu $a1, $s0, 0x40 +/* 7E48A4 80283A24 0C03BCCA */ jal enable_partner_ai +/* 7E48A8 80283A28 00000000 */ nop +.L80283A2C: +/* 7E48AC 80283A2C 24020001 */ addiu $v0, $zero, 1 +/* 7E48B0 80283A30 A6420008 */ sh $v0, 8($s2) +/* 7E48B4 80283A34 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E48B8 80283A38 8FB20018 */ lw $s2, 0x18($sp) +/* 7E48BC 80283A3C 8FB10014 */ lw $s1, 0x14($sp) +/* 7E48C0 80283A40 8FB00010 */ lw $s0, 0x10($sp) +/* 7E48C4 80283A44 24020002 */ addiu $v0, $zero, 2 +/* 7E48C8 80283A48 03E00008 */ jr $ra +/* 7E48CC 80283A4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s new file mode 100644 index 0000000000..6fbf4c9b88 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283A50 +/* 7E48D0 80283A50 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E48D4 80283A54 AFB20018 */ sw $s2, 0x18($sp) +/* 7E48D8 80283A58 0080902D */ daddu $s2, $a0, $zero +/* 7E48DC 80283A5C AFB00010 */ sw $s0, 0x10($sp) +/* 7E48E0 80283A60 00A0802D */ daddu $s0, $a1, $zero +/* 7E48E4 80283A64 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E48E8 80283A68 0C016AFA */ jal get_current_map_header +/* 7E48EC 80283A6C AFB10014 */ sw $s1, 0x14($sp) +/* 7E48F0 80283A70 0000302D */ daddu $a2, $zero, $zero +/* 7E48F4 80283A74 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 7E48F8 80283A78 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 7E48FC 80283A7C 12000021 */ beqz $s0, .L80283B04 +/* 7E4900 80283A80 0040282D */ daddu $a1, $v0, $zero +/* 7E4904 80283A84 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 7E4908 80283A88 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) +/* 7E490C 80283A8C 8482008E */ lh $v0, 0x8e($a0) +/* 7E4910 80283A90 8CA30014 */ lw $v1, 0x14($a1) +/* 7E4914 80283A94 00021100 */ sll $v0, $v0, 4 +/* 7E4918 80283A98 00431021 */ addu $v0, $v0, $v1 +/* 7E491C 80283A9C C4400000 */ lwc1 $f0, ($v0) +/* 7E4920 80283AA0 E6200028 */ swc1 $f0, 0x28($s1) +/* 7E4924 80283AA4 8482008E */ lh $v0, 0x8e($a0) +/* 7E4928 80283AA8 8CA30014 */ lw $v1, 0x14($a1) +/* 7E492C 80283AAC 00021100 */ sll $v0, $v0, 4 +/* 7E4930 80283AB0 00431021 */ addu $v0, $v0, $v1 +/* 7E4934 80283AB4 C4400008 */ lwc1 $f0, 8($v0) +/* 7E4938 80283AB8 E6200030 */ swc1 $f0, 0x30($s1) +/* 7E493C 80283ABC 8482008E */ lh $v0, 0x8e($a0) +/* 7E4940 80283AC0 8CA30014 */ lw $v1, 0x14($a1) +/* 7E4944 80283AC4 00021100 */ sll $v0, $v0, 4 +/* 7E4948 80283AC8 00431021 */ addu $v0, $v0, $v1 +/* 7E494C 80283ACC C4400004 */ lwc1 $f0, 4($v0) +/* 7E4950 80283AD0 4600018D */ trunc.w.s $f6, $f0 +/* 7E4954 80283AD4 44023000 */ mfc1 $v0, $f6 +/* 7E4958 80283AD8 00000000 */ nop +/* 7E495C 80283ADC AE42008C */ sw $v0, 0x8c($s2) +/* 7E4960 80283AE0 2442FFD8 */ addiu $v0, $v0, -0x28 +/* 7E4964 80283AE4 44820000 */ mtc1 $v0, $f0 +/* 7E4968 80283AE8 00000000 */ nop +/* 7E496C 80283AEC 46800020 */ cvt.s.w $f0, $f0 +/* 7E4970 80283AF0 8E220000 */ lw $v0, ($s1) +/* 7E4974 80283AF4 3C030400 */ lui $v1, 0x400 +/* 7E4978 80283AF8 E620002C */ swc1 $f0, 0x2c($s1) +/* 7E497C 80283AFC 080A0ED2 */ j .L80283B48 +/* 7E4980 80283B00 00431025 */ or $v0, $v0, $v1 +.L80283B04: +/* 7E4984 80283B04 C622002C */ lwc1 $f2, 0x2c($s1) +/* 7E4988 80283B08 3C013F80 */ lui $at, 0x3f80 +/* 7E498C 80283B0C 44810000 */ mtc1 $at, $f0 +/* 7E4990 80283B10 00000000 */ nop +/* 7E4994 80283B14 46001080 */ add.s $f2, $f2, $f0 +/* 7E4998 80283B18 E622002C */ swc1 $f2, 0x2c($s1) +/* 7E499C 80283B1C C640008C */ lwc1 $f0, 0x8c($s2) +/* 7E49A0 80283B20 46800020 */ cvt.s.w $f0, $f0 +/* 7E49A4 80283B24 4600103C */ c.lt.s $f2, $f0 +/* 7E49A8 80283B28 00000000 */ nop +/* 7E49AC 80283B2C 45010007 */ bc1t .L80283B4C +/* 7E49B0 80283B30 3C03FBFF */ lui $v1, 0xfbff +/* 7E49B4 80283B34 3463FFFF */ ori $v1, $v1, 0xffff +/* 7E49B8 80283B38 8E220000 */ lw $v0, ($s1) +/* 7E49BC 80283B3C 24060002 */ addiu $a2, $zero, 2 +/* 7E49C0 80283B40 E620002C */ swc1 $f0, 0x2c($s1) +/* 7E49C4 80283B44 00431024 */ and $v0, $v0, $v1 +.L80283B48: +/* 7E49C8 80283B48 AE220000 */ sw $v0, ($s1) +.L80283B4C: +/* 7E49CC 80283B4C C6200028 */ lwc1 $f0, 0x28($s1) +/* 7E49D0 80283B50 C622002C */ lwc1 $f2, 0x2c($s1) +/* 7E49D4 80283B54 C6240030 */ lwc1 $f4, 0x30($s1) +/* 7E49D8 80283B58 3C03800B */ lui $v1, %hi(gCameras) +/* 7E49DC 80283B5C 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* 7E49E0 80283B60 E4600060 */ swc1 $f0, 0x60($v1) +/* 7E49E4 80283B64 E4620064 */ swc1 $f2, 0x64($v1) +/* 7E49E8 80283B68 E4640068 */ swc1 $f4, 0x68($v1) +/* 7E49EC 80283B6C 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E49F0 80283B70 8FB20018 */ lw $s2, 0x18($sp) +/* 7E49F4 80283B74 8FB10014 */ lw $s1, 0x14($sp) +/* 7E49F8 80283B78 8FB00010 */ lw $s0, 0x10($sp) +/* 7E49FC 80283B7C 00C0102D */ daddu $v0, $a2, $zero +/* 7E4A00 80283B80 03E00008 */ jr $ra +/* 7E4A04 80283B84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s b/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s new file mode 100644 index 0000000000..79ef737efa --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283B88 +/* 7E4A08 80283B88 3C0141A0 */ lui $at, 0x41a0 +/* 7E4A0C 80283B8C 44816000 */ mtc1 $at, $f12 +/* 7E4A10 80283B90 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E4A14 80283B94 AFBF0010 */ sw $ra, 0x10($sp) +/* 7E4A18 80283B98 0C03BCE5 */ jal func_800EF394 +/* 7E4A1C 80283B9C 00000000 */ nop +/* 7E4A20 80283BA0 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E4A24 80283BA4 24020002 */ addiu $v0, $zero, 2 +/* 7E4A28 80283BA8 03E00008 */ jr $ra +/* 7E4A2C 80283BAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s new file mode 100644 index 0000000000..ad0f9c2619 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283BB0 +/* 7E4A30 80283BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E4A34 80283BB4 AFBF0010 */ sw $ra, 0x10($sp) +/* 7E4A38 80283BB8 0C03BCE9 */ jal func_800EF3A4 +/* 7E4A3C 80283BBC 00000000 */ nop +/* 7E4A40 80283BC0 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E4A44 80283BC4 24020002 */ addiu $v0, $zero, 2 +/* 7E4A48 80283BC8 03E00008 */ jr $ra +/* 7E4A4C 80283BCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s new file mode 100644 index 0000000000..3703e72e46 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283BD0 +/* 7E4A50 80283BD0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E4A54 80283BD4 AFB00010 */ sw $s0, 0x10($sp) +/* 7E4A58 80283BD8 0080802D */ daddu $s0, $a0, $zero +/* 7E4A5C 80283BDC AFB10014 */ sw $s1, 0x14($sp) +/* 7E4A60 80283BE0 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 7E4A64 80283BE4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 7E4A68 80283BE8 AFBF0018 */ sw $ra, 0x18($sp) +/* 7E4A6C 80283BEC 10A00008 */ beqz $a1, .L80283C10 +/* 7E4A70 80283BF0 8E02000C */ lw $v0, 0xc($s0) +/* 7E4A74 80283BF4 0C0B1EAF */ jal get_variable +/* 7E4A78 80283BF8 8C450000 */ lw $a1, ($v0) +/* 7E4A7C 80283BFC AE020070 */ sw $v0, 0x70($s0) +/* 7E4A80 80283C00 8E250080 */ lw $a1, 0x80($s1) +/* 7E4A84 80283C04 8E26005C */ lw $a2, 0x5c($s1) +/* 7E4A88 80283C08 0C0389DE */ jal move_player +/* 7E4A8C 80283C0C 0040202D */ daddu $a0, $v0, $zero +.L80283C10: +/* 7E4A90 80283C10 8E030070 */ lw $v1, 0x70($s0) +/* 7E4A94 80283C14 2463FFFF */ addiu $v1, $v1, -1 +/* 7E4A98 80283C18 AE030070 */ sw $v1, 0x70($s0) +/* 7E4A9C 80283C1C 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E4AA0 80283C20 8FB10014 */ lw $s1, 0x14($sp) +/* 7E4AA4 80283C24 8FB00010 */ lw $s0, 0x10($sp) +/* 7E4AA8 80283C28 000317C2 */ srl $v0, $v1, 0x1f +/* 7E4AAC 80283C2C 03E00008 */ jr $ra +/* 7E4AB0 80283C30 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s b/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s new file mode 100644 index 0000000000..30588c716d --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283C34 +/* 7E4AB4 80283C34 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7E4AB8 80283C38 AFB20018 */ sw $s2, 0x18($sp) +/* 7E4ABC 80283C3C 0080902D */ daddu $s2, $a0, $zero +/* 7E4AC0 80283C40 AFBF0020 */ sw $ra, 0x20($sp) +/* 7E4AC4 80283C44 AFB3001C */ sw $s3, 0x1c($sp) +/* 7E4AC8 80283C48 AFB10014 */ sw $s1, 0x14($sp) +/* 7E4ACC 80283C4C AFB00010 */ sw $s0, 0x10($sp) +/* 7E4AD0 80283C50 0C016AFA */ jal get_current_map_header +/* 7E4AD4 80283C54 8E50000C */ lw $s0, 0xc($s2) +/* 7E4AD8 80283C58 0240202D */ daddu $a0, $s2, $zero +/* 7E4ADC 80283C5C 8C530014 */ lw $s3, 0x14($v0) +/* 7E4AE0 80283C60 8E050000 */ lw $a1, ($s0) +/* 7E4AE4 80283C64 0C0B1EAF */ jal get_variable +/* 7E4AE8 80283C68 26100004 */ addiu $s0, $s0, 4 +/* 7E4AEC 80283C6C 8E050000 */ lw $a1, ($s0) +/* 7E4AF0 80283C70 26100004 */ addiu $s0, $s0, 4 +/* 7E4AF4 80283C74 00028900 */ sll $s1, $v0, 4 +/* 7E4AF8 80283C78 02338821 */ addu $s1, $s1, $s3 +/* 7E4AFC 80283C7C C6200000 */ lwc1 $f0, ($s1) +/* 7E4B00 80283C80 4600008D */ trunc.w.s $f2, $f0 +/* 7E4B04 80283C84 44061000 */ mfc1 $a2, $f2 +/* 7E4B08 80283C88 0C0B2026 */ jal set_variable +/* 7E4B0C 80283C8C 0240202D */ daddu $a0, $s2, $zero +/* 7E4B10 80283C90 8E050000 */ lw $a1, ($s0) +/* 7E4B14 80283C94 26100004 */ addiu $s0, $s0, 4 +/* 7E4B18 80283C98 C6200004 */ lwc1 $f0, 4($s1) +/* 7E4B1C 80283C9C 4600008D */ trunc.w.s $f2, $f0 +/* 7E4B20 80283CA0 44061000 */ mfc1 $a2, $f2 +/* 7E4B24 80283CA4 0C0B2026 */ jal set_variable +/* 7E4B28 80283CA8 0240202D */ daddu $a0, $s2, $zero +/* 7E4B2C 80283CAC 8E050000 */ lw $a1, ($s0) +/* 7E4B30 80283CB0 26100004 */ addiu $s0, $s0, 4 +/* 7E4B34 80283CB4 C6200008 */ lwc1 $f0, 8($s1) +/* 7E4B38 80283CB8 4600008D */ trunc.w.s $f2, $f0 +/* 7E4B3C 80283CBC 44061000 */ mfc1 $a2, $f2 +/* 7E4B40 80283CC0 0C0B2026 */ jal set_variable +/* 7E4B44 80283CC4 0240202D */ daddu $a0, $s2, $zero +/* 7E4B48 80283CC8 C620000C */ lwc1 $f0, 0xc($s1) +/* 7E4B4C 80283CCC 8E050000 */ lw $a1, ($s0) +/* 7E4B50 80283CD0 4600008D */ trunc.w.s $f2, $f0 +/* 7E4B54 80283CD4 44061000 */ mfc1 $a2, $f2 +/* 7E4B58 80283CD8 0C0B2026 */ jal set_variable +/* 7E4B5C 80283CDC 0240202D */ daddu $a0, $s2, $zero +/* 7E4B60 80283CE0 8FBF0020 */ lw $ra, 0x20($sp) +/* 7E4B64 80283CE4 8FB3001C */ lw $s3, 0x1c($sp) +/* 7E4B68 80283CE8 8FB20018 */ lw $s2, 0x18($sp) +/* 7E4B6C 80283CEC 8FB10014 */ lw $s1, 0x14($sp) +/* 7E4B70 80283CF0 8FB00010 */ lw $s0, 0x10($sp) +/* 7E4B74 80283CF4 24020002 */ addiu $v0, $zero, 2 +/* 7E4B78 80283CF8 03E00008 */ jr $ra +/* 7E4B7C 80283CFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s new file mode 100644 index 0000000000..cac5108f20 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283D00 +/* 7E4B80 80283D00 0080282D */ daddu $a1, $a0, $zero +/* 7E4B84 80283D04 8CA20090 */ lw $v0, 0x90($a1) +/* 7E4B88 80283D08 04400009 */ bltz $v0, .L80283D30 +/* 7E4B8C 80283D0C 2403FFFF */ addiu $v1, $zero, -1 +/* 7E4B90 80283D10 3C02802E */ lui $v0, 0x802e +/* 7E4B94 80283D14 2442BD28 */ addiu $v0, $v0, -0x42d8 +/* 7E4B98 80283D18 8CA4008C */ lw $a0, 0x8c($a1) +/* 7E4B9C 80283D1C AC430004 */ sw $v1, 4($v0) +/* 7E4BA0 80283D20 3C01802E */ lui $at, 0x802e +/* 7E4BA4 80283D24 AC23BC7C */ sw $v1, -0x4384($at) +/* 7E4BA8 80283D28 080A0F55 */ j .L80283D54 +/* 7E4BAC 80283D2C AC440000 */ sw $a0, ($v0) +.L80283D30: +/* 7E4BB0 80283D30 3C02802E */ lui $v0, 0x802e +/* 7E4BB4 80283D34 2442BC7C */ addiu $v0, $v0, -0x4384 +/* 7E4BB8 80283D38 8CA4008C */ lw $a0, 0x8c($a1) +/* 7E4BBC 80283D3C AC430004 */ sw $v1, 4($v0) +/* 7E4BC0 80283D40 3C01802E */ lui $at, 0x802e +/* 7E4BC4 80283D44 AC23BD28 */ sw $v1, -0x42d8($at) +/* 7E4BC8 80283D48 AC440000 */ sw $a0, ($v0) +/* 7E4BCC 80283D4C 3C02802E */ lui $v0, 0x802e +/* 7E4BD0 80283D50 2442BD28 */ addiu $v0, $v0, -0x42d8 +.L80283D54: +/* 7E4BD4 80283D54 ACA2008C */ sw $v0, 0x8c($a1) +/* 7E4BD8 80283D58 3C02802E */ lui $v0, 0x802e +/* 7E4BDC 80283D5C 2442BC7C */ addiu $v0, $v0, -0x4384 +/* 7E4BE0 80283D60 ACA20090 */ sw $v0, 0x90($a1) +/* 7E4BE4 80283D64 03E00008 */ jr $ra +/* 7E4BE8 80283D68 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s new file mode 100644 index 0000000000..c14c4cbc3f --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283D6C +/* 7E4BEC 80283D6C 0080282D */ daddu $a1, $a0, $zero +/* 7E4BF0 80283D70 8CA20090 */ lw $v0, 0x90($a1) +/* 7E4BF4 80283D74 0440000C */ bltz $v0, .L80283DA8 +/* 7E4BF8 80283D78 00000000 */ nop +/* 7E4BFC 80283D7C 8CA2008C */ lw $v0, 0x8c($a1) +/* 7E4C00 80283D80 3C03802E */ lui $v1, 0x802e +/* 7E4C04 80283D84 2463BD28 */ addiu $v1, $v1, -0x42d8 +/* 7E4C08 80283D88 AC620000 */ sw $v0, ($v1) +/* 7E4C0C 80283D8C 8CA40094 */ lw $a0, 0x94($a1) +/* 7E4C10 80283D90 2402FFFF */ addiu $v0, $zero, -1 +/* 7E4C14 80283D94 AC620008 */ sw $v0, 8($v1) +/* 7E4C18 80283D98 3C01802E */ lui $at, 0x802e +/* 7E4C1C 80283D9C AC22BC7C */ sw $v0, -0x4384($at) +/* 7E4C20 80283DA0 080A0F74 */ j .L80283DD0 +/* 7E4C24 80283DA4 AC640004 */ sw $a0, 4($v1) +.L80283DA8: +/* 7E4C28 80283DA8 8CA2008C */ lw $v0, 0x8c($a1) +/* 7E4C2C 80283DAC 3C03802E */ lui $v1, 0x802e +/* 7E4C30 80283DB0 2463BC7C */ addiu $v1, $v1, -0x4384 +/* 7E4C34 80283DB4 AC620000 */ sw $v0, ($v1) +/* 7E4C38 80283DB8 8CA40094 */ lw $a0, 0x94($a1) +/* 7E4C3C 80283DBC 2402FFFF */ addiu $v0, $zero, -1 +/* 7E4C40 80283DC0 AC620008 */ sw $v0, 8($v1) +/* 7E4C44 80283DC4 3C01802E */ lui $at, 0x802e +/* 7E4C48 80283DC8 AC22BD28 */ sw $v0, -0x42d8($at) +/* 7E4C4C 80283DCC AC640004 */ sw $a0, 4($v1) +.L80283DD0: +/* 7E4C50 80283DD0 3C02802E */ lui $v0, 0x802e +/* 7E4C54 80283DD4 2442BD28 */ addiu $v0, $v0, -0x42d8 +/* 7E4C58 80283DD8 ACA2008C */ sw $v0, 0x8c($a1) +/* 7E4C5C 80283DDC 3C02802E */ lui $v0, 0x802e +/* 7E4C60 80283DE0 2442BC7C */ addiu $v0, $v0, -0x4384 +/* 7E4C64 80283DE4 ACA20090 */ sw $v0, 0x90($a1) +/* 7E4C68 80283DE8 03E00008 */ jr $ra +/* 7E4C6C 80283DEC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s new file mode 100644 index 0000000000..987b888572 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283DF0 +/* 7E4C70 80283DF0 3C03802E */ lui $v1, 0x802e +/* 7E4C74 80283DF4 2463BD28 */ addiu $v1, $v1, -0x42d8 +/* 7E4C78 80283DF8 8C82008C */ lw $v0, 0x8c($a0) +/* 7E4C7C 80283DFC 2406FFFF */ addiu $a2, $zero, -1 +/* 7E4C80 80283E00 AC660004 */ sw $a2, 4($v1) +/* 7E4C84 80283E04 AC620000 */ sw $v0, ($v1) +/* 7E4C88 80283E08 8C850090 */ lw $a1, 0x90($a0) +/* 7E4C8C 80283E0C 3C02802E */ lui $v0, 0x802e +/* 7E4C90 80283E10 2442BC7C */ addiu $v0, $v0, -0x4384 +/* 7E4C94 80283E14 AC460004 */ sw $a2, 4($v0) +/* 7E4C98 80283E18 AC450000 */ sw $a1, ($v0) +/* 7E4C9C 80283E1C AC820090 */ sw $v0, 0x90($a0) +/* 7E4CA0 80283E20 24020002 */ addiu $v0, $zero, 2 +/* 7E4CA4 80283E24 03E00008 */ jr $ra +/* 7E4CA8 80283E28 AC83008C */ sw $v1, 0x8c($a0) diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s new file mode 100644 index 0000000000..6b1f36df10 --- /dev/null +++ b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80283E2C +/* 7E4CAC 80283E2C 8C82008C */ lw $v0, 0x8c($a0) +/* 7E4CB0 80283E30 3C05802E */ lui $a1, 0x802e +/* 7E4CB4 80283E34 24A5BD28 */ addiu $a1, $a1, -0x42d8 +/* 7E4CB8 80283E38 ACA20000 */ sw $v0, ($a1) +/* 7E4CBC 80283E3C 8C820094 */ lw $v0, 0x94($a0) +/* 7E4CC0 80283E40 2406FFFF */ addiu $a2, $zero, -1 +/* 7E4CC4 80283E44 ACA60008 */ sw $a2, 8($a1) +/* 7E4CC8 80283E48 ACA20004 */ sw $v0, 4($a1) +/* 7E4CCC 80283E4C 8C830090 */ lw $v1, 0x90($a0) +/* 7E4CD0 80283E50 3C02802E */ lui $v0, 0x802e +/* 7E4CD4 80283E54 2442BC7C */ addiu $v0, $v0, -0x4384 +/* 7E4CD8 80283E58 AC430000 */ sw $v1, ($v0) +/* 7E4CDC 80283E5C 8C830098 */ lw $v1, 0x98($a0) +/* 7E4CE0 80283E60 AC460008 */ sw $a2, 8($v0) +/* 7E4CE4 80283E64 AC430004 */ sw $v1, 4($v0) +/* 7E4CE8 80283E68 AC820090 */ sw $v0, 0x90($a0) +/* 7E4CEC 80283E6C 24020002 */ addiu $v0, $zero, 2 +/* 7E4CF0 80283E70 03E00008 */ jr $ra +/* 7E4CF4 80283E74 AC85008C */ sw $a1, 0x8c($a0) +/* 7E4CF8 80283E78 00000000 */ nop +/* 7E4CFC 80283E7C 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80058DD0.s b/asm/nonmatchings/world/world/func_80058DD0.s new file mode 100644 index 0000000000..aeabcebb6e --- /dev/null +++ b/asm/nonmatchings/world/world/func_80058DD0.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80058DD0 +/* 341D0 80058DD0 24050007 */ addiu $a1, $zero, 7 +/* 341D4 80058DD4 2486000E */ addiu $a2, $a0, 0xe +/* 341D8 80058DD8 84830000 */ lh $v1, ($a0) +/* 341DC 80058DDC 24020001 */ addiu $v0, $zero, 1 +/* 341E0 80058DE0 AC82002C */ sw $v0, 0x2c($a0) +/* 341E4 80058DE4 00431807 */ srav $v1, $v1, $v0 +/* 341E8 80058DE8 0060382D */ daddu $a3, $v1, $zero +/* 341EC 80058DEC 24024000 */ addiu $v0, $zero, 0x4000 +/* 341F0 80058DF0 00431023 */ subu $v0, $v0, $v1 +/* 341F4 80058DF4 A4820002 */ sh $v0, 2($a0) +.L80058DF8: +/* 341F8 80058DF8 A4C00008 */ sh $zero, 8($a2) +/* 341FC 80058DFC 24A5FFFF */ addiu $a1, $a1, -1 +/* 34200 80058E00 04A1FFFD */ bgez $a1, .L80058DF8 +/* 34204 80058E04 24C6FFFE */ addiu $a2, $a2, -2 +/* 34208 80058E08 00071400 */ sll $v0, $a3, 0x10 +/* 3420C 80058E0C 00021403 */ sra $v0, $v0, 0x10 +/* 34210 80058E10 3C013F10 */ lui $at, 0x3f10 +/* 34214 80058E14 44811800 */ mtc1 $at, $f3 +/* 34218 80058E18 44801000 */ mtc1 $zero, $f2 +/* 3421C 80058E1C 44820000 */ mtc1 $v0, $f0 +/* 34220 80058E20 00000000 */ nop +/* 34224 80058E24 46800021 */ cvt.d.w $f0, $f0 +/* 34228 80058E28 46220082 */ mul.d $f2, $f0, $f2 +/* 3422C 80058E2C 00000000 */ nop +/* 34230 80058E30 24050009 */ addiu $a1, $zero, 9 +/* 34234 80058E34 3C0140D0 */ lui $at, 0x40d0 +/* 34238 80058E38 44813800 */ mtc1 $at, $f7 +/* 3423C 80058E3C 44803000 */ mtc1 $zero, $f6 +/* 34240 80058E40 24830012 */ addiu $v1, $a0, 0x12 +/* 34244 80058E44 A4870018 */ sh $a3, 0x18($a0) +/* 34248 80058E48 46201106 */ mov.d $f4, $f2 +.L80058E4C: +/* 3424C 80058E4C 46241082 */ mul.d $f2, $f2, $f4 +/* 34250 80058E50 00000000 */ nop +/* 34254 80058E54 46261002 */ mul.d $f0, $f2, $f6 +/* 34258 80058E58 00000000 */ nop +/* 3425C 80058E5C 24A50001 */ addiu $a1, $a1, 1 +/* 34260 80058E60 4620020D */ trunc.w.d $f8, $f0 +/* 34264 80058E64 44024000 */ mfc1 $v0, $f8 +/* 34268 80058E68 00000000 */ nop +/* 3426C 80058E6C A4620008 */ sh $v0, 8($v1) +/* 34270 80058E70 28A20010 */ slti $v0, $a1, 0x10 +/* 34274 80058E74 1440FFF5 */ bnez $v0, .L80058E4C +/* 34278 80058E78 24630002 */ addiu $v1, $v1, 2 +/* 3427C 80058E7C 03E00008 */ jr $ra +/* 34280 80058E80 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80058E84.s b/asm/nonmatchings/world/world/func_80058E84.s new file mode 100644 index 0000000000..226b4c4634 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80058E84.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80058E84 +/* 34284 80058E84 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 34288 80058E88 AFB3001C */ sw $s3, 0x1c($sp) +/* 3428C 80058E8C 0080982D */ daddu $s3, $a0, $zero +/* 34290 80058E90 AFB20018 */ sw $s2, 0x18($sp) +/* 34294 80058E94 00C0902D */ daddu $s2, $a2, $zero +/* 34298 80058E98 0240202D */ daddu $a0, $s2, $zero +/* 3429C 80058E9C AFB40020 */ sw $s4, 0x20($sp) +/* 342A0 80058EA0 00A0A02D */ daddu $s4, $a1, $zero +/* 342A4 80058EA4 24050004 */ addiu $a1, $zero, 4 +/* 342A8 80058EA8 24060030 */ addiu $a2, $zero, 0x30 +/* 342AC 80058EAC AFBF0024 */ sw $ra, 0x24($sp) +/* 342B0 80058EB0 AFB10014 */ sw $s1, 0x14($sp) +/* 342B4 80058EB4 0C015FE4 */ jal alHeapAlloc +/* 342B8 80058EB8 AFB00010 */ sw $s0, 0x10($sp) +/* 342BC 80058EBC 0240202D */ daddu $a0, $s2, $zero +/* 342C0 80058EC0 24050A10 */ addiu $a1, $zero, 0xa10 +/* 342C4 80058EC4 24060002 */ addiu $a2, $zero, 2 +/* 342C8 80058EC8 0C015FE4 */ jal alHeapAlloc +/* 342CC 80058ECC AE62000C */ sw $v0, 0xc($s3) +/* 342D0 80058ED0 0000882D */ daddu $s1, $zero, $zero +/* 342D4 80058ED4 AE620000 */ sw $v0, ($s3) +/* 342D8 80058ED8 0240202D */ daddu $a0, $s2, $zero +.L80058EDC: +/* 342DC 80058EDC 24050001 */ addiu $a1, $zero, 1 +/* 342E0 80058EE0 24060010 */ addiu $a2, $zero, 0x10 +/* 342E4 80058EE4 3223FFFF */ andi $v1, $s1, 0xffff +/* 342E8 80058EE8 00A31004 */ sllv $v0, $v1, $a1 +/* 342EC 80058EEC 00431021 */ addu $v0, $v0, $v1 +/* 342F0 80058EF0 8E70000C */ lw $s0, 0xc($s3) +/* 342F4 80058EF4 00021100 */ sll $v0, $v0, 4 +/* 342F8 80058EF8 0C015FE4 */ jal alHeapAlloc +/* 342FC 80058EFC 02028021 */ addu $s0, $s0, $v0 +/* 34300 80058F00 0240202D */ daddu $a0, $s2, $zero +/* 34304 80058F04 24050001 */ addiu $a1, $zero, 1 +/* 34308 80058F08 24060020 */ addiu $a2, $zero, 0x20 +/* 3430C 80058F0C 0C015FE4 */ jal alHeapAlloc +/* 34310 80058F10 AE02002C */ sw $v0, 0x2c($s0) +/* 34314 80058F14 0240202D */ daddu $a0, $s2, $zero +/* 34318 80058F18 24050001 */ addiu $a1, $zero, 1 +/* 3431C 80058F1C 8E03002C */ lw $v1, 0x2c($s0) +/* 34320 80058F20 24060030 */ addiu $a2, $zero, 0x30 +/* 34324 80058F24 0C015FE4 */ jal alHeapAlloc +/* 34328 80058F28 AC620000 */ sw $v0, ($v1) +/* 3432C 80058F2C 0240202D */ daddu $a0, $s2, $zero +/* 34330 80058F30 24050001 */ addiu $a1, $zero, 1 +/* 34334 80058F34 24060008 */ addiu $a2, $zero, 8 +/* 34338 80058F38 0C015FE4 */ jal alHeapAlloc +/* 3433C 80058F3C AE020024 */ sw $v0, 0x24($s0) +/* 34340 80058F40 8E030024 */ lw $v1, 0x24($s0) +/* 34344 80058F44 26310001 */ addiu $s1, $s1, 1 +/* 34348 80058F48 AC620028 */ sw $v0, 0x28($v1) +/* 3434C 80058F4C 3222FFFF */ andi $v0, $s1, 0xffff +/* 34350 80058F50 2C420004 */ sltiu $v0, $v0, 4 +/* 34354 80058F54 1440FFE1 */ bnez $v0, .L80058EDC +/* 34358 80058F58 0240202D */ daddu $a0, $s2, $zero +/* 3435C 80058F5C 0260202D */ daddu $a0, $s3, $zero +/* 34360 80058F60 0C016413 */ jal func_8005904C +/* 34364 80058F64 328500FF */ andi $a1, $s4, 0xff +/* 34368 80058F68 8FBF0024 */ lw $ra, 0x24($sp) +/* 3436C 80058F6C 8FB40020 */ lw $s4, 0x20($sp) +/* 34370 80058F70 8FB3001C */ lw $s3, 0x1c($sp) +/* 34374 80058F74 8FB20018 */ lw $s2, 0x18($sp) +/* 34378 80058F78 8FB10014 */ lw $s1, 0x14($sp) +/* 3437C 80058F7C 8FB00010 */ lw $s0, 0x10($sp) +/* 34380 80058F80 03E00008 */ jr $ra +/* 34384 80058F84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/world/func_80058F88.s b/asm/nonmatchings/world/world/func_80058F88.s new file mode 100644 index 0000000000..2aec790b72 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80058F88.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80058F88 +/* 34388 80058F88 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 3438C 80058F8C AFB10014 */ sw $s1, 0x14($sp) +/* 34390 80058F90 0080882D */ daddu $s1, $a0, $zero +/* 34394 80058F94 AFB00010 */ sw $s0, 0x10($sp) +/* 34398 80058F98 00A0802D */ daddu $s0, $a1, $zero +/* 3439C 80058F9C 0200202D */ daddu $a0, $s0, $zero +/* 343A0 80058FA0 24051420 */ addiu $a1, $zero, 0x1420 +/* 343A4 80058FA4 AFBF0018 */ sw $ra, 0x18($sp) +/* 343A8 80058FA8 0C015FE4 */ jal alHeapAlloc +/* 343AC 80058FAC 24060002 */ addiu $a2, $zero, 2 +/* 343B0 80058FB0 0200202D */ daddu $a0, $s0, $zero +/* 343B4 80058FB4 24050001 */ addiu $a1, $zero, 1 +/* 343B8 80058FB8 24060030 */ addiu $a2, $zero, 0x30 +/* 343BC 80058FBC 0C015FE4 */ jal alHeapAlloc +/* 343C0 80058FC0 AE220000 */ sw $v0, ($s1) +/* 343C4 80058FC4 0200202D */ daddu $a0, $s0, $zero +/* 343C8 80058FC8 24050001 */ addiu $a1, $zero, 1 +/* 343CC 80058FCC 24060008 */ addiu $a2, $zero, 8 +/* 343D0 80058FD0 0C015FE4 */ jal alHeapAlloc +/* 343D4 80058FD4 AE220010 */ sw $v0, 0x10($s1) +/* 343D8 80058FD8 0220202D */ daddu $a0, $s1, $zero +/* 343DC 80058FDC 0000282D */ daddu $a1, $zero, $zero +/* 343E0 80058FE0 00A0302D */ daddu $a2, $a1, $zero +/* 343E4 80058FE4 8C830010 */ lw $v1, 0x10($a0) +/* 343E8 80058FE8 24075000 */ addiu $a3, $zero, 0x5000 +/* 343EC 80058FEC 0C016402 */ jal func_80059008 +/* 343F0 80058FF0 AC620028 */ sw $v0, 0x28($v1) +/* 343F4 80058FF4 8FBF0018 */ lw $ra, 0x18($sp) +/* 343F8 80058FF8 8FB10014 */ lw $s1, 0x14($sp) +/* 343FC 80058FFC 8FB00010 */ lw $s0, 0x10($sp) +/* 34400 80059000 03E00008 */ jr $ra +/* 34404 80059004 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/world/func_80059008.s b/asm/nonmatchings/world/world/func_80059008.s new file mode 100644 index 0000000000..b4094302e5 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059008.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059008 +/* 34408 80059008 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 3440C 8005900C 00071400 */ sll $v0, $a3, 0x10 +/* 34410 80059010 AFBF0010 */ sw $ra, 0x10($sp) +/* 34414 80059014 A4850006 */ sh $a1, 6($a0) +/* 34418 80059018 10400008 */ beqz $v0, .L8005903C +/* 3441C 8005901C A4860008 */ sh $a2, 8($a0) +/* 34420 80059020 8C820010 */ lw $v0, 0x10($a0) +/* 34424 80059024 AC82000C */ sw $v0, 0xc($a0) +/* 34428 80059028 A4470000 */ sh $a3, ($v0) +/* 3442C 8005902C 0C016374 */ jal func_80058DD0 +/* 34430 80059030 8C84000C */ lw $a0, 0xc($a0) +/* 34434 80059034 08016410 */ j .L80059040 +/* 34438 80059038 00000000 */ nop +.L8005903C: +/* 3443C 8005903C AC80000C */ sw $zero, 0xc($a0) +.L80059040: +/* 34440 80059040 8FBF0010 */ lw $ra, 0x10($sp) +/* 34444 80059044 03E00008 */ jr $ra +/* 34448 80059048 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/world/func_8005904C.s b/asm/nonmatchings/world/world/func_8005904C.s new file mode 100644 index 0000000000..a3c371c8e1 --- /dev/null +++ b/asm/nonmatchings/world/world/func_8005904C.s @@ -0,0 +1,191 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8005904C +/* 3444C 8005904C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 34450 80059050 AFB3001C */ sw $s3, 0x1c($sp) +/* 34454 80059054 0080982D */ daddu $s3, $a0, $zero +/* 34458 80059058 30A500FF */ andi $a1, $a1, 0xff +/* 3445C 8005905C 24A5FFFF */ addiu $a1, $a1, -1 +/* 34460 80059060 2CA2000A */ sltiu $v0, $a1, 0xa +/* 34464 80059064 AFBF0020 */ sw $ra, 0x20($sp) +/* 34468 80059068 AFB20018 */ sw $s2, 0x18($sp) +/* 3446C 8005906C AFB10014 */ sw $s1, 0x14($sp) +/* 34470 80059070 AFB00010 */ sw $s0, 0x10($sp) +/* 34474 80059074 8E660000 */ lw $a2, ($s3) +/* 34478 80059078 10400021 */ beqz $v0, .L80059100 +/* 3447C 8005907C 00051080 */ sll $v0, $a1, 2 +/* 34480 80059080 3C01800A */ lui $at, 0x800a +/* 34484 80059084 00220821 */ addu $at, $at, $v0 +/* 34488 80059088 8C228940 */ lw $v0, -0x76c0($at) +/* 3448C 8005908C 00400008 */ jr $v0 +/* 34490 80059090 00000000 */ nop +/* 34494 80059094 3C048008 */ lui $a0, 0x8008 +/* 34498 80059098 08016442 */ j .L80059108 +/* 3449C 8005909C 2484EFE0 */ addiu $a0, $a0, -0x1020 +/* 344A0 800590A0 3C048008 */ lui $a0, 0x8008 +/* 344A4 800590A4 08016442 */ j .L80059108 +/* 344A8 800590A8 2484F158 */ addiu $a0, $a0, -0xea8 +/* 344AC 800590AC 3C048008 */ lui $a0, 0x8008 +/* 344B0 800590B0 08016442 */ j .L80059108 +/* 344B4 800590B4 2484F180 */ addiu $a0, $a0, -0xe80 +/* 344B8 800590B8 3C048008 */ lui $a0, 0x8008 +/* 344BC 800590BC 08016442 */ j .L80059108 +/* 344C0 800590C0 2484F1A8 */ addiu $a0, $a0, -0xe58 +/* 344C4 800590C4 3C048008 */ lui $a0, 0x8008 +/* 344C8 800590C8 08016442 */ j .L80059108 +/* 344CC 800590CC 8C84F1F8 */ lw $a0, -0xe08($a0) +/* 344D0 800590D0 3C048008 */ lui $a0, 0x8008 +/* 344D4 800590D4 08016442 */ j .L80059108 +/* 344D8 800590D8 8C84F1FC */ lw $a0, -0xe04($a0) +/* 344DC 800590DC 3C048008 */ lui $a0, 0x8008 +/* 344E0 800590E0 08016442 */ j .L80059108 +/* 344E4 800590E4 8C84F200 */ lw $a0, -0xe00($a0) +/* 344E8 800590E8 3C048008 */ lui $a0, 0x8008 +/* 344EC 800590EC 08016442 */ j .L80059108 +/* 344F0 800590F0 8C84F204 */ lw $a0, -0xdfc($a0) +/* 344F4 800590F4 3C048008 */ lui $a0, 0x8008 +/* 344F8 800590F8 08016442 */ j .L80059108 +/* 344FC 800590FC 2484F048 */ addiu $a0, $a0, -0xfb8 +.L80059100: +/* 34500 80059100 3C048008 */ lui $a0, 0x8008 +/* 34504 80059104 2484F1D0 */ addiu $a0, $a0, -0xe30 +.L80059108: +/* 34508 80059108 90820003 */ lbu $v0, 3($a0) +/* 3450C 8005910C A2620010 */ sb $v0, 0x10($s3) +/* 34510 80059110 8C830004 */ lw $v1, 4($a0) +/* 34514 80059114 8E620000 */ lw $v0, ($s3) +/* 34518 80059118 24110507 */ addiu $s1, $zero, 0x507 +/* 3451C 8005911C AE620004 */ sw $v0, 4($s3) +/* 34520 80059120 00031040 */ sll $v0, $v1, 1 +/* 34524 80059124 00431021 */ addu $v0, $v0, $v1 +/* 34528 80059128 000210C0 */ sll $v0, $v0, 3 +/* 3452C 8005912C 00431023 */ subu $v0, $v0, $v1 +/* 34530 80059130 000210C0 */ sll $v0, $v0, 3 +/* 34534 80059134 AE620008 */ sw $v0, 8($s3) +.L80059138: +/* 34538 80059138 ACC00000 */ sw $zero, ($a2) +/* 3453C 8005913C 2631FFFF */ addiu $s1, $s1, -1 +/* 34540 80059140 0621FFFD */ bgez $s1, .L80059138 +/* 34544 80059144 24C60004 */ addiu $a2, $a2, 4 +/* 34548 80059148 92620010 */ lbu $v0, 0x10($s3) +/* 3454C 8005914C 10400069 */ beqz $v0, .L800592F4 +/* 34550 80059150 0000882D */ daddu $s1, $zero, $zero +/* 34554 80059154 0220902D */ daddu $s2, $s1, $zero +/* 34558 80059158 24020002 */ addiu $v0, $zero, 2 +/* 3455C 8005915C 00421004 */ sllv $v0, $v0, $v0 +/* 34560 80059160 00448021 */ addu $s0, $v0, $a0 +.L80059164: +/* 34564 80059164 8E62000C */ lw $v0, 0xc($s3) +/* 34568 80059168 8E030000 */ lw $v1, ($s0) +/* 3456C 8005916C 26100004 */ addiu $s0, $s0, 4 +/* 34570 80059170 00522021 */ addu $a0, $v0, $s2 +/* 34574 80059174 00031040 */ sll $v0, $v1, 1 +/* 34578 80059178 00431021 */ addu $v0, $v0, $v1 +/* 3457C 8005917C 000210C0 */ sll $v0, $v0, 3 +/* 34580 80059180 00431023 */ subu $v0, $v0, $v1 +/* 34584 80059184 000210C0 */ sll $v0, $v0, 3 +/* 34588 80059188 AC820000 */ sw $v0, ($a0) +/* 3458C 8005918C 8E030000 */ lw $v1, ($s0) +/* 34590 80059190 26100004 */ addiu $s0, $s0, 4 +/* 34594 80059194 00031040 */ sll $v0, $v1, 1 +/* 34598 80059198 00431021 */ addu $v0, $v0, $v1 +/* 3459C 8005919C 000210C0 */ sll $v0, $v0, 3 +/* 345A0 800591A0 00431023 */ subu $v0, $v0, $v1 +/* 345A4 800591A4 000210C0 */ sll $v0, $v0, 3 +/* 345A8 800591A8 AC820004 */ sw $v0, 4($a0) +/* 345AC 800591AC 96020002 */ lhu $v0, 2($s0) +/* 345B0 800591B0 26100004 */ addiu $s0, $s0, 4 +/* 345B4 800591B4 A482000A */ sh $v0, 0xa($a0) +/* 345B8 800591B8 96020002 */ lhu $v0, 2($s0) +/* 345BC 800591BC 26100004 */ addiu $s0, $s0, 4 +/* 345C0 800591C0 A4820008 */ sh $v0, 8($a0) +/* 345C4 800591C4 96020002 */ lhu $v0, 2($s0) +/* 345C8 800591C8 26100004 */ addiu $s0, $s0, 4 +/* 345CC 800591CC A482000C */ sh $v0, 0xc($a0) +/* 345D0 800591D0 8E020000 */ lw $v0, ($s0) +/* 345D4 800591D4 50400033 */ beql $v0, $zero, .L800592A4 +/* 345D8 800591D8 AC800028 */ sw $zero, 0x28($a0) +/* 345DC 800591DC 26100004 */ addiu $s0, $s0, 4 +/* 345E0 800591E0 44820000 */ mtc1 $v0, $f0 +/* 345E4 800591E4 00000000 */ nop +/* 345E8 800591E8 46800020 */ cvt.s.w $f0, $f0 +/* 345EC 800591EC 3C01447A */ lui $at, 0x447a +/* 345F0 800591F0 44811000 */ mtc1 $at, $f2 +/* 345F4 800591F4 8C830004 */ lw $v1, 4($a0) +/* 345F8 800591F8 8C820000 */ lw $v0, ($a0) +/* 345FC 800591FC 46020003 */ div.s $f0, $f0, $f2 +/* 34600 80059200 46000021 */ cvt.d.s $f0, $f0 +/* 34604 80059204 00621823 */ subu $v1, $v1, $v0 +/* 34608 80059208 46200000 */ add.d $f0, $f0, $f0 +/* 3460C 8005920C 3C028008 */ lui $v0, 0x8008 +/* 34610 80059210 8C428E50 */ lw $v0, -0x71b0($v0) +/* 34614 80059214 44832000 */ mtc1 $v1, $f4 +/* 34618 80059218 00000000 */ nop +/* 3461C 8005921C 46802121 */ cvt.d.w $f4, $f4 +/* 34620 80059220 C4420008 */ lwc1 $f2, 8($v0) +/* 34624 80059224 468010A1 */ cvt.d.w $f2, $f2 +/* 34628 80059228 46220003 */ div.d $f0, $f0, $f2 +/* 3462C 8005922C 46200020 */ cvt.s.d $f0, $f0 +/* 34630 80059230 E4800010 */ swc1 $f0, 0x10($a0) +/* 34634 80059234 C6000000 */ lwc1 $f0, ($s0) +/* 34638 80059238 46800020 */ cvt.s.w $f0, $f0 +/* 3463C 8005923C 26100004 */ addiu $s0, $s0, 4 +/* 34640 80059240 3C01800A */ lui $at, 0x800a +/* 34644 80059244 D4228968 */ ldc1 $f2, -0x7698($at) +/* 34648 80059248 46000021 */ cvt.d.s $f0, $f0 +/* 3464C 8005924C 04610006 */ bgez $v1, .L80059268 +/* 34650 80059250 46220083 */ div.d $f2, $f0, $f2 +/* 34654 80059254 3C0141F0 */ lui $at, 0x41f0 +/* 34658 80059258 44810800 */ mtc1 $at, $f1 +/* 3465C 8005925C 44800000 */ mtc1 $zero, $f0 +/* 34660 80059260 00000000 */ nop +/* 34664 80059264 46202100 */ add.d $f4, $f4, $f0 +.L80059268: +/* 34668 80059268 46241002 */ mul.d $f0, $f2, $f4 +/* 3466C 8005926C 00000000 */ nop +/* 34670 80059270 3C013F80 */ lui $at, 0x3f80 +/* 34674 80059274 44811000 */ mtc1 $at, $f2 +/* 34678 80059278 8C82002C */ lw $v0, 0x2c($a0) +/* 3467C 8005927C AC800018 */ sw $zero, 0x18($a0) +/* 34680 80059280 E4820014 */ swc1 $f2, 0x14($a0) +/* 34684 80059284 AC820028 */ sw $v0, 0x28($a0) +/* 34688 80059288 46200020 */ cvt.s.d $f0, $f0 +/* 3468C 8005928C E480001C */ swc1 $f0, 0x1c($a0) +/* 34690 80059290 AC400008 */ sw $zero, 8($v0) +/* 34694 80059294 8C830028 */ lw $v1, 0x28($a0) +/* 34698 80059298 24020001 */ addiu $v0, $zero, 1 +/* 3469C 8005929C 080164AA */ j .L800592A8 +/* 346A0 800592A0 AC62000C */ sw $v0, 0xc($v1) +.L800592A4: +/* 346A4 800592A4 26100008 */ addiu $s0, $s0, 8 +.L800592A8: +/* 346A8 800592A8 8E020000 */ lw $v0, ($s0) +/* 346AC 800592AC 5040000A */ beql $v0, $zero, .L800592D8 +/* 346B0 800592B0 AC800020 */ sw $zero, 0x20($a0) +/* 346B4 800592B4 8C830024 */ lw $v1, 0x24($a0) +/* 346B8 800592B8 AC830020 */ sw $v1, 0x20($a0) +/* 346BC 800592BC 96020002 */ lhu $v0, 2($s0) +/* 346C0 800592C0 A4620000 */ sh $v0, ($v1) +/* 346C4 800592C4 8C840020 */ lw $a0, 0x20($a0) +/* 346C8 800592C8 0C016374 */ jal func_80058DD0 +/* 346CC 800592CC 26100004 */ addiu $s0, $s0, 4 +/* 346D0 800592D0 080164B8 */ j .L800592E0 +/* 346D4 800592D4 26520030 */ addiu $s2, $s2, 0x30 +.L800592D8: +/* 346D8 800592D8 26100004 */ addiu $s0, $s0, 4 +/* 346DC 800592DC 26520030 */ addiu $s2, $s2, 0x30 +.L800592E0: +/* 346E0 800592E0 92620010 */ lbu $v0, 0x10($s3) +/* 346E4 800592E4 26310001 */ addiu $s1, $s1, 1 +/* 346E8 800592E8 0222102A */ slt $v0, $s1, $v0 +/* 346EC 800592EC 1440FF9D */ bnez $v0, .L80059164 +/* 346F0 800592F0 00000000 */ nop +.L800592F4: +/* 346F4 800592F4 8FBF0020 */ lw $ra, 0x20($sp) +/* 346F8 800592F8 8FB3001C */ lw $s3, 0x1c($sp) +/* 346FC 800592FC 8FB20018 */ lw $s2, 0x18($sp) +/* 34700 80059300 8FB10014 */ lw $s1, 0x14($sp) +/* 34704 80059304 8FB00010 */ lw $s0, 0x10($sp) +/* 34708 80059308 03E00008 */ jr $ra +/* 3470C 8005930C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/world/func_80059310.s b/asm/nonmatchings/world/world/func_80059310.s new file mode 100644 index 0000000000..c21b3f1924 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059310.s @@ -0,0 +1,375 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059310 +/* 34710 80059310 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 34714 80059314 AFB00030 */ sw $s0, 0x30($sp) +/* 34718 80059318 00A0802D */ daddu $s0, $a1, $zero +/* 3471C 8005931C AFB10034 */ sw $s1, 0x34($sp) +/* 34720 80059320 00C0882D */ daddu $s1, $a2, $zero +/* 34724 80059324 AFB60048 */ sw $s6, 0x48($sp) +/* 34728 80059328 24F60170 */ addiu $s6, $a3, 0x170 +/* 3472C 8005932C 32220FFF */ andi $v0, $s1, 0xfff +/* 34730 80059330 3C030617 */ lui $v1, 0x617 +/* 34734 80059334 00431025 */ or $v0, $v0, $v1 +/* 34738 80059338 AFBF0054 */ sw $ra, 0x54($sp) +/* 3473C 8005933C AFBE0050 */ sw $fp, 0x50($sp) +/* 34740 80059340 AFB7004C */ sw $s7, 0x4c($sp) +/* 34744 80059344 AFB50044 */ sw $s5, 0x44($sp) +/* 34748 80059348 AFB40040 */ sw $s4, 0x40($sp) +/* 3474C 8005934C AFB3003C */ sw $s3, 0x3c($sp) +/* 34750 80059350 AFB20038 */ sw $s2, 0x38($sp) +/* 34754 80059354 F7B60060 */ sdc1 $f22, 0x60($sp) +/* 34758 80059358 F7B40058 */ sdc1 $f20, 0x58($sp) +/* 3475C 8005935C AFA40068 */ sw $a0, 0x68($sp) +/* 34760 80059360 A7A70026 */ sh $a3, 0x26($sp) +/* 34764 80059364 A7A0001E */ sh $zero, 0x1e($sp) +/* 34768 80059368 AE020000 */ sw $v0, ($s0) +/* 3476C 8005936C 8FA80068 */ lw $t0, 0x68($sp) +/* 34770 80059370 26120008 */ addiu $s2, $s0, 8 +/* 34774 80059374 8D040004 */ lw $a0, 4($t0) +/* 34778 80059378 0C0187A4 */ jal osVirtualToPhysical +/* 3477C 8005937C 24F302E0 */ addiu $s3, $a3, 0x2e0 +/* 34780 80059380 0240202D */ daddu $a0, $s2, $zero +/* 34784 80059384 3C0300FF */ lui $v1, 0xff +/* 34788 80059388 3463FFFF */ ori $v1, $v1, 0xffff +/* 3478C 8005938C AE020004 */ sw $v0, 4($s0) +/* 34790 80059390 00111400 */ sll $v0, $s1, 0x10 +/* 34794 80059394 00021403 */ sra $v0, $v0, 0x10 +/* 34798 80059398 00431024 */ and $v0, $v0, $v1 +/* 3479C 8005939C 3C030200 */ lui $v1, 0x200 +/* 347A0 800593A0 00431025 */ or $v0, $v0, $v1 +/* 347A4 800593A4 AC820000 */ sw $v0, ($a0) +/* 347A8 800593A8 24020170 */ addiu $v0, $zero, 0x170 +/* 347AC 800593AC AC820004 */ sw $v0, 4($a0) +/* 347B0 800593B0 8FA80068 */ lw $t0, 0x68($sp) +/* 347B4 800593B4 0000A02D */ daddu $s4, $zero, $zero +/* 347B8 800593B8 91020010 */ lbu $v0, 0x10($t0) +/* 347BC 800593BC 26520008 */ addiu $s2, $s2, 8 +/* 347C0 800593C0 1040011D */ beqz $v0, .L80059838 +/* 347C4 800593C4 A7B10028 */ sh $s1, 0x28($sp) +/* 347C8 800593C8 00131400 */ sll $v0, $s3, 0x10 +/* 347CC 800593CC 3C014700 */ lui $at, 0x4700 +/* 347D0 800593D0 4481B000 */ mtc1 $at, $f22 +/* 347D4 800593D4 00021403 */ sra $v0, $v0, 0x10 +/* 347D8 800593D8 AFA2002C */ sw $v0, 0x2c($sp) +.L800593DC: +/* 347DC 800593DC 97A8001E */ lhu $t0, 0x1e($sp) +/* 347E0 800593E0 00081400 */ sll $v0, $t0, 0x10 +/* 347E4 800593E4 00021403 */ sra $v0, $v0, 0x10 +/* 347E8 800593E8 00021840 */ sll $v1, $v0, 1 +/* 347EC 800593EC 00621821 */ addu $v1, $v1, $v0 +/* 347F0 800593F0 8FA80068 */ lw $t0, 0x68($sp) +/* 347F4 800593F4 00031900 */ sll $v1, $v1, 4 +/* 347F8 800593F8 8D02000C */ lw $v0, 0xc($t0) +/* 347FC 800593FC 8D040004 */ lw $a0, 4($t0) +/* 34800 80059400 00439821 */ addu $s3, $v0, $v1 +/* 34804 80059404 8E620000 */ lw $v0, ($s3) +/* 34808 80059408 8D030000 */ lw $v1, ($t0) +/* 3480C 8005940C 00021040 */ sll $v0, $v0, 1 +/* 34810 80059410 0082B823 */ subu $s7, $a0, $v0 +/* 34814 80059414 02E3102B */ sltu $v0, $s7, $v1 +/* 34818 80059418 10400004 */ beqz $v0, .L8005942C +/* 3481C 8005941C 00000000 */ nop +/* 34820 80059420 8D020008 */ lw $v0, 8($t0) +/* 34824 80059424 00021040 */ sll $v0, $v0, 1 +/* 34828 80059428 02E2B821 */ addu $s7, $s7, $v0 +.L8005942C: +/* 3482C 8005942C 8E620004 */ lw $v0, 4($s3) +/* 34830 80059430 00021040 */ sll $v0, $v0, 1 +/* 34834 80059434 0082F023 */ subu $fp, $a0, $v0 +/* 34838 80059438 03C3102B */ sltu $v0, $fp, $v1 +/* 3483C 8005943C 10400005 */ beqz $v0, .L80059454 +/* 34840 80059440 00000000 */ nop +/* 34844 80059444 8FA80068 */ lw $t0, 0x68($sp) +/* 34848 80059448 8D020008 */ lw $v0, 8($t0) +/* 3484C 8005944C 00021040 */ sll $v0, $v0, 1 +/* 34850 80059450 03C2F021 */ addu $fp, $fp, $v0 +.L80059454: +/* 34854 80059454 16F40005 */ bne $s7, $s4, .L8005946C +/* 34858 80059458 0240802D */ daddu $s0, $s2, $zero +/* 3485C 8005945C 02C0102D */ daddu $v0, $s6, $zero +/* 34860 80059460 97B60026 */ lhu $s6, 0x26($sp) +/* 34864 80059464 08016524 */ j .L80059490 +/* 34868 80059468 A7A20026 */ sh $v0, 0x26($sp) +.L8005946C: +/* 3486C 8005946C 26520008 */ addiu $s2, $s2, 8 +/* 34870 80059470 02E0202D */ daddu $a0, $s7, $zero +/* 34874 80059474 97A80026 */ lhu $t0, 0x26($sp) +/* 34878 80059478 3C030417 */ lui $v1, 0x417 +/* 3487C 8005947C 31020FFF */ andi $v0, $t0, 0xfff +/* 34880 80059480 00431025 */ or $v0, $v0, $v1 +/* 34884 80059484 0C0187A4 */ jal osVirtualToPhysical +/* 34888 80059488 AE020000 */ sw $v0, ($s0) +/* 3488C 8005948C AE020004 */ sw $v0, 4($s0) +.L80059490: +/* 34890 80059490 8E620028 */ lw $v0, 0x28($s3) +/* 34894 80059494 10400068 */ beqz $v0, .L80059638 +/* 34898 80059498 0260202D */ daddu $a0, $s3, $zero +/* 3489C 8005949C 8E700004 */ lw $s0, 4($s3) +/* 348A0 800594A0 8E620000 */ lw $v0, ($s3) +/* 348A4 800594A4 240500B8 */ addiu $a1, $zero, 0xb8 +/* 348A8 800594A8 0C0166F5 */ jal func_80059BD4 +/* 348AC 800594AC 02028023 */ subu $s0, $s0, $v0 +/* 348B0 800594B0 44901000 */ mtc1 $s0, $f2 +/* 348B4 800594B4 00000000 */ nop +/* 348B8 800594B8 468010A0 */ cvt.s.w $f2, $f2 +/* 348BC 800594BC 46020103 */ div.s $f4, $f0, $f2 +/* 348C0 800594C0 46162002 */ mul.s $f0, $f4, $f22 +/* 348C4 800594C4 00000000 */ nop +/* 348C8 800594C8 4600018D */ trunc.w.s $f6, $f0 +/* 348CC 800594CC 44023000 */ mfc1 $v0, $f6 +/* 348D0 800594D0 3C013800 */ lui $at, 0x3800 +/* 348D4 800594D4 44810000 */ mtc1 $at, $f0 +/* 348D8 800594D8 44822000 */ mtc1 $v0, $f4 +/* 348DC 800594DC 00000000 */ nop +/* 348E0 800594E0 46802120 */ cvt.s.w $f4, $f4 +/* 348E4 800594E4 46002102 */ mul.s $f4, $f4, $f0 +/* 348E8 800594E8 00000000 */ nop +/* 348EC 800594EC 3C013FF0 */ lui $at, 0x3ff0 +/* 348F0 800594F0 44811800 */ mtc1 $at, $f3 +/* 348F4 800594F4 44801000 */ mtc1 $zero, $f2 +/* 348F8 800594F8 46002021 */ cvt.d.s $f0, $f4 +/* 348FC 800594FC 46201081 */ sub.d $f2, $f2, $f0 +/* 34900 80059500 3C014338 */ lui $at, 0x4338 +/* 34904 80059504 44812000 */ mtc1 $at, $f4 +/* 34908 80059508 46201520 */ cvt.s.d $f20, $f2 +/* 3490C 8005950C 4604A102 */ mul.s $f4, $f20, $f4 +/* 34910 80059510 00000000 */ nop +/* 34914 80059514 8E620028 */ lw $v0, 0x28($s3) +/* 34918 80059518 C4400008 */ lwc1 $f0, 8($v0) +/* 3491C 8005951C 46040000 */ add.s $f0, $f0, $f4 +/* 34920 80059520 4600018D */ trunc.w.s $f6, $f0 +/* 34924 80059524 44143000 */ mfc1 $s4, $f6 +/* 34928 80059528 00000000 */ nop +/* 3492C 8005952C 44941000 */ mtc1 $s4, $f2 +/* 34930 80059530 00000000 */ nop +/* 34934 80059534 468010A0 */ cvt.s.w $f2, $f2 +/* 34938 80059538 46020001 */ sub.s $f0, $f0, $f2 +/* 3493C 8005953C E4400008 */ swc1 $f0, 8($v0) +/* 34940 80059540 8E630018 */ lw $v1, 0x18($s3) +/* 34944 80059544 8E620004 */ lw $v0, 4($s3) +/* 34948 80059548 8FA80068 */ lw $t0, 0x68($sp) +/* 3494C 8005954C 00621823 */ subu $v1, $v1, $v0 +/* 34950 80059550 8D020004 */ lw $v0, 4($t0) +/* 34954 80059554 00031840 */ sll $v1, $v1, 1 +/* 34958 80059558 00432821 */ addu $a1, $v0, $v1 +/* 3495C 8005955C 30A20007 */ andi $v0, $a1, 7 +/* 34960 80059560 00021843 */ sra $v1, $v0, 1 +/* 34964 80059564 0003A840 */ sll $s5, $v1, 1 +/* 34968 80059568 8D020000 */ lw $v0, ($t0) +/* 3496C 8005956C 00B52823 */ subu $a1, $a1, $s5 +/* 34970 80059570 00A2102B */ sltu $v0, $a1, $v0 +/* 34974 80059574 10400004 */ beqz $v0, .L80059588 +/* 34978 80059578 00000000 */ nop +/* 3497C 8005957C 8D020008 */ lw $v0, 8($t0) +/* 34980 80059580 00021040 */ sll $v0, $v0, 1 +/* 34984 80059584 00A22821 */ addu $a1, $a1, $v0 +.L80059588: +/* 34988 80059588 8FA40068 */ lw $a0, 0x68($sp) +/* 3498C 8005958C 8FA6002C */ lw $a2, 0x2c($sp) +/* 34990 80059590 02833821 */ addu $a3, $s4, $v1 +/* 34994 80059594 0C0166AE */ jal func_80059AB8 +/* 34998 80059598 AFB20010 */ sw $s2, 0x10($sp) +/* 3499C 8005959C 0040902D */ daddu $s2, $v0, $zero +/* 349A0 800595A0 4616A002 */ mul.s $f0, $f20, $f22 +/* 349A4 800595A4 00000000 */ nop +/* 349A8 800595A8 00168C00 */ sll $s1, $s6, 0x10 +/* 349AC 800595AC 8E630028 */ lw $v1, 0x28($s3) +/* 349B0 800595B0 8C640000 */ lw $a0, ($v1) +/* 349B4 800595B4 4600018D */ trunc.w.s $f6, $f0 +/* 349B8 800595B8 44103000 */ mfc1 $s0, $f6 +/* 349BC 800595BC 0C0187A4 */ jal osVirtualToPhysical +/* 349C0 800595C0 00118E03 */ sra $s1, $s1, 0x18 +/* 349C4 800595C4 3C0300FF */ lui $v1, 0xff +/* 349C8 800595C8 3463FFFF */ ori $v1, $v1, 0xffff +/* 349CC 800595CC 0240202D */ daddu $a0, $s2, $zero +/* 349D0 800595D0 00431024 */ and $v0, $v0, $v1 +/* 349D4 800595D4 3C030500 */ lui $v1, 0x500 +/* 349D8 800595D8 00431025 */ or $v0, $v0, $v1 +/* 349DC 800595DC 3210FFFF */ andi $s0, $s0, 0xffff +/* 349E0 800595E0 00108380 */ sll $s0, $s0, 0xe +/* 349E4 800595E4 32310003 */ andi $s1, $s1, 3 +/* 349E8 800595E8 AC820000 */ sw $v0, ($a0) +/* 349EC 800595EC 8E620028 */ lw $v0, 0x28($s3) +/* 349F0 800595F0 8FA8002C */ lw $t0, 0x2c($sp) +/* 349F4 800595F4 8C43000C */ lw $v1, 0xc($v0) +/* 349F8 800595F8 01151021 */ addu $v0, $t0, $s5 +/* 349FC 800595FC 30420FFF */ andi $v0, $v0, 0xfff +/* 34A00 80059600 00021080 */ sll $v0, $v0, 2 +/* 34A04 80059604 00031F80 */ sll $v1, $v1, 0x1e +/* 34A08 80059608 00701825 */ or $v1, $v1, $s0 +/* 34A0C 8005960C 00621825 */ or $v1, $v1, $v0 +/* 34A10 80059610 00711825 */ or $v1, $v1, $s1 +/* 34A14 80059614 AC830004 */ sw $v1, 4($a0) +/* 34A18 80059618 8E620028 */ lw $v0, 0x28($s3) +/* 34A1C 8005961C AC40000C */ sw $zero, 0xc($v0) +/* 34A20 80059620 8E620018 */ lw $v0, 0x18($s3) +/* 34A24 80059624 26520008 */ addiu $s2, $s2, 8 +/* 34A28 80059628 2442FF48 */ addiu $v0, $v0, -0xb8 +/* 34A2C 8005962C 00541021 */ addu $v0, $v0, $s4 +/* 34A30 80059630 08016597 */ j .L8005965C +/* 34A34 80059634 AE620018 */ sw $v0, 0x18($s3) +.L80059638: +/* 34A38 80059638 0240802D */ daddu $s0, $s2, $zero +/* 34A3C 8005963C 26520008 */ addiu $s2, $s2, 8 +/* 34A40 80059640 03C0202D */ daddu $a0, $fp, $zero +/* 34A44 80059644 32C20FFF */ andi $v0, $s6, 0xfff +/* 34A48 80059648 3C030417 */ lui $v1, 0x417 +/* 34A4C 8005964C 00431025 */ or $v0, $v0, $v1 +/* 34A50 80059650 0C0187A4 */ jal osVirtualToPhysical +/* 34A54 80059654 AE020000 */ sw $v0, ($s0) +/* 34A58 80059658 AE020004 */ sw $v0, 4($s0) +.L8005965C: +/* 34A5C 8005965C 86620008 */ lh $v0, 8($s3) +/* 34A60 80059660 10400018 */ beqz $v0, .L800596C4 +/* 34A64 80059664 0240282D */ daddu $a1, $s2, $zero +/* 34A68 80059668 32C4FFFF */ andi $a0, $s6, 0xffff +/* 34A6C 8005966C 97A80026 */ lhu $t0, 0x26($sp) +/* 34A70 80059670 96630008 */ lhu $v1, 8($s3) +/* 34A74 80059674 00081400 */ sll $v0, $t0, 0x10 +/* 34A78 80059678 00441025 */ or $v0, $v0, $a0 +/* 34A7C 8005967C 3C080C00 */ lui $t0, 0xc00 +/* 34A80 80059680 00681825 */ or $v1, $v1, $t0 +/* 34A84 80059684 ACA20004 */ sw $v0, 4($a1) +/* 34A88 80059688 ACA30000 */ sw $v1, ($a1) +/* 34A8C 8005968C 8E620028 */ lw $v0, 0x28($s3) +/* 34A90 80059690 1440000C */ bnez $v0, .L800596C4 +/* 34A94 80059694 26520008 */ addiu $s2, $s2, 8 +/* 34A98 80059698 8E620020 */ lw $v0, 0x20($s3) +/* 34A9C 8005969C 14400009 */ bnez $v0, .L800596C4 +/* 34AA0 800596A0 0240802D */ daddu $s0, $s2, $zero +/* 34AA4 800596A4 26520008 */ addiu $s2, $s2, 8 +/* 34AA8 800596A8 03C0202D */ daddu $a0, $fp, $zero +/* 34AAC 800596AC 32C20FFF */ andi $v0, $s6, 0xfff +/* 34AB0 800596B0 3C080617 */ lui $t0, 0x617 +/* 34AB4 800596B4 00481025 */ or $v0, $v0, $t0 +/* 34AB8 800596B8 0C0187A4 */ jal osVirtualToPhysical +/* 34ABC 800596BC AE020000 */ sw $v0, ($s0) +/* 34AC0 800596C0 AE020004 */ sw $v0, 4($s0) +.L800596C4: +/* 34AC4 800596C4 8662000A */ lh $v0, 0xa($s3) +/* 34AC8 800596C8 10400014 */ beqz $v0, .L8005971C +/* 34ACC 800596CC 0240302D */ daddu $a2, $s2, $zero +/* 34AD0 800596D0 26520008 */ addiu $s2, $s2, 8 +/* 34AD4 800596D4 0240802D */ daddu $s0, $s2, $zero +/* 34AD8 800596D8 26520008 */ addiu $s2, $s2, 8 +/* 34ADC 800596DC 00161400 */ sll $v0, $s6, 0x10 +/* 34AE0 800596E0 3C080C00 */ lui $t0, 0xc00 +/* 34AE4 800596E4 97A50026 */ lhu $a1, 0x26($sp) +/* 34AE8 800596E8 9663000A */ lhu $v1, 0xa($s3) +/* 34AEC 800596EC 00451025 */ or $v0, $v0, $a1 +/* 34AF0 800596F0 00681825 */ or $v1, $v1, $t0 +/* 34AF4 800596F4 ACC20004 */ sw $v0, 4($a2) +/* 34AF8 800596F8 ACC30000 */ sw $v1, ($a2) +/* 34AFC 800596FC 97A80026 */ lhu $t0, 0x26($sp) +/* 34B00 80059700 02E0202D */ daddu $a0, $s7, $zero +/* 34B04 80059704 31020FFF */ andi $v0, $t0, 0xfff +/* 34B08 80059708 3C080617 */ lui $t0, 0x617 +/* 34B0C 8005970C 00481025 */ or $v0, $v0, $t0 +/* 34B10 80059710 0C0187A4 */ jal osVirtualToPhysical +/* 34B14 80059714 AE020000 */ sw $v0, ($s0) +/* 34B18 80059718 AE020004 */ sw $v0, 4($s0) +.L8005971C: +/* 34B1C 8005971C 8E620020 */ lw $v0, 0x20($s3) +/* 34B20 80059720 10400020 */ beqz $v0, .L800597A4 +/* 34B24 80059724 3C020B00 */ lui $v0, 0xb00 +/* 34B28 80059728 34420020 */ ori $v0, $v0, 0x20 +/* 34B2C 8005972C 0240882D */ daddu $s1, $s2, $zero +/* 34B30 80059730 00168400 */ sll $s0, $s6, 0x10 +/* 34B34 80059734 AE220000 */ sw $v0, ($s1) +/* 34B38 80059738 8E640020 */ lw $a0, 0x20($s3) +/* 34B3C 8005973C 00108603 */ sra $s0, $s0, 0x18 +/* 34B40 80059740 0C0187A4 */ jal osVirtualToPhysical +/* 34B44 80059744 24840008 */ addiu $a0, $a0, 8 +/* 34B48 80059748 26520008 */ addiu $s2, $s2, 8 +/* 34B4C 8005974C AE220004 */ sw $v0, 4($s1) +/* 34B50 80059750 0240882D */ daddu $s1, $s2, $zero +/* 34B54 80059754 8E620020 */ lw $v0, 0x20($s3) +/* 34B58 80059758 3C030E00 */ lui $v1, 0xe00 +/* 34B5C 8005975C 9044002F */ lbu $a0, 0x2f($v0) +/* 34B60 80059760 94420002 */ lhu $v0, 2($v0) +/* 34B64 80059764 00042400 */ sll $a0, $a0, 0x10 +/* 34B68 80059768 00431025 */ or $v0, $v0, $v1 +/* 34B6C 8005976C 00822025 */ or $a0, $a0, $v0 +/* 34B70 80059770 AE240000 */ sw $a0, ($s1) +/* 34B74 80059774 8E620020 */ lw $v0, 0x20($s3) +/* 34B78 80059778 8C440028 */ lw $a0, 0x28($v0) +/* 34B7C 8005977C 0C0187A4 */ jal osVirtualToPhysical +/* 34B80 80059780 00108600 */ sll $s0, $s0, 0x18 +/* 34B84 80059784 3C0300FF */ lui $v1, 0xff +/* 34B88 80059788 3463FFFF */ ori $v1, $v1, 0xffff +/* 34B8C 8005978C 00431024 */ and $v0, $v0, $v1 +/* 34B90 80059790 02028025 */ or $s0, $s0, $v0 +/* 34B94 80059794 AE300004 */ sw $s0, 4($s1) +/* 34B98 80059798 8E620020 */ lw $v0, 0x20($s3) +/* 34B9C 8005979C 26520008 */ addiu $s2, $s2, 8 +/* 34BA0 800597A0 AC40002C */ sw $zero, 0x2c($v0) +.L800597A4: +/* 34BA4 800597A4 8E620028 */ lw $v0, 0x28($s3) +/* 34BA8 800597A8 14400009 */ bnez $v0, .L800597D0 +/* 34BAC 800597AC 0240802D */ daddu $s0, $s2, $zero +/* 34BB0 800597B0 26520008 */ addiu $s2, $s2, 8 +/* 34BB4 800597B4 03C0202D */ daddu $a0, $fp, $zero +/* 34BB8 800597B8 32C20FFF */ andi $v0, $s6, 0xfff +/* 34BBC 800597BC 3C080617 */ lui $t0, 0x617 +/* 34BC0 800597C0 00481025 */ or $v0, $v0, $t0 +/* 34BC4 800597C4 0C0187A4 */ jal osVirtualToPhysical +/* 34BC8 800597C8 AE020000 */ sw $v0, ($s0) +/* 34BCC 800597CC AE020004 */ sw $v0, 4($s0) +.L800597D0: +/* 34BD0 800597D0 8662000C */ lh $v0, 0xc($s3) +/* 34BD4 800597D4 1040000A */ beqz $v0, .L80059800 +/* 34BD8 800597D8 0240282D */ daddu $a1, $s2, $zero +/* 34BDC 800597DC 26520008 */ addiu $s2, $s2, 8 +/* 34BE0 800597E0 00161400 */ sll $v0, $s6, 0x10 +/* 34BE4 800597E4 3C080C00 */ lui $t0, 0xc00 +/* 34BE8 800597E8 97A40028 */ lhu $a0, 0x28($sp) +/* 34BEC 800597EC 9663000C */ lhu $v1, 0xc($s3) +/* 34BF0 800597F0 00441025 */ or $v0, $v0, $a0 +/* 34BF4 800597F4 00681825 */ or $v1, $v1, $t0 +/* 34BF8 800597F8 ACA20004 */ sw $v0, 4($a1) +/* 34BFC 800597FC ACA30000 */ sw $v1, ($a1) +.L80059800: +/* 34C00 80059800 97A8001E */ lhu $t0, 0x1e($sp) +/* 34C04 80059804 25030001 */ addiu $v1, $t0, 1 +/* 34C08 80059808 A7A3001E */ sh $v1, 0x1e($sp) +/* 34C0C 8005980C 00031C00 */ sll $v1, $v1, 0x10 +/* 34C10 80059810 8FA80068 */ lw $t0, 0x68($sp) +/* 34C14 80059814 8E620004 */ lw $v0, 4($s3) +/* 34C18 80059818 8D040004 */ lw $a0, 4($t0) +/* 34C1C 8005981C 00021040 */ sll $v0, $v0, 1 +/* 34C20 80059820 0082A021 */ addu $s4, $a0, $v0 +/* 34C24 80059824 91020010 */ lbu $v0, 0x10($t0) +/* 34C28 80059828 00031C03 */ sra $v1, $v1, 0x10 +/* 34C2C 8005982C 0062182A */ slt $v1, $v1, $v0 +/* 34C30 80059830 1460FEEA */ bnez $v1, .L800593DC +/* 34C34 80059834 00000000 */ nop +.L80059838: +/* 34C38 80059838 8FA80068 */ lw $t0, 0x68($sp) +/* 34C3C 8005983C 8D030004 */ lw $v1, 4($t0) +/* 34C40 80059840 8D020008 */ lw $v0, 8($t0) +/* 34C44 80059844 8D040000 */ lw $a0, ($t0) +/* 34C48 80059848 24630170 */ addiu $v1, $v1, 0x170 +/* 34C4C 8005984C 00021040 */ sll $v0, $v0, 1 +/* 34C50 80059850 00821021 */ addu $v0, $a0, $v0 +/* 34C54 80059854 AD030004 */ sw $v1, 4($t0) +/* 34C58 80059858 0062182B */ sltu $v1, $v1, $v0 +/* 34C5C 8005985C 50600001 */ beql $v1, $zero, .L80059864 +/* 34C60 80059860 AD040004 */ sw $a0, 4($t0) +.L80059864: +/* 34C64 80059864 0240102D */ daddu $v0, $s2, $zero +/* 34C68 80059868 8FBF0054 */ lw $ra, 0x54($sp) +/* 34C6C 8005986C 8FBE0050 */ lw $fp, 0x50($sp) +/* 34C70 80059870 8FB7004C */ lw $s7, 0x4c($sp) +/* 34C74 80059874 8FB60048 */ lw $s6, 0x48($sp) +/* 34C78 80059878 8FB50044 */ lw $s5, 0x44($sp) +/* 34C7C 8005987C 8FB40040 */ lw $s4, 0x40($sp) +/* 34C80 80059880 8FB3003C */ lw $s3, 0x3c($sp) +/* 34C84 80059884 8FB20038 */ lw $s2, 0x38($sp) +/* 34C88 80059888 8FB10034 */ lw $s1, 0x34($sp) +/* 34C8C 8005988C 8FB00030 */ lw $s0, 0x30($sp) +/* 34C90 80059890 D7B60060 */ ldc1 $f22, 0x60($sp) +/* 34C94 80059894 D7B40058 */ ldc1 $f20, 0x58($sp) +/* 34C98 80059898 03E00008 */ jr $ra +/* 34C9C 8005989C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/world/func_800598A0.s b/asm/nonmatchings/world/world/func_800598A0.s new file mode 100644 index 0000000000..fab9b05da6 --- /dev/null +++ b/asm/nonmatchings/world/world/func_800598A0.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_800598A0 +/* 34CA0 800598A0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 34CA4 800598A4 00063400 */ sll $a2, $a2, 0x10 +/* 34CA8 800598A8 00063403 */ sra $a2, $a2, 0x10 +/* 34CAC 800598AC 2CC20008 */ sltiu $v0, $a2, 8 +/* 34CB0 800598B0 1040007D */ beqz $v0, .L80059AA8 +/* 34CB4 800598B4 AFBF0010 */ sw $ra, 0x10($sp) +/* 34CB8 800598B8 00061080 */ sll $v0, $a2, 2 +/* 34CBC 800598BC 3C01800A */ lui $at, 0x800a +/* 34CC0 800598C0 00220821 */ addu $at, $at, $v0 +/* 34CC4 800598C4 8C228970 */ lw $v0, -0x7690($at) +/* 34CC8 800598C8 00400008 */ jr $v0 +/* 34CCC 800598CC 00000000 */ nop +/* 34CD0 800598D0 00051400 */ sll $v0, $a1, 0x10 +/* 34CD4 800598D4 00021403 */ sra $v0, $v0, 0x10 +/* 34CD8 800598D8 00021840 */ sll $v1, $v0, 1 +/* 34CDC 800598DC 00621821 */ addu $v1, $v1, $v0 +/* 34CE0 800598E0 8C82000C */ lw $v0, 0xc($a0) +/* 34CE4 800598E4 00031900 */ sll $v1, $v1, 4 +/* 34CE8 800598E8 00621821 */ addu $v1, $v1, $v0 +/* 34CEC 800598EC 2402FFF8 */ addiu $v0, $zero, -8 +/* 34CF0 800598F0 00E21024 */ and $v0, $a3, $v0 +/* 34CF4 800598F4 080166AA */ j .L80059AA8 +/* 34CF8 800598F8 AC620000 */ sw $v0, ($v1) +/* 34CFC 800598FC 00051400 */ sll $v0, $a1, 0x10 +/* 34D00 80059900 00021403 */ sra $v0, $v0, 0x10 +/* 34D04 80059904 00021840 */ sll $v1, $v0, 1 +/* 34D08 80059908 00621821 */ addu $v1, $v1, $v0 +/* 34D0C 8005990C 8C82000C */ lw $v0, 0xc($a0) +/* 34D10 80059910 00031900 */ sll $v1, $v1, 4 +/* 34D14 80059914 00621821 */ addu $v1, $v1, $v0 +/* 34D18 80059918 2402FFF8 */ addiu $v0, $zero, -8 +/* 34D1C 8005991C 00E21024 */ and $v0, $a3, $v0 +/* 34D20 80059920 080166AA */ j .L80059AA8 +/* 34D24 80059924 AC620004 */ sw $v0, 4($v1) +/* 34D28 80059928 00051400 */ sll $v0, $a1, 0x10 +/* 34D2C 8005992C 00021403 */ sra $v0, $v0, 0x10 +/* 34D30 80059930 00021840 */ sll $v1, $v0, 1 +/* 34D34 80059934 00621821 */ addu $v1, $v1, $v0 +/* 34D38 80059938 8C82000C */ lw $v0, 0xc($a0) +/* 34D3C 8005993C 00031900 */ sll $v1, $v1, 4 +/* 34D40 80059940 00621821 */ addu $v1, $v1, $v0 +/* 34D44 80059944 080166AA */ j .L80059AA8 +/* 34D48 80059948 A4670008 */ sh $a3, 8($v1) +/* 34D4C 8005994C 00051400 */ sll $v0, $a1, 0x10 +/* 34D50 80059950 00021403 */ sra $v0, $v0, 0x10 +/* 34D54 80059954 00021840 */ sll $v1, $v0, 1 +/* 34D58 80059958 00621821 */ addu $v1, $v1, $v0 +/* 34D5C 8005995C 8C82000C */ lw $v0, 0xc($a0) +/* 34D60 80059960 00031900 */ sll $v1, $v1, 4 +/* 34D64 80059964 00621821 */ addu $v1, $v1, $v0 +/* 34D68 80059968 080166AA */ j .L80059AA8 +/* 34D6C 8005996C A467000A */ sh $a3, 0xa($v1) +/* 34D70 80059970 00051400 */ sll $v0, $a1, 0x10 +/* 34D74 80059974 00021403 */ sra $v0, $v0, 0x10 +/* 34D78 80059978 00021840 */ sll $v1, $v0, 1 +/* 34D7C 8005997C 00621821 */ addu $v1, $v1, $v0 +/* 34D80 80059980 8C82000C */ lw $v0, 0xc($a0) +/* 34D84 80059984 00031900 */ sll $v1, $v1, 4 +/* 34D88 80059988 00621821 */ addu $v1, $v1, $v0 +/* 34D8C 8005998C 080166AA */ j .L80059AA8 +/* 34D90 80059990 A467000C */ sh $a3, 0xc($v1) +/* 34D94 80059994 00051400 */ sll $v0, $a1, 0x10 +/* 34D98 80059998 00021403 */ sra $v0, $v0, 0x10 +/* 34D9C 8005999C 00021840 */ sll $v1, $v0, 1 +/* 34DA0 800599A0 00621821 */ addu $v1, $v1, $v0 +/* 34DA4 800599A4 00031900 */ sll $v1, $v1, 4 +/* 34DA8 800599A8 44870000 */ mtc1 $a3, $f0 +/* 34DAC 800599AC 00000000 */ nop +/* 34DB0 800599B0 46800020 */ cvt.s.w $f0, $f0 +/* 34DB4 800599B4 3C01447A */ lui $at, 0x447a +/* 34DB8 800599B8 44811000 */ mtc1 $at, $f2 +/* 34DBC 800599BC 8C82000C */ lw $v0, 0xc($a0) +/* 34DC0 800599C0 3C048008 */ lui $a0, 0x8008 +/* 34DC4 800599C4 8C848E50 */ lw $a0, -0x71b0($a0) +/* 34DC8 800599C8 46020003 */ div.s $f0, $f0, $f2 +/* 34DCC 800599CC 46000021 */ cvt.d.s $f0, $f0 +/* 34DD0 800599D0 46200000 */ add.d $f0, $f0, $f0 +/* 34DD4 800599D4 00621821 */ addu $v1, $v1, $v0 +/* 34DD8 800599D8 C4820008 */ lwc1 $f2, 8($a0) +/* 34DDC 800599DC 468010A1 */ cvt.d.w $f2, $f2 +/* 34DE0 800599E0 46220003 */ div.d $f0, $f0, $f2 +/* 34DE4 800599E4 46200020 */ cvt.s.d $f0, $f0 +/* 34DE8 800599E8 080166AA */ j .L80059AA8 +/* 34DEC 800599EC E4600010 */ swc1 $f0, 0x10($v1) +/* 34DF0 800599F0 00051400 */ sll $v0, $a1, 0x10 +/* 34DF4 800599F4 00021403 */ sra $v0, $v0, 0x10 +/* 34DF8 800599F8 00021840 */ sll $v1, $v0, 1 +/* 34DFC 800599FC 00621821 */ addu $v1, $v1, $v0 +/* 34E00 80059A00 00031900 */ sll $v1, $v1, 4 +/* 34E04 80059A04 44870000 */ mtc1 $a3, $f0 +/* 34E08 80059A08 00000000 */ nop +/* 34E0C 80059A0C 46800020 */ cvt.s.w $f0, $f0 +/* 34E10 80059A10 46000021 */ cvt.d.s $f0, $f0 +/* 34E14 80059A14 8C82000C */ lw $v0, 0xc($a0) +/* 34E18 80059A18 3C01800A */ lui $at, 0x800a +/* 34E1C 80059A1C D4228990 */ ldc1 $f2, -0x7670($at) +/* 34E20 80059A20 00622021 */ addu $a0, $v1, $v0 +/* 34E24 80059A24 8C830004 */ lw $v1, 4($a0) +/* 34E28 80059A28 8C820000 */ lw $v0, ($a0) +/* 34E2C 80059A2C 00621823 */ subu $v1, $v1, $v0 +/* 34E30 80059A30 44832000 */ mtc1 $v1, $f4 +/* 34E34 80059A34 00000000 */ nop +/* 34E38 80059A38 46802121 */ cvt.d.w $f4, $f4 +/* 34E3C 80059A3C 04610006 */ bgez $v1, .L80059A58 +/* 34E40 80059A40 46220083 */ div.d $f2, $f0, $f2 +/* 34E44 80059A44 3C0141F0 */ lui $at, 0x41f0 +/* 34E48 80059A48 44810800 */ mtc1 $at, $f1 +/* 34E4C 80059A4C 44800000 */ mtc1 $zero, $f0 +/* 34E50 80059A50 00000000 */ nop +/* 34E54 80059A54 46202100 */ add.d $f4, $f4, $f0 +.L80059A58: +/* 34E58 80059A58 46241002 */ mul.d $f0, $f2, $f4 +/* 34E5C 80059A5C 00000000 */ nop +/* 34E60 80059A60 46200020 */ cvt.s.d $f0, $f0 +/* 34E64 80059A64 080166AA */ j .L80059AA8 +/* 34E68 80059A68 E480001C */ swc1 $f0, 0x1c($a0) +/* 34E6C 80059A6C 00051400 */ sll $v0, $a1, 0x10 +/* 34E70 80059A70 00021403 */ sra $v0, $v0, 0x10 +/* 34E74 80059A74 00021840 */ sll $v1, $v0, 1 +/* 34E78 80059A78 00621821 */ addu $v1, $v1, $v0 +/* 34E7C 80059A7C 8C82000C */ lw $v0, 0xc($a0) +/* 34E80 80059A80 00031900 */ sll $v1, $v1, 4 +/* 34E84 80059A84 00621021 */ addu $v0, $v1, $v0 +/* 34E88 80059A88 8C420020 */ lw $v0, 0x20($v0) +/* 34E8C 80059A8C 10400006 */ beqz $v0, .L80059AA8 +/* 34E90 80059A90 00000000 */ nop +/* 34E94 80059A94 A4470000 */ sh $a3, ($v0) +/* 34E98 80059A98 8C82000C */ lw $v0, 0xc($a0) +/* 34E9C 80059A9C 00621021 */ addu $v0, $v1, $v0 +/* 34EA0 80059AA0 0C016374 */ jal func_80058DD0 +/* 34EA4 80059AA4 8C440020 */ lw $a0, 0x20($v0) +.L80059AA8: +/* 34EA8 80059AA8 8FBF0010 */ lw $ra, 0x10($sp) +/* 34EAC 80059AAC 0000102D */ daddu $v0, $zero, $zero +/* 34EB0 80059AB0 03E00008 */ jr $ra +/* 34EB4 80059AB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/world/func_80059AB8.s b/asm/nonmatchings/world/world/func_80059AB8.s new file mode 100644 index 0000000000..52a8841a34 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059AB8.s @@ -0,0 +1,77 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059AB8 +/* 34EB8 80059AB8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 34EBC 80059ABC AFB50024 */ sw $s5, 0x24($sp) +/* 34EC0 80059AC0 0080A82D */ daddu $s5, $a0, $zero +/* 34EC4 80059AC4 00A0202D */ daddu $a0, $a1, $zero +/* 34EC8 80059AC8 AFB60028 */ sw $s6, 0x28($sp) +/* 34ECC 80059ACC 00C0B02D */ daddu $s6, $a2, $zero +/* 34ED0 80059AD0 AFB40020 */ sw $s4, 0x20($sp) +/* 34ED4 80059AD4 8FB40040 */ lw $s4, 0x40($sp) +/* 34ED8 80059AD8 00073840 */ sll $a3, $a3, 1 +/* 34EDC 80059ADC AFB00010 */ sw $s0, 0x10($sp) +/* 34EE0 80059AE0 00878021 */ addu $s0, $a0, $a3 +/* 34EE4 80059AE4 AFBF002C */ sw $ra, 0x2c($sp) +/* 34EE8 80059AE8 AFB3001C */ sw $s3, 0x1c($sp) +/* 34EEC 80059AEC AFB20018 */ sw $s2, 0x18($sp) +/* 34EF0 80059AF0 AFB10014 */ sw $s1, 0x14($sp) +/* 34EF4 80059AF4 8EA20008 */ lw $v0, 8($s5) +/* 34EF8 80059AF8 8EA30000 */ lw $v1, ($s5) +/* 34EFC 80059AFC 00021040 */ sll $v0, $v0, 1 +/* 34F00 80059B00 00623021 */ addu $a2, $v1, $v0 +/* 34F04 80059B04 00D0102B */ sltu $v0, $a2, $s0 +/* 34F08 80059B08 1040001C */ beqz $v0, .L80059B7C +/* 34F0C 80059B0C 0280902D */ daddu $s2, $s4, $zero +/* 34F10 80059B10 26940008 */ addiu $s4, $s4, 8 +/* 34F14 80059B14 00C48823 */ subu $s1, $a2, $a0 +/* 34F18 80059B18 00118843 */ sra $s1, $s1, 1 +/* 34F1C 80059B1C 00118840 */ sll $s1, $s1, 1 +/* 34F20 80059B20 32230FFF */ andi $v1, $s1, 0xfff +/* 34F24 80059B24 00031B00 */ sll $v1, $v1, 0xc +/* 34F28 80059B28 32C20FFF */ andi $v0, $s6, 0xfff +/* 34F2C 80059B2C 3C130400 */ lui $s3, 0x400 +/* 34F30 80059B30 00531025 */ or $v0, $v0, $s3 +/* 34F34 80059B34 00621825 */ or $v1, $v1, $v0 +/* 34F38 80059B38 02068023 */ subu $s0, $s0, $a2 +/* 34F3C 80059B3C 00108043 */ sra $s0, $s0, 1 +/* 34F40 80059B40 0C0187A4 */ jal osVirtualToPhysical +/* 34F44 80059B44 AE430000 */ sw $v1, ($s2) +/* 34F48 80059B48 AE420004 */ sw $v0, 4($s2) +/* 34F4C 80059B4C 0280902D */ daddu $s2, $s4, $zero +/* 34F50 80059B50 00108040 */ sll $s0, $s0, 1 +/* 34F54 80059B54 32100FFF */ andi $s0, $s0, 0xfff +/* 34F58 80059B58 00108300 */ sll $s0, $s0, 0xc +/* 34F5C 80059B5C 02D18821 */ addu $s1, $s6, $s1 +/* 34F60 80059B60 32310FFF */ andi $s1, $s1, 0xfff +/* 34F64 80059B64 02338825 */ or $s1, $s1, $s3 +/* 34F68 80059B68 02118025 */ or $s0, $s0, $s1 +/* 34F6C 80059B6C AE500000 */ sw $s0, ($s2) +/* 34F70 80059B70 8EA40000 */ lw $a0, ($s5) +/* 34F74 80059B74 080166E7 */ j .L80059B9C +/* 34F78 80059B78 26940008 */ addiu $s4, $s4, 8 +.L80059B7C: +/* 34F7C 80059B7C 26940008 */ addiu $s4, $s4, 8 +/* 34F80 80059B80 30E20FFF */ andi $v0, $a3, 0xfff +/* 34F84 80059B84 00021300 */ sll $v0, $v0, 0xc +/* 34F88 80059B88 32C30FFF */ andi $v1, $s6, 0xfff +/* 34F8C 80059B8C 3C050400 */ lui $a1, 0x400 +/* 34F90 80059B90 00651825 */ or $v1, $v1, $a1 +/* 34F94 80059B94 00431025 */ or $v0, $v0, $v1 +/* 34F98 80059B98 AE420000 */ sw $v0, ($s2) +.L80059B9C: +/* 34F9C 80059B9C 0C0187A4 */ jal osVirtualToPhysical +/* 34FA0 80059BA0 00000000 */ nop +/* 34FA4 80059BA4 AE420004 */ sw $v0, 4($s2) +/* 34FA8 80059BA8 0280102D */ daddu $v0, $s4, $zero +/* 34FAC 80059BAC 8FBF002C */ lw $ra, 0x2c($sp) +/* 34FB0 80059BB0 8FB60028 */ lw $s6, 0x28($sp) +/* 34FB4 80059BB4 8FB50024 */ lw $s5, 0x24($sp) +/* 34FB8 80059BB8 8FB40020 */ lw $s4, 0x20($sp) +/* 34FBC 80059BBC 8FB3001C */ lw $s3, 0x1c($sp) +/* 34FC0 80059BC0 8FB20018 */ lw $s2, 0x18($sp) +/* 34FC4 80059BC4 8FB10014 */ lw $s1, 0x14($sp) +/* 34FC8 80059BC8 8FB00010 */ lw $s0, 0x10($sp) +/* 34FCC 80059BCC 03E00008 */ jr $ra +/* 34FD0 80059BD0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/world/func_80059BD4.s b/asm/nonmatchings/world/world/func_80059BD4.s new file mode 100644 index 0000000000..b15be47501 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059BD4.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059BD4 +/* 34FD4 80059BD4 C4800010 */ lwc1 $f0, 0x10($a0) +/* 34FD8 80059BD8 44851000 */ mtc1 $a1, $f2 +/* 34FDC 80059BDC 00000000 */ nop +/* 34FE0 80059BE0 468010A0 */ cvt.s.w $f2, $f2 +/* 34FE4 80059BE4 46020002 */ mul.s $f0, $f0, $f2 +/* 34FE8 80059BE8 00000000 */ nop +/* 34FEC 80059BEC C4820014 */ lwc1 $f2, 0x14($a0) +/* 34FF0 80059BF0 46001080 */ add.s $f2, $f2, $f0 +/* 34FF4 80059BF4 24820014 */ addiu $v0, $a0, 0x14 +/* 34FF8 80059BF8 3C014000 */ lui $at, 0x4000 +/* 34FFC 80059BFC 44810800 */ mtc1 $at, $f1 +/* 35000 80059C00 44800000 */ mtc1 $zero, $f0 +/* 35004 80059C04 46001121 */ cvt.d.s $f4, $f2 +/* 35008 80059C08 4624003C */ c.lt.d $f0, $f4 +/* 3500C 80059C0C 00000000 */ nop +/* 35010 80059C10 45000008 */ bc1f .L80059C34 +/* 35014 80059C14 E4820014 */ swc1 $f2, 0x14($a0) +/* 35018 80059C18 3C014010 */ lui $at, 0x4010 +/* 3501C 80059C1C 44810800 */ mtc1 $at, $f1 +/* 35020 80059C20 44800000 */ mtc1 $zero, $f0 +/* 35024 80059C24 00000000 */ nop +/* 35028 80059C28 46202001 */ sub.d $f0, $f4, $f0 +/* 3502C 80059C2C 0801670E */ j .L80059C38 +/* 35030 80059C30 46200020 */ cvt.s.d $f0, $f0 +.L80059C34: +/* 35034 80059C34 46001006 */ mov.s $f0, $f2 +.L80059C38: +/* 35038 80059C38 E4400000 */ swc1 $f0, ($v0) +/* 3503C 80059C3C C4820014 */ lwc1 $f2, 0x14($a0) +/* 35040 80059C40 44800000 */ mtc1 $zero, $f0 +/* 35044 80059C44 00000000 */ nop +/* 35048 80059C48 4600103C */ c.lt.s $f2, $f0 +/* 3504C 80059C4C 00000000 */ nop +/* 35050 80059C50 45030001 */ bc1tl .L80059C58 +/* 35054 80059C54 46001087 */ neg.s $f2, $f2 +.L80059C58: +/* 35058 80059C58 3C013FF0 */ lui $at, 0x3ff0 +/* 3505C 80059C5C 44810800 */ mtc1 $at, $f1 +/* 35060 80059C60 44800000 */ mtc1 $zero, $f0 +/* 35064 80059C64 460010A1 */ cvt.d.s $f2, $f2 +/* 35068 80059C68 46201081 */ sub.d $f2, $f2, $f0 +/* 3506C 80059C6C C480001C */ lwc1 $f0, 0x1c($a0) +/* 35070 80059C70 462010A0 */ cvt.s.d $f2, $f2 +/* 35074 80059C74 46020002 */ mul.s $f0, $f0, $f2 +/* 35078 80059C78 03E00008 */ jr $ra +/* 3507C 80059C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/world/func_80059C88.s b/asm/nonmatchings/world/world/func_80059C88.s new file mode 100644 index 0000000000..77d0e7ff62 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059C88.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059C88 +/* 35088 80059C88 8C82000C */ lw $v0, 0xc($a0) +/* 3508C 80059C8C AC450004 */ sw $a1, 4($v0) +/* 35090 80059C90 AC460008 */ sw $a2, 8($v0) +/* 35094 80059C94 03E00008 */ jr $ra +/* 35098 80059C98 AC47000C */ sw $a3, 0xc($v0) diff --git a/asm/nonmatchings/world/world/func_80059C9C.s b/asm/nonmatchings/world/world/func_80059C9C.s new file mode 100644 index 0000000000..82c14cdfd6 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059C9C.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059C9C +/* 3509C 80059C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 350A0 80059CA0 2402000E */ addiu $v0, $zero, 0xe +/* 350A4 80059CA4 3C03800A */ lui $v1, 0x800a +/* 350A8 80059CA8 246341C0 */ addiu $v1, $v1, 0x41c0 +/* 350AC 80059CAC AFBF001C */ sw $ra, 0x1c($sp) +/* 350B0 80059CB0 AFB00018 */ sw $s0, 0x18($sp) +.L80059CB4: +/* 350B4 80059CB4 AC600000 */ sw $zero, ($v1) +/* 350B8 80059CB8 2442FFFF */ addiu $v0, $v0, -1 +/* 350BC 80059CBC 0441FFFD */ bgez $v0, .L80059CB4 +/* 350C0 80059CC0 2463FFE0 */ addiu $v1, $v1, -0x20 +/* 350C4 80059CC4 2402005F */ addiu $v0, $zero, 0x5f +/* 350C8 80059CC8 3C03800B */ lui $v1, 0x800b +/* 350CC 80059CCC 24634514 */ addiu $v1, $v1, 0x4514 +.L80059CD0: +/* 350D0 80059CD0 AC600000 */ sw $zero, ($v1) +/* 350D4 80059CD4 2442FFFF */ addiu $v0, $v0, -1 +/* 350D8 80059CD8 0441FFFD */ bgez $v0, .L80059CD0 +/* 350DC 80059CDC 2463FFFC */ addiu $v1, $v1, -4 +/* 350E0 80059CE0 0C019A58 */ jal osUnmapTLBAll +/* 350E4 80059CE4 00000000 */ nop +/* 350E8 80059CE8 3C0300FF */ lui $v1, 0xff +/* 350EC 80059CEC 3463FFFF */ ori $v1, $v1, 0xffff +/* 350F0 80059CF0 24040010 */ addiu $a0, $zero, 0x10 +/* 350F4 80059CF4 0000282D */ daddu $a1, $zero, $zero +/* 350F8 80059CF8 3C10E020 */ lui $s0, 0xe020 +/* 350FC 80059CFC 26100000 */ addiu $s0, $s0, 0 +/* 35100 80059D00 0200302D */ daddu $a2, $s0, $zero +/* 35104 80059D04 2402FFFF */ addiu $v0, $zero, -1 +/* 35108 80059D08 3C07801A */ lui $a3, 0x801a +/* 3510C 80059D0C 24E76000 */ addiu $a3, $a3, 0x6000 +/* 35110 80059D10 00E33824 */ and $a3, $a3, $v1 +/* 35114 80059D14 AFA20010 */ sw $v0, 0x10($sp) +/* 35118 80059D18 0C0199E8 */ jal osMapTLB +/* 3511C 80059D1C AFA20014 */ sw $v0, 0x14($sp) +/* 35120 80059D20 3C040032 */ lui $a0, 0x32 +/* 35124 80059D24 24845AD0 */ addiu $a0, $a0, 0x5ad0 +/* 35128 80059D28 3C050032 */ lui $a1, 0x32 +/* 3512C 80059D2C 24A56410 */ addiu $a1, $a1, 0x6410 +/* 35130 80059D30 0C00A5CF */ jal dma_copy +/* 35134 80059D34 0200302D */ daddu $a2, $s0, $zero +/* 35138 80059D38 8FBF001C */ lw $ra, 0x1c($sp) +/* 3513C 80059D3C 8FB00018 */ lw $s0, 0x18($sp) +/* 35140 80059D40 03E00008 */ jr $ra +/* 35144 80059D44 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/world/func_80059D50.s b/asm/nonmatchings/world/world/func_80059D50.s new file mode 100644 index 0000000000..eeae71c2ce --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059D50.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059D50 +/* 35150 80059D50 3C02800A */ lui $v0, %hi(D_8009A650) +/* 35154 80059D54 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) +/* 35158 80059D58 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 3515C 80059D5C AFBF0020 */ sw $ra, 0x20($sp) +/* 35160 80059D60 AFB3001C */ sw $s3, 0x1c($sp) +/* 35164 80059D64 AFB20018 */ sw $s2, 0x18($sp) +/* 35168 80059D68 AFB10014 */ sw $s1, 0x14($sp) +/* 3516C 80059D6C 30420C00 */ andi $v0, $v0, 0xc00 +/* 35170 80059D70 14400059 */ bnez $v0, .L80059ED8 +/* 35174 80059D74 AFB00010 */ sw $s0, 0x10($sp) +/* 35178 80059D78 0000902D */ daddu $s2, $zero, $zero +/* 3517C 80059D7C 3C10800A */ lui $s0, 0x800a +/* 35180 80059D80 26104000 */ addiu $s0, $s0, 0x4000 +/* 35184 80059D84 24040003 */ addiu $a0, $zero, 3 +.L80059D88: +/* 35188 80059D88 8E030000 */ lw $v1, ($s0) +/* 3518C 80059D8C 30620001 */ andi $v0, $v1, 1 +/* 35190 80059D90 10400007 */ beqz $v0, .L80059DB0 +/* 35194 80059D94 26520001 */ addiu $s2, $s2, 1 +/* 35198 80059D98 30620002 */ andi $v0, $v1, 2 +/* 3519C 80059D9C 14400004 */ bnez $v0, .L80059DB0 +/* 351A0 80059DA0 00000000 */ nop +/* 351A4 80059DA4 34620002 */ ori $v0, $v1, 2 +/* 351A8 80059DA8 AE020000 */ sw $v0, ($s0) +/* 351AC 80059DAC AE04000C */ sw $a0, 0xc($s0) +.L80059DB0: +/* 351B0 80059DB0 2A42000F */ slti $v0, $s2, 0xf +/* 351B4 80059DB4 1440FFF4 */ bnez $v0, .L80059D88 +/* 351B8 80059DB8 26100020 */ addiu $s0, $s0, 0x20 +/* 351BC 80059DBC 0000902D */ daddu $s2, $zero, $zero +/* 351C0 80059DC0 2413FFFD */ addiu $s3, $zero, -3 +/* 351C4 80059DC4 3C11800B */ lui $s1, 0x800b +/* 351C8 80059DC8 26314398 */ addiu $s1, $s1, 0x4398 +.L80059DCC: +/* 351CC 80059DCC 8E300000 */ lw $s0, ($s1) +/* 351D0 80059DD0 52000020 */ beql $s0, $zero, .L80059E54 +/* 351D4 80059DD4 26520001 */ addiu $s2, $s2, 1 +/* 351D8 80059DD8 8E020000 */ lw $v0, ($s0) +/* 351DC 80059DDC 30420001 */ andi $v0, $v0, 1 +/* 351E0 80059DE0 5040001C */ beql $v0, $zero, .L80059E54 +/* 351E4 80059DE4 26520001 */ addiu $s2, $s2, 1 +/* 351E8 80059DE8 8E030010 */ lw $v1, 0x10($s0) +/* 351EC 80059DEC 8C620000 */ lw $v0, ($v1) +/* 351F0 80059DF0 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* 351F4 80059DF4 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) +/* 351F8 80059DF8 00531024 */ and $v0, $v0, $s3 +/* 351FC 80059DFC AC620000 */ sw $v0, ($v1) +/* 35200 80059E00 80820070 */ lb $v0, 0x70($a0) +/* 35204 80059E04 10400007 */ beqz $v0, .L80059E24 +/* 35208 80059E08 00000000 */ nop +/* 3520C 80059E0C 8E020000 */ lw $v0, ($s0) +/* 35210 80059E10 30420004 */ andi $v0, $v0, 4 +/* 35214 80059E14 5040000F */ beql $v0, $zero, .L80059E54 +/* 35218 80059E18 26520001 */ addiu $s2, $s2, 1 +/* 3521C 80059E1C 0801678D */ j .L80059E34 +/* 35220 80059E20 00000000 */ nop +.L80059E24: +/* 35224 80059E24 8E020000 */ lw $v0, ($s0) +/* 35228 80059E28 30420004 */ andi $v0, $v0, 4 +/* 3522C 80059E2C 54400009 */ bnel $v0, $zero, .L80059E54 +/* 35230 80059E30 26520001 */ addiu $s2, $s2, 1 +.L80059E34: +/* 35234 80059E34 8E020010 */ lw $v0, 0x10($s0) +/* 35238 80059E38 8C420010 */ lw $v0, 0x10($v0) +/* 3523C 80059E3C 0040F809 */ jalr $v0 +/* 35240 80059E40 0200202D */ daddu $a0, $s0, $zero +/* 35244 80059E44 8E020000 */ lw $v0, ($s0) +/* 35248 80059E48 34420008 */ ori $v0, $v0, 8 +/* 3524C 80059E4C AE020000 */ sw $v0, ($s0) +/* 35250 80059E50 26520001 */ addiu $s2, $s2, 1 +.L80059E54: +/* 35254 80059E54 2A420060 */ slti $v0, $s2, 0x60 +/* 35258 80059E58 1440FFDC */ bnez $v0, .L80059DCC +/* 3525C 80059E5C 26310004 */ addiu $s1, $s1, 4 +/* 35260 80059E60 0000902D */ daddu $s2, $zero, $zero +/* 35264 80059E64 3C10800A */ lui $s0, 0x800a +/* 35268 80059E68 26104000 */ addiu $s0, $s0, 0x4000 +/* 3526C 80059E6C 2611001C */ addiu $s1, $s0, 0x1c +.L80059E70: +/* 35270 80059E70 8E030000 */ lw $v1, ($s0) +/* 35274 80059E74 30620001 */ andi $v0, $v1, 1 +/* 35278 80059E78 50400013 */ beql $v0, $zero, .L80059EC8 +/* 3527C 80059E7C 26520001 */ addiu $s2, $s2, 1 +/* 35280 80059E80 30620002 */ andi $v0, $v1, 2 +/* 35284 80059E84 50400010 */ beql $v0, $zero, .L80059EC8 +/* 35288 80059E88 26520001 */ addiu $s2, $s2, 1 +/* 3528C 80059E8C 8E22FFF0 */ lw $v0, -0x10($s1) +/* 35290 80059E90 10400003 */ beqz $v0, .L80059EA0 +/* 35294 80059E94 2442FFFF */ addiu $v0, $v0, -1 +/* 35298 80059E98 080167B1 */ j .L80059EC4 +/* 3529C 80059E9C AE22FFF0 */ sw $v0, -0x10($s1) +.L80059EA0: +/* 352A0 80059EA0 8E240000 */ lw $a0, ($s1) +/* 352A4 80059EA4 50800005 */ beql $a0, $zero, .L80059EBC +/* 352A8 80059EA8 AE000000 */ sw $zero, ($s0) +/* 352AC 80059EAC 0C00AB1E */ jal general_heap_free +/* 352B0 80059EB0 00000000 */ nop +/* 352B4 80059EB4 AE200000 */ sw $zero, ($s1) +/* 352B8 80059EB8 AE000000 */ sw $zero, ($s0) +.L80059EBC: +/* 352BC 80059EBC 0C019A48 */ jal osUnmapTLB +/* 352C0 80059EC0 0240202D */ daddu $a0, $s2, $zero +.L80059EC4: +/* 352C4 80059EC4 26520001 */ addiu $s2, $s2, 1 +.L80059EC8: +/* 352C8 80059EC8 26310020 */ addiu $s1, $s1, 0x20 +/* 352CC 80059ECC 2A42000F */ slti $v0, $s2, 0xf +/* 352D0 80059ED0 1440FFE7 */ bnez $v0, .L80059E70 +/* 352D4 80059ED4 26100020 */ addiu $s0, $s0, 0x20 +.L80059ED8: +/* 352D8 80059ED8 8FBF0020 */ lw $ra, 0x20($sp) +/* 352DC 80059EDC 8FB3001C */ lw $s3, 0x1c($sp) +/* 352E0 80059EE0 8FB20018 */ lw $s2, 0x18($sp) +/* 352E4 80059EE4 8FB10014 */ lw $s1, 0x14($sp) +/* 352E8 80059EE8 8FB00010 */ lw $s0, 0x10($sp) +/* 352EC 80059EEC 03E00008 */ jr $ra +/* 352F0 80059EF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/world/func_80059F94.s b/asm/nonmatchings/world/world/func_80059F94.s new file mode 100644 index 0000000000..e02e9c8c07 --- /dev/null +++ b/asm/nonmatchings/world/world/func_80059F94.s @@ -0,0 +1,211 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80059F94 +/* 35394 80059F94 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 35398 80059F98 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 3539C 80059F9C 3C014080 */ lui $at, 0x4080 +/* 353A0 80059FA0 4481A000 */ mtc1 $at, $f20 +/* 353A4 80059FA4 AFB10014 */ sw $s1, 0x14($sp) +/* 353A8 80059FA8 24110001 */ addiu $s1, $zero, 1 +/* 353AC 80059FAC AFB20018 */ sw $s2, 0x18($sp) +/* 353B0 80059FB0 0000902D */ daddu $s2, $zero, $zero +/* 353B4 80059FB4 AFB50024 */ sw $s5, 0x24($sp) +/* 353B8 80059FB8 3C15800B */ lui $s5, %hi(gCameras) +/* 353BC 80059FBC 26B51D80 */ addiu $s5, $s5, %lo(gCameras) +/* 353C0 80059FC0 AFB00010 */ sw $s0, 0x10($sp) +/* 353C4 80059FC4 3C10800A */ lui $s0, 0x800a +/* 353C8 80059FC8 2610A66C */ addiu $s0, $s0, -0x5994 +/* 353CC 80059FCC AFB40020 */ sw $s4, 0x20($sp) +/* 353D0 80059FD0 24140002 */ addiu $s4, $zero, 2 +/* 353D4 80059FD4 AFB3001C */ sw $s3, 0x1c($sp) +/* 353D8 80059FD8 3413FFFE */ ori $s3, $zero, 0xfffe +/* 353DC 80059FDC AFBF0028 */ sw $ra, 0x28($sp) +/* 353E0 80059FE0 00121080 */ sll $v0, $s2, 2 +.L80059FE4: +/* 353E4 80059FE4 3C0E800B */ lui $t6, 0x800b +/* 353E8 80059FE8 01C27021 */ addu $t6, $t6, $v0 +/* 353EC 80059FEC 8DCE4398 */ lw $t6, 0x4398($t6) +/* 353F0 80059FF0 51C000A5 */ beql $t6, $zero, .L8005A288 +/* 353F4 80059FF4 26520001 */ addiu $s2, $s2, 1 +/* 353F8 80059FF8 8DC30000 */ lw $v1, ($t6) +/* 353FC 80059FFC 30620001 */ andi $v0, $v1, 1 +/* 35400 8005A000 504000A1 */ beql $v0, $zero, .L8005A288 +/* 35404 8005A004 26520001 */ addiu $s2, $s2, 1 +/* 35408 8005A008 30620008 */ andi $v0, $v1, 8 +/* 3540C 8005A00C 5040009E */ beql $v0, $zero, .L8005A288 +/* 35410 8005A010 26520001 */ addiu $s2, $s2, 1 +/* 35414 8005A014 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 35418 8005A018 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 3541C 8005A01C 80420070 */ lb $v0, 0x70($v0) +/* 35420 8005A020 10400005 */ beqz $v0, .L8005A038 +/* 35424 8005A024 30620004 */ andi $v0, $v1, 4 +/* 35428 8005A028 50400097 */ beql $v0, $zero, .L8005A288 +/* 3542C 8005A02C 26520001 */ addiu $s2, $s2, 1 +/* 35430 8005A030 08016810 */ j .L8005A040 +/* 35434 8005A034 00000000 */ nop +.L8005A038: +/* 35438 8005A038 54400093 */ bnel $v0, $zero, .L8005A288 +/* 3543C 8005A03C 26520001 */ addiu $s2, $s2, 1 +.L8005A040: +/* 35440 8005A040 8DC20010 */ lw $v0, 0x10($t6) +/* 35444 8005A044 8C4F0018 */ lw $t7, 0x18($v0) +/* 35448 8005A048 3C028006 */ lui $v0, 0x8006 +/* 3544C 8005A04C 24429C80 */ addiu $v0, $v0, -0x6380 +/* 35450 8005A050 51E2008D */ beql $t7, $v0, .L8005A288 +/* 35454 8005A054 26520001 */ addiu $s2, $s2, 1 +/* 35458 8005A058 12200088 */ beqz $s1, .L8005A27C +/* 3545C 8005A05C 3C04DC08 */ lui $a0, 0xdc08 +/* 35460 8005A060 34840008 */ ori $a0, $a0, 8 +/* 35464 8005A064 3C06D9FF */ lui $a2, 0xd9ff +/* 35468 8005A068 34C6FFFF */ ori $a2, $a2, 0xffff +/* 3546C 8005A06C 3C050020 */ lui $a1, 0x20 +/* 35470 8005A070 34A50405 */ ori $a1, $a1, 0x405 +/* 35474 8005A074 3C07DB04 */ lui $a3, 0xdb04 +/* 35478 8005A078 34E70004 */ ori $a3, $a3, 4 +/* 3547C 8005A07C 3C08DB04 */ lui $t0, 0xdb04 +/* 35480 8005A080 3508000C */ ori $t0, $t0, 0xc +/* 35484 8005A084 3C09DB04 */ lui $t1, 0xdb04 +/* 35488 8005A088 35290014 */ ori $t1, $t1, 0x14 +/* 3548C 8005A08C 3C0ADB04 */ lui $t2, 0xdb04 +/* 35490 8005A090 8E0B0000 */ lw $t3, ($s0) +/* 35494 8005A094 354A001C */ ori $t2, $t2, 0x1c +/* 35498 8005A098 0160182D */ daddu $v1, $t3, $zero +/* 3549C 8005A09C 256B0008 */ addiu $t3, $t3, 8 +/* 354A0 8005A0A0 AE0B0000 */ sw $t3, ($s0) +/* 354A4 8005A0A4 3C0D8007 */ lui $t5, %hi(gCurrentCameraID) +/* 354A8 8005A0A8 8DAD7410 */ lw $t5, %lo(gCurrentCameraID)($t5) +/* 354AC 8005A0AC 3C02E700 */ lui $v0, 0xe700 +/* 354B0 8005A0B0 AC620000 */ sw $v0, ($v1) +/* 354B4 8005A0B4 25620008 */ addiu $v0, $t3, 8 +/* 354B8 8005A0B8 AC600004 */ sw $zero, 4($v1) +/* 354BC 8005A0BC AE020000 */ sw $v0, ($s0) +/* 354C0 8005A0C0 AD640000 */ sw $a0, ($t3) +/* 354C4 8005A0C4 3C04ED00 */ lui $a0, 0xed00 +/* 354C8 8005A0C8 000D1080 */ sll $v0, $t5, 2 +/* 354CC 8005A0CC 004D1021 */ addu $v0, $v0, $t5 +/* 354D0 8005A0D0 00021080 */ sll $v0, $v0, 2 +/* 354D4 8005A0D4 004D1023 */ subu $v0, $v0, $t5 +/* 354D8 8005A0D8 000218C0 */ sll $v1, $v0, 3 +/* 354DC 8005A0DC 00431021 */ addu $v0, $v0, $v1 +/* 354E0 8005A0E0 000210C0 */ sll $v0, $v0, 3 +/* 354E4 8005A0E4 00556021 */ addu $t4, $v0, $s5 +/* 354E8 8005A0E8 258200A0 */ addiu $v0, $t4, 0xa0 +/* 354EC 8005A0EC AD620004 */ sw $v0, 4($t3) +/* 354F0 8005A0F0 25620010 */ addiu $v0, $t3, 0x10 +/* 354F4 8005A0F4 AE020000 */ sw $v0, ($s0) +/* 354F8 8005A0F8 3C02D900 */ lui $v0, 0xd900 +/* 354FC 8005A0FC AD620008 */ sw $v0, 8($t3) +/* 35500 8005A100 25620018 */ addiu $v0, $t3, 0x18 +/* 35504 8005A104 AD60000C */ sw $zero, 0xc($t3) +/* 35508 8005A108 AE020000 */ sw $v0, ($s0) +/* 3550C 8005A10C 25620020 */ addiu $v0, $t3, 0x20 +/* 35510 8005A110 AD660010 */ sw $a2, 0x10($t3) +/* 35514 8005A114 AD650014 */ sw $a1, 0x14($t3) +/* 35518 8005A118 AE020000 */ sw $v0, ($s0) +/* 3551C 8005A11C 8583000E */ lh $v1, 0xe($t4) +/* 35520 8005A120 25620028 */ addiu $v0, $t3, 0x28 +/* 35524 8005A124 AE020000 */ sw $v0, ($s0) +/* 35528 8005A128 44831000 */ mtc1 $v1, $f2 +/* 3552C 8005A12C 00000000 */ nop +/* 35530 8005A130 468010A0 */ cvt.s.w $f2, $f2 +/* 35534 8005A134 46141082 */ mul.s $f2, $f2, $f20 +/* 35538 8005A138 00000000 */ nop +/* 3553C 8005A13C 85830010 */ lh $v1, 0x10($t4) +/* 35540 8005A140 25620030 */ addiu $v0, $t3, 0x30 +/* 35544 8005A144 AE020000 */ sw $v0, ($s0) +/* 35548 8005A148 25620038 */ addiu $v0, $t3, 0x38 +/* 3554C 8005A14C 44830000 */ mtc1 $v1, $f0 +/* 35550 8005A150 00000000 */ nop +/* 35554 8005A154 46800020 */ cvt.s.w $f0, $f0 +/* 35558 8005A158 46140002 */ mul.s $f0, $f0, $f20 +/* 3555C 8005A15C 00000000 */ nop +/* 35560 8005A160 AE020000 */ sw $v0, ($s0) +/* 35564 8005A164 4600110D */ trunc.w.s $f4, $f2 +/* 35568 8005A168 44032000 */ mfc1 $v1, $f4 +/* 3556C 8005A16C 00000000 */ nop +/* 35570 8005A170 30630FFF */ andi $v1, $v1, 0xfff +/* 35574 8005A174 00031B00 */ sll $v1, $v1, 0xc +/* 35578 8005A178 4600010D */ trunc.w.s $f4, $f0 +/* 3557C 8005A17C 44022000 */ mfc1 $v0, $f4 +/* 35580 8005A180 00000000 */ nop +/* 35584 8005A184 30420FFF */ andi $v0, $v0, 0xfff +/* 35588 8005A188 00441025 */ or $v0, $v0, $a0 +/* 3558C 8005A18C 00621825 */ or $v1, $v1, $v0 +/* 35590 8005A190 AD630018 */ sw $v1, 0x18($t3) +/* 35594 8005A194 8583000E */ lh $v1, 0xe($t4) +/* 35598 8005A198 8585000A */ lh $a1, 0xa($t4) +/* 3559C 8005A19C 85840010 */ lh $a0, 0x10($t4) +/* 355A0 8005A1A0 8586000C */ lh $a2, 0xc($t4) +/* 355A4 8005A1A4 25620040 */ addiu $v0, $t3, 0x40 +/* 355A8 8005A1A8 AE020000 */ sw $v0, ($s0) +/* 355AC 8005A1AC AD670020 */ sw $a3, 0x20($t3) +/* 355B0 8005A1B0 AD740024 */ sw $s4, 0x24($t3) +/* 355B4 8005A1B4 AD680028 */ sw $t0, 0x28($t3) +/* 355B8 8005A1B8 00651821 */ addu $v1, $v1, $a1 +/* 355BC 8005A1BC 44831000 */ mtc1 $v1, $f2 +/* 355C0 8005A1C0 00000000 */ nop +/* 355C4 8005A1C4 468010A0 */ cvt.s.w $f2, $f2 +/* 355C8 8005A1C8 46141082 */ mul.s $f2, $f2, $f20 +/* 355CC 8005A1CC 00000000 */ nop +/* 355D0 8005A1D0 AD74002C */ sw $s4, 0x2c($t3) +/* 355D4 8005A1D4 AD690030 */ sw $t1, 0x30($t3) +/* 355D8 8005A1D8 00862021 */ addu $a0, $a0, $a2 +/* 355DC 8005A1DC 44840000 */ mtc1 $a0, $f0 +/* 355E0 8005A1E0 00000000 */ nop +/* 355E4 8005A1E4 46800020 */ cvt.s.w $f0, $f0 +/* 355E8 8005A1E8 46140002 */ mul.s $f0, $f0, $f20 +/* 355EC 8005A1EC 00000000 */ nop +/* 355F0 8005A1F0 AD730034 */ sw $s3, 0x34($t3) +/* 355F4 8005A1F4 4600110D */ trunc.w.s $f4, $f2 +/* 355F8 8005A1F8 44032000 */ mfc1 $v1, $f4 +/* 355FC 8005A1FC 00000000 */ nop +/* 35600 8005A200 30630FFF */ andi $v1, $v1, 0xfff +/* 35604 8005A204 00031B00 */ sll $v1, $v1, 0xc +/* 35608 8005A208 4600010D */ trunc.w.s $f4, $f0 +/* 3560C 8005A20C 44022000 */ mfc1 $v0, $f4 +/* 35610 8005A210 00000000 */ nop +/* 35614 8005A214 30420FFF */ andi $v0, $v0, 0xfff +/* 35618 8005A218 00621825 */ or $v1, $v1, $v0 +/* 3561C 8005A21C AD63001C */ sw $v1, 0x1c($t3) +/* 35620 8005A220 AD6A0038 */ sw $t2, 0x38($t3) +/* 35624 8005A224 AD73003C */ sw $s3, 0x3c($t3) +/* 35628 8005A228 95820000 */ lhu $v0, ($t4) +/* 3562C 8005A22C 30420010 */ andi $v0, $v0, 0x10 +/* 35630 8005A230 14400012 */ bnez $v0, .L8005A27C +/* 35634 8005A234 0000882D */ daddu $s1, $zero, $zero +/* 35638 8005A238 3C04DA38 */ lui $a0, 0xda38 +/* 3563C 8005A23C 34840007 */ ori $a0, $a0, 7 +/* 35640 8005A240 25620048 */ addiu $v0, $t3, 0x48 +/* 35644 8005A244 AE020000 */ sw $v0, ($s0) +/* 35648 8005A248 3C02DB0E */ lui $v0, 0xdb0e +/* 3564C 8005A24C AD620040 */ sw $v0, 0x40($t3) +/* 35650 8005A250 95830038 */ lhu $v1, 0x38($t4) +/* 35654 8005A254 25620050 */ addiu $v0, $t3, 0x50 +/* 35658 8005A258 AE020000 */ sw $v0, ($s0) +/* 3565C 8005A25C 000D1180 */ sll $v0, $t5, 6 +/* 35660 8005A260 AD630044 */ sw $v1, 0x44($t3) +/* 35664 8005A264 3C03800A */ lui $v1, 0x800a +/* 35668 8005A268 8C63A674 */ lw $v1, -0x598c($v1) +/* 3566C 8005A26C 24420030 */ addiu $v0, $v0, 0x30 +/* 35670 8005A270 AD640048 */ sw $a0, 0x48($t3) +/* 35674 8005A274 00621821 */ addu $v1, $v1, $v0 +/* 35678 8005A278 AD63004C */ sw $v1, 0x4c($t3) +.L8005A27C: +/* 3567C 8005A27C 01E0F809 */ jalr $t7 +/* 35680 8005A280 01C0202D */ daddu $a0, $t6, $zero +/* 35684 8005A284 26520001 */ addiu $s2, $s2, 1 +.L8005A288: +/* 35688 8005A288 2A420060 */ slti $v0, $s2, 0x60 +/* 3568C 8005A28C 5440FF55 */ bnel $v0, $zero, .L80059FE4 +/* 35690 8005A290 00121080 */ sll $v0, $s2, 2 +/* 35694 8005A294 8FBF0028 */ lw $ra, 0x28($sp) +/* 35698 8005A298 8FB50024 */ lw $s5, 0x24($sp) +/* 3569C 8005A29C 8FB40020 */ lw $s4, 0x20($sp) +/* 356A0 8005A2A0 8FB3001C */ lw $s3, 0x1c($sp) +/* 356A4 8005A2A4 8FB20018 */ lw $s2, 0x18($sp) +/* 356A8 8005A2A8 8FB10014 */ lw $s1, 0x14($sp) +/* 356AC 8005A2AC 8FB00010 */ lw $s0, 0x10($sp) +/* 356B0 8005A2B0 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 356B4 8005A2B4 03E00008 */ jr $ra +/* 356B8 8005A2B8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/world/func_8005A2BC.s b/asm/nonmatchings/world/world/func_8005A2BC.s new file mode 100644 index 0000000000..82657661e3 --- /dev/null +++ b/asm/nonmatchings/world/world/func_8005A2BC.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8005A2BC +/* 356BC 8005A2BC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 356C0 8005A2C0 AFB20018 */ sw $s2, 0x18($sp) +/* 356C4 8005A2C4 0080902D */ daddu $s2, $a0, $zero +/* 356C8 8005A2C8 AFB00010 */ sw $s0, 0x10($sp) +/* 356CC 8005A2CC 0000802D */ daddu $s0, $zero, $zero +/* 356D0 8005A2D0 3C03800B */ lui $v1, 0x800b +/* 356D4 8005A2D4 24634398 */ addiu $v1, $v1, 0x4398 +/* 356D8 8005A2D8 AFBF001C */ sw $ra, 0x1c($sp) +/* 356DC 8005A2DC AFB10014 */ sw $s1, 0x14($sp) +.L8005A2E0: +/* 356E0 8005A2E0 8C620000 */ lw $v0, ($v1) +/* 356E4 8005A2E4 10400006 */ beqz $v0, .L8005A300 +/* 356E8 8005A2E8 2A020060 */ slti $v0, $s0, 0x60 +/* 356EC 8005A2EC 26100001 */ addiu $s0, $s0, 1 +/* 356F0 8005A2F0 2A020060 */ slti $v0, $s0, 0x60 +/* 356F4 8005A2F4 1440FFFA */ bnez $v0, .L8005A2E0 +/* 356F8 8005A2F8 24630004 */ addiu $v1, $v1, 4 +/* 356FC 8005A2FC 2A020060 */ slti $v0, $s0, 0x60 +.L8005A300: +/* 35700 8005A300 14400003 */ bnez $v0, .L8005A310 +/* 35704 8005A304 00000000 */ nop +.L8005A308: +/* 35708 8005A308 080168C2 */ j .L8005A308 +/* 3570C 8005A30C 00000000 */ nop +.L8005A310: +/* 35710 8005A310 0C00AB0A */ jal general_heap_malloc +/* 35714 8005A314 24040014 */ addiu $a0, $zero, 0x14 +/* 35718 8005A318 00101880 */ sll $v1, $s0, 2 +/* 3571C 8005A31C 0040882D */ daddu $s1, $v0, $zero +/* 35720 8005A320 3C01800B */ lui $at, 0x800b +/* 35724 8005A324 00230821 */ addu $at, $at, $v1 +/* 35728 8005A328 AC314398 */ sw $s1, 0x4398($at) +/* 3572C 8005A32C 16200003 */ bnez $s1, .L8005A33C +/* 35730 8005A330 0000802D */ daddu $s0, $zero, $zero +.L8005A334: +/* 35734 8005A334 080168CD */ j .L8005A334 +/* 35738 8005A338 00000000 */ nop +.L8005A33C: +/* 3573C 8005A33C 3C04800A */ lui $a0, 0x800a +/* 35740 8005A340 24844000 */ addiu $a0, $a0, 0x4000 +/* 35744 8005A344 8E430004 */ lw $v1, 4($s2) +/* 35748 8005A348 24020001 */ addiu $v0, $zero, 1 +/* 3574C 8005A34C AE220000 */ sw $v0, ($s1) +/* 35750 8005A350 AE230004 */ sw $v1, 4($s1) +.L8005A354: +/* 35754 8005A354 8C820000 */ lw $v0, ($a0) +/* 35758 8005A358 30420001 */ andi $v0, $v0, 1 +/* 3575C 8005A35C 50400006 */ beql $v0, $zero, .L8005A378 +/* 35760 8005A360 26100001 */ addiu $s0, $s0, 1 +/* 35764 8005A364 8C830004 */ lw $v1, 4($a0) +/* 35768 8005A368 8E420004 */ lw $v0, 4($s2) +/* 3576C 8005A36C 10620006 */ beq $v1, $v0, .L8005A388 +/* 35770 8005A370 2A02000F */ slti $v0, $s0, 0xf +/* 35774 8005A374 26100001 */ addiu $s0, $s0, 1 +.L8005A378: +/* 35778 8005A378 2A02000F */ slti $v0, $s0, 0xf +/* 3577C 8005A37C 1440FFF5 */ bnez $v0, .L8005A354 +/* 35780 8005A380 24840020 */ addiu $a0, $a0, 0x20 +/* 35784 8005A384 2A02000F */ slti $v0, $s0, 0xf +.L8005A388: +/* 35788 8005A388 14400003 */ bnez $v0, .L8005A398 +/* 3578C 8005A38C 00000000 */ nop +.L8005A390: +/* 35790 8005A390 080168E4 */ j .L8005A390 +/* 35794 8005A394 00000000 */ nop +.L8005A398: +/* 35798 8005A398 8C820008 */ lw $v0, 8($a0) +/* 3579C 8005A39C 14400016 */ bnez $v0, .L8005A3F8 +/* 357A0 8005A3A0 24420001 */ addiu $v0, $v0, 1 +/* 357A4 8005A3A4 8E42000C */ lw $v0, 0xc($s2) +/* 357A8 8005A3A8 14400004 */ bnez $v0, .L8005A3BC +/* 357AC 8005A3AC AC820010 */ sw $v0, 0x10($a0) +/* 357B0 8005A3B0 3C028006 */ lui $v0, 0x8006 +/* 357B4 8005A3B4 24429C80 */ addiu $v0, $v0, -0x6380 +/* 357B8 8005A3B8 AC820014 */ sw $v0, 0x14($a0) +.L8005A3BC: +/* 357BC 8005A3BC 8E420010 */ lw $v0, 0x10($s2) +/* 357C0 8005A3C0 8C830018 */ lw $v1, 0x18($a0) +/* 357C4 8005A3C4 14600004 */ bnez $v1, .L8005A3D8 +/* 357C8 8005A3C8 AC820014 */ sw $v0, 0x14($a0) +/* 357CC 8005A3CC 3C028006 */ lui $v0, 0x8006 +/* 357D0 8005A3D0 24429C80 */ addiu $v0, $v0, -0x6380 +/* 357D4 8005A3D4 AC820018 */ sw $v0, 0x18($a0) +.L8005A3D8: +/* 357D8 8005A3D8 8E420014 */ lw $v0, 0x14($s2) +/* 357DC 8005A3DC 14400004 */ bnez $v0, .L8005A3F0 +/* 357E0 8005A3E0 AC820018 */ sw $v0, 0x18($a0) +/* 357E4 8005A3E4 3C028006 */ lui $v0, 0x8006 +/* 357E8 8005A3E8 24429C80 */ addiu $v0, $v0, -0x6380 +/* 357EC 8005A3EC AC820018 */ sw $v0, 0x18($a0) +.L8005A3F0: +/* 357F0 8005A3F0 8C820008 */ lw $v0, 8($a0) +/* 357F4 8005A3F4 24420001 */ addiu $v0, $v0, 1 +.L8005A3F8: +/* 357F8 8005A3F8 AC820008 */ sw $v0, 8($a0) +/* 357FC 8005A3FC AE240010 */ sw $a0, 0x10($s1) +/* 35800 8005A400 8E420008 */ lw $v0, 8($s2) +/* 35804 8005A404 10400003 */ beqz $v0, .L8005A414 +/* 35808 8005A408 00000000 */ nop +/* 3580C 8005A40C 0040F809 */ jalr $v0 +/* 35810 8005A410 0220202D */ daddu $a0, $s1, $zero +.L8005A414: +/* 35814 8005A414 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 35818 8005A418 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 3581C 8005A41C 80420070 */ lb $v0, 0x70($v0) +/* 35820 8005A420 10400005 */ beqz $v0, .L8005A438 +/* 35824 8005A424 0220102D */ daddu $v0, $s1, $zero +/* 35828 8005A428 8E220000 */ lw $v0, ($s1) +/* 3582C 8005A42C 34420004 */ ori $v0, $v0, 4 +/* 35830 8005A430 AE220000 */ sw $v0, ($s1) +/* 35834 8005A434 0220102D */ daddu $v0, $s1, $zero +.L8005A438: +/* 35838 8005A438 8FBF001C */ lw $ra, 0x1c($sp) +/* 3583C 8005A43C 8FB20018 */ lw $s2, 0x18($sp) +/* 35840 8005A440 8FB10014 */ lw $s1, 0x14($sp) +/* 35844 8005A444 8FB00010 */ lw $s0, 0x10($sp) +/* 35848 8005A448 03E00008 */ jr $ra +/* 3584C 8005A44C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/world/get_asset_offset.s b/asm/nonmatchings/world/world/get_asset_offset.s new file mode 100644 index 0000000000..fcb7cc7f75 --- /dev/null +++ b/asm/nonmatchings/world/world/get_asset_offset.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel get_asset_offset +/* 361D0 8005ADD0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 361D4 8005ADD4 AFB20038 */ sw $s2, 0x38($sp) +/* 361D8 8005ADD8 0080902D */ daddu $s2, $a0, $zero +/* 361DC 8005ADDC AFB3003C */ sw $s3, 0x3c($sp) +/* 361E0 8005ADE0 00A0982D */ daddu $s3, $a1, $zero +/* 361E4 8005ADE4 3C0401E4 */ lui $a0, 0x1e4 +/* 361E8 8005ADE8 34840020 */ ori $a0, $a0, 0x20 +/* 361EC 8005ADEC 3C0501E4 */ lui $a1, 0x1e4 +/* 361F0 8005ADF0 34A5003C */ ori $a1, $a1, 0x3c +/* 361F4 8005ADF4 27A60010 */ addiu $a2, $sp, 0x10 +/* 361F8 8005ADF8 AFBF0040 */ sw $ra, 0x40($sp) +/* 361FC 8005ADFC AFB10034 */ sw $s1, 0x34($sp) +/* 36200 8005AE00 0C00A5CF */ jal dma_copy +/* 36204 8005AE04 AFB00030 */ sw $s0, 0x30($sp) +/* 36208 8005AE08 8FA40020 */ lw $a0, 0x20($sp) +/* 3620C 8005AE0C 0C00AB39 */ jal heap_malloc +/* 36210 8005AE10 00000000 */ nop +/* 36214 8005AE14 0040882D */ daddu $s1, $v0, $zero +/* 36218 8005AE18 0220802D */ daddu $s0, $s1, $zero +/* 3621C 8005AE1C 3C0201E4 */ lui $v0, 0x1e4 +/* 36220 8005AE20 34420020 */ ori $v0, $v0, 0x20 +/* 36224 8005AE24 3C0401E4 */ lui $a0, 0x1e4 +/* 36228 8005AE28 34840020 */ ori $a0, $a0, 0x20 +/* 3622C 8005AE2C 8FA50020 */ lw $a1, 0x20($sp) +/* 36230 8005AE30 0220302D */ daddu $a2, $s1, $zero +/* 36234 8005AE34 0C00A5CF */ jal dma_copy +/* 36238 8005AE38 00A22821 */ addu $a1, $a1, $v0 +.L8005AE3C: +/* 3623C 8005AE3C 0200202D */ daddu $a0, $s0, $zero +/* 36240 8005AE40 0C01BB5C */ jal strcmp +/* 36244 8005AE44 0240282D */ daddu $a1, $s2, $zero +/* 36248 8005AE48 10400003 */ beqz $v0, .L8005AE58 +/* 3624C 8005AE4C 3C0301E4 */ lui $v1, 0x1e4 +/* 36250 8005AE50 08016B8F */ j .L8005AE3C +/* 36254 8005AE54 2610001C */ addiu $s0, $s0, 0x1c +.L8005AE58: +/* 36258 8005AE58 8E020014 */ lw $v0, 0x14($s0) +/* 3625C 8005AE5C 34630020 */ ori $v1, $v1, 0x20 +/* 36260 8005AE60 AE620000 */ sw $v0, ($s3) +/* 36264 8005AE64 8E100010 */ lw $s0, 0x10($s0) +/* 36268 8005AE68 0220202D */ daddu $a0, $s1, $zero +/* 3626C 8005AE6C 0C00AB4B */ jal heap_free +/* 36270 8005AE70 02038021 */ addu $s0, $s0, $v1 +/* 36274 8005AE74 0200102D */ daddu $v0, $s0, $zero +/* 36278 8005AE78 8FBF0040 */ lw $ra, 0x40($sp) +/* 3627C 8005AE7C 8FB3003C */ lw $s3, 0x3c($sp) +/* 36280 8005AE80 8FB20038 */ lw $s2, 0x38($sp) +/* 36284 8005AE84 8FB10034 */ lw $s1, 0x34($sp) +/* 36288 8005AE88 8FB00030 */ lw $s0, 0x30($sp) +/* 3628C 8005AE8C 03E00008 */ jr $ra +/* 36290 8005AE90 27BD0048 */ addiu $sp, $sp, 0x48 +/* 36294 8005AE94 00000000 */ nop +/* 36298 8005AE98 00000000 */ nop +/* 3629C 8005AE9C 00000000 */ nop diff --git a/asm/nonmatchings/world/world/get_current_map_config.s b/asm/nonmatchings/world/world/get_current_map_config.s new file mode 100644 index 0000000000..b59d381a0f --- /dev/null +++ b/asm/nonmatchings/world/world/get_current_map_config.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel get_current_map_config +/* 35FD8 8005ABD8 3C02800A */ lui $v0, 0x800a +/* 35FDC 8005ABDC 8C4241E0 */ lw $v0, 0x41e0($v0) +/* 35FE0 8005ABE0 03E00008 */ jr $ra +/* 35FE4 8005ABE4 00000000 */ nop diff --git a/asm/nonmatchings/world/world/get_current_map_header.s b/asm/nonmatchings/world/world/get_current_map_header.s new file mode 100644 index 0000000000..866291ad6f --- /dev/null +++ b/asm/nonmatchings/world/world/get_current_map_header.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel get_current_map_header +/* 35FE8 8005ABE8 3C02800A */ lui $v0, 0x800a +/* 35FEC 8005ABEC 244241E8 */ addiu $v0, $v0, 0x41e8 +/* 35FF0 8005ABF0 03E00008 */ jr $ra +/* 35FF4 8005ABF4 00000000 */ nop diff --git a/asm/nonmatchings/world/world/get_map_IDs_by_name.s b/asm/nonmatchings/world/world/get_map_IDs_by_name.s new file mode 100644 index 0000000000..72e6bb7711 --- /dev/null +++ b/asm/nonmatchings/world/world/get_map_IDs_by_name.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel get_map_IDs_by_name +/* 35FF8 8005ABF8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 35FFC 8005ABFC AFB50024 */ sw $s5, 0x24($sp) +/* 36000 8005AC00 0080A82D */ daddu $s5, $a0, $zero +/* 36004 8005AC04 AFB60028 */ sw $s6, 0x28($sp) +/* 36008 8005AC08 00A0B02D */ daddu $s6, $a1, $zero +/* 3600C 8005AC0C AFB7002C */ sw $s7, 0x2c($sp) +/* 36010 8005AC10 00C0B82D */ daddu $s7, $a2, $zero +/* 36014 8005AC14 3C028009 */ lui $v0, %hi(gAreas) +/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, %lo(gAreas) +/* 3601C 8005AC1C AFBF0030 */ sw $ra, 0x30($sp) +/* 36020 8005AC20 AFB40020 */ sw $s4, 0x20($sp) +/* 36024 8005AC24 AFB3001C */ sw $s3, 0x1c($sp) +/* 36028 8005AC28 AFB20018 */ sw $s2, 0x18($sp) +/* 3602C 8005AC2C AFB10014 */ sw $s1, 0x14($sp) +/* 36030 8005AC30 AFB00010 */ sw $s0, 0x10($sp) +/* 36034 8005AC34 8C440004 */ lw $a0, 4($v0) +/* 36038 8005AC38 1080001F */ beqz $a0, .L8005ACB8 +/* 3603C 8005AC3C 0000A02D */ daddu $s4, $zero, $zero +/* 36040 8005AC40 0280902D */ daddu $s2, $s4, $zero +.L8005AC44: +/* 36044 8005AC44 02421021 */ addu $v0, $s2, $v0 +/* 36048 8005AC48 8C420000 */ lw $v0, ($v0) +/* 3604C 8005AC4C 18400012 */ blez $v0, .L8005AC98 +/* 36050 8005AC50 0000802D */ daddu $s0, $zero, $zero +/* 36054 8005AC54 3C028009 */ lui $v0, %hi(gAreas) +/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, %lo(gAreas) +/* 3605C 8005AC5C 02429821 */ addu $s3, $s2, $v0 +/* 36060 8005AC60 0080882D */ daddu $s1, $a0, $zero +.L8005AC64: +/* 36064 8005AC64 8E240000 */ lw $a0, ($s1) +/* 36068 8005AC68 0C01BB5C */ jal strcmp +/* 3606C 8005AC6C 02A0282D */ daddu $a1, $s5, $zero +/* 36070 8005AC70 54400005 */ bnel $v0, $zero, .L8005AC88 +/* 36074 8005AC74 26100001 */ addiu $s0, $s0, 1 +/* 36078 8005AC78 24020001 */ addiu $v0, $zero, 1 +/* 3607C 8005AC7C A6D40000 */ sh $s4, ($s6) +/* 36080 8005AC80 08016B2F */ j .L8005ACBC +/* 36084 8005AC84 A6F00000 */ sh $s0, ($s7) +.L8005AC88: +/* 36088 8005AC88 8E620000 */ lw $v0, ($s3) +/* 3608C 8005AC8C 0202102A */ slt $v0, $s0, $v0 +/* 36090 8005AC90 1440FFF4 */ bnez $v0, .L8005AC64 +/* 36094 8005AC94 26310020 */ addiu $s1, $s1, 0x20 +.L8005AC98: +/* 36098 8005AC98 26520010 */ addiu $s2, $s2, 0x10 +/* 3609C 8005AC9C 3C048009 */ lui $a0, 0x8009 +/* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2 +/* 360A4 8005ACA4 8C8434F4 */ lw $a0, 0x34f4($a0) +/* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas) +/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas) +/* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44 +/* 360B4 8005ACB4 26940001 */ addiu $s4, $s4, 1 +.L8005ACB8: +/* 360B8 8005ACB8 0000102D */ daddu $v0, $zero, $zero +.L8005ACBC: +/* 360BC 8005ACBC 8FBF0030 */ lw $ra, 0x30($sp) +/* 360C0 8005ACC0 8FB7002C */ lw $s7, 0x2c($sp) +/* 360C4 8005ACC4 8FB60028 */ lw $s6, 0x28($sp) +/* 360C8 8005ACC8 8FB50024 */ lw $s5, 0x24($sp) +/* 360CC 8005ACCC 8FB40020 */ lw $s4, 0x20($sp) +/* 360D0 8005ACD0 8FB3001C */ lw $s3, 0x1c($sp) +/* 360D4 8005ACD4 8FB20018 */ lw $s2, 0x18($sp) +/* 360D8 8005ACD8 8FB10014 */ lw $s1, 0x14($sp) +/* 360DC 8005ACDC 8FB00010 */ lw $s0, 0x10($sp) +/* 360E0 8005ACE0 03E00008 */ jr $ra +/* 360E4 8005ACE4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/world/load_asset_by_name.s b/asm/nonmatchings/world/world/load_asset_by_name.s new file mode 100644 index 0000000000..97be367b37 --- /dev/null +++ b/asm/nonmatchings/world/world/load_asset_by_name.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel load_asset_by_name +/* 360E8 8005ACE8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 360EC 8005ACEC AFB00030 */ sw $s0, 0x30($sp) +/* 360F0 8005ACF0 0080802D */ daddu $s0, $a0, $zero +/* 360F4 8005ACF4 AFB3003C */ sw $s3, 0x3c($sp) +/* 360F8 8005ACF8 00A0982D */ daddu $s3, $a1, $zero +/* 360FC 8005ACFC 3C0401E4 */ lui $a0, 0x1e4 +/* 36100 8005AD00 34840020 */ ori $a0, $a0, 0x20 +/* 36104 8005AD04 3C0501E4 */ lui $a1, 0x1e4 +/* 36108 8005AD08 34A5003C */ ori $a1, $a1, 0x3c +/* 3610C 8005AD0C 27A60010 */ addiu $a2, $sp, 0x10 +/* 36110 8005AD10 AFBF0040 */ sw $ra, 0x40($sp) +/* 36114 8005AD14 AFB20038 */ sw $s2, 0x38($sp) +/* 36118 8005AD18 0C00A5CF */ jal dma_copy +/* 3611C 8005AD1C AFB10034 */ sw $s1, 0x34($sp) +/* 36120 8005AD20 8FA40020 */ lw $a0, 0x20($sp) +/* 36124 8005AD24 0C00AB39 */ jal heap_malloc +/* 36128 8005AD28 00000000 */ nop +/* 3612C 8005AD2C 0040902D */ daddu $s2, $v0, $zero +/* 36130 8005AD30 0240882D */ daddu $s1, $s2, $zero +/* 36134 8005AD34 3C0201E4 */ lui $v0, 0x1e4 +/* 36138 8005AD38 34420020 */ ori $v0, $v0, 0x20 +/* 3613C 8005AD3C 3C0401E4 */ lui $a0, 0x1e4 +/* 36140 8005AD40 34840020 */ ori $a0, $a0, 0x20 +/* 36144 8005AD44 8FA50020 */ lw $a1, 0x20($sp) +/* 36148 8005AD48 0240302D */ daddu $a2, $s2, $zero +/* 3614C 8005AD4C 0C00A5CF */ jal dma_copy +/* 36150 8005AD50 00A22821 */ addu $a1, $a1, $v0 +.L8005AD54: +/* 36154 8005AD54 0220202D */ daddu $a0, $s1, $zero +/* 36158 8005AD58 0C01BB5C */ jal strcmp +/* 3615C 8005AD5C 0200282D */ daddu $a1, $s0, $zero +/* 36160 8005AD60 10400003 */ beqz $v0, .L8005AD70 +/* 36164 8005AD64 00000000 */ nop +/* 36168 8005AD68 08016B55 */ j .L8005AD54 +/* 3616C 8005AD6C 2631001C */ addiu $s1, $s1, 0x1c +.L8005AD70: +/* 36170 8005AD70 8E220018 */ lw $v0, 0x18($s1) +/* 36174 8005AD74 AE620000 */ sw $v0, ($s3) +/* 36178 8005AD78 0C00AB0A */ jal general_heap_malloc +/* 3617C 8005AD7C 8E240014 */ lw $a0, 0x14($s1) +/* 36180 8005AD80 3C0301E4 */ lui $v1, 0x1e4 +/* 36184 8005AD84 34630020 */ ori $v1, $v1, 0x20 +/* 36188 8005AD88 0040802D */ daddu $s0, $v0, $zero +/* 3618C 8005AD8C 0040302D */ daddu $a2, $v0, $zero +/* 36190 8005AD90 8E220010 */ lw $v0, 0x10($s1) +/* 36194 8005AD94 8E250014 */ lw $a1, 0x14($s1) +/* 36198 8005AD98 00432021 */ addu $a0, $v0, $v1 +/* 3619C 8005AD9C 00A32821 */ addu $a1, $a1, $v1 +/* 361A0 8005ADA0 0C00A5CF */ jal dma_copy +/* 361A4 8005ADA4 00452821 */ addu $a1, $v0, $a1 +/* 361A8 8005ADA8 0C00AB4B */ jal heap_free +/* 361AC 8005ADAC 0240202D */ daddu $a0, $s2, $zero +/* 361B0 8005ADB0 0200102D */ daddu $v0, $s0, $zero +/* 361B4 8005ADB4 8FBF0040 */ lw $ra, 0x40($sp) +/* 361B8 8005ADB8 8FB3003C */ lw $s3, 0x3c($sp) +/* 361BC 8005ADBC 8FB20038 */ lw $s2, 0x38($sp) +/* 361C0 8005ADC0 8FB10034 */ lw $s1, 0x34($sp) +/* 361C4 8005ADC4 8FB00030 */ lw $s0, 0x30($sp) +/* 361C8 8005ADC8 03E00008 */ jr $ra +/* 361CC 8005ADCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s new file mode 100644 index 0000000000..34eb98d497 --- /dev/null +++ b/asm/nonmatchings/world/world/load_map_by_IDs.s @@ -0,0 +1,333 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel load_map_by_IDs +/* 35AF4 8005A6F4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 35AF8 8005A6F8 AFB00038 */ sw $s0, 0x38($sp) +/* 35AFC 8005A6FC 00C0802D */ daddu $s0, $a2, $zero +/* 35B00 8005A700 AFB1003C */ sw $s1, 0x3c($sp) +/* 35B04 8005A704 0080882D */ daddu $s1, $a0, $zero +/* 35B08 8005A708 AFB30044 */ sw $s3, 0x44($sp) +/* 35B0C 8005A70C 00A0982D */ daddu $s3, $a1, $zero +/* 35B10 8005A710 AFB40048 */ sw $s4, 0x48($sp) +/* 35B14 8005A714 0000A02D */ daddu $s4, $zero, $zero +/* 35B18 8005A718 AFBF004C */ sw $ra, 0x4c($sp) +/* 35B1C 8005A71C 0C05260E */ jal func_80149838 +/* 35B20 8005A720 AFB20040 */ sw $s2, 0x40($sp) +/* 35B24 8005A724 3C05800A */ lui $a1, %hi(D_8009A650) +/* 35B28 8005A728 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) +/* 35B2C 8005A72C 2402FFBF */ addiu $v0, $zero, -0x41 +/* 35B30 8005A730 3C128007 */ lui $s2, %hi(gGameStatusPtr) +/* 35B34 8005A734 2652419C */ addiu $s2, $s2, %lo(gGameStatusPtr) +/* 35B38 8005A738 8CA30000 */ lw $v1, ($a1) +/* 35B3C 8005A73C 8E440000 */ lw $a0, ($s2) +/* 35B40 8005A740 00621824 */ and $v1, $v1, $v0 +/* 35B44 8005A744 2402FF7F */ addiu $v0, $zero, -0x81 +/* 35B48 8005A748 00621824 */ and $v1, $v1, $v0 +/* 35B4C 8005A74C ACA30000 */ sw $v1, ($a1) +/* 35B50 8005A750 0C00B458 */ jal func_8002D160 +/* 35B54 8005A754 A0800084 */ sb $zero, 0x84($a0) +/* 35B58 8005A758 0C0AC81E */ jal func_802B2078 +/* 35B5C 8005A75C 00108400 */ sll $s0, $s0, 0x10 +/* 35B60 8005A760 0C047624 */ jal func_8011D890 +/* 35B64 8005A764 00108403 */ sra $s0, $s0, 0x10 +/* 35B68 8005A768 0C048C2E */ jal clear_dynamic_entity_list +/* 35B6C 8005A76C 00000000 */ nop +/* 35B70 8005A770 0C0B0C77 */ jal clear_script_list +/* 35B74 8005A774 00000000 */ nop +/* 35B78 8005A778 12000005 */ beqz $s0, .L8005A790 +/* 35B7C 8005A77C 24020001 */ addiu $v0, $zero, 1 +/* 35B80 8005A780 12020008 */ beq $s0, $v0, .L8005A7A4 +/* 35B84 8005A784 00000000 */ nop +/* 35B88 8005A788 080169F0 */ j .L8005A7C0 +/* 35B8C 8005A78C 00000000 */ nop +.L8005A790: +/* 35B90 8005A790 0C0514E4 */ jal clear_area_flags +/* 35B94 8005A794 00000000 */ nop +/* 35B98 8005A798 8E420000 */ lw $v0, ($s2) +/* 35B9C 8005A79C 080169F0 */ j .L8005A7C0 +/* 35BA0 8005A7A0 A0400167 */ sb $zero, 0x167($v0) +.L8005A7A4: +/* 35BA4 8005A7A4 0C00AD24 */ jal fio_deserialize_state +/* 35BA8 8005A7A8 00000000 */ nop +/* 35BAC 8005A7AC 8E420000 */ lw $v0, ($s2) +/* 35BB0 8005A7B0 94510086 */ lhu $s1, 0x86($v0) +/* 35BB4 8005A7B4 9453008C */ lhu $s3, 0x8c($v0) +/* 35BB8 8005A7B8 A0500167 */ sb $s0, 0x167($v0) +/* 35BBC 8005A7BC A4510088 */ sh $s1, 0x88($v0) +.L8005A7C0: +/* 35BC0 8005A7C0 3C04800E */ lui $a0, 0x800e +/* 35BC4 8005A7C4 24849230 */ addiu $a0, $a0, -0x6dd0 +/* 35BC8 8005A7C8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 35BCC 8005A7CC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 35BD0 8005A7D0 00131C00 */ sll $v1, $s3, 0x10 +/* 35BD4 8005A7D4 AC400144 */ sw $zero, 0x144($v0) +/* 35BD8 8005A7D8 00111400 */ sll $v0, $s1, 0x10 +/* 35BDC 8005A7DC 00021303 */ sra $v0, $v0, 0xc +/* 35BE0 8005A7E0 3C018009 */ lui $at, 0x8009 +/* 35BE4 8005A7E4 00220821 */ addu $at, $at, $v0 +/* 35BE8 8005A7E8 8C2234F4 */ lw $v0, 0x34f4($at) +/* 35BEC 8005A7EC 00031AC3 */ sra $v1, $v1, 0xb +/* 35BF0 8005A7F0 00439021 */ addu $s2, $v0, $v1 +/* 35BF4 8005A7F4 8E460000 */ lw $a2, ($s2) +/* 35BF8 8005A7F8 3C05800A */ lui $a1, 0x800a +/* 35BFC 8005A7FC 0C01953C */ jal sprintf +/* 35C00 8005A800 24A58A10 */ addiu $a1, $a1, -0x75f0 +/* 35C04 8005A804 3C04800E */ lui $a0, 0x800e +/* 35C08 8005A808 248491E0 */ addiu $a0, $a0, -0x6e20 +/* 35C0C 8005A80C 8E460000 */ lw $a2, ($s2) +/* 35C10 8005A810 3C05800A */ lui $a1, 0x800a +/* 35C14 8005A814 0C01953C */ jal sprintf +/* 35C18 8005A818 24A58A1C */ addiu $a1, $a1, -0x75e4 +/* 35C1C 8005A81C 8E450000 */ lw $a1, ($s2) +/* 35C20 8005A820 0C01BB50 */ jal strcpy +/* 35C24 8005A824 27A40018 */ addiu $a0, $sp, 0x18 +/* 35C28 8005A828 3C04800B */ lui $a0, 0x800b +/* 35C2C 8005A82C 24840CF0 */ addiu $a0, $a0, 0xcf0 +/* 35C30 8005A830 3C05800A */ lui $a1, 0x800a +/* 35C34 8005A834 24A58A24 */ addiu $a1, $a1, -0x75dc +/* 35C38 8005A838 27A60018 */ addiu $a2, $sp, 0x18 +/* 35C3C 8005A83C 0C01953C */ jal sprintf +/* 35C40 8005A840 A3A0001B */ sb $zero, 0x1b($sp) +/* 35C44 8005A844 8E450014 */ lw $a1, 0x14($s2) +/* 35C48 8005A848 3C01800A */ lui $at, 0x800a +/* 35C4C 8005A84C AC3241E0 */ sw $s2, 0x41e0($at) +/* 35C50 8005A850 10A00005 */ beqz $a1, .L8005A868 +/* 35C54 8005A854 00000000 */ nop +/* 35C58 8005A858 3C04800E */ lui $a0, 0x800e +/* 35C5C 8005A85C 24849668 */ addiu $a0, $a0, -0x6998 +/* 35C60 8005A860 0C01BB50 */ jal strcpy +/* 35C64 8005A864 00000000 */ nop +.L8005A868: +/* 35C68 8005A868 0C0169B0 */ jal load_world_script_api +/* 35C6C 8005A86C 00000000 */ nop +/* 35C70 8005A870 8E440008 */ lw $a0, 8($s2) +/* 35C74 8005A874 10800004 */ beqz $a0, .L8005A888 +/* 35C78 8005A878 00000000 */ nop +/* 35C7C 8005A87C 8E45000C */ lw $a1, 0xc($s2) +/* 35C80 8005A880 0C00A5CF */ jal dma_copy +/* 35C84 8005A884 8E460010 */ lw $a2, 0x10($s2) +.L8005A888: +/* 35C88 8005A888 8E420004 */ lw $v0, 4($s2) +/* 35C8C 8005A88C 3C03800A */ lui $v1, 0x800a +/* 35C90 8005A890 246341E8 */ addiu $v1, $v1, 0x41e8 +/* 35C94 8005A894 24440040 */ addiu $a0, $v0, 0x40 +.L8005A898: +/* 35C98 8005A898 8C480000 */ lw $t0, ($v0) +/* 35C9C 8005A89C 8C490004 */ lw $t1, 4($v0) +/* 35CA0 8005A8A0 8C4A0008 */ lw $t2, 8($v0) +/* 35CA4 8005A8A4 8C4B000C */ lw $t3, 0xc($v0) +/* 35CA8 8005A8A8 AC680000 */ sw $t0, ($v1) +/* 35CAC 8005A8AC AC690004 */ sw $t1, 4($v1) +/* 35CB0 8005A8B0 AC6A0008 */ sw $t2, 8($v1) +/* 35CB4 8005A8B4 AC6B000C */ sw $t3, 0xc($v1) +/* 35CB8 8005A8B8 24420010 */ addiu $v0, $v0, 0x10 +/* 35CBC 8005A8BC 1444FFF6 */ bne $v0, $a0, .L8005A898 +/* 35CC0 8005A8C0 24630010 */ addiu $v1, $v1, 0x10 +/* 35CC4 8005A8C4 8E420018 */ lw $v0, 0x18($s2) +/* 35CC8 8005A8C8 3C13800A */ lui $s3, 0x800a +/* 35CCC 8005A8CC 267341E8 */ addiu $s3, $s3, 0x41e8 +/* 35CD0 8005A8D0 10400004 */ beqz $v0, .L8005A8E4 +/* 35CD4 8005A8D4 00000000 */ nop +/* 35CD8 8005A8D8 0040F809 */ jalr $v0 +/* 35CDC 8005A8DC 00000000 */ nop +/* 35CE0 8005A8E0 0040A02D */ daddu $s4, $v0, $zero +.L8005A8E4: +/* 35CE4 8005A8E4 16800015 */ bnez $s4, .L8005A93C +/* 35CE8 8005A8E8 00000000 */ nop +/* 35CEC 8005A8EC 3C04800E */ lui $a0, 0x800e +/* 35CF0 8005A8F0 24849230 */ addiu $a0, $a0, -0x6dd0 +/* 35CF4 8005A8F4 0C016B3A */ jal load_asset_by_name +/* 35CF8 8005A8F8 27A50030 */ addiu $a1, $sp, 0x30 +/* 35CFC 8005A8FC 0040882D */ daddu $s1, $v0, $zero +/* 35D00 8005A900 0220202D */ daddu $a0, $s1, $zero +/* 35D04 8005A904 3C108021 */ lui $s0, 0x8021 +/* 35D08 8005A908 26100000 */ addiu $s0, $s0, 0 +/* 35D0C 8005A90C 0C01BB7C */ jal decode_yay0 +/* 35D10 8005A910 0200282D */ daddu $a1, $s0, $zero +/* 35D14 8005A914 0C00AB1E */ jal general_heap_free +/* 35D18 8005A918 0220202D */ daddu $a0, $s1, $zero +/* 35D1C 8005A91C 8E020000 */ lw $v0, ($s0) +/* 35D20 8005A920 8E030008 */ lw $v1, 8($s0) +/* 35D24 8005A924 8E04000C */ lw $a0, 0xc($s0) +/* 35D28 8005A928 8E050010 */ lw $a1, 0x10($s0) +/* 35D2C 8005A92C AE620000 */ sw $v0, ($s3) +/* 35D30 8005A930 AE630028 */ sw $v1, 0x28($s3) +/* 35D34 8005A934 AE64002C */ sw $a0, 0x2c($s3) +/* 35D38 8005A938 AE650030 */ sw $a1, 0x30($s3) +.L8005A93C: +/* 35D3C 8005A93C 8E420014 */ lw $v0, 0x14($s2) +/* 35D40 8005A940 10400005 */ beqz $v0, .L8005A958 +/* 35D44 8005A944 00000000 */ nop +/* 35D48 8005A948 3C04800E */ lui $a0, 0x800e +/* 35D4C 8005A94C 24849668 */ addiu $a0, $a0, -0x6998 +/* 35D50 8005A950 0C05175C */ jal load_map_bg +/* 35D54 8005A954 00000000 */ nop +.L8005A958: +/* 35D58 8005A958 0C00B458 */ jal func_8002D160 +/* 35D5C 8005A95C 00000000 */ nop +/* 35D60 8005A960 0C0AC81E */ jal func_802B2078 +/* 35D64 8005A964 00000000 */ nop +/* 35D68 8005A968 0C05259C */ jal func_80149670 +/* 35D6C 8005A96C 0000202D */ daddu $a0, $zero, $zero +/* 35D70 8005A970 0C048C2E */ jal clear_dynamic_entity_list +/* 35D74 8005A974 00000000 */ nop +/* 35D78 8005A978 0C0B0C77 */ jal clear_script_list +/* 35D7C 8005A97C 00000000 */ nop +/* 35D80 8005A980 0C00B7BD */ jal create_cameras_a +/* 35D84 8005A984 00000000 */ nop +/* 35D88 8005A988 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 35D8C 8005A98C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) +/* 35D90 8005A990 8E020000 */ lw $v0, ($s0) +/* 35D94 8005A994 0C0B763E */ jal func_802DD8F8 +/* 35D98 8005A998 80440084 */ lb $a0, 0x84($v0) +/* 35D9C 8005A99C 0C047889 */ jal func_8011E224 +/* 35DA0 8005A9A0 00000000 */ nop +/* 35DA4 8005A9A4 0C0482EC */ jal clear_virtual_models +/* 35DA8 8005A9A8 00000000 */ nop +/* 35DAC 8005A9AC 0C00E12F */ jal clear_npcs +/* 35DB0 8005A9B0 00000000 */ nop +/* 35DB4 8005A9B4 0C050440 */ jal func_80141100 +/* 35DB8 8005A9B8 00000000 */ nop +/* 35DBC 8005A9BC 0C0515A0 */ jal clear_trigger_data +/* 35DC0 8005A9C0 00000000 */ nop +/* 35DC4 8005A9C4 0C045751 */ jal clear_model_data +/* 35DC8 8005A9C8 00000000 */ nop +/* 35DCC 8005A9CC 0C052010 */ jal func_80148040 +/* 35DD0 8005A9D0 00000000 */ nop +/* 35DD4 8005A9D4 0C05177E */ jal func_80145DF8 +/* 35DD8 8005A9D8 00000000 */ nop +/* 35DDC 8005A9DC 8E020000 */ lw $v0, ($s0) +/* 35DE0 8005A9E0 804300A8 */ lb $v1, 0xa8($v0) +/* 35DE4 8005A9E4 2402FFFF */ addiu $v0, $zero, -1 +/* 35DE8 8005A9E8 14620003 */ bne $v1, $v0, .L8005A9F8 +/* 35DEC 8005A9EC 00000000 */ nop +/* 35DF0 8005A9F0 0C04E062 */ jal func_80138188 +/* 35DF4 8005A9F4 00000000 */ nop +.L8005A9F8: +/* 35DF8 8005A9F8 16800005 */ bnez $s4, .L8005AA10 +/* 35DFC 8005A9FC 00000000 */ nop +/* 35E00 8005AA00 0C016BE5 */ jal initialize_collision +/* 35E04 8005AA04 00000000 */ nop +/* 35E08 8005AA08 0C016BF0 */ jal load_hit_asset +/* 35E0C 8005AA0C 00000000 */ nop +.L8005AA10: +/* 35E10 8005AA10 0C01CACC */ jal func_80072B30 +/* 35E14 8005AA14 00000000 */ nop +/* 35E18 8005AA18 0C00F900 */ jal clear_encounter_status +/* 35E1C 8005AA1C 00000000 */ nop +/* 35E20 8005AA20 0C04432E */ jal clear_entity_data +/* 35E24 8005AA24 24040001 */ addiu $a0, $zero, 1 +/* 35E28 8005AA28 0C016727 */ jal func_80059C9C +/* 35E2C 8005AA2C 00000000 */ nop +/* 35E30 8005AA30 0C037F14 */ jal clear_player_status +/* 35E34 8005AA34 00000000 */ nop +/* 35E38 8005AA38 0C037F1D */ jal func_800DFC74 +/* 35E3C 8005AA3C 00000000 */ nop +/* 35E40 8005AA40 0C03AD1D */ jal partner_reset_data +/* 35E44 8005AA44 00000000 */ nop +/* 35E48 8005AA48 0C048D9D */ jal clear_printers +/* 35E4C 8005AA4C 00000000 */ nop +/* 35E50 8005AA50 0C04C3FC */ jal clear_item_entity_data +/* 35E54 8005AA54 00000000 */ nop +/* 35E58 8005AA58 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 35E5C 8005AA5C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 35E60 8005AA60 C4400084 */ lwc1 $f0, 0x84($v0) +/* 35E64 8005AA64 E4400080 */ swc1 $f0, 0x80($v0) +/* 35E68 8005AA68 8E42001C */ lw $v0, 0x1c($s2) +/* 35E6C 8005AA6C 30420003 */ andi $v0, $v0, 3 +/* 35E70 8005AA70 00021080 */ sll $v0, $v0, 2 +/* 35E74 8005AA74 3C048009 */ lui $a0, 0x8009 +/* 35E78 8005AA78 00822021 */ addu $a0, $a0, $v0 +/* 35E7C 8005AA7C 0C0525FF */ jal func_801497FC +/* 35E80 8005AA80 8C84FF60 */ lw $a0, -0xa0($a0) +/* 35E84 8005AA84 0C052580 */ jal func_80149600 +/* 35E88 8005AA88 00000000 */ nop +/* 35E8C 8005AA8C 1680000B */ bnez $s4, .L8005AABC +/* 35E90 8005AA90 00000000 */ nop +/* 35E94 8005AA94 3C04800B */ lui $a0, 0x800b +/* 35E98 8005AA98 24840CF0 */ addiu $a0, $a0, 0xcf0 +/* 35E9C 8005AA9C 0C016B74 */ jal get_asset_offset +/* 35EA0 8005AAA0 27A50030 */ addiu $a1, $sp, 0x30 +/* 35EA4 8005AAA4 8E640000 */ lw $a0, ($s3) +/* 35EA8 8005AAA8 10800004 */ beqz $a0, .L8005AABC +/* 35EAC 8005AAAC 00000000 */ nop +/* 35EB0 8005AAB0 8FA60030 */ lw $a2, 0x30($sp) +/* 35EB4 8005AAB4 0C046B52 */ jal load_data_for_models +/* 35EB8 8005AAB8 0040282D */ daddu $a1, $v0, $zero +.L8005AABC: +/* 35EBC 8005AABC 8E640038 */ lw $a0, 0x38($s3) +/* 35EC0 8005AAC0 50800005 */ beql $a0, $zero, .L8005AAD8 +/* 35EC4 8005AAC4 24040128 */ addiu $a0, $zero, 0x128 +/* 35EC8 8005AAC8 0C05178A */ jal read_background_size +/* 35ECC 8005AACC 00000000 */ nop +/* 35ED0 8005AAD0 08016ABA */ j .L8005AAE8 +/* 35ED4 8005AAD4 00000000 */ nop +.L8005AAD8: +/* 35ED8 8005AAD8 240500C8 */ addiu $a1, $zero, 0xc8 +/* 35EDC 8005AADC 2406000C */ addiu $a2, $zero, 0xc +/* 35EE0 8005AAE0 0C05179C */ jal set_background_size +/* 35EE4 8005AAE4 24070014 */ addiu $a3, $zero, 0x14 +.L8005AAE8: +/* 35EE8 8005AAE8 3C04800B */ lui $a0, %hi(gCameras) +/* 35EEC 8005AAEC 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* 35EF0 8005AAF0 94820000 */ lhu $v0, ($a0) +/* 35EF4 8005AAF4 94830AB0 */ lhu $v1, 0xab0($a0) +/* 35EF8 8005AAF8 3C018007 */ lui $at, %hi(gCurrentCameraID) +/* 35EFC 8005AAFC AC207410 */ sw $zero, %lo(gCurrentCameraID)($at) +/* 35F00 8005AB00 34420002 */ ori $v0, $v0, 2 +/* 35F04 8005AB04 A4820000 */ sh $v0, ($a0) +/* 35F08 8005AB08 94820558 */ lhu $v0, 0x558($a0) +/* 35F0C 8005AB0C 34630002 */ ori $v1, $v1, 2 +/* 35F10 8005AB10 A4830AB0 */ sh $v1, 0xab0($a0) +/* 35F14 8005AB14 34420002 */ ori $v0, $v0, 2 +/* 35F18 8005AB18 A4820558 */ sh $v0, 0x558($a0) +/* 35F1C 8005AB1C 94821008 */ lhu $v0, 0x1008($a0) +/* 35F20 8005AB20 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 35F24 8005AB24 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 35F28 8005AB28 34420002 */ ori $v0, $v0, 2 +/* 35F2C 8005AB2C A4821008 */ sh $v0, 0x1008($a0) +/* 35F30 8005AB30 806300A8 */ lb $v1, 0xa8($v1) +/* 35F34 8005AB34 2402FFFF */ addiu $v0, $zero, -1 +/* 35F38 8005AB38 14620008 */ bne $v1, $v0, .L8005AB5C +/* 35F3C 8005AB3C 240200A2 */ addiu $v0, $zero, 0xa2 +/* 35F40 8005AB40 240200C8 */ addiu $v0, $zero, 0xc8 +/* 35F44 8005AB44 AFA20010 */ sw $v0, 0x10($sp) +/* 35F48 8005AB48 0000202D */ daddu $a0, $zero, $zero +/* 35F4C 8005AB4C 2405000C */ addiu $a1, $zero, 0xc +/* 35F50 8005AB50 24060014 */ addiu $a2, $zero, 0x14 +/* 35F54 8005AB54 08016ADC */ j .L8005AB70 +/* 35F58 8005AB58 24070128 */ addiu $a3, $zero, 0x128 +.L8005AB5C: +/* 35F5C 8005AB5C AFA20010 */ sw $v0, 0x10($sp) +/* 35F60 8005AB60 0000202D */ daddu $a0, $zero, $zero +/* 35F64 8005AB64 2405001D */ addiu $a1, $zero, 0x1d +/* 35F68 8005AB68 2406001C */ addiu $a2, $zero, 0x1c +/* 35F6C 8005AB6C 24070106 */ addiu $a3, $zero, 0x106 +.L8005AB70: +/* 35F70 8005AB70 0C00B8C5 */ jal set_cam_viewport +/* 35F74 8005AB74 00000000 */ nop +/* 35F78 8005AB78 0C039E4D */ jal initialize_status_menu +/* 35F7C 8005AB7C 00000000 */ nop +/* 35F80 8005AB80 0000282D */ daddu $a1, $zero, $zero +/* 35F84 8005AB84 00A0302D */ daddu $a2, $a1, $zero +/* 35F88 8005AB88 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 35F8C 8005AB8C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) +/* 35F90 8005AB90 8E030000 */ lw $v1, ($s0) +/* 35F94 8005AB94 240203E8 */ addiu $v0, $zero, 0x3e8 +/* 35F98 8005AB98 A4620090 */ sh $v0, 0x90($v1) +/* 35F9C 8005AB9C A4620092 */ sh $v0, 0x92($v1) +/* 35FA0 8005ABA0 8E640010 */ lw $a0, 0x10($s3) +/* 35FA4 8005ABA4 0C0B0D74 */ jal start_script_in_group +/* 35FA8 8005ABA8 00A0382D */ daddu $a3, $a1, $zero +/* 35FAC 8005ABAC 8E030000 */ lw $v1, ($s0) +/* 35FB0 8005ABB0 8C420144 */ lw $v0, 0x144($v0) +/* 35FB4 8005ABB4 AC62006C */ sw $v0, 0x6c($v1) +/* 35FB8 8005ABB8 8FBF004C */ lw $ra, 0x4c($sp) +/* 35FBC 8005ABBC 8FB40048 */ lw $s4, 0x48($sp) +/* 35FC0 8005ABC0 8FB30044 */ lw $s3, 0x44($sp) +/* 35FC4 8005ABC4 8FB20040 */ lw $s2, 0x40($sp) +/* 35FC8 8005ABC8 8FB1003C */ lw $s1, 0x3c($sp) +/* 35FCC 8005ABCC 8FB00038 */ lw $s0, 0x38($sp) +/* 35FD0 8005ABD0 03E00008 */ jr $ra +/* 35FD4 8005ABD4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/world/play_effect.s b/asm/nonmatchings/world/world/play_effect.s new file mode 100644 index 0000000000..5cf072e2dc --- /dev/null +++ b/asm/nonmatchings/world/world/play_effect.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel play_effect +/* 35964 8005A564 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 35968 8005A568 AFB20020 */ sw $s2, 0x20($sp) +/* 3596C 8005A56C 0080902D */ daddu $s2, $a0, $zero +/* 35970 8005A570 3C038008 */ lui $v1, 0x8008 +/* 35974 8005A574 2463F210 */ addiu $v1, $v1, -0xdf0 +/* 35978 8005A578 00121040 */ sll $v0, $s2, 1 +/* 3597C 8005A57C 00521021 */ addu $v0, $v0, $s2 +/* 35980 8005A580 000210C0 */ sll $v0, $v0, 3 +/* 35984 8005A584 AFB1001C */ sw $s1, 0x1c($sp) +/* 35988 8005A588 00438821 */ addu $s1, $v0, $v1 +/* 3598C 8005A58C 0000202D */ daddu $a0, $zero, $zero +/* 35990 8005A590 AFB00018 */ sw $s0, 0x18($sp) +/* 35994 8005A594 3C10800A */ lui $s0, 0x800a +/* 35998 8005A598 26104000 */ addiu $s0, $s0, 0x4000 +/* 3599C 8005A59C AFBF0024 */ sw $ra, 0x24($sp) +.L8005A5A0: +/* 359A0 8005A5A0 8E020000 */ lw $v0, ($s0) +/* 359A4 8005A5A4 30420001 */ andi $v0, $v0, 1 +/* 359A8 8005A5A8 50400005 */ beql $v0, $zero, .L8005A5C0 +/* 359AC 8005A5AC 24840001 */ addiu $a0, $a0, 1 +/* 359B0 8005A5B0 8E020004 */ lw $v0, 4($s0) +/* 359B4 8005A5B4 10520006 */ beq $v0, $s2, .L8005A5D0 +/* 359B8 8005A5B8 2882000F */ slti $v0, $a0, 0xf +/* 359BC 8005A5BC 24840001 */ addiu $a0, $a0, 1 +.L8005A5C0: +/* 359C0 8005A5C0 2882000F */ slti $v0, $a0, 0xf +/* 359C4 8005A5C4 1440FFF6 */ bnez $v0, .L8005A5A0 +/* 359C8 8005A5C8 26100020 */ addiu $s0, $s0, 0x20 +/* 359CC 8005A5CC 2882000F */ slti $v0, $a0, 0xf +.L8005A5D0: +/* 359D0 8005A5D0 14400030 */ bnez $v0, .L8005A694 +/* 359D4 8005A5D4 24020001 */ addiu $v0, $zero, 1 +/* 359D8 8005A5D8 0000202D */ daddu $a0, $zero, $zero +/* 359DC 8005A5DC 3C10800A */ lui $s0, 0x800a +/* 359E0 8005A5E0 26104000 */ addiu $s0, $s0, 0x4000 +.L8005A5E4: +/* 359E4 8005A5E4 8E020000 */ lw $v0, ($s0) +/* 359E8 8005A5E8 30420001 */ andi $v0, $v0, 1 +/* 359EC 8005A5EC 10400006 */ beqz $v0, .L8005A608 +/* 359F0 8005A5F0 2882000F */ slti $v0, $a0, 0xf +/* 359F4 8005A5F4 24840001 */ addiu $a0, $a0, 1 +/* 359F8 8005A5F8 2882000F */ slti $v0, $a0, 0xf +/* 359FC 8005A5FC 1440FFF9 */ bnez $v0, .L8005A5E4 +/* 35A00 8005A600 26100020 */ addiu $s0, $s0, 0x20 +/* 35A04 8005A604 2882000F */ slti $v0, $a0, 0xf +.L8005A608: +/* 35A08 8005A608 14400003 */ bnez $v0, .L8005A618 +/* 35A0C 8005A60C 3C0700FF */ lui $a3, 0xff +.L8005A610: +/* 35A10 8005A610 08016984 */ j .L8005A610 +/* 35A14 8005A614 00000000 */ nop +.L8005A618: +/* 35A18 8005A618 34E7FFFF */ ori $a3, $a3, 0xffff +/* 35A1C 8005A61C 0000282D */ daddu $a1, $zero, $zero +/* 35A20 8005A620 2402FFFF */ addiu $v0, $zero, -1 +/* 35A24 8005A624 3C038019 */ lui $v1, 0x8019 +/* 35A28 8005A628 24637000 */ addiu $v1, $v1, 0x7000 +/* 35A2C 8005A62C AFA20010 */ sw $v0, 0x10($sp) +/* 35A30 8005A630 AFA20014 */ sw $v0, 0x14($sp) +/* 35A34 8005A634 00041300 */ sll $v0, $a0, 0xc +/* 35A38 8005A638 00431021 */ addu $v0, $v0, $v1 +/* 35A3C 8005A63C 8E26000C */ lw $a2, 0xc($s1) +/* 35A40 8005A640 0C0199E8 */ jal osMapTLB +/* 35A44 8005A644 00473824 */ and $a3, $v0, $a3 +/* 35A48 8005A648 8E240004 */ lw $a0, 4($s1) +/* 35A4C 8005A64C 8E250008 */ lw $a1, 8($s1) +/* 35A50 8005A650 0C00A5CF */ jal dma_copy +/* 35A54 8005A654 8E26000C */ lw $a2, 0xc($s1) +/* 35A58 8005A658 8E220010 */ lw $v0, 0x10($s1) +/* 35A5C 8005A65C 5040000D */ beql $v0, $zero, .L8005A694 +/* 35A60 8005A660 24020001 */ addiu $v0, $zero, 1 +/* 35A64 8005A664 8E240014 */ lw $a0, 0x14($s1) +/* 35A68 8005A668 0C00AB0A */ jal general_heap_malloc +/* 35A6C 8005A66C 00822023 */ subu $a0, $a0, $v0 +/* 35A70 8005A670 14400003 */ bnez $v0, .L8005A680 +/* 35A74 8005A674 AE02001C */ sw $v0, 0x1c($s0) +.L8005A678: +/* 35A78 8005A678 0801699E */ j .L8005A678 +/* 35A7C 8005A67C 00000000 */ nop +.L8005A680: +/* 35A80 8005A680 8E240010 */ lw $a0, 0x10($s1) +/* 35A84 8005A684 8E250014 */ lw $a1, 0x14($s1) +/* 35A88 8005A688 0C00A5CF */ jal dma_copy +/* 35A8C 8005A68C 8E06001C */ lw $a2, 0x1c($s0) +/* 35A90 8005A690 24020001 */ addiu $v0, $zero, 1 +.L8005A694: +/* 35A94 8005A694 0040182D */ daddu $v1, $v0, $zero +/* 35A98 8005A698 AE120004 */ sw $s2, 4($s0) +/* 35A9C 8005A69C AE000008 */ sw $zero, 8($s0) +/* 35AA0 8005A6A0 AE030000 */ sw $v1, ($s0) +/* 35AA4 8005A6A4 8FBF0024 */ lw $ra, 0x24($sp) +/* 35AA8 8005A6A8 8FB20020 */ lw $s2, 0x20($sp) +/* 35AAC 8005A6AC 8FB1001C */ lw $s1, 0x1c($sp) +/* 35AB0 8005A6B0 8FB00018 */ lw $s0, 0x18($sp) +/* 35AB4 8005A6B4 03E00008 */ jr $ra +/* 35AB8 8005A6B8 27BD0028 */ addiu $sp, $sp, 0x28 +/* 35ABC 8005A6BC 00000000 */ nop diff --git a/asm/nonmatchings/world/world/remove_all_effects.s b/asm/nonmatchings/world/world/remove_all_effects.s new file mode 100644 index 0000000000..12613041d9 --- /dev/null +++ b/asm/nonmatchings/world/world/remove_all_effects.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel remove_all_effects +/* 358E0 8005A4E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 358E4 8005A4E4 AFB20018 */ sw $s2, 0x18($sp) +/* 358E8 8005A4E8 0000902D */ daddu $s2, $zero, $zero +/* 358EC 8005A4EC AFB10014 */ sw $s1, 0x14($sp) +/* 358F0 8005A4F0 3C11800B */ lui $s1, 0x800b +/* 358F4 8005A4F4 26314398 */ addiu $s1, $s1, 0x4398 +/* 358F8 8005A4F8 AFBF001C */ sw $ra, 0x1c($sp) +/* 358FC 8005A4FC AFB00010 */ sw $s0, 0x10($sp) +.L8005A500: +/* 35900 8005A500 8E300000 */ lw $s0, ($s1) +/* 35904 8005A504 5200000E */ beql $s0, $zero, .L8005A540 +/* 35908 8005A508 26520001 */ addiu $s2, $s2, 1 +/* 3590C 8005A50C 8E020000 */ lw $v0, ($s0) +/* 35910 8005A510 30420004 */ andi $v0, $v0, 4 +/* 35914 8005A514 5040000A */ beql $v0, $zero, .L8005A540 +/* 35918 8005A518 26520001 */ addiu $s2, $s2, 1 +/* 3591C 8005A51C 8E04000C */ lw $a0, 0xc($s0) +/* 35920 8005A520 10800003 */ beqz $a0, .L8005A530 +/* 35924 8005A524 00000000 */ nop +/* 35928 8005A528 0C00AB1E */ jal general_heap_free +/* 3592C 8005A52C 00000000 */ nop +.L8005A530: +/* 35930 8005A530 0C00AB1E */ jal general_heap_free +/* 35934 8005A534 0200202D */ daddu $a0, $s0, $zero +/* 35938 8005A538 AE200000 */ sw $zero, ($s1) +/* 3593C 8005A53C 26520001 */ addiu $s2, $s2, 1 +.L8005A540: +/* 35940 8005A540 2A420060 */ slti $v0, $s2, 0x60 +/* 35944 8005A544 1440FFEE */ bnez $v0, .L8005A500 +/* 35948 8005A548 26310004 */ addiu $s1, $s1, 4 +/* 3594C 8005A54C 8FBF001C */ lw $ra, 0x1c($sp) +/* 35950 8005A550 8FB20018 */ lw $s2, 0x18($sp) +/* 35954 8005A554 8FB10014 */ lw $s1, 0x14($sp) +/* 35958 8005A558 8FB00010 */ lw $s0, 0x10($sp) +/* 3595C 8005A55C 03E00008 */ jr $ra +/* 35960 8005A560 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/world/remove_effect.s b/asm/nonmatchings/world/world/remove_effect.s new file mode 100644 index 0000000000..e445cf8a4d --- /dev/null +++ b/asm/nonmatchings/world/world/remove_effect.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel remove_effect +/* 35850 8005A450 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 35854 8005A454 AFB10014 */ sw $s1, 0x14($sp) +/* 35858 8005A458 0080882D */ daddu $s1, $a0, $zero +/* 3585C 8005A45C AFB00010 */ sw $s0, 0x10($sp) +/* 35860 8005A460 0000802D */ daddu $s0, $zero, $zero +/* 35864 8005A464 3C03800B */ lui $v1, 0x800b +/* 35868 8005A468 24634398 */ addiu $v1, $v1, 0x4398 +/* 3586C 8005A46C AFBF0018 */ sw $ra, 0x18($sp) +.L8005A470: +/* 35870 8005A470 8C620000 */ lw $v0, ($v1) +/* 35874 8005A474 10510006 */ beq $v0, $s1, .L8005A490 +/* 35878 8005A478 2A020060 */ slti $v0, $s0, 0x60 +/* 3587C 8005A47C 26100001 */ addiu $s0, $s0, 1 +/* 35880 8005A480 2A020060 */ slti $v0, $s0, 0x60 +/* 35884 8005A484 1440FFFA */ bnez $v0, .L8005A470 +/* 35888 8005A488 24630004 */ addiu $v1, $v1, 4 +/* 3588C 8005A48C 2A020060 */ slti $v0, $s0, 0x60 +.L8005A490: +/* 35890 8005A490 14400003 */ bnez $v0, .L8005A4A0 +/* 35894 8005A494 00000000 */ nop +.L8005A498: +/* 35898 8005A498 08016926 */ j .L8005A498 +/* 3589C 8005A49C 00000000 */ nop +.L8005A4A0: +/* 358A0 8005A4A0 8E24000C */ lw $a0, 0xc($s1) +/* 358A4 8005A4A4 10800003 */ beqz $a0, .L8005A4B4 +/* 358A8 8005A4A8 00000000 */ nop +/* 358AC 8005A4AC 0C00AB1E */ jal general_heap_free +/* 358B0 8005A4B0 00000000 */ nop +.L8005A4B4: +/* 358B4 8005A4B4 0C00AB1E */ jal general_heap_free +/* 358B8 8005A4B8 0220202D */ daddu $a0, $s1, $zero +/* 358BC 8005A4BC 00101080 */ sll $v0, $s0, 2 +/* 358C0 8005A4C0 3C01800B */ lui $at, 0x800b +/* 358C4 8005A4C4 00220821 */ addu $at, $at, $v0 +/* 358C8 8005A4C8 AC204398 */ sw $zero, 0x4398($at) +/* 358CC 8005A4CC 8FBF0018 */ lw $ra, 0x18($sp) +/* 358D0 8005A4D0 8FB10014 */ lw $s1, 0x14($sp) +/* 358D4 8005A4D4 8FB00010 */ lw $s0, 0x10($sp) +/* 358D8 8005A4D8 03E00008 */ jr $ra +/* 358DC 8005A4DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/world/render_effects.s b/asm/nonmatchings/world/world/render_effects.s new file mode 100644 index 0000000000..f0d191c036 --- /dev/null +++ b/asm/nonmatchings/world/world/render_effects.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel render_effects +/* 352F4 80059EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 352F8 80059EF8 AFB10014 */ sw $s1, 0x14($sp) +/* 352FC 80059EFC 0000882D */ daddu $s1, $zero, $zero +/* 35300 80059F00 AFB00010 */ sw $s0, 0x10($sp) +/* 35304 80059F04 3C10800B */ lui $s0, 0x800b +/* 35308 80059F08 26104398 */ addiu $s0, $s0, 0x4398 +/* 3530C 80059F0C AFBF0018 */ sw $ra, 0x18($sp) +.L80059F10: +/* 35310 80059F10 8E040000 */ lw $a0, ($s0) +/* 35314 80059F14 50800017 */ beql $a0, $zero, .L80059F74 +/* 35318 80059F18 26310001 */ addiu $s1, $s1, 1 +/* 3531C 80059F1C 8C830000 */ lw $v1, ($a0) +/* 35320 80059F20 30620001 */ andi $v0, $v1, 1 +/* 35324 80059F24 50400013 */ beql $v0, $zero, .L80059F74 +/* 35328 80059F28 26310001 */ addiu $s1, $s1, 1 +/* 3532C 80059F2C 30620008 */ andi $v0, $v1, 8 +/* 35330 80059F30 50400010 */ beql $v0, $zero, .L80059F74 +/* 35334 80059F34 26310001 */ addiu $s1, $s1, 1 +/* 35338 80059F38 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 3533C 80059F3C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 35340 80059F40 80420070 */ lb $v0, 0x70($v0) +/* 35344 80059F44 10400005 */ beqz $v0, .L80059F5C +/* 35348 80059F48 30620004 */ andi $v0, $v1, 4 +/* 3534C 80059F4C 50400009 */ beql $v0, $zero, .L80059F74 +/* 35350 80059F50 26310001 */ addiu $s1, $s1, 1 +/* 35354 80059F54 080167D9 */ j .L80059F64 +/* 35358 80059F58 00000000 */ nop +.L80059F5C: +/* 3535C 80059F5C 54400005 */ bnel $v0, $zero, .L80059F74 +/* 35360 80059F60 26310001 */ addiu $s1, $s1, 1 +.L80059F64: +/* 35364 80059F64 8C820010 */ lw $v0, 0x10($a0) +/* 35368 80059F68 8C420014 */ lw $v0, 0x14($v0) +/* 3536C 80059F6C 0040F809 */ jalr $v0 +/* 35370 80059F70 26310001 */ addiu $s1, $s1, 1 +.L80059F74: +/* 35374 80059F74 2A220060 */ slti $v0, $s1, 0x60 +/* 35378 80059F78 1440FFE5 */ bnez $v0, .L80059F10 +/* 3537C 80059F7C 26100004 */ addiu $s0, $s0, 4 +/* 35380 80059F80 8FBF0018 */ lw $ra, 0x18($sp) +/* 35384 80059F84 8FB10014 */ lw $s1, 0x14($sp) +/* 35388 80059F88 8FB00010 */ lw $s0, 0x10($sp) +/* 3538C 80059F8C 03E00008 */ jr $ra +/* 35390 80059F90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c index 733d47d9db..8e7dfef265 100644 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ b/src/world/area_kmr/kmr_00/8ABF90.c @@ -12,11 +12,20 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478); INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240530_8AC4C0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240584_8AC514); +ApiStatus func_80240584_8AC514(ScriptInstance* script, s32 isInitialCall) { + func_8005553C(0, 2000); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405A8_8AC538); +ApiStatus func_802405A8_8AC538(ScriptInstance* script, s32 isInitialCall) { + func_80055590(0, 2000); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405CC_8AC55C); +ApiStatus func_802405CC_8AC55C(ScriptInstance* script, s32 isInitialCall) { + func_800554E8(0, 1000); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405F0_8AC580); diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 30190c2498..535099ac83 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -241,7 +241,7 @@ render_effects = 0x80059EF4; remove_effect = 0x8005A450; remove_all_effects = 0x8005A4E0; play_effect = 0x8005A564; -load_map_script_lib = 0x8005A6C0; +load_world_script_api = 0x8005A6C0; load_map_by_IDs = 0x8005A6F4; get_current_map_config = 0x8005ABD8; get_current_map_header = 0x8005ABE8; @@ -565,6 +565,7 @@ D_80078DB0 = 0x80078DB0; D_80078DB4 = 0x80078DB4; gEffectTable = 0x8007F214; gAreas = 0x800934F0; +gCurrentEncounter = 0x800B0F10; // size:0xB0 gBattleState = 0x800DC068; test_below_player = 0x800DDFD0; trace_below_player = 0x800DE54C; From 5a0dea8665321593a9691a214884c58e471b6921 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 14:53:06 -0500 Subject: [PATCH 02/12] a few more kmr funcs --- .../kmr_00/8ABF90/func_802403B8_8AC348.s | 62 ------------------- .../kmr_00/8ABF90/func_802404A0_8AC430.s | 22 ------- .../kmr_00/8ABF90/func_80240530_8AC4C0.s | 25 -------- .../kmr_00/8ABF90/func_80240BD8_8ACB68.s | 61 ------------------ .../kmr_04/8CA900/func_8024002C_8CA92C.s | 17 ----- include/functions.h | 4 ++ src/os/code_4ac90_len_3910.c | 4 +- src/world/area_kmr/kmr_00/8ABF90.c | 46 ++++++++++++-- src/world/area_kmr/kmr_04/8CA900.c | 6 +- 9 files changed, 53 insertions(+), 194 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s deleted file mode 100644 index 0c8d88a05b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B8_8AC348 -/* 8AC348 802403B8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8AC34C 802403BC AFB1001C */ sw $s1, 0x1c($sp) -/* 8AC350 802403C0 0080882D */ daddu $s1, $a0, $zero -/* 8AC354 802403C4 AFBF002C */ sw $ra, 0x2c($sp) -/* 8AC358 802403C8 AFB40028 */ sw $s4, 0x28($sp) -/* 8AC35C 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* 8AC360 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* 8AC364 802403D4 AFB00018 */ sw $s0, 0x18($sp) -/* 8AC368 802403D8 8E30000C */ lw $s0, 0xc($s1) -/* 8AC36C 802403DC 8E050000 */ lw $a1, ($s0) -/* 8AC370 802403E0 0C0B1EAF */ jal get_variable -/* 8AC374 802403E4 26100004 */ addiu $s0, $s0, 4 -/* 8AC378 802403E8 8E050000 */ lw $a1, ($s0) -/* 8AC37C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* 8AC380 802403F0 0220202D */ daddu $a0, $s1, $zero -/* 8AC384 802403F4 0C0B1EAF */ jal get_variable -/* 8AC388 802403F8 0040A02D */ daddu $s4, $v0, $zero -/* 8AC38C 802403FC 8E050000 */ lw $a1, ($s0) -/* 8AC390 80240400 26100004 */ addiu $s0, $s0, 4 -/* 8AC394 80240404 0220202D */ daddu $a0, $s1, $zero -/* 8AC398 80240408 0C0B1EAF */ jal get_variable -/* 8AC39C 8024040C 0040982D */ daddu $s3, $v0, $zero -/* 8AC3A0 80240410 8E050000 */ lw $a1, ($s0) -/* 8AC3A4 80240414 26100004 */ addiu $s0, $s0, 4 -/* 8AC3A8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 8AC3AC 8024041C 0C0B1EAF */ jal get_variable -/* 8AC3B0 80240420 0040902D */ daddu $s2, $v0, $zero -/* 8AC3B4 80240424 0220202D */ daddu $a0, $s1, $zero -/* 8AC3B8 80240428 8E050000 */ lw $a1, ($s0) -/* 8AC3BC 8024042C 0C0B1EAF */ jal get_variable -/* 8AC3C0 80240430 0040802D */ daddu $s0, $v0, $zero -/* 8AC3C4 80240434 0280202D */ daddu $a0, $s4, $zero -/* 8AC3C8 80240438 44931000 */ mtc1 $s3, $f2 -/* 8AC3CC 8024043C 00000000 */ nop -/* 8AC3D0 80240440 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC3D4 80240444 44051000 */ mfc1 $a1, $f2 -/* 8AC3D8 80240448 44921000 */ mtc1 $s2, $f2 -/* 8AC3DC 8024044C 00000000 */ nop -/* 8AC3E0 80240450 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC3E4 80240454 44061000 */ mfc1 $a2, $f2 -/* 8AC3E8 80240458 44901000 */ mtc1 $s0, $f2 -/* 8AC3EC 8024045C 00000000 */ nop -/* 8AC3F0 80240460 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC3F4 80240464 44071000 */ mfc1 $a3, $f2 -/* 8AC3F8 80240468 44820000 */ mtc1 $v0, $f0 -/* 8AC3FC 8024046C 00000000 */ nop -/* 8AC400 80240470 46800020 */ cvt.s.w $f0, $f0 -/* 8AC404 80240474 0C01BFBC */ jal func_8006FEF0 -/* 8AC408 80240478 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC40C 8024047C 8FBF002C */ lw $ra, 0x2c($sp) -/* 8AC410 80240480 8FB40028 */ lw $s4, 0x28($sp) -/* 8AC414 80240484 8FB30024 */ lw $s3, 0x24($sp) -/* 8AC418 80240488 8FB20020 */ lw $s2, 0x20($sp) -/* 8AC41C 8024048C 8FB1001C */ lw $s1, 0x1c($sp) -/* 8AC420 80240490 8FB00018 */ lw $s0, 0x18($sp) -/* 8AC424 80240494 24020002 */ addiu $v0, $zero, 2 -/* 8AC428 80240498 03E00008 */ jr $ra -/* 8AC42C 8024049C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s deleted file mode 100644 index 5f6d59ef52..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A0_8AC430 -/* 8AC430 802404A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8AC434 802404A4 2402001E */ addiu $v0, $zero, 0x1e -/* 8AC438 802404A8 44801000 */ mtc1 $zero, $f2 -/* 8AC43C 802404AC 3C013E99 */ lui $at, 0x3e99 -/* 8AC440 802404B0 3421999A */ ori $at, $at, 0x999a -/* 8AC444 802404B4 44810000 */ mtc1 $at, $f0 -/* 8AC448 802404B8 44051000 */ mfc1 $a1, $f2 -/* 8AC44C 802404BC 24040004 */ addiu $a0, $zero, 4 -/* 8AC450 802404C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8AC454 802404C4 AFA20014 */ sw $v0, 0x14($sp) -/* 8AC458 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC45C 802404CC 00A0302D */ daddu $a2, $a1, $zero -/* 8AC460 802404D0 0C01C5D4 */ jal func_80071750 -/* 8AC464 802404D4 00A0382D */ daddu $a3, $a1, $zero -/* 8AC468 802404D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8AC46C 802404DC 24020002 */ addiu $v0, $zero, 2 -/* 8AC470 802404E0 03E00008 */ jr $ra -/* 8AC474 802404E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s deleted file mode 100644 index 2ec6fc2697..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530_8AC4C0 -/* 8AC4C0 80240530 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8AC4C4 80240534 AFBF0018 */ sw $ra, 0x18($sp) -/* 8AC4C8 80240538 8C82000C */ lw $v0, 0xc($a0) -/* 8AC4CC 8024053C 0C0B1EAF */ jal get_variable -/* 8AC4D0 80240540 8C450000 */ lw $a1, ($v0) -/* 8AC4D4 80240544 0C00EABB */ jal get_npc_unsafe -/* 8AC4D8 80240548 0040202D */ daddu $a0, $v0, $zero -/* 8AC4DC 8024054C 3C014120 */ lui $at, 0x4120 -/* 8AC4E0 80240550 44810000 */ mtc1 $at, $f0 -/* 8AC4E4 80240554 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8AC4E8 80240558 46001080 */ add.s $f2, $f2, $f0 -/* 8AC4EC 8024055C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC4F0 80240560 8C450038 */ lw $a1, 0x38($v0) -/* 8AC4F4 80240564 8C470040 */ lw $a3, 0x40($v0) -/* 8AC4F8 80240568 44061000 */ mfc1 $a2, $f2 -/* 8AC4FC 8024056C 0C01BFBC */ jal func_8006FEF0 -/* 8AC500 80240570 24040003 */ addiu $a0, $zero, 3 -/* 8AC504 80240574 8FBF0018 */ lw $ra, 0x18($sp) -/* 8AC508 80240578 24020002 */ addiu $v0, $zero, 2 -/* 8AC50C 8024057C 03E00008 */ jr $ra -/* 8AC510 80240580 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s deleted file mode 100644 index 7d41d5f9ba..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD8_8ACB68 -/* 8ACB68 80240BD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8ACB6C 80240BDC AFB1001C */ sw $s1, 0x1c($sp) -/* 8ACB70 80240BE0 0080882D */ daddu $s1, $a0, $zero -/* 8ACB74 80240BE4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8ACB78 80240BE8 AFB00018 */ sw $s0, 0x18($sp) -/* 8ACB7C 80240BEC 10A0001D */ beqz $a1, .L80240C64 -/* 8ACB80 80240BF0 8E22000C */ lw $v0, 0xc($s1) -/* 8ACB84 80240BF4 0C0B1EAF */ jal get_variable -/* 8ACB88 80240BF8 8C450000 */ lw $a1, ($v0) -/* 8ACB8C 80240BFC 0040202D */ daddu $a0, $v0, $zero -/* 8ACB90 80240C00 0C00EABB */ jal get_npc_unsafe -/* 8ACB94 80240C04 AE240074 */ sw $a0, 0x74($s1) -/* 8ACB98 80240C08 0040802D */ daddu $s0, $v0, $zero -/* 8ACB9C 80240C0C 3C04B000 */ lui $a0, 0xb000 -/* 8ACBA0 80240C10 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8ACBA4 80240C14 3484001E */ ori $a0, $a0, 0x1e -/* 8ACBA8 80240C18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8ACBAC 80240C1C 8E060038 */ lw $a2, 0x38($s0) -/* 8ACBB0 80240C20 8E07003C */ lw $a3, 0x3c($s0) -/* 8ACBB4 80240C24 0C052757 */ jal play_sound_at_position -/* 8ACBB8 80240C28 0000282D */ daddu $a1, $zero, $zero -/* 8ACBBC 80240C2C C604003C */ lwc1 $f4, 0x3c($s0) -/* 8ACBC0 80240C30 3C0141A0 */ lui $at, 0x41a0 -/* 8ACBC4 80240C34 44810000 */ mtc1 $at, $f0 -/* 8ACBC8 80240C38 3C014120 */ lui $at, 0x4120 -/* 8ACBCC 80240C3C 44811000 */ mtc1 $at, $f2 -/* 8ACBD0 80240C40 46002100 */ add.s $f4, $f4, $f0 -/* 8ACBD4 80240C44 E7A20010 */ swc1 $f2, 0x10($sp) -/* 8ACBD8 80240C48 8E050038 */ lw $a1, 0x38($s0) -/* 8ACBDC 80240C4C 8E070040 */ lw $a3, 0x40($s0) -/* 8ACBE0 80240C50 44062000 */ mfc1 $a2, $f4 -/* 8ACBE4 80240C54 0C01BFBC */ jal func_8006FEF0 -/* 8ACBE8 80240C58 0000202D */ daddu $a0, $zero, $zero -/* 8ACBEC 80240C5C 24020003 */ addiu $v0, $zero, 3 -/* 8ACBF0 80240C60 AE220070 */ sw $v0, 0x70($s1) -.L80240C64: -/* 8ACBF4 80240C64 0C00EABB */ jal get_npc_unsafe -/* 8ACBF8 80240C68 8E240074 */ lw $a0, 0x74($s1) -/* 8ACBFC 80240C6C 0040802D */ daddu $s0, $v0, $zero -/* 8ACC00 80240C70 8E230070 */ lw $v1, 0x70($s1) -/* 8ACC04 80240C74 2402FFFF */ addiu $v0, $zero, -1 -/* 8ACC08 80240C78 2463FFFF */ addiu $v1, $v1, -1 -/* 8ACC0C 80240C7C 10620003 */ beq $v1, $v0, .L80240C8C -/* 8ACC10 80240C80 AE230070 */ sw $v1, 0x70($s1) -/* 8ACC14 80240C84 08090327 */ j .L80240C9C -/* 8ACC18 80240C88 0000102D */ daddu $v0, $zero, $zero -.L80240C8C: -/* 8ACC1C 80240C8C 3C01C47A */ lui $at, 0xc47a -/* 8ACC20 80240C90 44810000 */ mtc1 $at, $f0 -/* 8ACC24 80240C94 24020002 */ addiu $v0, $zero, 2 -/* 8ACC28 80240C98 E600003C */ swc1 $f0, 0x3c($s0) -.L80240C9C: -/* 8ACC2C 80240C9C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8ACC30 80240CA0 8FB1001C */ lw $s1, 0x1c($sp) -/* 8ACC34 80240CA4 8FB00018 */ lw $s0, 0x18($sp) -/* 8ACC38 80240CA8 03E00008 */ jr $ra -/* 8ACC3C 80240CAC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s deleted file mode 100644 index 1e621e0276..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024002C_8CA92C -/* 8CA92C 8024002C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CA930 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* 8CA934 80240034 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CA938 80240038 0C039D59 */ jal get_player_data -/* 8CA93C 8024003C 0080802D */ daddu $s0, $a0, $zero -/* 8CA940 80240040 80430002 */ lb $v1, 2($v0) -/* 8CA944 80240044 AE030084 */ sw $v1, 0x84($s0) -/* 8CA948 80240048 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CA94C 8024004C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CA950 80240050 24020002 */ addiu $v0, $zero, 2 -/* 8CA954 80240054 03E00008 */ jr $ra -/* 8CA958 80240058 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8CA95C 8024005C 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index 545f4ec24e..ef868510b0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -33,6 +33,8 @@ s32 get_model_list_index_from_tree_index(s32 treeIndex); void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); +void func_8006FEF0(s32, f32, f32, f32, f32); +void func_80071750(s32, f32, f32, f32, f32, s32); void func_80072950(s32, f32, f32, f32, f32, s32 time); void update_collider_transform(s16 colliderID); @@ -74,6 +76,8 @@ void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); f32 func_800E0088(f32, f32); s32 func_800EB168(s32); +PlayerData* get_player_data(void); + // Partner void func_800EBA3C(Npc* partner); void func_800EBB40(Npc* partner); diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index a335a6b510..0a8deb9f6d 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_emote); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FEF0); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FF50); @@ -164,7 +164,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071690); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800716F0); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071750); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800717B0); diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c index 8e7dfef265..5ca2ded1f5 100644 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ b/src/world/area_kmr/kmr_00/8ABF90.c @@ -4,13 +4,31 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240000_8ABF90); INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240388_8AC318); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802403B8_8AC348); +ApiStatus func_802403B8_8AC348(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32 var4 = get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404A0_8AC430); + func_8006FEF0(var0, var1, var2, var3, var4); + return ApiStatus_DONE2; +} + +ApiStatus func_802404A0_8AC430(ScriptInstance* script, s32 isInitialCall) { + func_80071750(4, 0.0f, 0.0f, 0.0f, 0.3f, 30); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240530_8AC4C0); +ApiStatus func_80240530_8AC4C0(ScriptInstance* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(get_variable(script, *script->ptrReadPos)); + + func_8006FEF0(3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); + return ApiStatus_DONE2; +} ApiStatus func_80240584_8AC514(ScriptInstance* script, s32 isInitialCall) { func_8005553C(0, 2000); @@ -29,6 +47,26 @@ ApiStatus func_802405CC_8AC55C(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405F0_8AC580); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240BD8_8ACB68); +ApiStatus func_80240BD8_8ACB68(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc* npc; + + if (isInitialCall) { + script->functionTemp[1].s = get_variable(script, *args); + npc = get_npc_unsafe(script->functionTemp[1].s); + play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); + func_8006FEF0(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f); + script->functionTemp[0].s = 3; + } + + npc = get_npc_unsafe(script->functionTemp[1].s); + script->functionTemp[0].s--; + if (script->functionTemp[0].s == -1) { + npc->pos.y = -1000.0f; + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240CB0_8ACC40); diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c index 3326b00c98..9102ee97cb 100644 --- a/src/world/area_kmr/kmr_04/8CA900.c +++ b/src/world/area_kmr/kmr_04/8CA900.c @@ -2,4 +2,8 @@ #include "world/common/CheckPartnerFlags1000.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C_8CA92C); +ApiStatus func_8024002C_8CA92C(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = get_player_data()->curHP; + + return ApiStatus_DONE2; +} From 743619e28f7799d772dfdecea7d171a8ed14c195 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 15:19:04 -0500 Subject: [PATCH 03/12] a few more --- .../kmr_04/8CA960/func_80240434_8CAD34.s | 8 --- .../kmr_04/8CA960/func_80240444_8CAD44.s | 15 ----- .../kmr_05/8CF570/func_8024173C_8CF7AC.s | 23 -------- .../kmr_06/8D2A10/func_80241CC8_8D31D8.s | 58 ------------------- .../kmr_09/8D5E00/func_802414F8_8D72F8.s | 18 ------ .../kmr_10/8D84D0/func_80240304_8D87D4.s | 55 ------------------ src/world/area_kmr/kmr_04/8CA960.c | 12 +++- src/world/area_kmr/kmr_05/8CF570.c | 9 ++- src/world/area_kmr/kmr_06/8D2A10.c | 19 +++++- src/world/area_kmr/kmr_09/8D5E00.c | 6 +- src/world/area_kmr/kmr_10/8D84D0.c | 15 ++++- tools/symbol_addrs.txt | 1 + 12 files changed, 56 insertions(+), 183 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s deleted file mode 100644 index 03e5caf0ac..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_8CAD34 -/* 8CAD34 80240434 3C018011 */ lui $at, %hi(gPlayerData+0x1) -/* 8CAD38 80240438 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) -/* 8CAD3C 8024043C 03E00008 */ jr $ra -/* 8CAD40 80240440 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s deleted file mode 100644 index 26fc9b1e21..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240444_8CAD44.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444_8CAD44 -/* 8CAD44 80240444 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CAD48 80240448 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CAD4C 8024044C 0C04417A */ jal get_entity_by_index -/* 8CAD50 80240450 8C840084 */ lw $a0, 0x84($a0) -/* 8CAD54 80240454 0C043F5A */ jal func_8010FD68 -/* 8CAD58 80240458 0040202D */ daddu $a0, $v0, $zero -/* 8CAD5C 8024045C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CAD60 80240460 24020002 */ addiu $v0, $zero, 2 -/* 8CAD64 80240464 03E00008 */ jr $ra -/* 8CAD68 80240468 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8CAD6C 8024046C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s deleted file mode 100644 index 4a2b86ff84..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024173C_8CF7AC -/* 8CF7AC 8024173C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CF7B0 80241740 AFB00010 */ sw $s0, 0x10($sp) -/* 8CF7B4 80241744 0080802D */ daddu $s0, $a0, $zero -/* 8CF7B8 80241748 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CF7BC 8024174C 0C00FB5A */ jal get_enemy_safe -/* 8CF7C0 80241750 24040006 */ addiu $a0, $zero, 6 -/* 8CF7C4 80241754 14400003 */ bnez $v0, .L80241764 -/* 8CF7C8 80241758 24020001 */ addiu $v0, $zero, 1 -/* 8CF7CC 8024175C 080905DA */ j .L80241768 -/* 8CF7D0 80241760 AE000084 */ sw $zero, 0x84($s0) -.L80241764: -/* 8CF7D4 80241764 AE020084 */ sw $v0, 0x84($s0) -.L80241768: -/* 8CF7D8 80241768 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CF7DC 8024176C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CF7E0 80241770 24020002 */ addiu $v0, $zero, 2 -/* 8CF7E4 80241774 03E00008 */ jr $ra -/* 8CF7E8 80241778 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8CF7EC 8024177C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s deleted file mode 100644 index c522a017fc..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CC8_8D31D8 -/* 8D31D8 80241CC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D31DC 80241CCC AFB00010 */ sw $s0, 0x10($sp) -/* 8D31E0 80241CD0 0080802D */ daddu $s0, $a0, $zero -/* 8D31E4 80241CD4 3C05FD05 */ lui $a1, 0xfd05 -/* 8D31E8 80241CD8 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D31EC 80241CDC AFBF0020 */ sw $ra, 0x20($sp) -/* 8D31F0 80241CE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D31F4 80241CE4 AFB20018 */ sw $s2, 0x18($sp) -/* 8D31F8 80241CE8 0C0B1EAF */ jal get_variable -/* 8D31FC 80241CEC AFB10014 */ sw $s1, 0x14($sp) -/* 8D3200 80241CF0 0200202D */ daddu $a0, $s0, $zero -/* 8D3204 80241CF4 3C05FD05 */ lui $a1, 0xfd05 -/* 8D3208 80241CF8 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D320C 80241CFC 0C0B1EAF */ jal get_variable -/* 8D3210 80241D00 0040902D */ daddu $s2, $v0, $zero -/* 8D3214 80241D04 0200202D */ daddu $a0, $s0, $zero -/* 8D3218 80241D08 3C05FD05 */ lui $a1, 0xfd05 -/* 8D321C 80241D0C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D3220 80241D10 0C0B1EAF */ jal get_variable -/* 8D3224 80241D14 0040982D */ daddu $s3, $v0, $zero -/* 8D3228 80241D18 8E440004 */ lw $a0, 4($s2) -/* 8D322C 80241D1C 0C048D70 */ jal func_801235C0 -/* 8D3230 80241D20 0040882D */ daddu $s1, $v0, $zero -/* 8D3234 80241D24 0C00AB4B */ jal heap_free -/* 8D3238 80241D28 0240202D */ daddu $a0, $s2, $zero -/* 8D323C 80241D2C 0C00AB4B */ jal heap_free -/* 8D3240 80241D30 0260202D */ daddu $a0, $s3, $zero -/* 8D3244 80241D34 0C00AB4B */ jal heap_free -/* 8D3248 80241D38 0220202D */ daddu $a0, $s1, $zero -/* 8D324C 80241D3C 0200202D */ daddu $a0, $s0, $zero -/* 8D3250 80241D40 3C05FD05 */ lui $a1, 0xfd05 -/* 8D3254 80241D44 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D3258 80241D48 0C0B2026 */ jal set_variable -/* 8D325C 80241D4C 0000302D */ daddu $a2, $zero, $zero -/* 8D3260 80241D50 0200202D */ daddu $a0, $s0, $zero -/* 8D3264 80241D54 3C05FD05 */ lui $a1, 0xfd05 -/* 8D3268 80241D58 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D326C 80241D5C 0C0B2026 */ jal set_variable -/* 8D3270 80241D60 0000302D */ daddu $a2, $zero, $zero -/* 8D3274 80241D64 0200202D */ daddu $a0, $s0, $zero -/* 8D3278 80241D68 3C05FD05 */ lui $a1, 0xfd05 -/* 8D327C 80241D6C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D3280 80241D70 0C0B2026 */ jal set_variable -/* 8D3284 80241D74 0000302D */ daddu $a2, $zero, $zero -/* 8D3288 80241D78 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D328C 80241D7C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D3290 80241D80 8FB20018 */ lw $s2, 0x18($sp) -/* 8D3294 80241D84 8FB10014 */ lw $s1, 0x14($sp) -/* 8D3298 80241D88 8FB00010 */ lw $s0, 0x10($sp) -/* 8D329C 80241D8C 24020002 */ addiu $v0, $zero, 2 -/* 8D32A0 80241D90 03E00008 */ jr $ra -/* 8D32A4 80241D94 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8D32A8 80241D98 00000000 */ nop -/* 8D32AC 80241D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s deleted file mode 100644 index e3d954ccfb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F8_8D72F8 -/* 8D72F8 802414F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D72FC 802414FC AFB00010 */ sw $s0, 0x10($sp) -/* 8D7300 80241500 0080802D */ daddu $s0, $a0, $zero -/* 8D7304 80241504 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D7308 80241508 0C00FB5A */ jal get_enemy_safe -/* 8D730C 8024150C 24040002 */ addiu $a0, $zero, 2 -/* 8D7310 80241510 AE020084 */ sw $v0, 0x84($s0) -/* 8D7314 80241514 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D7318 80241518 8FB00010 */ lw $s0, 0x10($sp) -/* 8D731C 8024151C 24020002 */ addiu $v0, $zero, 2 -/* 8D7320 80241520 03E00008 */ jr $ra -/* 8D7324 80241524 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8D7328 80241528 00000000 */ nop -/* 8D732C 8024152C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s deleted file mode 100644 index e6a170ae27..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240304_8D87D4 -/* 8D87D4 80240304 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D87D8 80240308 AFB10014 */ sw $s1, 0x14($sp) -/* 8D87DC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* 8D87E0 80240310 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D87E4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D87E8 80240318 AFB20018 */ sw $s2, 0x18($sp) -/* 8D87EC 8024031C AFB00010 */ sw $s0, 0x10($sp) -/* 8D87F0 80240320 8E30000C */ lw $s0, 0xc($s1) -/* 8D87F4 80240324 8E050000 */ lw $a1, ($s0) -/* 8D87F8 80240328 0C0B1EAF */ jal get_variable -/* 8D87FC 8024032C 26100004 */ addiu $s0, $s0, 4 -/* 8D8800 80240330 8E050000 */ lw $a1, ($s0) -/* 8D8804 80240334 26100004 */ addiu $s0, $s0, 4 -/* 8D8808 80240338 0220202D */ daddu $a0, $s1, $zero -/* 8D880C 8024033C 0C0B1EAF */ jal get_variable -/* 8D8810 80240340 0040982D */ daddu $s3, $v0, $zero -/* 8D8814 80240344 8E050000 */ lw $a1, ($s0) -/* 8D8818 80240348 26100004 */ addiu $s0, $s0, 4 -/* 8D881C 8024034C 0220202D */ daddu $a0, $s1, $zero -/* 8D8820 80240350 0C0B1EAF */ jal get_variable -/* 8D8824 80240354 0040902D */ daddu $s2, $v0, $zero -/* 8D8828 80240358 0220202D */ daddu $a0, $s1, $zero -/* 8D882C 8024035C 8E050000 */ lw $a1, ($s0) -/* 8D8830 80240360 0C0B1EAF */ jal get_variable -/* 8D8834 80240364 0040882D */ daddu $s1, $v0, $zero -/* 8D8838 80240368 0260202D */ daddu $a0, $s3, $zero -/* 8D883C 8024036C 0C04417A */ jal get_entity_by_index -/* 8D8840 80240370 0040802D */ daddu $s0, $v0, $zero -/* 8D8844 80240374 0040182D */ daddu $v1, $v0, $zero -/* 8D8848 80240378 44920000 */ mtc1 $s2, $f0 -/* 8D884C 8024037C 00000000 */ nop -/* 8D8850 80240380 46800020 */ cvt.s.w $f0, $f0 -/* 8D8854 80240384 E4600048 */ swc1 $f0, 0x48($v1) -/* 8D8858 80240388 44910000 */ mtc1 $s1, $f0 -/* 8D885C 8024038C 00000000 */ nop -/* 8D8860 80240390 46800020 */ cvt.s.w $f0, $f0 -/* 8D8864 80240394 E460004C */ swc1 $f0, 0x4c($v1) -/* 8D8868 80240398 44900000 */ mtc1 $s0, $f0 -/* 8D886C 8024039C 00000000 */ nop -/* 8D8870 802403A0 46800020 */ cvt.s.w $f0, $f0 -/* 8D8874 802403A4 E4600050 */ swc1 $f0, 0x50($v1) -/* 8D8878 802403A8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D887C 802403AC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D8880 802403B0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D8884 802403B4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D8888 802403B8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D888C 802403BC 24020002 */ addiu $v0, $zero, 2 -/* 8D8890 802403C0 03E00008 */ jr $ra -/* 8D8894 802403C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8D8898 802403C8 00000000 */ nop -/* 8D889C 802403CC 00000000 */ nop diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index fa5c2991fd..f093d21cf2 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -10,6 +10,14 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240434_8CAD34); +ApiStatus func_80240434_8CAD34(ScriptInstance* script, s32 isInitialCall) { + gPlayerData.hammerLevel = 0; -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240444_8CAD44); + return ApiStatus_DONE2; +} + +ApiStatus func_80240444_8CAD44(ScriptInstance* script, s32 isInitialCall) { + func_8010FD68(get_entity_by_index(script->varTable[0])); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_kmr/kmr_05/8CF570.c b/src/world/area_kmr/kmr_05/8CF570.c index 40108e0814..918928f1c1 100644 --- a/src/world/area_kmr/kmr_05/8CF570.c +++ b/src/world/area_kmr/kmr_05/8CF570.c @@ -2,5 +2,12 @@ #include "world/common/SomeMatrixOperations.inc.c" +ApiStatus func_8024173C_8CF7AC(ScriptInstance* script, s32 isInitialCall) { + if (get_enemy_safe(6) == NULL) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_8024173C_8CF7AC); + return ApiStatus_DONE2; +} diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c index a143535e33..e16bb442c4 100644 --- a/src/world/area_kmr/kmr_06/8D2A10.c +++ b/src/world/area_kmr/kmr_06/8D2A10.c @@ -14,4 +14,21 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241A68_8D2F78); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241C78_8D3188); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241CC8_8D31D8); +ApiStatus func_80241CC8_8D31D8(ScriptInstance* script, s32 isInitialCall) { + // todo use correct types + s32* mapVar10 = get_variable(script, SI_MAP_VAR(10)); + s32 mapVar11 = get_variable(script, SI_MAP_VAR(11)); + s32 mapVar12 = get_variable(script, SI_MAP_VAR(12)); + + func_801235C0(mapVar10[1]); + + heap_free(mapVar10); + heap_free(mapVar11); + heap_free(mapVar12); + + set_variable(script, SI_MAP_VAR(10), 0); + set_variable(script, SI_MAP_VAR(11), 0); + set_variable(script, SI_MAP_VAR(12), 0); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index e72deb901d..485dac7e92 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -22,4 +22,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802411E8_8D6FE8); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_8024130C_8D710C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802414F8_8D72F8); +ApiStatus func_802414F8_8D72F8(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = get_enemy_safe(2); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index c9559e5a2a..b6fe6e8913 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -10,4 +10,17 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738); INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240304_8D87D4); +ApiStatus func_80240304_8D87D4(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 entityIndex = get_variable(script, *args++); + s32 x = get_variable(script, *args++); + s32 y = get_variable(script, *args++); + s32 z = get_variable(script, *args++); + Entity* entity = get_entity_by_index(entityIndex); + + entity->position.x = x; + entity->position.y = y; + entity->position.z = z; + + return ApiStatus_DONE2; +} diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 535099ac83..e514193529 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -564,6 +564,7 @@ EnemyNpcDefeat = 0x8007809C; D_80078DB0 = 0x80078DB0; D_80078DB4 = 0x80078DB4; gEffectTable = 0x8007F214; +gItemTable = 0x800878E0; // size: 0x2D80 gAreas = 0x800934F0; gCurrentEncounter = 0x800B0F10; // size:0xB0 gBattleState = 0x800DC068; From d55b0888a1c6c042ecd3f697a20ed3011cc15b3c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 15:22:54 -0500 Subject: [PATCH 04/12] gItemTable offsets --- .../code_135EE0/pause_badges_comparator.s | 8 +- .../code_135EE0/pause_badges_try_equip.s | 4 +- asm/nonmatchings/code_18C790/func_8025E190.s | 8 +- asm/nonmatchings/code_18F340/func_80260E90.s | 4 +- asm/nonmatchings/code_18F340/func_80261064.s | 4 +- asm/nonmatchings/code_18F340/func_802611E8.s | 4 +- .../code_415D90/update_partner_menu.s | 4 +- .../code_415D90/update_player_menu.s | 12 +-- .../code_80850_len_3060/is_ability_active.s | 4 +- .../code_b72b0_len_15ed0/func_80133A94.s | 4 +- .../code_b72b0_len_15ed0/func_801363A0.s | 8 +- .../code_b72b0_len_15ed0/func_8013673C.s | 4 +- .../update_item_entity_temp.s | 16 ++-- .../code_ebd0_len_6a0/func_80033BC0.s | 52 +++++----- .../code_f270_len_1190/func_80034C3C.s | 88 ++++++++--------- .../hos_06/A397F0/func_80240AD0_A39FB0.s | 4 +- .../mac_01/8017D0/func_8024522C_805AAC.s | 4 +- .../nok_02/9DA8F0/func_802442E0_9DB300.s | 4 +- .../world/world/load_map_by_IDs.s | 96 +++++++++---------- tools/symbol_addrs.txt | 2 +- 20 files changed, 167 insertions(+), 167 deletions(-) diff --git a/asm/nonmatchings/code_135EE0/pause_badges_comparator.s b/asm/nonmatchings/code_135EE0/pause_badges_comparator.s index af6a222628..71523184a5 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_comparator.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_comparator.s @@ -8,9 +8,9 @@ glabel pause_badges_comparator /* 13A32C 80246FEC 08091C00 */ j .L80247000 /* 13A330 80246FF0 24037FFF */ addiu $v1, $zero, 0x7fff .L80246FF4: -/* 13A334 80246FF4 3C038008 */ lui $v1, 0x8008 +/* 13A334 80246FF4 3C038008 */ lui $v1, %hi(gItemTable+0x6) /* 13A338 80246FF8 00621821 */ addu $v1, $v1, $v0 -/* 13A33C 80246FFC 946378E6 */ lhu $v1, 0x78e6($v1) +/* 13A33C 80246FFC 946378E6 */ lhu $v1, %lo(gItemTable+0x6)($v1) .L80247000: /* 13A340 80247000 84A20000 */ lh $v0, ($a1) /* 13A344 80247004 14400003 */ bnez $v0, .L80247014 @@ -18,9 +18,9 @@ glabel pause_badges_comparator /* 13A34C 8024700C 08091C08 */ j .L80247020 /* 13A350 80247010 24047FFF */ addiu $a0, $zero, 0x7fff .L80247014: -/* 13A354 80247014 3C048008 */ lui $a0, 0x8008 +/* 13A354 80247014 3C048008 */ lui $a0, %hi(gItemTable+0x6) /* 13A358 80247018 00822021 */ addu $a0, $a0, $v0 -/* 13A35C 8024701C 948478E6 */ lhu $a0, 0x78e6($a0) +/* 13A35C 8024701C 948478E6 */ lhu $a0, %lo(gItemTable+0x6)($a0) .L80247020: /* 13A360 80247020 00031400 */ sll $v0, $v1, 0x10 /* 13A364 80247024 00021C03 */ sra $v1, $v0, 0x10 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s b/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s index fc676a9918..09ccf5cca0 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_try_equip.s @@ -41,9 +41,9 @@ glabel pause_badges_try_equip /* 13A6FC 802473BC 00021403 */ sra $v0, $v0, 0x10 /* 13A700 802473C0 10400013 */ beqz $v0, .L80247410 /* 13A704 802473C4 00021140 */ sll $v0, $v0, 5 -/* 13A708 802473C8 3C038008 */ lui $v1, 0x8008 +/* 13A708 802473C8 3C038008 */ lui $v1, %hi(gItemTable+0x1A) /* 13A70C 802473CC 00621821 */ addu $v1, $v1, $v0 -/* 13A710 802473D0 906378FA */ lbu $v1, 0x78fa($v1) +/* 13A710 802473D0 906378FA */ lbu $v1, %lo(gItemTable+0x1A)($v1) /* 13A714 802473D4 00031080 */ sll $v0, $v1, 2 /* 13A718 802473D8 00431021 */ addu $v0, $v0, $v1 /* 13A71C 802473DC 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s index 25536adca0..b9ce87826e 100644 --- a/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/asm/nonmatchings/code_18C790/func_8025E190.s @@ -816,8 +816,8 @@ glabel func_8025E190 /* 18D6C4 8025EDE4 2404000C */ addiu $a0, $zero, 0xc /* 18D6C8 8025EDE8 1040001B */ beqz $v0, .L8025EE58 /* 18D6CC 8025EDEC 00000000 */ nop -/* 18D6D0 8025EDF0 3C028009 */ lui $v0, 0x8009 -/* 18D6D4 8025EDF4 844297E4 */ lh $v0, -0x681c($v0) +/* 18D6D0 8025EDF0 3C028009 */ lui $v0, %hi(gItemTable+0x1F04) +/* 18D6D4 8025EDF4 844297E4 */ lh $v0, %lo(gItemTable+0x1F04)($v0) /* 18D6D8 8025EDF8 3C14802A */ lui $s4, 0x802a /* 18D6DC 8025EDFC 8E94FAA8 */ lw $s4, -0x558($s4) /* 18D6E0 8025EE00 000210C0 */ sll $v0, $v0, 3 @@ -1062,8 +1062,8 @@ glabel func_8025E190 /* 18DA84 8025F1A4 24040004 */ addiu $a0, $zero, 4 /* 18DA88 8025F1A8 1040001B */ beqz $v0, .L8025F218 /* 18DA8C 8025F1AC 00000000 */ nop -/* 18DA90 8025F1B0 3C028009 */ lui $v0, 0x8009 -/* 18DA94 8025F1B4 844295C4 */ lh $v0, -0x6a3c($v0) +/* 18DA90 8025F1B0 3C028009 */ lui $v0, %hi(gItemTable+0x1CE4) +/* 18DA94 8025F1B4 844295C4 */ lh $v0, %lo(gItemTable+0x1CE4)($v0) /* 18DA98 8025F1B8 3C14802A */ lui $s4, 0x802a /* 18DA9C 8025F1BC 8E94FAC4 */ lw $s4, -0x53c($s4) /* 18DAA0 8025F1C0 000210C0 */ sll $v0, $v0, 3 diff --git a/asm/nonmatchings/code_18F340/func_80260E90.s b/asm/nonmatchings/code_18F340/func_80260E90.s index 83d0f9b1fd..91972974b5 100644 --- a/asm/nonmatchings/code_18F340/func_80260E90.s +++ b/asm/nonmatchings/code_18F340/func_80260E90.s @@ -23,9 +23,9 @@ glabel func_80260E90 /* 18F7B8 80260ED8 8442017A */ lh $v0, 0x17a($v0) /* 18F7BC 80260EDC 0260202D */ daddu $a0, $s3, $zero /* 18F7C0 80260EE0 00021140 */ sll $v0, $v0, 5 -/* 18F7C4 80260EE4 3C128008 */ lui $s2, 0x8008 +/* 18F7C4 80260EE4 3C128008 */ lui $s2, %hi(gItemTable+0xC) /* 18F7C8 80260EE8 02429021 */ addu $s2, $s2, $v0 -/* 18F7CC 80260EEC 865278EC */ lh $s2, 0x78ec($s2) +/* 18F7CC 80260EEC 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) /* 18F7D0 80260EF0 92620191 */ lbu $v0, 0x191($s3) /* 18F7D4 80260EF4 C6620148 */ lwc1 $f2, 0x148($s3) /* 18F7D8 80260EF8 44820000 */ mtc1 $v0, $f0 diff --git a/asm/nonmatchings/code_18F340/func_80261064.s b/asm/nonmatchings/code_18F340/func_80261064.s index 49745bae6e..4fa77ee069 100644 --- a/asm/nonmatchings/code_18F340/func_80261064.s +++ b/asm/nonmatchings/code_18F340/func_80261064.s @@ -10,9 +10,9 @@ glabel func_80261064 /* 18F958 80261078 8462017A */ lh $v0, 0x17a($v1) /* 18F95C 8026107C 8C6400D8 */ lw $a0, 0xd8($v1) /* 18F960 80261080 00021140 */ sll $v0, $v0, 5 -/* 18F964 80261084 3C108008 */ lui $s0, 0x8008 +/* 18F964 80261084 3C108008 */ lui $s0, %hi(gItemTable+0xC) /* 18F968 80261088 02028021 */ addu $s0, $s0, $v0 -/* 18F96C 8026108C 861078EC */ lh $s0, 0x78ec($s0) +/* 18F96C 8026108C 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) /* 18F970 80261090 0C099CAB */ jal heroes_is_ability_active /* 18F974 80261094 2405001D */ addiu $a1, $zero, 0x1d /* 18F978 80261098 10400007 */ beqz $v0, .L802610B8 diff --git a/asm/nonmatchings/code_18F340/func_802611E8.s b/asm/nonmatchings/code_18F340/func_802611E8.s index bd5d756376..b77b1b717e 100644 --- a/asm/nonmatchings/code_18F340/func_802611E8.s +++ b/asm/nonmatchings/code_18F340/func_802611E8.s @@ -8,8 +8,8 @@ glabel func_802611E8 /* 18FAD4 802611F4 3C048011 */ lui $a0, %hi(gPlayerData) /* 18FAD8 802611F8 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) /* 18FADC 802611FC AFB10014 */ sw $s1, 0x14($sp) -/* 18FAE0 80261200 3C118009 */ lui $s1, 0x8009 -/* 18FAE4 80261204 26318B80 */ addiu $s1, $s1, -0x7480 +/* 18FAE0 80261200 3C118009 */ lui $s1, %hi(gItemTable+0x12A0) +/* 18FAE4 80261204 26318B80 */ addiu $s1, $s1, %lo(gItemTable+0x12A0) /* 18FAE8 80261208 AFBF001C */ sw $ra, 0x1c($sp) /* 18FAEC 8026120C AFB00010 */ sw $s0, 0x10($sp) /* 18FAF0 80261210 90820002 */ lbu $v0, 2($a0) diff --git a/asm/nonmatchings/code_415D90/update_partner_menu.s b/asm/nonmatchings/code_415D90/update_partner_menu.s index 130efaf459..2632ee7d7c 100644 --- a/asm/nonmatchings/code_415D90/update_partner_menu.s +++ b/asm/nonmatchings/code_415D90/update_partner_menu.s @@ -881,9 +881,9 @@ glabel update_partner_menu /* 41DC4C 802A8EBC A682017A */ sh $v0, 0x17a($s4) /* 41DC50 802A8EC0 00021400 */ sll $v0, $v0, 0x10 /* 41DC54 802A8EC4 000212C3 */ sra $v0, $v0, 0xb -/* 41DC58 802A8EC8 3C038008 */ lui $v1, 0x8008 +/* 41DC58 802A8EC8 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41DC5C 802A8ECC 00621821 */ addu $v1, $v1, $v0 -/* 41DC60 802A8ED0 8C6378E8 */ lw $v1, 0x78e8($v1) +/* 41DC60 802A8ED0 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) /* 41DC64 802A8ED4 9242032D */ lbu $v0, 0x32d($s2) /* 41DC68 802A8ED8 AE800188 */ sw $zero, 0x188($s4) /* 41DC6C 802A8EDC 2442FFFF */ addiu $v0, $v0, -1 diff --git a/asm/nonmatchings/code_415D90/update_player_menu.s b/asm/nonmatchings/code_415D90/update_player_menu.s index 8400f7b653..354b17aef3 100644 --- a/asm/nonmatchings/code_415D90/update_player_menu.s +++ b/asm/nonmatchings/code_415D90/update_player_menu.s @@ -1524,9 +1524,9 @@ glabel update_player_menu /* 41BD14 802A6F84 A6C2017A */ sh $v0, 0x17a($s6) /* 41BD18 802A6F88 00021400 */ sll $v0, $v0, 0x10 /* 41BD1C 802A6F8C 000212C3 */ sra $v0, $v0, 0xb -/* 41BD20 802A6F90 3C038008 */ lui $v1, 0x8008 +/* 41BD20 802A6F90 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41BD24 802A6F94 00621821 */ addu $v1, $v1, $v0 -/* 41BD28 802A6F98 8C6378E8 */ lw $v1, 0x78e8($v1) +/* 41BD28 802A6F98 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) /* 41BD2C 802A6F9C 3C02802B */ lui $v0, 0x802b /* 41BD30 802A6FA0 9042CFFD */ lbu $v0, -0x3003($v0) /* 41BD34 802A6FA4 AEC00188 */ sw $zero, 0x188($s6) @@ -1698,9 +1698,9 @@ glabel update_player_menu /* 41BFAC 802A721C 24030034 */ addiu $v1, $zero, 0x34 /* 41BFB0 802A7220 A6C3017C */ sh $v1, 0x17c($s6) /* 41BFB4 802A7224 00021140 */ sll $v0, $v0, 5 -/* 41BFB8 802A7228 3C038008 */ lui $v1, 0x8008 +/* 41BFB8 802A7228 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41BFBC 802A722C 00621821 */ addu $v1, $v1, $v0 -/* 41BFC0 802A7230 8C6378E8 */ lw $v1, 0x78e8($v1) +/* 41BFC0 802A7230 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) /* 41BFC4 802A7234 3C02802B */ lui $v0, 0x802b /* 41BFC8 802A7238 9042CFFD */ lbu $v0, -0x3003($v0) /* 41BFCC 802A723C AEC00188 */ sw $zero, 0x188($s6) @@ -2116,9 +2116,9 @@ glabel update_player_menu /* 41C5DC 802A784C A6C2017A */ sh $v0, 0x17a($s6) /* 41C5E0 802A7850 00021400 */ sll $v0, $v0, 0x10 /* 41C5E4 802A7854 000212C3 */ sra $v0, $v0, 0xb -/* 41C5E8 802A7858 3C038008 */ lui $v1, 0x8008 +/* 41C5E8 802A7858 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41C5EC 802A785C 00621821 */ addu $v1, $v1, $v0 -/* 41C5F0 802A7860 8C6378E8 */ lw $v1, 0x78e8($v1) +/* 41C5F0 802A7860 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) /* 41C5F4 802A7864 3C02802B */ lui $v0, 0x802b /* 41C5F8 802A7868 9042CFFD */ lbu $v0, -0x3003($v0) /* 41C5FC 802A786C AEC00188 */ sw $zero, 0x188($s6) diff --git a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s index c7c3a412d7..0fb8cd2082 100644 --- a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s +++ b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s @@ -36,9 +36,9 @@ glabel is_ability_active /* 8326C 800E9DBC 84430208 */ lh $v1, 0x208($v0) /* 83270 800E9DC0 10600004 */ beqz $v1, .L800E9DD4 /* 83274 800E9DC4 00031140 */ sll $v0, $v1, 5 -/* 83278 800E9DC8 3C038008 */ lui $v1, 0x8008 +/* 83278 800E9DC8 3C038008 */ lui $v1, %hi(gItemTable+0x1A) /* 8327C 800E9DCC 00621821 */ addu $v1, $v1, $v0 -/* 83280 800E9DD0 906378FA */ lbu $v1, 0x78fa($v1) +/* 83280 800E9DD0 906378FA */ lbu $v1, %lo(gItemTable+0x1A)($v1) .L800E9DD4: /* 83284 800E9DD4 2D220038 */ sltiu $v0, $t1, 0x38 /* 83288 800E9DD8 504000A9 */ beql $v0, $zero, .L800EA080 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s index 11b9bc03b0..088737167b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80133A94.s @@ -17,9 +17,9 @@ glabel func_80133A94 /* CA1C4 80133AC4 34424000 */ ori $v0, $v0, 0x4000 /* CA1C8 80133AC8 00431824 */ and $v1, $v0, $v1 /* CA1CC 80133ACC AC830000 */ sw $v1, ($a0) -/* CA1D0 80133AD0 3C028008 */ lui $v0, 0x8008 +/* CA1D0 80133AD0 3C028008 */ lui $v0, %hi(gItemTable+0x18) /* CA1D4 80133AD4 00451021 */ addu $v0, $v0, $a1 -/* CA1D8 80133AD8 944278F8 */ lhu $v0, 0x78f8($v0) +/* CA1D8 80133AD8 944278F8 */ lhu $v0, %lo(gItemTable+0x18)($v0) /* CA1DC 80133ADC 30421000 */ andi $v0, $v0, 0x1000 /* CA1E0 80133AE0 10400005 */ beqz $v0, .L80133AF8 /* CA1E4 80133AE4 3C020004 */ lui $v0, 4 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s index d73bf04627..797379ba6d 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s @@ -69,9 +69,9 @@ glabel func_801363A0 /* CCB84 80136484 0000282D */ daddu $a1, $zero, $zero /* CCB88 80136488 86840018 */ lh $a0, 0x18($s4) /* CCB8C 8013648C 00041140 */ sll $v0, $a0, 5 -/* CCB90 80136490 3C038008 */ lui $v1, 0x8008 +/* CCB90 80136490 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* CCB94 80136494 00621821 */ addu $v1, $v1, $v0 -/* CCB98 80136498 946378F8 */ lhu $v1, 0x78f8($v1) +/* CCB98 80136498 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* CCB9C 8013649C 30620008 */ andi $v0, $v1, 8 /* CCBA0 801364A0 5440000F */ bnel $v0, $zero, .L801364E0 /* CCBA4 801364A4 0240202D */ daddu $a0, $s2, $zero @@ -160,9 +160,9 @@ glabel func_801363A0 .L801365C8: /* CCCC8 801365C8 86840018 */ lh $a0, 0x18($s4) /* CCCCC 801365CC 00041140 */ sll $v0, $a0, 5 -/* CCCD0 801365D0 3C038008 */ lui $v1, 0x8008 +/* CCCD0 801365D0 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* CCCD4 801365D4 00621821 */ addu $v1, $v1, $v0 -/* CCCD8 801365D8 946378F8 */ lhu $v1, 0x78f8($v1) +/* CCCD8 801365D8 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* CCCDC 801365DC 2404000C */ addiu $a0, $zero, 0xc /* CCCE0 801365E0 0220282D */ daddu $a1, $s1, $zero /* CCCE4 801365E4 24C6FFE8 */ addiu $a2, $a2, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s index 04bd6932e8..4a400b5825 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8013673C.s @@ -102,9 +102,9 @@ glabel func_8013673C /* CCF94 80136894 86250018 */ lh $a1, 0x18($s1) /* CCF98 80136898 00021040 */ sll $v0, $v0, 1 /* CCF9C 8013689C 00051940 */ sll $v1, $a1, 5 -/* CCFA0 801368A0 3C048008 */ lui $a0, 0x8008 +/* CCFA0 801368A0 3C048008 */ lui $a0, %hi(gItemTable+0x18) /* CCFA4 801368A4 00832021 */ addu $a0, $a0, $v1 -/* CCFA8 801368A8 948478F8 */ lhu $a0, 0x78f8($a0) +/* CCFA8 801368A8 948478F8 */ lhu $a0, %lo(gItemTable+0x18)($a0) /* CCFAC 801368AC 3C068015 */ lui $a2, 0x8015 /* CCFB0 801368B0 00C23021 */ addu $a2, $a2, $v0 /* CCFB4 801368B4 84C6C6E4 */ lh $a2, -0x391c($a2) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s index a976d26f12..69126c8956 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s @@ -97,9 +97,9 @@ glabel update_item_entity_temp /* CBF38 80135838 00000000 */ nop /* CBF3C 8013583C 86240018 */ lh $a0, 0x18($s1) /* CBF40 80135840 00041140 */ sll $v0, $a0, 5 -/* CBF44 80135844 3C038008 */ lui $v1, 0x8008 +/* CBF44 80135844 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* CBF48 80135848 00621821 */ addu $v1, $v1, $v0 -/* CBF4C 8013584C 946378F8 */ lhu $v1, 0x78f8($v1) +/* CBF4C 8013584C 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* CBF50 80135850 30620040 */ andi $v0, $v1, 0x40 /* CBF54 80135854 10400003 */ beqz $v0, .L80135864 /* CBF58 80135858 30620008 */ andi $v0, $v1, 8 @@ -310,9 +310,9 @@ glabel update_item_entity_temp /* CC234 80135B34 00000000 */ nop /* CC238 80135B38 86240018 */ lh $a0, 0x18($s1) /* CC23C 80135B3C 00041140 */ sll $v0, $a0, 5 -/* CC240 80135B40 3C038008 */ lui $v1, 0x8008 +/* CC240 80135B40 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* CC244 80135B44 00621821 */ addu $v1, $v1, $v0 -/* CC248 80135B48 946378F8 */ lhu $v1, 0x78f8($v1) +/* CC248 80135B48 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* CC24C 80135B4C 30620040 */ andi $v0, $v1, 0x40 /* CC250 80135B50 1440000F */ bnez $v0, .L80135B90 /* CC254 80135B54 30620008 */ andi $v0, $v1, 8 @@ -377,9 +377,9 @@ glabel update_item_entity_temp /* CC334 80135C34 00000000 */ nop /* CC338 80135C38 86240018 */ lh $a0, 0x18($s1) /* CC33C 80135C3C 00041140 */ sll $v0, $a0, 5 -/* CC340 80135C40 3C038008 */ lui $v1, 0x8008 +/* CC340 80135C40 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* CC344 80135C44 00621821 */ addu $v1, $v1, $v0 -/* CC348 80135C48 946378F8 */ lhu $v1, 0x78f8($v1) +/* CC348 80135C48 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* CC34C 80135C4C 30620040 */ andi $v0, $v1, 0x40 /* CC350 80135C50 54400013 */ bnel $v0, $zero, .L80135CA0 /* CC354 80135C54 3C040006 */ lui $a0, 6 @@ -413,9 +413,9 @@ glabel update_item_entity_temp /* CC3B8 80135CB8 24020006 */ addiu $v0, $zero, 6 /* CC3BC 80135CBC 86240018 */ lh $a0, 0x18($s1) /* CC3C0 80135CC0 00041140 */ sll $v0, $a0, 5 -/* CC3C4 80135CC4 3C038008 */ lui $v1, 0x8008 +/* CC3C4 80135CC4 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* CC3C8 80135CC8 00621821 */ addu $v1, $v1, $v0 -/* CC3CC 80135CCC 946378F8 */ lhu $v1, 0x78f8($v1) +/* CC3CC 80135CCC 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* CC3D0 80135CD0 30620040 */ andi $v0, $v1, 0x40 /* CC3D4 80135CD4 1440000F */ bnez $v0, .L80135D14 /* CC3D8 80135CD8 30620008 */ andi $v0, $v1, 8 diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s index d7331898fe..c9ec986f63 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s @@ -33,9 +33,9 @@ glabel func_80033BC0 /* F030 80033C30 0C018030 */ jal nuContRmbForceStopEnd /* F034 80033C34 AC820000 */ sw $v0, ($a0) /* F038 80033C38 0C05260E */ jal func_80149838 -/* F03C 80033C3C 00000000 */ nop +/* F03C 80033C3C 00000000 */ nop /* F040 80033C40 0C016AFA */ jal get_current_map_header -/* F044 80033C44 00000000 */ nop +/* F044 80033C44 00000000 */ nop /* F048 80033C48 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* F04C 80033C4C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F050 80033C50 8E040000 */ lw $a0, ($s0) @@ -53,7 +53,7 @@ glabel func_80033BC0 /* F080 80033C80 0C016BE1 */ jal func_8005AF84 /* F084 80033C84 A0400070 */ sb $zero, 0x70($v0) /* F088 80033C88 0C00AB37 */ jal func_8002ACDC -/* F08C 80033C8C 00000000 */ nop +/* F08C 80033C8C 00000000 */ nop /* F090 80033C90 0C05259C */ jal func_80149670 /* F094 80033C94 24040001 */ addiu $a0, $zero, 1 /* F098 80033C98 8E030000 */ lw $v1, ($s0) @@ -65,37 +65,37 @@ glabel func_80033BC0 /* F0B0 80033CB0 0C0B763E */ jal func_802DD8F8 /* F0B4 80033CB4 80440084 */ lb $a0, 0x84($v0) /* F0B8 80033CB8 0C0457FA */ jal init_model_data -/* F0BC 80033CBC 00000000 */ nop +/* F0BC 80033CBC 00000000 */ nop /* F0C0 80033CC0 0C05203C */ jal func_801480F0 -/* F0C4 80033CC4 00000000 */ nop +/* F0C4 80033CC4 00000000 */ nop /* F0C8 80033CC8 0C048316 */ jal init_virtual_models -/* F0CC 80033CCC 00000000 */ nop +/* F0CC 80033CCC 00000000 */ nop /* F0D0 80033CD0 0C0478C4 */ jal func_8011E310 -/* F0D4 80033CD4 00000000 */ nop +/* F0D4 80033CD4 00000000 */ nop /* F0D8 80033CD8 0C048C45 */ jal init_dynamic_entity_list -/* F0DC 80033CDC 00000000 */ nop +/* F0DC 80033CDC 00000000 */ nop /* F0E0 80033CE0 0000202D */ daddu $a0, $zero, $zero /* F0E4 80033CE4 0C0514BA */ jal func_801452E8 /* F0E8 80033CE8 0080282D */ daddu $a1, $a0, $zero /* F0EC 80033CEC 0C0504C0 */ jal init_menu_icon_list -/* F0F0 80033CF0 00000000 */ nop +/* F0F0 80033CF0 00000000 */ nop /* F0F4 80033CF4 0C04C433 */ jal init_item_entity_list -/* F0F8 80033CF8 00000000 */ nop +/* F0F8 80033CF8 00000000 */ nop /* F0FC 80033CFC 0C0B0CBB */ jal init_script_list -/* F100 80033D00 00000000 */ nop +/* F100 80033D00 00000000 */ nop /* F104 80033D04 0C00E14B */ jal init_npc_list -/* F108 80033D08 00000000 */ nop +/* F108 80033D08 00000000 */ nop /* F10C 80033D0C 0C044396 */ jal func_80110E58 -/* F110 80033D10 00000000 */ nop +/* F110 80033D10 00000000 */ nop /* F114 80033D14 0C0515CA */ jal init_trigger_list -/* F118 80033D18 00000000 */ nop +/* F118 80033D18 00000000 */ nop /* F11C 80033D1C 8E020000 */ lw $v0, ($s0) /* F120 80033D20 904200AA */ lbu $v0, 0xaa($v0) /* F124 80033D24 30420001 */ andi $v0, $v0, 1 /* F128 80033D28 10400008 */ beqz $v0, .L80033D4C -/* F12C 80033D2C 00000000 */ nop +/* F12C 80033D2C 00000000 */ nop /* F130 80033D30 0C00EC6C */ jal func_8003B1B0 -/* F134 80033D34 00000000 */ nop +/* F134 80033D34 00000000 */ nop /* F138 80033D38 3C02800A */ lui $v0, 0x800a /* F13C 80033D3C 8C420904 */ lw $v0, 0x904($v0) /* F140 80033D40 24040011 */ addiu $a0, $zero, 0x11 @@ -107,7 +107,7 @@ glabel func_80033BC0 /* F154 80033D54 0C03AC80 */ jal func_800EB200 /* F158 80033D58 80440012 */ lb $a0, 0x12($v0) /* F15C 80033D5C 0C0169B0 */ jal load_world_script_api -/* F160 80033D60 00000000 */ nop +/* F160 80033D60 00000000 */ nop /* F164 80033D64 3C04800E */ lui $a0, 0x800e /* F168 80033D68 24849230 */ addiu $a0, $a0, -0x6dd0 /* F16C 80033D6C 0C016B3A */ jal load_asset_by_name @@ -120,12 +120,12 @@ glabel func_80033BC0 /* F188 80033D88 0C00AB1E */ jal general_heap_free /* F18C 80033D8C 0200202D */ daddu $a0, $s0, $zero /* F190 80033D90 0C016BE5 */ jal initialize_collision -/* F194 80033D94 00000000 */ nop +/* F194 80033D94 00000000 */ nop /* F198 80033D98 0C016C16 */ jal load_collision -/* F19C 80033D9C 00000000 */ nop +/* F19C 80033D9C 00000000 */ nop /* F1A0 80033DA0 8E240008 */ lw $a0, 8($s1) /* F1A4 80033DA4 10800004 */ beqz $a0, .L80033DB8 -/* F1A8 80033DA8 00000000 */ nop +/* F1A8 80033DA8 00000000 */ nop /* F1AC 80033DAC 8E25000C */ lw $a1, 0xc($s1) /* F1B0 80033DB0 0C00A5CF */ jal dma_copy /* F1B4 80033DB4 8E260010 */ lw $a2, 0x10($s1) @@ -136,9 +136,9 @@ glabel func_80033BC0 /* F1C4 80033DC4 50800005 */ beql $a0, $zero, .L80033DDC /* F1C8 80033DC8 24040128 */ addiu $a0, $zero, 0x128 /* F1CC 80033DCC 0C05178A */ jal read_background_size -/* F1D0 80033DD0 00000000 */ nop +/* F1D0 80033DD0 00000000 */ nop /* F1D4 80033DD4 0800CF7B */ j .L80033DEC -/* F1D8 80033DD8 00000000 */ nop +/* F1D8 80033DD8 00000000 */ nop .L80033DDC: /* F1DC 80033DDC 240500C8 */ addiu $a1, $zero, 0xc8 /* F1E0 80033DE0 2406000C */ addiu $a2, $zero, 0xc @@ -154,9 +154,9 @@ glabel func_80033BC0 /* F204 80033E04 0C045709 */ jal load_model_textures /* F208 80033E08 0040282D */ daddu $a1, $v0, $zero /* F20C 80033E0C 0C04584B */ jal calculate_model_sizes -/* F210 80033E10 00000000 */ nop +/* F210 80033E10 00000000 */ nop /* F214 80033E14 0C00EC6C */ jal func_8003B1B0 -/* F218 80033E18 00000000 */ nop +/* F218 80033E18 00000000 */ nop /* F21C 80033E1C 3C02800A */ lui $v0, 0x800a /* F220 80033E20 8C420904 */ lw $v0, 0x904($v0) /* F224 80033E24 3C04800A */ lui $a0, 0x800a @@ -164,12 +164,12 @@ glabel func_80033BC0 /* F22C 80033E2C 10800003 */ beqz $a0, .L80033E3C /* F230 80033E30 AE620004 */ sw $v0, 4($s3) /* F234 80033E34 0C009C22 */ jal func_80027088 -/* F238 80033E38 00000000 */ nop +/* F238 80033E38 00000000 */ nop .L80033E3C: /* F23C 80033E3C 24040004 */ addiu $a0, $zero, 4 .L80033E40: /* F240 80033E40 0C00CD3C */ jal set_game_mode -/* F244 80033E44 00000000 */ nop +/* F244 80033E44 00000000 */ nop .L80033E48: /* F248 80033E48 8FBF0028 */ lw $ra, 0x28($sp) /* F24C 80033E4C 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s index 75b1db7e46..61f3fe0a2d 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s @@ -17,19 +17,19 @@ glabel func_80034C3C /* 1006C 80034C6C 28620002 */ slti $v0, $v1, 2 /* 10070 80034C70 24020004 */ addiu $v0, $zero, 4 /* 10074 80034C74 106200CA */ beq $v1, $v0, .L80034FA0 -/* 10078 80034C78 00000000 */ nop +/* 10078 80034C78 00000000 */ nop /* 1007C 80034C7C 0800D3F6 */ j .L80034FD8 -/* 10080 80034C80 00000000 */ nop +/* 10080 80034C80 00000000 */ nop .L80034C84: /* 10084 80034C84 104000D4 */ beqz $v0, .L80034FD8 -/* 10088 80034C88 00000000 */ nop +/* 10088 80034C88 00000000 */ nop /* 1008C 80034C8C 046000D2 */ bltz $v1, .L80034FD8 /* 10090 80034C90 24020004 */ addiu $v0, $zero, 4 /* 10094 80034C94 3C06800A */ lui $a2, 0x800a /* 10098 80034C98 24C60920 */ addiu $a2, $a2, 0x920 /* 1009C 80034C9C 80C30000 */ lb $v1, ($a2) /* 100A0 80034CA0 14620007 */ bne $v1, $v0, .L80034CC0 -/* 100A4 80034CA4 00000000 */ nop +/* 100A4 80034CA4 00000000 */ nop /* 100A8 80034CA8 3C03800A */ lui $v1, %hi(D_8009A650) /* 100AC 80034CAC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* 100B0 80034CB0 8C620000 */ lw $v0, ($v1) @@ -44,7 +44,7 @@ glabel func_80034C3C /* 100D0 80034CD0 A0C20000 */ sb $v0, ($a2) /* 100D4 80034CD4 00021600 */ sll $v0, $v0, 0x18 /* 100D8 80034CD8 144000BF */ bnez $v0, .L80034FD8 -/* 100DC 80034CDC 00000000 */ nop +/* 100DC 80034CDC 00000000 */ nop .L80034CE0: /* 100E0 80034CE0 3C048007 */ lui $a0, 0x8007 /* 100E4 80034CE4 24847950 */ addiu $a0, $a0, 0x7950 @@ -53,7 +53,7 @@ glabel func_80034C3C /* 100F0 80034CF0 0C017CBC */ jal nuGfxSetCfb /* 100F4 80034CF4 A0C20000 */ sb $v0, ($a2) /* 100F8 80034CF8 0C0911C2 */ jal pause_cleanup -/* 100FC 80034CFC 00000000 */ nop +/* 100FC 80034CFC 00000000 */ nop /* 10100 80034D00 3C04800A */ lui $a0, %hi(D_8009A650) /* 10104 80034D04 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 10108 80034D08 8C820000 */ lw $v0, ($a0) @@ -80,47 +80,47 @@ glabel func_80034C3C /* 1015C 80034D5C 0C016BE1 */ jal func_8005AF84 /* 10160 80034D60 A4A30148 */ sh $v1, 0x148($a1) /* 10164 80034D64 0C00AB37 */ jal func_8002ACDC -/* 10168 80034D68 00000000 */ nop +/* 10168 80034D68 00000000 */ nop /* 1016C 80034D6C 0C018030 */ jal nuContRmbForceStopEnd -/* 10170 80034D70 00000000 */ nop +/* 10170 80034D70 00000000 */ nop /* 10174 80034D74 0C05259C */ jal func_80149670 /* 10178 80034D78 24040001 */ addiu $a0, $zero, 1 /* 1017C 80034D7C 8E020000 */ lw $v0, ($s0) /* 10180 80034D80 0C0B763E */ jal func_802DD8F8 /* 10184 80034D84 80440084 */ lb $a0, 0x84($v0) /* 10188 80034D88 0C0457FA */ jal init_model_data -/* 1018C 80034D8C 00000000 */ nop +/* 1018C 80034D8C 00000000 */ nop /* 10190 80034D90 0C05203C */ jal func_801480F0 -/* 10194 80034D94 00000000 */ nop +/* 10194 80034D94 00000000 */ nop /* 10198 80034D98 0C048316 */ jal init_virtual_models -/* 1019C 80034D9C 00000000 */ nop +/* 1019C 80034D9C 00000000 */ nop /* 101A0 80034DA0 0C0478C4 */ jal func_8011E310 -/* 101A4 80034DA4 00000000 */ nop +/* 101A4 80034DA4 00000000 */ nop /* 101A8 80034DA8 0C048C45 */ jal init_dynamic_entity_list -/* 101AC 80034DAC 00000000 */ nop +/* 101AC 80034DAC 00000000 */ nop /* 101B0 80034DB0 0000202D */ daddu $a0, $zero, $zero /* 101B4 80034DB4 0C0514BA */ jal func_801452E8 /* 101B8 80034DB8 0080282D */ daddu $a1, $a0, $zero /* 101BC 80034DBC 0C0504C0 */ jal init_menu_icon_list -/* 101C0 80034DC0 00000000 */ nop +/* 101C0 80034DC0 00000000 */ nop /* 101C4 80034DC4 0C04C433 */ jal init_item_entity_list -/* 101C8 80034DC8 00000000 */ nop +/* 101C8 80034DC8 00000000 */ nop /* 101CC 80034DCC 0C0B0CBB */ jal init_script_list -/* 101D0 80034DD0 00000000 */ nop +/* 101D0 80034DD0 00000000 */ nop /* 101D4 80034DD4 0C00E14B */ jal init_npc_list -/* 101D8 80034DD8 00000000 */ nop +/* 101D8 80034DD8 00000000 */ nop /* 101DC 80034DDC 0C044396 */ jal func_80110E58 -/* 101E0 80034DE0 00000000 */ nop +/* 101E0 80034DE0 00000000 */ nop /* 101E4 80034DE4 0C0515CA */ jal init_trigger_list -/* 101E8 80034DE8 00000000 */ nop +/* 101E8 80034DE8 00000000 */ nop /* 101EC 80034DEC 3C04800A */ lui $a0, 0x800a /* 101F0 80034DF0 8C840924 */ lw $a0, 0x924($a0) /* 101F4 80034DF4 0C0525FF */ jal func_801497FC -/* 101F8 80034DF8 00000000 */ nop +/* 101F8 80034DF8 00000000 */ nop /* 101FC 80034DFC 0C052B1C */ jal func_8014AC70 -/* 10200 80034E00 00000000 */ nop +/* 10200 80034E00 00000000 */ nop /* 10204 80034E04 0C0169B0 */ jal load_world_script_api -/* 10208 80034E08 00000000 */ nop +/* 10208 80034E08 00000000 */ nop /* 1020C 80034E0C 3C04800E */ lui $a0, 0x800e /* 10210 80034E10 24849230 */ addiu $a0, $a0, -0x6dd0 /* 10214 80034E14 0C016B3A */ jal load_asset_by_name @@ -133,12 +133,12 @@ glabel func_80034C3C /* 10230 80034E30 0C00AB1E */ jal general_heap_free /* 10234 80034E34 0200202D */ daddu $a0, $s0, $zero /* 10238 80034E38 0C016BE5 */ jal initialize_collision -/* 1023C 80034E3C 00000000 */ nop +/* 1023C 80034E3C 00000000 */ nop /* 10240 80034E40 0C016C16 */ jal load_collision -/* 10244 80034E44 00000000 */ nop +/* 10244 80034E44 00000000 */ nop /* 10248 80034E48 8E240008 */ lw $a0, 8($s1) /* 1024C 80034E4C 10800004 */ beqz $a0, .L80034E60 -/* 10250 80034E50 00000000 */ nop +/* 10250 80034E50 00000000 */ nop /* 10254 80034E54 8E25000C */ lw $a1, 0xc($s1) /* 10258 80034E58 0C00A5CF */ jal dma_copy /* 1025C 80034E5C 8E260010 */ lw $a2, 0x10($s1) @@ -149,9 +149,9 @@ glabel func_80034C3C /* 1026C 80034E6C 50800005 */ beql $a0, $zero, .L80034E84 /* 10270 80034E70 24040128 */ addiu $a0, $zero, 0x128 /* 10274 80034E74 0C05178A */ jal read_background_size -/* 10278 80034E78 00000000 */ nop +/* 10278 80034E78 00000000 */ nop /* 1027C 80034E7C 0800D3A5 */ j .L80034E94 -/* 10280 80034E80 00000000 */ nop +/* 10280 80034E80 00000000 */ nop .L80034E84: /* 10284 80034E84 240500C8 */ addiu $a1, $zero, 0xc8 /* 10288 80034E88 2406000C */ addiu $a2, $zero, 0xc @@ -164,11 +164,11 @@ glabel func_80034C3C /* 102A0 80034EA0 0C04584B */ jal calculate_model_sizes /* 102A4 80034EA4 A462015C */ sh $v0, 0x15c($v1) /* 102A8 80034EA8 0C00EC6C */ jal func_8003B1B0 -/* 102AC 80034EAC 00000000 */ nop +/* 102AC 80034EAC 00000000 */ nop /* 102B0 80034EB0 0C051FB1 */ jal func_80147EC4 /* 102B4 80034EB4 0000202D */ daddu $a0, $zero, $zero /* 102B8 80034EB8 0C03A631 */ jal func_800E98C4 -/* 102BC 80034EBC 00000000 */ nop +/* 102BC 80034EBC 00000000 */ nop /* 102C0 80034EC0 0C009C22 */ jal func_80027088 /* 102C4 80034EC4 24040001 */ addiu $a0, $zero, 1 /* 102C8 80034EC8 24020003 */ addiu $v0, $zero, 3 @@ -185,13 +185,13 @@ glabel func_80034C3C /* 102F4 80034EF4 3C01802E */ lui $at, 0x802e /* 102F8 80034EF8 A0239D71 */ sb $v1, -0x628f($at) /* 102FC 80034EFC 0C00F949 */ jal func_8003E524 -/* 10300 80034F00 00000000 */ nop +/* 10300 80034F00 00000000 */ nop /* 10304 80034F04 0C00E64C */ jal update_npcs -/* 10308 80034F08 00000000 */ nop +/* 10308 80034F08 00000000 */ nop /* 1030C 80034F0C 0C037DD0 */ jal update_player -/* 10310 80034F10 00000000 */ nop +/* 10310 80034F10 00000000 */ nop /* 10314 80034F14 0C016754 */ jal func_80059D50 -/* 10318 80034F18 00000000 */ nop +/* 10318 80034F18 00000000 */ nop /* 1031C 80034F1C 3C03800A */ lui $v1, 0x800a /* 10320 80034F20 24630922 */ addiu $v1, $v1, 0x922 /* 10324 80034F24 94620000 */ lhu $v0, ($v1) @@ -201,16 +201,16 @@ glabel func_80034C3C /* 10334 80034F34 04420028 */ bltzl $v0, .L80034FD8 /* 10338 80034F38 A4600000 */ sh $zero, ($v1) /* 1033C 80034F3C 0800D3F6 */ j .L80034FD8 -/* 10340 80034F40 00000000 */ nop +/* 10340 80034F40 00000000 */ nop .L80034F44: /* 10344 80034F44 0C00F949 */ jal func_8003E524 -/* 10348 80034F48 00000000 */ nop +/* 10348 80034F48 00000000 */ nop /* 1034C 80034F4C 0C00E64C */ jal update_npcs -/* 10350 80034F50 00000000 */ nop +/* 10350 80034F50 00000000 */ nop /* 10354 80034F54 0C037DD0 */ jal update_player -/* 10358 80034F58 00000000 */ nop +/* 10358 80034F58 00000000 */ nop /* 1035C 80034F5C 0C016754 */ jal func_80059D50 -/* 10360 80034F60 00000000 */ nop +/* 10360 80034F60 00000000 */ nop /* 10364 80034F64 3C04800A */ lui $a0, 0x800a /* 10368 80034F68 24840922 */ addiu $a0, $a0, 0x922 /* 1036C 80034F6C 84820000 */ lh $v0, ($a0) @@ -226,20 +226,20 @@ glabel func_80034C3C /* 10390 80034F90 04420011 */ bltzl $v0, .L80034FD8 /* 10394 80034F94 A4800000 */ sh $zero, ($a0) /* 10398 80034F98 0800D3F6 */ j .L80034FD8 -/* 1039C 80034F9C 00000000 */ nop +/* 1039C 80034F9C 00000000 */ nop .L80034FA0: /* 103A0 80034FA0 0C009C22 */ jal func_80027088 /* 103A4 80034FA4 0000202D */ daddu $a0, $zero, $zero /* 103A8 80034FA8 0C00F949 */ jal func_8003E524 -/* 103AC 80034FAC 00000000 */ nop +/* 103AC 80034FAC 00000000 */ nop /* 103B0 80034FB0 0C00E64C */ jal update_npcs -/* 103B4 80034FB4 00000000 */ nop +/* 103B4 80034FB4 00000000 */ nop /* 103B8 80034FB8 0C037DD0 */ jal update_player -/* 103BC 80034FBC 00000000 */ nop +/* 103BC 80034FBC 00000000 */ nop /* 103C0 80034FC0 0C016754 */ jal func_80059D50 -/* 103C4 80034FC4 00000000 */ nop +/* 103C4 80034FC4 00000000 */ nop /* 103C8 80034FC8 0C038069 */ jal enable_player_input -/* 103CC 80034FCC 00000000 */ nop +/* 103CC 80034FCC 00000000 */ nop /* 103D0 80034FD0 0C00CD3C */ jal set_game_mode /* 103D4 80034FD4 24040004 */ addiu $a0, $zero, 4 .L80034FD8: diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s index c5ce7fa7f1..a05cb23b6f 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s @@ -130,9 +130,9 @@ glabel func_80240AD0_A39FB0 /* A3A188 80240CA8 AE620094 */ sw $v0, 0x94($s3) /* A3A18C 80240CAC 8C620000 */ lw $v0, ($v1) /* A3A190 80240CB0 00021140 */ sll $v0, $v0, 5 -/* A3A194 80240CB4 3C038008 */ lui $v1, 0x8008 +/* A3A194 80240CB4 3C038008 */ lui $v1, %hi(gItemTable+0x1A) /* A3A198 80240CB8 00621821 */ addu $v1, $v1, $v0 -/* A3A19C 80240CBC 906378FA */ lbu $v1, 0x78fa($v1) +/* A3A19C 80240CBC 906378FA */ lbu $v1, %lo(gItemTable+0x1A)($v1) /* A3A1A0 80240CC0 00031080 */ sll $v0, $v1, 2 /* A3A1A4 80240CC4 00431021 */ addu $v0, $v0, $v1 /* A3A1A8 80240CC8 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s index 1927b1c282..26075f11b5 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s @@ -42,8 +42,8 @@ glabel func_8024522C_805AAC /* 805B3C 802452BC 8FA70010 */ lw $a3, 0x10($sp) /* 805B40 802452C0 54E20019 */ bnel $a3, $v0, .L80245328 /* 805B44 802452C4 26730001 */ addiu $s3, $s3, 1 -/* 805B48 802452C8 3C028009 */ lui $v0, 0x8009 -/* 805B4C 802452CC 84428364 */ lh $v0, -0x7c9c($v0) +/* 805B48 802452C8 3C028009 */ lui $v0, %hi(gItemTable+0xA84) +/* 805B4C 802452CC 84428364 */ lh $v0, %lo(gItemTable+0xA84)($v0) /* 805B50 802452D0 3C078009 */ lui $a3, 0x8009 /* 805B54 802452D4 24E7A680 */ addiu $a3, $a3, -0x5980 /* 805B58 802452D8 AE330108 */ sw $s3, 0x108($s1) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s index 1d1ca2e1e7..399fb6bed3 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s @@ -19,9 +19,9 @@ glabel func_802442E0_9DB300 /* 9DB338 80244318 00041140 */ sll $v0, $a0, 5 /* 9DB33C 8024431C 3C018025 */ lui $at, 0x8025 /* 9DB340 80244320 AC2429B4 */ sw $a0, 0x29b4($at) -/* 9DB344 80244324 3C038008 */ lui $v1, 0x8008 +/* 9DB344 80244324 3C038008 */ lui $v1, %hi(gItemTable+0x18) /* 9DB348 80244328 00621821 */ addu $v1, $v1, $v0 -/* 9DB34C 8024432C 946378F8 */ lhu $v1, 0x78f8($v1) +/* 9DB34C 8024432C 946378F8 */ lhu $v1, %lo(gItemTable+0x18)($v1) /* 9DB350 80244330 AE040088 */ sw $a0, 0x88($s0) /* 9DB354 80244334 30630004 */ andi $v1, $v1, 4 /* 9DB358 80244338 0003182B */ sltu $v1, $zero, $v1 diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s index 34eb98d497..4561cc722a 100644 --- a/asm/nonmatchings/world/world/load_map_by_IDs.s +++ b/asm/nonmatchings/world/world/load_map_by_IDs.s @@ -32,24 +32,24 @@ glabel load_map_by_IDs /* 35B60 8005A760 0C047624 */ jal func_8011D890 /* 35B64 8005A764 00108403 */ sra $s0, $s0, 0x10 /* 35B68 8005A768 0C048C2E */ jal clear_dynamic_entity_list -/* 35B6C 8005A76C 00000000 */ nop +/* 35B6C 8005A76C 00000000 */ nop /* 35B70 8005A770 0C0B0C77 */ jal clear_script_list -/* 35B74 8005A774 00000000 */ nop +/* 35B74 8005A774 00000000 */ nop /* 35B78 8005A778 12000005 */ beqz $s0, .L8005A790 /* 35B7C 8005A77C 24020001 */ addiu $v0, $zero, 1 /* 35B80 8005A780 12020008 */ beq $s0, $v0, .L8005A7A4 -/* 35B84 8005A784 00000000 */ nop +/* 35B84 8005A784 00000000 */ nop /* 35B88 8005A788 080169F0 */ j .L8005A7C0 -/* 35B8C 8005A78C 00000000 */ nop +/* 35B8C 8005A78C 00000000 */ nop .L8005A790: /* 35B90 8005A790 0C0514E4 */ jal clear_area_flags -/* 35B94 8005A794 00000000 */ nop +/* 35B94 8005A794 00000000 */ nop /* 35B98 8005A798 8E420000 */ lw $v0, ($s2) /* 35B9C 8005A79C 080169F0 */ j .L8005A7C0 /* 35BA0 8005A7A0 A0400167 */ sb $zero, 0x167($v0) .L8005A7A4: /* 35BA4 8005A7A4 0C00AD24 */ jal fio_deserialize_state -/* 35BA8 8005A7A8 00000000 */ nop +/* 35BA8 8005A7A8 00000000 */ nop /* 35BAC 8005A7AC 8E420000 */ lw $v0, ($s2) /* 35BB0 8005A7B0 94510086 */ lhu $s1, 0x86($v0) /* 35BB4 8005A7B4 9453008C */ lhu $s3, 0x8c($v0) @@ -93,17 +93,17 @@ glabel load_map_by_IDs /* 35C48 8005A848 3C01800A */ lui $at, 0x800a /* 35C4C 8005A84C AC3241E0 */ sw $s2, 0x41e0($at) /* 35C50 8005A850 10A00005 */ beqz $a1, .L8005A868 -/* 35C54 8005A854 00000000 */ nop +/* 35C54 8005A854 00000000 */ nop /* 35C58 8005A858 3C04800E */ lui $a0, 0x800e /* 35C5C 8005A85C 24849668 */ addiu $a0, $a0, -0x6998 /* 35C60 8005A860 0C01BB50 */ jal strcpy -/* 35C64 8005A864 00000000 */ nop +/* 35C64 8005A864 00000000 */ nop .L8005A868: /* 35C68 8005A868 0C0169B0 */ jal load_world_script_api -/* 35C6C 8005A86C 00000000 */ nop +/* 35C6C 8005A86C 00000000 */ nop /* 35C70 8005A870 8E440008 */ lw $a0, 8($s2) /* 35C74 8005A874 10800004 */ beqz $a0, .L8005A888 -/* 35C78 8005A878 00000000 */ nop +/* 35C78 8005A878 00000000 */ nop /* 35C7C 8005A87C 8E45000C */ lw $a1, 0xc($s2) /* 35C80 8005A880 0C00A5CF */ jal dma_copy /* 35C84 8005A884 8E460010 */ lw $a2, 0x10($s2) @@ -128,13 +128,13 @@ glabel load_map_by_IDs /* 35CC8 8005A8C8 3C13800A */ lui $s3, 0x800a /* 35CCC 8005A8CC 267341E8 */ addiu $s3, $s3, 0x41e8 /* 35CD0 8005A8D0 10400004 */ beqz $v0, .L8005A8E4 -/* 35CD4 8005A8D4 00000000 */ nop +/* 35CD4 8005A8D4 00000000 */ nop /* 35CD8 8005A8D8 0040F809 */ jalr $v0 -/* 35CDC 8005A8DC 00000000 */ nop +/* 35CDC 8005A8DC 00000000 */ nop /* 35CE0 8005A8E0 0040A02D */ daddu $s4, $v0, $zero .L8005A8E4: /* 35CE4 8005A8E4 16800015 */ bnez $s4, .L8005A93C -/* 35CE8 8005A8E8 00000000 */ nop +/* 35CE8 8005A8E8 00000000 */ nop /* 35CEC 8005A8EC 3C04800E */ lui $a0, 0x800e /* 35CF0 8005A8F0 24849230 */ addiu $a0, $a0, -0x6dd0 /* 35CF4 8005A8F4 0C016B3A */ jal load_asset_by_name @@ -158,78 +158,78 @@ glabel load_map_by_IDs .L8005A93C: /* 35D3C 8005A93C 8E420014 */ lw $v0, 0x14($s2) /* 35D40 8005A940 10400005 */ beqz $v0, .L8005A958 -/* 35D44 8005A944 00000000 */ nop +/* 35D44 8005A944 00000000 */ nop /* 35D48 8005A948 3C04800E */ lui $a0, 0x800e /* 35D4C 8005A94C 24849668 */ addiu $a0, $a0, -0x6998 /* 35D50 8005A950 0C05175C */ jal load_map_bg -/* 35D54 8005A954 00000000 */ nop +/* 35D54 8005A954 00000000 */ nop .L8005A958: /* 35D58 8005A958 0C00B458 */ jal func_8002D160 -/* 35D5C 8005A95C 00000000 */ nop +/* 35D5C 8005A95C 00000000 */ nop /* 35D60 8005A960 0C0AC81E */ jal func_802B2078 -/* 35D64 8005A964 00000000 */ nop +/* 35D64 8005A964 00000000 */ nop /* 35D68 8005A968 0C05259C */ jal func_80149670 /* 35D6C 8005A96C 0000202D */ daddu $a0, $zero, $zero /* 35D70 8005A970 0C048C2E */ jal clear_dynamic_entity_list -/* 35D74 8005A974 00000000 */ nop +/* 35D74 8005A974 00000000 */ nop /* 35D78 8005A978 0C0B0C77 */ jal clear_script_list -/* 35D7C 8005A97C 00000000 */ nop +/* 35D7C 8005A97C 00000000 */ nop /* 35D80 8005A980 0C00B7BD */ jal create_cameras_a -/* 35D84 8005A984 00000000 */ nop +/* 35D84 8005A984 00000000 */ nop /* 35D88 8005A988 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 35D8C 8005A98C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 35D90 8005A990 8E020000 */ lw $v0, ($s0) /* 35D94 8005A994 0C0B763E */ jal func_802DD8F8 /* 35D98 8005A998 80440084 */ lb $a0, 0x84($v0) /* 35D9C 8005A99C 0C047889 */ jal func_8011E224 -/* 35DA0 8005A9A0 00000000 */ nop +/* 35DA0 8005A9A0 00000000 */ nop /* 35DA4 8005A9A4 0C0482EC */ jal clear_virtual_models -/* 35DA8 8005A9A8 00000000 */ nop +/* 35DA8 8005A9A8 00000000 */ nop /* 35DAC 8005A9AC 0C00E12F */ jal clear_npcs -/* 35DB0 8005A9B0 00000000 */ nop +/* 35DB0 8005A9B0 00000000 */ nop /* 35DB4 8005A9B4 0C050440 */ jal func_80141100 -/* 35DB8 8005A9B8 00000000 */ nop +/* 35DB8 8005A9B8 00000000 */ nop /* 35DBC 8005A9BC 0C0515A0 */ jal clear_trigger_data -/* 35DC0 8005A9C0 00000000 */ nop +/* 35DC0 8005A9C0 00000000 */ nop /* 35DC4 8005A9C4 0C045751 */ jal clear_model_data -/* 35DC8 8005A9C8 00000000 */ nop +/* 35DC8 8005A9C8 00000000 */ nop /* 35DCC 8005A9CC 0C052010 */ jal func_80148040 -/* 35DD0 8005A9D0 00000000 */ nop +/* 35DD0 8005A9D0 00000000 */ nop /* 35DD4 8005A9D4 0C05177E */ jal func_80145DF8 -/* 35DD8 8005A9D8 00000000 */ nop +/* 35DD8 8005A9D8 00000000 */ nop /* 35DDC 8005A9DC 8E020000 */ lw $v0, ($s0) /* 35DE0 8005A9E0 804300A8 */ lb $v1, 0xa8($v0) /* 35DE4 8005A9E4 2402FFFF */ addiu $v0, $zero, -1 /* 35DE8 8005A9E8 14620003 */ bne $v1, $v0, .L8005A9F8 -/* 35DEC 8005A9EC 00000000 */ nop +/* 35DEC 8005A9EC 00000000 */ nop /* 35DF0 8005A9F0 0C04E062 */ jal func_80138188 -/* 35DF4 8005A9F4 00000000 */ nop +/* 35DF4 8005A9F4 00000000 */ nop .L8005A9F8: /* 35DF8 8005A9F8 16800005 */ bnez $s4, .L8005AA10 -/* 35DFC 8005A9FC 00000000 */ nop +/* 35DFC 8005A9FC 00000000 */ nop /* 35E00 8005AA00 0C016BE5 */ jal initialize_collision -/* 35E04 8005AA04 00000000 */ nop +/* 35E04 8005AA04 00000000 */ nop /* 35E08 8005AA08 0C016BF0 */ jal load_hit_asset -/* 35E0C 8005AA0C 00000000 */ nop +/* 35E0C 8005AA0C 00000000 */ nop .L8005AA10: /* 35E10 8005AA10 0C01CACC */ jal func_80072B30 -/* 35E14 8005AA14 00000000 */ nop +/* 35E14 8005AA14 00000000 */ nop /* 35E18 8005AA18 0C00F900 */ jal clear_encounter_status -/* 35E1C 8005AA1C 00000000 */ nop +/* 35E1C 8005AA1C 00000000 */ nop /* 35E20 8005AA20 0C04432E */ jal clear_entity_data /* 35E24 8005AA24 24040001 */ addiu $a0, $zero, 1 /* 35E28 8005AA28 0C016727 */ jal func_80059C9C -/* 35E2C 8005AA2C 00000000 */ nop +/* 35E2C 8005AA2C 00000000 */ nop /* 35E30 8005AA30 0C037F14 */ jal clear_player_status -/* 35E34 8005AA34 00000000 */ nop +/* 35E34 8005AA34 00000000 */ nop /* 35E38 8005AA38 0C037F1D */ jal func_800DFC74 -/* 35E3C 8005AA3C 00000000 */ nop +/* 35E3C 8005AA3C 00000000 */ nop /* 35E40 8005AA40 0C03AD1D */ jal partner_reset_data -/* 35E44 8005AA44 00000000 */ nop +/* 35E44 8005AA44 00000000 */ nop /* 35E48 8005AA48 0C048D9D */ jal clear_printers -/* 35E4C 8005AA4C 00000000 */ nop +/* 35E4C 8005AA4C 00000000 */ nop /* 35E50 8005AA50 0C04C3FC */ jal clear_item_entity_data -/* 35E54 8005AA54 00000000 */ nop +/* 35E54 8005AA54 00000000 */ nop /* 35E58 8005AA58 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 35E5C 8005AA5C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 35E60 8005AA60 C4400084 */ lwc1 $f0, 0x84($v0) @@ -242,16 +242,16 @@ glabel load_map_by_IDs /* 35E7C 8005AA7C 0C0525FF */ jal func_801497FC /* 35E80 8005AA80 8C84FF60 */ lw $a0, -0xa0($a0) /* 35E84 8005AA84 0C052580 */ jal func_80149600 -/* 35E88 8005AA88 00000000 */ nop +/* 35E88 8005AA88 00000000 */ nop /* 35E8C 8005AA8C 1680000B */ bnez $s4, .L8005AABC -/* 35E90 8005AA90 00000000 */ nop +/* 35E90 8005AA90 00000000 */ nop /* 35E94 8005AA94 3C04800B */ lui $a0, 0x800b /* 35E98 8005AA98 24840CF0 */ addiu $a0, $a0, 0xcf0 /* 35E9C 8005AA9C 0C016B74 */ jal get_asset_offset /* 35EA0 8005AAA0 27A50030 */ addiu $a1, $sp, 0x30 /* 35EA4 8005AAA4 8E640000 */ lw $a0, ($s3) /* 35EA8 8005AAA8 10800004 */ beqz $a0, .L8005AABC -/* 35EAC 8005AAAC 00000000 */ nop +/* 35EAC 8005AAAC 00000000 */ nop /* 35EB0 8005AAB0 8FA60030 */ lw $a2, 0x30($sp) /* 35EB4 8005AAB4 0C046B52 */ jal load_data_for_models /* 35EB8 8005AAB8 0040282D */ daddu $a1, $v0, $zero @@ -260,9 +260,9 @@ glabel load_map_by_IDs /* 35EC0 8005AAC0 50800005 */ beql $a0, $zero, .L8005AAD8 /* 35EC4 8005AAC4 24040128 */ addiu $a0, $zero, 0x128 /* 35EC8 8005AAC8 0C05178A */ jal read_background_size -/* 35ECC 8005AACC 00000000 */ nop +/* 35ECC 8005AACC 00000000 */ nop /* 35ED0 8005AAD0 08016ABA */ j .L8005AAE8 -/* 35ED4 8005AAD4 00000000 */ nop +/* 35ED4 8005AAD4 00000000 */ nop .L8005AAD8: /* 35ED8 8005AAD8 240500C8 */ addiu $a1, $zero, 0xc8 /* 35EDC 8005AADC 2406000C */ addiu $a2, $zero, 0xc @@ -306,9 +306,9 @@ glabel load_map_by_IDs /* 35F6C 8005AB6C 24070106 */ addiu $a3, $zero, 0x106 .L8005AB70: /* 35F70 8005AB70 0C00B8C5 */ jal set_cam_viewport -/* 35F74 8005AB74 00000000 */ nop +/* 35F74 8005AB74 00000000 */ nop /* 35F78 8005AB78 0C039E4D */ jal initialize_status_menu -/* 35F7C 8005AB7C 00000000 */ nop +/* 35F7C 8005AB7C 00000000 */ nop /* 35F80 8005AB80 0000282D */ daddu $a1, $zero, $zero /* 35F84 8005AB84 00A0302D */ daddu $a2, $a1, $zero /* 35F88 8005AB88 3C108007 */ lui $s0, %hi(gGameStatusPtr) diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index e514193529..7d8ed28671 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -564,7 +564,7 @@ EnemyNpcDefeat = 0x8007809C; D_80078DB0 = 0x80078DB0; D_80078DB4 = 0x80078DB4; gEffectTable = 0x8007F214; -gItemTable = 0x800878E0; // size: 0x2D80 +gItemTable = 0x800878E0; // size:0x2D80 gAreas = 0x800934F0; gCurrentEncounter = 0x800B0F10; // size:0xB0 gBattleState = 0x800DC068; From ec5e547146b631dd03cb85633a458f1f5371b58f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 15:44:06 -0500 Subject: [PATCH 05/12] symbol detection fix --- .../code_105700_len_2130/func_802E3F0C.s | 4 +-- .../code_135EE0/pause_badges_handle_input.s | 4 +-- .../code_13CAF0/pause_items_handle_input.s | 4 +-- asm/nonmatchings/code_167570/func_802471EC.s | 4 +-- .../code_b72b0_len_15ed0/init_got_item.s | 4 +-- .../code_b72b0_len_15ed0/make_item_entity.s | 4 +-- .../update_item_entity_temp.s | 28 +++++++++---------- .../dgb_03/C31730/func_802416B4_C32B94.s | 4 +-- .../dgb_06/C3D080/func_80240268_C3D2E8.s | 4 +-- .../dgb_09/C46BE0/func_80242730_C49310.s | 4 +-- .../dgb_12/C4DEF0/func_80240268_C4E158.s | 4 +-- .../dgb_18/C56EF0/begin_battle_C57158.s | 4 +-- .../hos_06/A397F0/func_80240AD0_A39FB0.s | 4 +-- .../hos_06/A3B4B0/func_80242238_A3B718.s | 4 +-- .../isk_09/9864E0/func_80240268_986748.s | 4 +-- .../iwa_03/918BB0/func_80240268_918E18.s | 4 +-- .../jan_04/B44AC0/func_802405B8_B44D28.s | 4 +-- .../jan_12/B73570/func_80240FA4_B74054.s | 4 +-- .../kkj_17/AF1C60/func_80240268_AF1EC8.s | 4 +-- .../kkj_20/AFDB40/func_80240268_AFDDA8.s | 4 +-- .../kmr_10/8D84D0/func_80240268_8D8738.s | 4 +-- .../kpa_14/A57830/func_802405E8_A57A98.s | 4 +-- .../kpa_15/A596A0/func_80240578_A59908.s | 4 +-- .../kzn_08/C71C10/func_802409F8_C71E78.s | 4 +-- .../obk_07/BCEBF0/func_80240268_BCEE58.s | 4 +-- .../omo_04/DAD400/func_80240268_DAD668.s | 4 +-- .../omo_06/DB8180/func_80240AD8_DB83E8.s | 4 +-- .../omo_07/DC01D0/func_80243188_DC0438.s | 4 +-- .../omo_09/DCD3F0/func_80240988_DCD658.s | 4 +-- .../omo_13/DE36C0/func_80241498_DE3928.s | 4 +-- .../pra_05/D55BD0/func_80241188_D56D38.s | 4 +-- .../pra_11/D61520/func_80241188_D62688.s | 4 +-- .../pra_12/D62D10/func_802411B8_D63EC8.s | 4 +-- .../pra_14/D67D20/func_80241188_D68E88.s | 4 +-- .../pra_27/D799F0/func_802411B8_D7ABA8.s | 4 +-- .../pra_28/D7B2A0/func_802411B8_D7C458.s | 4 +-- .../pra_35/D8FBA0/func_80242BB8_D8FE08.s | 4 +-- .../sam_01/CF7E80/func_80241EF8_CF9A68.s | 4 +-- .../sam_10/D37800/func_80240268_D37A68.s | 4 +-- .../tik_02/86CA50/func_80240578_86CCB8.s | 4 +-- .../tik_05/8750D0/func_802408E8_8756A8.s | 4 +-- .../tik_12/8891C0/func_80240BC8_889798.s | 4 +-- .../world/script_api/7E0E80/func_80280B78.s | 4 +-- tools/n64splat | 2 +- 44 files changed, 99 insertions(+), 99 deletions(-) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s index 38924f2e42..17c307478b 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s @@ -52,9 +52,9 @@ glabel func_802E3F0C /* 105844 802E3FC4 3C014034 */ lui $at, 0x4034 /* 105848 802E3FC8 44811800 */ mtc1 $at, $f3 /* 10584C 802E3FCC 44801000 */ mtc1 $zero, $f2 -/* 105850 802E3FD0 3C018008 */ lui $at, 0x8008 +/* 105850 802E3FD0 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 105854 802E3FD4 00220821 */ addu $at, $at, $v0 -/* 105858 802E3FD8 942278F8 */ lhu $v0, 0x78f8($at) +/* 105858 802E3FD8 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 10585C 802E3FDC 46000021 */ cvt.d.s $f0, $f0 /* 105860 802E3FE0 46220000 */ add.d $f0, $f0, $f2 /* 105864 802E3FE4 26070050 */ addiu $a3, $s0, 0x50 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s index 9b39fc746c..c26ba78cc6 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s @@ -322,9 +322,9 @@ glabel pause_badges_handle_input /* 13C874 80249534 00000000 */ nop /* 13C878 80249538 10600008 */ beqz $v1, .L8024955C /* 13C87C 8024953C 00031140 */ sll $v0, $v1, 5 -/* 13C880 80249540 3C018008 */ lui $at, 0x8008 +/* 13C880 80249540 3C018008 */ lui $at, %hi(gItemTable+0x10) /* 13C884 80249544 00220821 */ addu $at, $at, $v0 -/* 13C888 80249548 8C2278F0 */ lw $v0, 0x78f0($at) +/* 13C888 80249548 8C2278F0 */ lw $v0, %lo(gItemTable+0x10)($at) /* 13C88C 8024954C 3C018027 */ lui $at, 0x8027 /* 13C890 80249550 AC2200C8 */ sw $v0, 0xc8($at) /* 13C894 80249554 08092566 */ j .L80249598 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s index 1519cb0083..99608f669f 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s @@ -262,9 +262,9 @@ glabel pause_items_handle_input /* 13DED4 8024AB94 00000000 */ nop /* 13DED8 8024AB98 10600008 */ beqz $v1, .L8024ABBC /* 13DEDC 8024AB9C 00031140 */ sll $v0, $v1, 5 -/* 13DEE0 8024ABA0 3C018008 */ lui $at, 0x8008 +/* 13DEE0 8024ABA0 3C018008 */ lui $at, %hi(gItemTable+0x10) /* 13DEE4 8024ABA4 00220821 */ addu $at, $at, $v0 -/* 13DEE8 8024ABA8 8C2278F0 */ lw $v0, 0x78f0($at) +/* 13DEE8 8024ABA8 8C2278F0 */ lw $v0, %lo(gItemTable+0x10)($at) /* 13DEEC 8024ABAC 3C018027 */ lui $at, 0x8027 /* 13DEF0 8024ABB0 AC2200C8 */ sw $v0, 0xc8($at) /* 13DEF4 8024ABB4 08092AFE */ j .L8024ABF8 diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s index eb4c69fd35..c9e96cc667 100644 --- a/asm/nonmatchings/code_167570/func_802471EC.s +++ b/asm/nonmatchings/code_167570/func_802471EC.s @@ -673,9 +673,9 @@ glabel func_802471EC /* 168448 80247BE8 2C820005 */ sltiu $v0, $a0, 5 /* 16844C 80247BEC 10400043 */ beqz $v0, .L80247CFC /* 168450 80247BF0 00041080 */ sll $v0, $a0, 2 -/* 168454 80247BF4 3C018025 */ lui $at, 0x8025 +/* 168454 80247BF4 3C018025 */ lui $at, %hi(pause_partners_draw_movelist_title) /* 168458 80247BF8 00220821 */ addu $at, $at, $v0 -/* 16845C 80247BFC 8C22C048 */ lw $v0, -0x3fb8($at) +/* 16845C 80247BFC 8C22C048 */ lw $v0, %lo(pause_partners_draw_movelist_title)($at) /* 168460 80247C00 00400008 */ jr $v0 /* 168464 80247C04 00000000 */ nop /* 168468 80247C08 3C018025 */ lui $at, 0x8025 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s b/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s index 7cc13571d1..943c60a96f 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s @@ -93,9 +93,9 @@ glabel init_got_item /* C8344 80131C44 AE230000 */ sw $v1, ($s1) /* C8348 80131C48 E6200030 */ swc1 $f0, 0x30($s1) /* C834C 80131C4C E6220010 */ swc1 $f2, 0x10($s1) -/* C8350 80131C50 3C018008 */ lui $at, 0x8008 +/* C8350 80131C50 3C018008 */ lui $at, %hi(gItemTable+0x18) /* C8354 80131C54 00220821 */ addu $at, $at, $v0 -/* C8358 80131C58 942278F8 */ lhu $v0, 0x78f8($at) +/* C8358 80131C58 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* C835C 80131C5C 30421000 */ andi $v0, $v0, 0x1000 /* C8360 80131C60 10400005 */ beqz $v0, .L80131C78 /* C8364 80131C64 3C020004 */ lui $v0, 4 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s index c64ec0ee05..1329717014 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s @@ -116,9 +116,9 @@ glabel make_item_entity /* C7C8C 8013158C A6020036 */ sh $v0, 0x36($s0) /* C7C90 80131590 A6020038 */ sh $v0, 0x38($s0) /* C7C94 80131594 00121140 */ sll $v0, $s2, 5 -/* C7C98 80131598 3C018008 */ lui $at, 0x8008 +/* C7C98 80131598 3C018008 */ lui $at, %hi(gItemTable+0x18) /* C7C9C 8013159C 00220821 */ addu $at, $at, $v0 -/* C7CA0 801315A0 942278F8 */ lhu $v0, 0x78f8($at) +/* C7CA0 801315A0 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* C7CA4 801315A4 2403001E */ addiu $v1, $zero, 0x1e /* C7CA8 801315A8 3C018015 */ lui $at, 0x8015 /* C7CAC 801315AC A42365A6 */ sh $v1, 0x65a6($at) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s index 69126c8956..e84cc08a92 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s @@ -128,9 +128,9 @@ glabel update_item_entity_temp .L801358A8: /* CBFA8 801358A8 86220018 */ lh $v0, 0x18($s1) /* CBFAC 801358AC 00021140 */ sll $v0, $v0, 5 -/* CBFB0 801358B0 3C018008 */ lui $at, 0x8008 +/* CBFB0 801358B0 3C018008 */ lui $at, %hi(gItemTable+0x4) /* CBFB4 801358B4 00220821 */ addu $at, $at, $v0 -/* CBFB8 801358B8 842278E4 */ lh $v0, 0x78e4($at) +/* CBFB8 801358B8 842278E4 */ lh $v0, %lo(gItemTable+0x4)($at) /* CBFBC 801358BC 000210C0 */ sll $v0, $v0, 3 /* CBFC0 801358C0 3C048009 */ lui $a0, 0x8009 /* CBFC4 801358C4 00822021 */ addu $a0, $a0, $v0 @@ -182,9 +182,9 @@ glabel update_item_entity_temp .L80135974: /* CC074 80135974 86220018 */ lh $v0, 0x18($s1) /* CC078 80135978 00021140 */ sll $v0, $v0, 5 -/* CC07C 8013597C 3C018008 */ lui $at, 0x8008 +/* CC07C 8013597C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CC080 80135980 00220821 */ addu $at, $at, $v0 -/* CC084 80135984 942278F8 */ lhu $v0, 0x78f8($at) +/* CC084 80135984 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC088 80135988 30420008 */ andi $v0, $v0, 8 /* CC08C 8013598C 1040000F */ beqz $v0, .L801359CC /* CC090 80135990 0000202D */ daddu $a0, $zero, $zero @@ -207,9 +207,9 @@ glabel update_item_entity_temp .L801359CC: /* CC0CC 801359CC 86220018 */ lh $v0, 0x18($s1) /* CC0D0 801359D0 00021140 */ sll $v0, $v0, 5 -/* CC0D4 801359D4 3C018008 */ lui $at, 0x8008 +/* CC0D4 801359D4 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CC0D8 801359D8 00220821 */ addu $at, $at, $v0 -/* CC0DC 801359DC 942278F8 */ lhu $v0, 0x78f8($at) +/* CC0DC 801359DC 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC0E0 801359E0 30420040 */ andi $v0, $v0, 0x40 /* CC0E4 801359E4 10400012 */ beqz $v0, .L80135A30 /* CC0E8 801359E8 0000202D */ daddu $a0, $zero, $zero @@ -348,9 +348,9 @@ glabel update_item_entity_temp .L80135BC8: /* CC2C8 80135BC8 86220018 */ lh $v0, 0x18($s1) /* CC2CC 80135BCC 00021140 */ sll $v0, $v0, 5 -/* CC2D0 80135BD0 3C018008 */ lui $at, 0x8008 +/* CC2D0 80135BD0 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CC2D4 80135BD4 00220821 */ addu $at, $at, $v0 -/* CC2D8 80135BD8 942278F8 */ lhu $v0, 0x78f8($at) +/* CC2D8 80135BD8 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC2DC 80135BDC 30420020 */ andi $v0, $v0, 0x20 /* CC2E0 80135BE0 10400010 */ beqz $v0, .L80135C24 /* CC2E4 80135BE4 00000000 */ nop @@ -495,9 +495,9 @@ glabel update_item_entity_temp .L80135DEC: /* CC4EC 80135DEC 86220018 */ lh $v0, 0x18($s1) /* CC4F0 80135DF0 00021140 */ sll $v0, $v0, 5 -/* CC4F4 80135DF4 3C018008 */ lui $at, 0x8008 +/* CC4F4 80135DF4 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CC4F8 80135DF8 00220821 */ addu $at, $at, $v0 -/* CC4FC 80135DFC 942278F8 */ lhu $v0, 0x78f8($at) +/* CC4FC 80135DFC 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC500 80135E00 30420020 */ andi $v0, $v0, 0x20 /* CC504 80135E04 10400006 */ beqz $v0, .L80135E20 /* CC508 80135E08 2404000C */ addiu $a0, $zero, 0xc @@ -531,9 +531,9 @@ glabel update_item_entity_temp /* CC574 80135E74 A222001A */ sb $v0, 0x1a($s1) /* CC578 80135E78 86220018 */ lh $v0, 0x18($s1) /* CC57C 80135E7C 00021140 */ sll $v0, $v0, 5 -/* CC580 80135E80 3C018008 */ lui $at, 0x8008 +/* CC580 80135E80 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CC584 80135E84 00220821 */ addu $at, $at, $v0 -/* CC588 80135E88 942278F8 */ lhu $v0, 0x78f8($at) +/* CC588 80135E88 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC58C 80135E8C 30420004 */ andi $v0, $v0, 4 /* CC590 80135E90 10400009 */ beqz $v0, .L80135EB8 /* CC594 80135E94 0000202D */ daddu $a0, $zero, $zero @@ -570,9 +570,9 @@ glabel update_item_entity_temp /* CC604 80135F04 A222001A */ sb $v0, 0x1a($s1) /* CC608 80135F08 86230018 */ lh $v1, 0x18($s1) /* CC60C 80135F0C 00031140 */ sll $v0, $v1, 5 -/* CC610 80135F10 3C018008 */ lui $at, 0x8008 +/* CC610 80135F10 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CC614 80135F14 00220821 */ addu $at, $at, $v0 -/* CC618 80135F18 942278F8 */ lhu $v0, 0x78f8($at) +/* CC618 80135F18 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CC61C 80135F1C 30420004 */ andi $v0, $v0, 4 /* CC620 80135F20 10400003 */ beqz $v0, .L80135F30 /* CC624 80135F24 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 64c13b6966..491b435c0c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -124,9 +124,9 @@ glabel func_802416B4_C32B94 /* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 /* C32D5C 8024187C 10400042 */ beqz $v0, .L80241988 /* C32D60 80241880 00031080 */ sll $v0, $v1, 2 -/* C32D64 80241884 3C018024 */ lui $at, 0x8024 +/* C32D64 80241884 3C018024 */ lui $at, %hi(pause_tabs_draw_stats) /* C32D68 80241888 00220821 */ addu $at, $at, $v0 -/* C32D6C 8024188C 8C224B98 */ lw $v0, 0x4b98($at) +/* C32D6C 8024188C 8C224B98 */ lw $v0, %lo(pause_tabs_draw_stats)($at) /* C32D70 80241890 00400008 */ jr $v0 /* C32D74 80241894 00000000 */ nop /* C32D78 80241898 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s index 77f053290b..c423a6bfed 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s @@ -11,9 +11,9 @@ glabel func_80240268_C3D2E8 /* C3D300 80240280 8C450000 */ lw $a1, ($v0) /* C3D304 80240284 00021140 */ sll $v0, $v0, 5 /* C3D308 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C3D30C 8024028C 3C018008 */ lui $at, 0x8008 +/* C3D30C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* C3D310 80240290 00220821 */ addu $at, $at, $v0 -/* C3D314 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* C3D314 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* C3D318 80240298 30420040 */ andi $v0, $v0, 0x40 /* C3D31C 8024029C 10400002 */ beqz $v0, .L802402A8 /* C3D320 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 45a1eca563..e2f554ea49 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -66,9 +66,9 @@ glabel func_80242730_C49310 /* C493FC 8024281C 2C62000F */ sltiu $v0, $v1, 0xf /* C49400 80242820 10400034 */ beqz $v0, .L802428F4 /* C49404 80242824 00031080 */ sll $v0, $v1, 2 -/* C49408 80242828 3C018024 */ lui $at, 0x8024 +/* C49408 80242828 3C018024 */ lui $at, %hi(DisablePartnerBlur) /* C4940C 8024282C 00220821 */ addu $at, $at, $v0 -/* C49410 80242830 8C2256D8 */ lw $v0, 0x56d8($at) +/* C49410 80242830 8C2256D8 */ lw $v0, %lo(DisablePartnerBlur)($at) /* C49414 80242834 00400008 */ jr $v0 /* C49418 80242838 00000000 */ nop /* C4941C 8024283C 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s index c12eeb8986..0f38f76d59 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s @@ -11,9 +11,9 @@ glabel func_80240268_C4E158 /* C4E170 80240280 8C450000 */ lw $a1, ($v0) /* C4E174 80240284 00021140 */ sll $v0, $v0, 5 /* C4E178 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C4E17C 8024028C 3C018008 */ lui $at, 0x8008 +/* C4E17C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* C4E180 80240290 00220821 */ addu $at, $at, $v0 -/* C4E184 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* C4E184 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* C4E188 80240298 30420040 */ andi $v0, $v0, 0x40 /* C4E18C 8024029C 10400002 */ beqz $v0, .L802402A8 /* C4E190 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s index 99c367974e..6127881d49 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s @@ -11,9 +11,9 @@ glabel begin_battle_C57158 /* C57170 80241230 8C450000 */ lw $a1, ($v0) /* C57174 80241234 00021140 */ sll $v0, $v0, 5 /* C57178 80241238 AE000084 */ sw $zero, 0x84($s0) -/* C5717C 8024123C 3C018008 */ lui $at, 0x8008 +/* C5717C 8024123C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* C57180 80241240 00220821 */ addu $at, $at, $v0 -/* C57184 80241244 942278F8 */ lhu $v0, 0x78f8($at) +/* C57184 80241244 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* C57188 80241248 30420040 */ andi $v0, $v0, 0x40 /* C5718C 8024124C 10400002 */ beqz $v0, .L80241258 /* C57190 80241250 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s index a05cb23b6f..cb0f944197 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s @@ -124,9 +124,9 @@ glabel func_80240AD0_A39FB0 /* A3A170 80240C90 AE620088 */ sw $v0, 0x88($s3) /* A3A174 80240C94 8C620000 */ lw $v0, ($v1) /* A3A178 80240C98 00021140 */ sll $v0, $v0, 5 -/* A3A17C 80240C9C 3C018008 */ lui $at, 0x8008 +/* A3A17C 80240C9C 3C018008 */ lui $at, %hi(gItemTable) /* A3A180 80240CA0 00220821 */ addu $at, $at, $v0 -/* A3A184 80240CA4 8C2278E0 */ lw $v0, 0x78e0($at) +/* A3A184 80240CA4 8C2278E0 */ lw $v0, %lo(gItemTable)($at) /* A3A188 80240CA8 AE620094 */ sw $v0, 0x94($s3) /* A3A18C 80240CAC 8C620000 */ lw $v0, ($v1) /* A3A190 80240CB0 00021140 */ sll $v0, $v0, 5 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s index 6d5b641387..7875e2d598 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s @@ -11,9 +11,9 @@ glabel func_80242238_A3B718 /* A3B730 80242250 8C450000 */ lw $a1, ($v0) /* A3B734 80242254 00021140 */ sll $v0, $v0, 5 /* A3B738 80242258 AE000084 */ sw $zero, 0x84($s0) -/* A3B73C 8024225C 3C018008 */ lui $at, 0x8008 +/* A3B73C 8024225C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* A3B740 80242260 00220821 */ addu $at, $at, $v0 -/* A3B744 80242264 942278F8 */ lhu $v0, 0x78f8($at) +/* A3B744 80242264 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* A3B748 80242268 30420040 */ andi $v0, $v0, 0x40 /* A3B74C 8024226C 10400002 */ beqz $v0, .L80242278 /* A3B750 80242270 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s index 71f2fc41b1..e5a231ce10 100644 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s +++ b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s @@ -11,9 +11,9 @@ glabel func_80240268_986748 /* 986760 80240280 8C450000 */ lw $a1, ($v0) /* 986764 80240284 00021140 */ sll $v0, $v0, 5 /* 986768 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 98676C 8024028C 3C018008 */ lui $at, 0x8008 +/* 98676C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 986770 80240290 00220821 */ addu $at, $at, $v0 -/* 986774 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* 986774 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 986778 80240298 30420040 */ andi $v0, $v0, 0x40 /* 98677C 8024029C 10400002 */ beqz $v0, .L802402A8 /* 986780 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s index 53b15ea335..c0afdfea60 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s @@ -11,9 +11,9 @@ glabel func_80240268_918E18 /* 918E30 80240280 8C450000 */ lw $a1, ($v0) /* 918E34 80240284 00021140 */ sll $v0, $v0, 5 /* 918E38 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 918E3C 8024028C 3C018008 */ lui $at, 0x8008 +/* 918E3C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 918E40 80240290 00220821 */ addu $at, $at, $v0 -/* 918E44 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* 918E44 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 918E48 80240298 30420040 */ andi $v0, $v0, 0x40 /* 918E4C 8024029C 10400002 */ beqz $v0, .L802402A8 /* 918E50 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s index 7329f118d5..64cdc774c2 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s @@ -11,9 +11,9 @@ glabel func_802405B8_B44D28 /* B44D40 802405D0 8C450000 */ lw $a1, ($v0) /* B44D44 802405D4 00021140 */ sll $v0, $v0, 5 /* B44D48 802405D8 AE000084 */ sw $zero, 0x84($s0) -/* B44D4C 802405DC 3C018008 */ lui $at, 0x8008 +/* B44D4C 802405DC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* B44D50 802405E0 00220821 */ addu $at, $at, $v0 -/* B44D54 802405E4 942278F8 */ lhu $v0, 0x78f8($at) +/* B44D54 802405E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* B44D58 802405E8 30420040 */ andi $v0, $v0, 0x40 /* B44D5C 802405EC 10400002 */ beqz $v0, .L802405F8 /* B44D60 802405F0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 613e42884f..e5b4c42817 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -100,9 +100,9 @@ glabel func_80240FA4_B74054 /* B741B8 80241108 2C620064 */ sltiu $v0, $v1, 0x64 /* B741BC 8024110C 10400048 */ beqz $v0, .L80241230 /* B741C0 80241110 00031080 */ sll $v0, $v1, 2 -/* B741C4 80241114 3C018024 */ lui $at, 0x8024 +/* B741C4 80241114 3C018024 */ lui $at, %hi(pause_textbox_draw_contents) /* B741C8 80241118 00220821 */ addu $at, $at, $v0 -/* B741CC 8024111C 8C223570 */ lw $v0, 0x3570($at) +/* B741CC 8024111C 8C223570 */ lw $v0, %lo(pause_textbox_draw_contents)($at) /* B741D0 80241120 00400008 */ jr $v0 /* B741D4 80241124 00000000 */ nop /* B741D8 80241128 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s index 150d71f6ff..f9e8671c71 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s @@ -11,9 +11,9 @@ glabel func_80240268_AF1EC8 /* AF1EE0 80240280 8C450000 */ lw $a1, ($v0) /* AF1EE4 80240284 00021140 */ sll $v0, $v0, 5 /* AF1EE8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AF1EEC 8024028C 3C018008 */ lui $at, 0x8008 +/* AF1EEC 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* AF1EF0 80240290 00220821 */ addu $at, $at, $v0 -/* AF1EF4 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* AF1EF4 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* AF1EF8 80240298 30420040 */ andi $v0, $v0, 0x40 /* AF1EFC 8024029C 10400002 */ beqz $v0, .L802402A8 /* AF1F00 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s index 615f7872a8..96268db26b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s @@ -11,9 +11,9 @@ glabel func_80240268_AFDDA8 /* AFDDC0 80240280 8C450000 */ lw $a1, ($v0) /* AFDDC4 80240284 00021140 */ sll $v0, $v0, 5 /* AFDDC8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AFDDCC 8024028C 3C018008 */ lui $at, 0x8008 +/* AFDDCC 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* AFDDD0 80240290 00220821 */ addu $at, $at, $v0 -/* AFDDD4 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* AFDDD4 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* AFDDD8 80240298 30420040 */ andi $v0, $v0, 0x40 /* AFDDDC 8024029C 10400002 */ beqz $v0, .L802402A8 /* AFDDE0 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s index 8ca1886817..a29f9e2c23 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s @@ -11,9 +11,9 @@ glabel func_80240268_8D8738 /* 8D8750 80240280 8C450000 */ lw $a1, ($v0) /* 8D8754 80240284 00021140 */ sll $v0, $v0, 5 /* 8D8758 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 8D875C 8024028C 3C018008 */ lui $at, 0x8008 +/* 8D875C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 8D8760 80240290 00220821 */ addu $at, $at, $v0 -/* 8D8764 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* 8D8764 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 8D8768 80240298 30420040 */ andi $v0, $v0, 0x40 /* 8D876C 8024029C 10400002 */ beqz $v0, .L802402A8 /* 8D8770 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s index d5a3627e3e..8582105a4d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s @@ -11,9 +11,9 @@ glabel func_802405E8_A57A98 /* A57AB0 80240600 8C450000 */ lw $a1, ($v0) /* A57AB4 80240604 00021140 */ sll $v0, $v0, 5 /* A57AB8 80240608 AE000084 */ sw $zero, 0x84($s0) -/* A57ABC 8024060C 3C018008 */ lui $at, 0x8008 +/* A57ABC 8024060C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* A57AC0 80240610 00220821 */ addu $at, $at, $v0 -/* A57AC4 80240614 942278F8 */ lhu $v0, 0x78f8($at) +/* A57AC4 80240614 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* A57AC8 80240618 30420040 */ andi $v0, $v0, 0x40 /* A57ACC 8024061C 10400002 */ beqz $v0, .L80240628 /* A57AD0 80240620 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s index 8a45449717..cd959556c0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s +++ b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s @@ -11,9 +11,9 @@ glabel func_80240578_A59908 /* A59920 80240590 8C450000 */ lw $a1, ($v0) /* A59924 80240594 00021140 */ sll $v0, $v0, 5 /* A59928 80240598 AE000084 */ sw $zero, 0x84($s0) -/* A5992C 8024059C 3C018008 */ lui $at, 0x8008 +/* A5992C 8024059C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* A59930 802405A0 00220821 */ addu $at, $at, $v0 -/* A59934 802405A4 942278F8 */ lhu $v0, 0x78f8($at) +/* A59934 802405A4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* A59938 802405A8 30420040 */ andi $v0, $v0, 0x40 /* A5993C 802405AC 10400002 */ beqz $v0, .L802405B8 /* A59940 802405B0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s index 992f37f603..e08f09b538 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s @@ -11,9 +11,9 @@ glabel func_802409F8_C71E78 /* C71E90 80240A10 8C450000 */ lw $a1, ($v0) /* C71E94 80240A14 00021140 */ sll $v0, $v0, 5 /* C71E98 80240A18 AE000084 */ sw $zero, 0x84($s0) -/* C71E9C 80240A1C 3C018008 */ lui $at, 0x8008 +/* C71E9C 80240A1C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* C71EA0 80240A20 00220821 */ addu $at, $at, $v0 -/* C71EA4 80240A24 942278F8 */ lhu $v0, 0x78f8($at) +/* C71EA4 80240A24 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* C71EA8 80240A28 30420040 */ andi $v0, $v0, 0x40 /* C71EAC 80240A2C 10400002 */ beqz $v0, .L80240A38 /* C71EB0 80240A30 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s index fb6528e594..e1d91b4109 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s @@ -11,9 +11,9 @@ glabel func_80240268_BCEE58 /* BCEE70 80240280 8C450000 */ lw $a1, ($v0) /* BCEE74 80240284 00021140 */ sll $v0, $v0, 5 /* BCEE78 80240288 AE000084 */ sw $zero, 0x84($s0) -/* BCEE7C 8024028C 3C018008 */ lui $at, 0x8008 +/* BCEE7C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* BCEE80 80240290 00220821 */ addu $at, $at, $v0 -/* BCEE84 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* BCEE84 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* BCEE88 80240298 30420040 */ andi $v0, $v0, 0x40 /* BCEE8C 8024029C 10400002 */ beqz $v0, .L802402A8 /* BCEE90 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s index e2264a6465..13f7c32e66 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s @@ -11,9 +11,9 @@ glabel func_80240268_DAD668 /* DAD680 80240280 8C450000 */ lw $a1, ($v0) /* DAD684 80240284 00021140 */ sll $v0, $v0, 5 /* DAD688 80240288 AE000084 */ sw $zero, 0x84($s0) -/* DAD68C 8024028C 3C018008 */ lui $at, 0x8008 +/* DAD68C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* DAD690 80240290 00220821 */ addu $at, $at, $v0 -/* DAD694 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* DAD694 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* DAD698 80240298 30420040 */ andi $v0, $v0, 0x40 /* DAD69C 8024029C 10400002 */ beqz $v0, .L802402A8 /* DAD6A0 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s index 4901d0a90a..2fdc7b1b90 100644 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s +++ b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s @@ -11,9 +11,9 @@ glabel func_80240AD8_DB83E8 /* DB8400 80240AF0 8C450000 */ lw $a1, ($v0) /* DB8404 80240AF4 00021140 */ sll $v0, $v0, 5 /* DB8408 80240AF8 AE000084 */ sw $zero, 0x84($s0) -/* DB840C 80240AFC 3C018008 */ lui $at, 0x8008 +/* DB840C 80240AFC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* DB8410 80240B00 00220821 */ addu $at, $at, $v0 -/* DB8414 80240B04 942278F8 */ lhu $v0, 0x78f8($at) +/* DB8414 80240B04 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* DB8418 80240B08 30420040 */ andi $v0, $v0, 0x40 /* DB841C 80240B0C 10400002 */ beqz $v0, .L80240B18 /* DB8420 80240B10 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s index 51243395a4..42ec6f4440 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s @@ -11,9 +11,9 @@ glabel func_80243188_DC0438 /* DC0450 802431A0 8C450000 */ lw $a1, ($v0) /* DC0454 802431A4 00021140 */ sll $v0, $v0, 5 /* DC0458 802431A8 AE000084 */ sw $zero, 0x84($s0) -/* DC045C 802431AC 3C018008 */ lui $at, 0x8008 +/* DC045C 802431AC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* DC0460 802431B0 00220821 */ addu $at, $at, $v0 -/* DC0464 802431B4 942278F8 */ lhu $v0, 0x78f8($at) +/* DC0464 802431B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* DC0468 802431B8 30420040 */ andi $v0, $v0, 0x40 /* DC046C 802431BC 10400002 */ beqz $v0, .L802431C8 /* DC0470 802431C0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s index e9c4ce0398..77117b7c23 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s @@ -11,9 +11,9 @@ glabel func_80240988_DCD658 /* DCD670 802409A0 8C450000 */ lw $a1, ($v0) /* DCD674 802409A4 00021140 */ sll $v0, $v0, 5 /* DCD678 802409A8 AE000084 */ sw $zero, 0x84($s0) -/* DCD67C 802409AC 3C018008 */ lui $at, 0x8008 +/* DCD67C 802409AC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* DCD680 802409B0 00220821 */ addu $at, $at, $v0 -/* DCD684 802409B4 942278F8 */ lhu $v0, 0x78f8($at) +/* DCD684 802409B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* DCD688 802409B8 30420040 */ andi $v0, $v0, 0x40 /* DCD68C 802409BC 10400002 */ beqz $v0, .L802409C8 /* DCD690 802409C0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s index 68d5a009a2..c65da6908b 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s @@ -11,9 +11,9 @@ glabel func_80241498_DE3928 /* DE3940 802414B0 8C450000 */ lw $a1, ($v0) /* DE3944 802414B4 00021140 */ sll $v0, $v0, 5 /* DE3948 802414B8 AE000084 */ sw $zero, 0x84($s0) -/* DE394C 802414BC 3C018008 */ lui $at, 0x8008 +/* DE394C 802414BC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* DE3950 802414C0 00220821 */ addu $at, $at, $v0 -/* DE3954 802414C4 942278F8 */ lhu $v0, 0x78f8($at) +/* DE3954 802414C4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* DE3958 802414C8 30420040 */ andi $v0, $v0, 0x40 /* DE395C 802414CC 10400002 */ beqz $v0, .L802414D8 /* DE3960 802414D0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s index 8d12a9f9be..af10412f52 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s @@ -11,9 +11,9 @@ glabel func_80241188_D56D38 /* D56D50 802411A0 8C450000 */ lw $a1, ($v0) /* D56D54 802411A4 00021140 */ sll $v0, $v0, 5 /* D56D58 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D56D5C 802411AC 3C018008 */ lui $at, 0x8008 +/* D56D5C 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D56D60 802411B0 00220821 */ addu $at, $at, $v0 -/* D56D64 802411B4 942278F8 */ lhu $v0, 0x78f8($at) +/* D56D64 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D56D68 802411B8 30420040 */ andi $v0, $v0, 0x40 /* D56D6C 802411BC 10400002 */ beqz $v0, .L802411C8 /* D56D70 802411C0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s index aee5e60fe3..7b9aedc5ab 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s @@ -11,9 +11,9 @@ glabel func_80241188_D62688 /* D626A0 802411A0 8C450000 */ lw $a1, ($v0) /* D626A4 802411A4 00021140 */ sll $v0, $v0, 5 /* D626A8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D626AC 802411AC 3C018008 */ lui $at, 0x8008 +/* D626AC 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D626B0 802411B0 00220821 */ addu $at, $at, $v0 -/* D626B4 802411B4 942278F8 */ lhu $v0, 0x78f8($at) +/* D626B4 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D626B8 802411B8 30420040 */ andi $v0, $v0, 0x40 /* D626BC 802411BC 10400002 */ beqz $v0, .L802411C8 /* D626C0 802411C0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s index d3c4603ad4..2cdd966250 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s @@ -11,9 +11,9 @@ glabel func_802411B8_D63EC8 /* D63EE0 802411D0 8C450000 */ lw $a1, ($v0) /* D63EE4 802411D4 00021140 */ sll $v0, $v0, 5 /* D63EE8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D63EEC 802411DC 3C018008 */ lui $at, 0x8008 +/* D63EEC 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D63EF0 802411E0 00220821 */ addu $at, $at, $v0 -/* D63EF4 802411E4 942278F8 */ lhu $v0, 0x78f8($at) +/* D63EF4 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D63EF8 802411E8 30420040 */ andi $v0, $v0, 0x40 /* D63EFC 802411EC 10400002 */ beqz $v0, .L802411F8 /* D63F00 802411F0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s index e708da90fe..e6c3810e5d 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s @@ -11,9 +11,9 @@ glabel func_80241188_D68E88 /* D68EA0 802411A0 8C450000 */ lw $a1, ($v0) /* D68EA4 802411A4 00021140 */ sll $v0, $v0, 5 /* D68EA8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D68EAC 802411AC 3C018008 */ lui $at, 0x8008 +/* D68EAC 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D68EB0 802411B0 00220821 */ addu $at, $at, $v0 -/* D68EB4 802411B4 942278F8 */ lhu $v0, 0x78f8($at) +/* D68EB4 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D68EB8 802411B8 30420040 */ andi $v0, $v0, 0x40 /* D68EBC 802411BC 10400002 */ beqz $v0, .L802411C8 /* D68EC0 802411C0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s index 451146e8f9..531b0ab6d9 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s @@ -11,9 +11,9 @@ glabel func_802411B8_D7ABA8 /* D7ABC0 802411D0 8C450000 */ lw $a1, ($v0) /* D7ABC4 802411D4 00021140 */ sll $v0, $v0, 5 /* D7ABC8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7ABCC 802411DC 3C018008 */ lui $at, 0x8008 +/* D7ABCC 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D7ABD0 802411E0 00220821 */ addu $at, $at, $v0 -/* D7ABD4 802411E4 942278F8 */ lhu $v0, 0x78f8($at) +/* D7ABD4 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D7ABD8 802411E8 30420040 */ andi $v0, $v0, 0x40 /* D7ABDC 802411EC 10400002 */ beqz $v0, .L802411F8 /* D7ABE0 802411F0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s index 16b5b1982b..63e76797cf 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s @@ -11,9 +11,9 @@ glabel func_802411B8_D7C458 /* D7C470 802411D0 8C450000 */ lw $a1, ($v0) /* D7C474 802411D4 00021140 */ sll $v0, $v0, 5 /* D7C478 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7C47C 802411DC 3C018008 */ lui $at, 0x8008 +/* D7C47C 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D7C480 802411E0 00220821 */ addu $at, $at, $v0 -/* D7C484 802411E4 942278F8 */ lhu $v0, 0x78f8($at) +/* D7C484 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D7C488 802411E8 30420040 */ andi $v0, $v0, 0x40 /* D7C48C 802411EC 10400002 */ beqz $v0, .L802411F8 /* D7C490 802411F0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s index 15efa22f53..56d903bf8b 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s @@ -11,9 +11,9 @@ glabel func_80242BB8_D8FE08 /* D8FE20 80242BD0 8C450000 */ lw $a1, ($v0) /* D8FE24 80242BD4 00021140 */ sll $v0, $v0, 5 /* D8FE28 80242BD8 AE000084 */ sw $zero, 0x84($s0) -/* D8FE2C 80242BDC 3C018008 */ lui $at, 0x8008 +/* D8FE2C 80242BDC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D8FE30 80242BE0 00220821 */ addu $at, $at, $v0 -/* D8FE34 80242BE4 942278F8 */ lhu $v0, 0x78f8($at) +/* D8FE34 80242BE4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D8FE38 80242BE8 30420040 */ andi $v0, $v0, 0x40 /* D8FE3C 80242BEC 10400002 */ beqz $v0, .L80242BF8 /* D8FE40 80242BF0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s index b0013735bd..3648ece98f 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s @@ -11,9 +11,9 @@ glabel func_80241EF8_CF9A68 /* CF9A80 80241F10 8C450000 */ lw $a1, ($v0) /* CF9A84 80241F14 00021140 */ sll $v0, $v0, 5 /* CF9A88 80241F18 AE000084 */ sw $zero, 0x84($s0) -/* CF9A8C 80241F1C 3C018008 */ lui $at, 0x8008 +/* CF9A8C 80241F1C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* CF9A90 80241F20 00220821 */ addu $at, $at, $v0 -/* CF9A94 80241F24 942278F8 */ lhu $v0, 0x78f8($at) +/* CF9A94 80241F24 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* CF9A98 80241F28 30420040 */ andi $v0, $v0, 0x40 /* CF9A9C 80241F2C 10400002 */ beqz $v0, .L80241F38 /* CF9AA0 80241F30 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s index 860e726e19..403bdbdf18 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s @@ -11,9 +11,9 @@ glabel func_80240268_D37A68 /* D37A80 80240280 8C450000 */ lw $a1, ($v0) /* D37A84 80240284 00021140 */ sll $v0, $v0, 5 /* D37A88 80240288 AE000084 */ sw $zero, 0x84($s0) -/* D37A8C 8024028C 3C018008 */ lui $at, 0x8008 +/* D37A8C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* D37A90 80240290 00220821 */ addu $at, $at, $v0 -/* D37A94 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* D37A94 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* D37A98 80240298 30420040 */ andi $v0, $v0, 0x40 /* D37A9C 8024029C 10400002 */ beqz $v0, .L802402A8 /* D37AA0 802402A0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s index 7138223922..de36c223b6 100644 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s +++ b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s @@ -11,9 +11,9 @@ glabel func_80240578_86CCB8 /* 86CCD0 80240590 8C450000 */ lw $a1, ($v0) /* 86CCD4 80240594 00021140 */ sll $v0, $v0, 5 /* 86CCD8 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 86CCDC 8024059C 3C018008 */ lui $at, 0x8008 +/* 86CCDC 8024059C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 86CCE0 802405A0 00220821 */ addu $at, $at, $v0 -/* 86CCE4 802405A4 942278F8 */ lhu $v0, 0x78f8($at) +/* 86CCE4 802405A4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 86CCE8 802405A8 30420040 */ andi $v0, $v0, 0x40 /* 86CCEC 802405AC 10400002 */ beqz $v0, .L802405B8 /* 86CCF0 802405B0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s index 1cf2fe6e11..e9417584aa 100644 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s @@ -11,9 +11,9 @@ glabel func_802408E8_8756A8 /* 8756C0 80240900 8C450000 */ lw $a1, ($v0) /* 8756C4 80240904 00021140 */ sll $v0, $v0, 5 /* 8756C8 80240908 AE000084 */ sw $zero, 0x84($s0) -/* 8756CC 8024090C 3C018008 */ lui $at, 0x8008 +/* 8756CC 8024090C 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 8756D0 80240910 00220821 */ addu $at, $at, $v0 -/* 8756D4 80240914 942278F8 */ lhu $v0, 0x78f8($at) +/* 8756D4 80240914 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 8756D8 80240918 30420040 */ andi $v0, $v0, 0x40 /* 8756DC 8024091C 10400002 */ beqz $v0, .L80240928 /* 8756E0 80240920 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s index 3e76e15376..64d72913b6 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s @@ -11,9 +11,9 @@ glabel func_80240BC8_889798 /* 8897B0 80240BE0 8C450000 */ lw $a1, ($v0) /* 8897B4 80240BE4 00021140 */ sll $v0, $v0, 5 /* 8897B8 80240BE8 AE000084 */ sw $zero, 0x84($s0) -/* 8897BC 80240BEC 3C018008 */ lui $at, 0x8008 +/* 8897BC 80240BEC 3C018008 */ lui $at, %hi(gItemTable+0x18) /* 8897C0 80240BF0 00220821 */ addu $at, $at, $v0 -/* 8897C4 80240BF4 942278F8 */ lhu $v0, 0x78f8($at) +/* 8897C4 80240BF4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) /* 8897C8 80240BF8 30420040 */ andi $v0, $v0, 0x40 /* 8897CC 80240BFC 10400002 */ beqz $v0, .L80240C08 /* 8897D0 80240C00 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s index 9f96c4c9fa..52a7392921 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s +++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s @@ -22,8 +22,8 @@ glabel func_80280B78 /* 7E1A34 80280BB4 2463000C */ addiu $v1, $v1, 0xc .L80280BB8: /* 7E1A38 80280BB8 00041140 */ sll $v0, $a0, 5 -/* 7E1A3C 80280BBC 3C018008 */ lui $at, 0x8008 +/* 7E1A3C 80280BBC 3C018008 */ lui $at, %hi(gItemTable+0xC) /* 7E1A40 80280BC0 00220821 */ addu $at, $at, $v0 -/* 7E1A44 80280BC4 842278EC */ lh $v0, 0x78ec($at) +/* 7E1A44 80280BC4 842278EC */ lh $v0, %lo(gItemTable+0xC)($at) /* 7E1A48 80280BC8 03E00008 */ jr $ra /* 7E1A4C 80280BCC 00000000 */ nop diff --git a/tools/n64splat b/tools/n64splat index 42c5f587eb..79f47d6951 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 42c5f587eb8b2bc669f2710c93ff10c46ae48dc3 +Subproject commit 79f47d69514c39d902b7b3aee41d713670d88934 From 285396f1424236a7d33d9abe375e643115eb379d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 15:48:48 -0500 Subject: [PATCH 06/12] CheckItemFlags40 --- .../dgb_06/C3D080/func_80240268_C3D2E8.s | 27 ------------------- .../dgb_12/C4DEF0/func_80240268_C4E158.s | 27 ------------------- .../dgb_18/C56EF0/begin_battle_C57158.s | 27 ------------------- .../hos_06/A3B4B0/func_80242238_A3B718.s | 26 ------------------ .../isk_09/9864E0/func_80240268_986748.s | 26 ------------------ .../iwa_03/918BB0/func_80240268_918E18.s | 26 ------------------ .../jan_04/B44AC0/func_802405B8_B44D28.s | 27 ------------------- .../kkj_17/AF1C60/func_80240268_AF1EC8.s | 26 ------------------ .../kmr_10/8D84D0/func_80240268_8D8738.s | 26 ------------------ .../kpa_15/A596A0/func_80240578_A59908.s | 27 ------------------- .../kzn_08/C71C10/func_802409F8_C71E78.s | 27 ------------------- .../obk_07/BCEBF0/func_80240268_BCEE58.s | 27 ------------------- .../omo_06/DB8180/func_80240AD8_DB83E8.s | 27 ------------------- .../omo_09/DCD3F0/func_80240988_DCD658.s | 27 ------------------- .../omo_13/DE36C0/func_80241498_DE3928.s | 27 ------------------- .../pra_05/D55BD0/func_80241188_D56D38.s | 27 ------------------- .../pra_11/D61520/func_80241188_D62688.s | 27 ------------------- .../pra_12/D62D10/func_802411B8_D63EC8.s | 27 ------------------- .../pra_14/D67D20/func_80241188_D68E88.s | 27 ------------------- .../pra_27/D799F0/func_802411B8_D7ABA8.s | 27 ------------------- .../pra_28/D7B2A0/func_802411B8_D7C458.s | 27 ------------------- .../pra_35/D8FBA0/func_80242BB8_D8FE08.s | 27 ------------------- .../sam_01/CF7E80/func_80241EF8_CF9A68.s | 27 ------------------- .../sam_10/D37800/func_80240268_D37A68.s | 26 ------------------ .../tik_02/86CA50/func_80240578_86CCB8.s | 27 ------------------- .../tik_05/8750D0/func_802408E8_8756A8.s | 26 ------------------ src/world/area_dgb/dgb_06/C3D080.c | 2 +- src/world/area_dgb/dgb_12/C4DEF0.c | 2 +- src/world/area_dgb/dgb_18/C56EF0.c | 2 +- src/world/area_hos/hos_06/A3B4B0.c | 2 +- src/world/area_isk/isk_09/9864E0.c | 2 +- src/world/area_iwa/iwa_03/918BB0.c | 2 +- src/world/area_jan/jan_04/B44AC0.c | 2 +- src/world/area_kkj/kkj_17/AF1C60.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- src/world/area_kpa/kpa_15/A596A0.c | 2 +- src/world/area_kzn/kzn_08/C71C10.c | 2 +- src/world/area_obk/obk_07/BCEBF0.c | 2 +- src/world/area_omo/omo_06/DB8180.c | 2 +- src/world/area_omo/omo_09/DCD3F0.c | 2 +- src/world/area_omo/omo_13/DE36C0.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_35/D8FBA0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 2 +- src/world/area_sam/sam_10/D37800.c | 2 +- src/world/area_tik/tik_02/86CA50.c | 2 +- src/world/area_tik/tik_05/8750D0.c | 2 +- src/world/common/CheckItemFlags40.inc.c | 13 +++++++++ 53 files changed, 39 insertions(+), 721 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s create mode 100644 src/world/common/CheckItemFlags40.inc.c diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s deleted file mode 100644 index c423a6bfed..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C3D2E8 -/* C3D2E8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3D2EC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* C3D2F0 80240270 0080802D */ daddu $s0, $a0, $zero -/* C3D2F4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* C3D2F8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* C3D2FC 8024027C 0C0B1EAF */ jal get_variable -/* C3D300 80240280 8C450000 */ lw $a1, ($v0) -/* C3D304 80240284 00021140 */ sll $v0, $v0, 5 -/* C3D308 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C3D30C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C3D310 80240290 00220821 */ addu $at, $at, $v0 -/* C3D314 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C3D318 80240298 30420040 */ andi $v0, $v0, 0x40 -/* C3D31C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* C3D320 802402A0 24020001 */ addiu $v0, $zero, 1 -/* C3D324 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* C3D328 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C3D32C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* C3D330 802402B0 24020002 */ addiu $v0, $zero, 2 -/* C3D334 802402B4 03E00008 */ jr $ra -/* C3D338 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C3D33C 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s deleted file mode 100644 index 0f38f76d59..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C4E158 -/* C4E158 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4E15C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* C4E160 80240270 0080802D */ daddu $s0, $a0, $zero -/* C4E164 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* C4E168 80240278 8E02000C */ lw $v0, 0xc($s0) -/* C4E16C 8024027C 0C0B1EAF */ jal get_variable -/* C4E170 80240280 8C450000 */ lw $a1, ($v0) -/* C4E174 80240284 00021140 */ sll $v0, $v0, 5 -/* C4E178 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C4E17C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C4E180 80240290 00220821 */ addu $at, $at, $v0 -/* C4E184 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C4E188 80240298 30420040 */ andi $v0, $v0, 0x40 -/* C4E18C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* C4E190 802402A0 24020001 */ addiu $v0, $zero, 1 -/* C4E194 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* C4E198 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C4E19C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* C4E1A0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* C4E1A4 802402B4 03E00008 */ jr $ra -/* C4E1A8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C4E1AC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s deleted file mode 100644 index 6127881d49..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel begin_battle_C57158 -/* C57158 80241218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5715C 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* C57160 80241220 0080802D */ daddu $s0, $a0, $zero -/* C57164 80241224 AFBF0014 */ sw $ra, 0x14($sp) -/* C57168 80241228 8E02000C */ lw $v0, 0xc($s0) -/* C5716C 8024122C 0C0B1EAF */ jal get_variable -/* C57170 80241230 8C450000 */ lw $a1, ($v0) -/* C57174 80241234 00021140 */ sll $v0, $v0, 5 -/* C57178 80241238 AE000084 */ sw $zero, 0x84($s0) -/* C5717C 8024123C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C57180 80241240 00220821 */ addu $at, $at, $v0 -/* C57184 80241244 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C57188 80241248 30420040 */ andi $v0, $v0, 0x40 -/* C5718C 8024124C 10400002 */ beqz $v0, .L80241258 -/* C57190 80241250 24020001 */ addiu $v0, $zero, 1 -/* C57194 80241254 AE020084 */ sw $v0, 0x84($s0) -.L80241258: -/* C57198 80241258 8FBF0014 */ lw $ra, 0x14($sp) -/* C5719C 8024125C 8FB00010 */ lw $s0, 0x10($sp) -/* C571A0 80241260 24020002 */ addiu $v0, $zero, 2 -/* C571A4 80241264 03E00008 */ jr $ra -/* C571A8 80241268 27BD0018 */ addiu $sp, $sp, 0x18 -/* C571AC 8024126C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s deleted file mode 100644 index 7875e2d598..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242238_A3B718 -/* A3B718 80242238 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3B71C 8024223C AFB00010 */ sw $s0, 0x10($sp) -/* A3B720 80242240 0080802D */ daddu $s0, $a0, $zero -/* A3B724 80242244 AFBF0014 */ sw $ra, 0x14($sp) -/* A3B728 80242248 8E02000C */ lw $v0, 0xc($s0) -/* A3B72C 8024224C 0C0B1EAF */ jal get_variable -/* A3B730 80242250 8C450000 */ lw $a1, ($v0) -/* A3B734 80242254 00021140 */ sll $v0, $v0, 5 -/* A3B738 80242258 AE000084 */ sw $zero, 0x84($s0) -/* A3B73C 8024225C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* A3B740 80242260 00220821 */ addu $at, $at, $v0 -/* A3B744 80242264 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* A3B748 80242268 30420040 */ andi $v0, $v0, 0x40 -/* A3B74C 8024226C 10400002 */ beqz $v0, .L80242278 -/* A3B750 80242270 24020001 */ addiu $v0, $zero, 1 -/* A3B754 80242274 AE020084 */ sw $v0, 0x84($s0) -.L80242278: -/* A3B758 80242278 8FBF0014 */ lw $ra, 0x14($sp) -/* A3B75C 8024227C 8FB00010 */ lw $s0, 0x10($sp) -/* A3B760 80242280 24020002 */ addiu $v0, $zero, 2 -/* A3B764 80242284 03E00008 */ jr $ra -/* A3B768 80242288 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s deleted file mode 100644 index e5a231ce10..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_986748 -/* 986748 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98674C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 986750 80240270 0080802D */ daddu $s0, $a0, $zero -/* 986754 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 986758 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 98675C 8024027C 0C0B1EAF */ jal get_variable -/* 986760 80240280 8C450000 */ lw $a1, ($v0) -/* 986764 80240284 00021140 */ sll $v0, $v0, 5 -/* 986768 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 98676C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 986770 80240290 00220821 */ addu $at, $at, $v0 -/* 986774 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 986778 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 98677C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 986780 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 986784 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 986788 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 98678C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 986790 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 986794 802402B4 03E00008 */ jr $ra -/* 986798 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s deleted file mode 100644 index c0afdfea60..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_918E18 -/* 918E18 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E1C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 918E20 80240270 0080802D */ daddu $s0, $a0, $zero -/* 918E24 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 918E28 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 918E2C 8024027C 0C0B1EAF */ jal get_variable -/* 918E30 80240280 8C450000 */ lw $a1, ($v0) -/* 918E34 80240284 00021140 */ sll $v0, $v0, 5 -/* 918E38 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 918E3C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 918E40 80240290 00220821 */ addu $at, $at, $v0 -/* 918E44 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 918E48 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 918E4C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 918E50 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 918E54 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 918E58 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 918E5C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 918E60 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 918E64 802402B4 03E00008 */ jr $ra -/* 918E68 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s deleted file mode 100644 index 64cdc774c2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B8_B44D28 -/* B44D28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B44D2C 802405BC AFB00010 */ sw $s0, 0x10($sp) -/* B44D30 802405C0 0080802D */ daddu $s0, $a0, $zero -/* B44D34 802405C4 AFBF0014 */ sw $ra, 0x14($sp) -/* B44D38 802405C8 8E02000C */ lw $v0, 0xc($s0) -/* B44D3C 802405CC 0C0B1EAF */ jal get_variable -/* B44D40 802405D0 8C450000 */ lw $a1, ($v0) -/* B44D44 802405D4 00021140 */ sll $v0, $v0, 5 -/* B44D48 802405D8 AE000084 */ sw $zero, 0x84($s0) -/* B44D4C 802405DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* B44D50 802405E0 00220821 */ addu $at, $at, $v0 -/* B44D54 802405E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* B44D58 802405E8 30420040 */ andi $v0, $v0, 0x40 -/* B44D5C 802405EC 10400002 */ beqz $v0, .L802405F8 -/* B44D60 802405F0 24020001 */ addiu $v0, $zero, 1 -/* B44D64 802405F4 AE020084 */ sw $v0, 0x84($s0) -.L802405F8: -/* B44D68 802405F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B44D6C 802405FC 8FB00010 */ lw $s0, 0x10($sp) -/* B44D70 80240600 24020002 */ addiu $v0, $zero, 2 -/* B44D74 80240604 03E00008 */ jr $ra -/* B44D78 80240608 27BD0018 */ addiu $sp, $sp, 0x18 -/* B44D7C 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s deleted file mode 100644 index f9e8671c71..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_AF1EC8 -/* AF1EC8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF1ECC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* AF1ED0 80240270 0080802D */ daddu $s0, $a0, $zero -/* AF1ED4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* AF1ED8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* AF1EDC 8024027C 0C0B1EAF */ jal get_variable -/* AF1EE0 80240280 8C450000 */ lw $a1, ($v0) -/* AF1EE4 80240284 00021140 */ sll $v0, $v0, 5 -/* AF1EE8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AF1EEC 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* AF1EF0 80240290 00220821 */ addu $at, $at, $v0 -/* AF1EF4 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* AF1EF8 80240298 30420040 */ andi $v0, $v0, 0x40 -/* AF1EFC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* AF1F00 802402A0 24020001 */ addiu $v0, $zero, 1 -/* AF1F04 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* AF1F08 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AF1F0C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* AF1F10 802402B0 24020002 */ addiu $v0, $zero, 2 -/* AF1F14 802402B4 03E00008 */ jr $ra -/* AF1F18 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s deleted file mode 100644 index a29f9e2c23..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_8D8738 -/* 8D8738 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D873C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 8D8740 80240270 0080802D */ daddu $s0, $a0, $zero -/* 8D8744 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D8748 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 8D874C 8024027C 0C0B1EAF */ jal get_variable -/* 8D8750 80240280 8C450000 */ lw $a1, ($v0) -/* 8D8754 80240284 00021140 */ sll $v0, $v0, 5 -/* 8D8758 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 8D875C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 8D8760 80240290 00220821 */ addu $at, $at, $v0 -/* 8D8764 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 8D8768 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 8D876C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 8D8770 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 8D8774 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 8D8778 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D877C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8D8780 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 8D8784 802402B4 03E00008 */ jr $ra -/* 8D8788 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s deleted file mode 100644 index cd959556c0..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_A59908 -/* A59908 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5990C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* A59910 80240580 0080802D */ daddu $s0, $a0, $zero -/* A59914 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* A59918 80240588 8E02000C */ lw $v0, 0xc($s0) -/* A5991C 8024058C 0C0B1EAF */ jal get_variable -/* A59920 80240590 8C450000 */ lw $a1, ($v0) -/* A59924 80240594 00021140 */ sll $v0, $v0, 5 -/* A59928 80240598 AE000084 */ sw $zero, 0x84($s0) -/* A5992C 8024059C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* A59930 802405A0 00220821 */ addu $at, $at, $v0 -/* A59934 802405A4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* A59938 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* A5993C 802405AC 10400002 */ beqz $v0, .L802405B8 -/* A59940 802405B0 24020001 */ addiu $v0, $zero, 1 -/* A59944 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* A59948 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5994C 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* A59950 802405C0 24020002 */ addiu $v0, $zero, 2 -/* A59954 802405C4 03E00008 */ jr $ra -/* A59958 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5995C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s deleted file mode 100644 index e08f09b538..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8_C71E78 -/* C71E78 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C71E7C 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* C71E80 80240A00 0080802D */ daddu $s0, $a0, $zero -/* C71E84 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* C71E88 80240A08 8E02000C */ lw $v0, 0xc($s0) -/* C71E8C 80240A0C 0C0B1EAF */ jal get_variable -/* C71E90 80240A10 8C450000 */ lw $a1, ($v0) -/* C71E94 80240A14 00021140 */ sll $v0, $v0, 5 -/* C71E98 80240A18 AE000084 */ sw $zero, 0x84($s0) -/* C71E9C 80240A1C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C71EA0 80240A20 00220821 */ addu $at, $at, $v0 -/* C71EA4 80240A24 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C71EA8 80240A28 30420040 */ andi $v0, $v0, 0x40 -/* C71EAC 80240A2C 10400002 */ beqz $v0, .L80240A38 -/* C71EB0 80240A30 24020001 */ addiu $v0, $zero, 1 -/* C71EB4 80240A34 AE020084 */ sw $v0, 0x84($s0) -.L80240A38: -/* C71EB8 80240A38 8FBF0014 */ lw $ra, 0x14($sp) -/* C71EBC 80240A3C 8FB00010 */ lw $s0, 0x10($sp) -/* C71EC0 80240A40 24020002 */ addiu $v0, $zero, 2 -/* C71EC4 80240A44 03E00008 */ jr $ra -/* C71EC8 80240A48 27BD0018 */ addiu $sp, $sp, 0x18 -/* C71ECC 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s deleted file mode 100644 index e1d91b4109..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_BCEE58 -/* BCEE58 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCEE5C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* BCEE60 80240270 0080802D */ daddu $s0, $a0, $zero -/* BCEE64 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* BCEE68 80240278 8E02000C */ lw $v0, 0xc($s0) -/* BCEE6C 8024027C 0C0B1EAF */ jal get_variable -/* BCEE70 80240280 8C450000 */ lw $a1, ($v0) -/* BCEE74 80240284 00021140 */ sll $v0, $v0, 5 -/* BCEE78 80240288 AE000084 */ sw $zero, 0x84($s0) -/* BCEE7C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* BCEE80 80240290 00220821 */ addu $at, $at, $v0 -/* BCEE84 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* BCEE88 80240298 30420040 */ andi $v0, $v0, 0x40 -/* BCEE8C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* BCEE90 802402A0 24020001 */ addiu $v0, $zero, 1 -/* BCEE94 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* BCEE98 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* BCEE9C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* BCEEA0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* BCEEA4 802402B4 03E00008 */ jr $ra -/* BCEEA8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* BCEEAC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s deleted file mode 100644 index 2fdc7b1b90..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD8_DB83E8 -/* DB83E8 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB83EC 80240ADC AFB00010 */ sw $s0, 0x10($sp) -/* DB83F0 80240AE0 0080802D */ daddu $s0, $a0, $zero -/* DB83F4 80240AE4 AFBF0014 */ sw $ra, 0x14($sp) -/* DB83F8 80240AE8 8E02000C */ lw $v0, 0xc($s0) -/* DB83FC 80240AEC 0C0B1EAF */ jal get_variable -/* DB8400 80240AF0 8C450000 */ lw $a1, ($v0) -/* DB8404 80240AF4 00021140 */ sll $v0, $v0, 5 -/* DB8408 80240AF8 AE000084 */ sw $zero, 0x84($s0) -/* DB840C 80240AFC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DB8410 80240B00 00220821 */ addu $at, $at, $v0 -/* DB8414 80240B04 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DB8418 80240B08 30420040 */ andi $v0, $v0, 0x40 -/* DB841C 80240B0C 10400002 */ beqz $v0, .L80240B18 -/* DB8420 80240B10 24020001 */ addiu $v0, $zero, 1 -/* DB8424 80240B14 AE020084 */ sw $v0, 0x84($s0) -.L80240B18: -/* DB8428 80240B18 8FBF0014 */ lw $ra, 0x14($sp) -/* DB842C 80240B1C 8FB00010 */ lw $s0, 0x10($sp) -/* DB8430 80240B20 24020002 */ addiu $v0, $zero, 2 -/* DB8434 80240B24 03E00008 */ jr $ra -/* DB8438 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 -/* DB843C 80240B2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s deleted file mode 100644 index 77117b7c23..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240988_DCD658 -/* DCD658 80240988 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCD65C 8024098C AFB00010 */ sw $s0, 0x10($sp) -/* DCD660 80240990 0080802D */ daddu $s0, $a0, $zero -/* DCD664 80240994 AFBF0014 */ sw $ra, 0x14($sp) -/* DCD668 80240998 8E02000C */ lw $v0, 0xc($s0) -/* DCD66C 8024099C 0C0B1EAF */ jal get_variable -/* DCD670 802409A0 8C450000 */ lw $a1, ($v0) -/* DCD674 802409A4 00021140 */ sll $v0, $v0, 5 -/* DCD678 802409A8 AE000084 */ sw $zero, 0x84($s0) -/* DCD67C 802409AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DCD680 802409B0 00220821 */ addu $at, $at, $v0 -/* DCD684 802409B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DCD688 802409B8 30420040 */ andi $v0, $v0, 0x40 -/* DCD68C 802409BC 10400002 */ beqz $v0, .L802409C8 -/* DCD690 802409C0 24020001 */ addiu $v0, $zero, 1 -/* DCD694 802409C4 AE020084 */ sw $v0, 0x84($s0) -.L802409C8: -/* DCD698 802409C8 8FBF0014 */ lw $ra, 0x14($sp) -/* DCD69C 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* DCD6A0 802409D0 24020002 */ addiu $v0, $zero, 2 -/* DCD6A4 802409D4 03E00008 */ jr $ra -/* DCD6A8 802409D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* DCD6AC 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s deleted file mode 100644 index c65da6908b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241498_DE3928 -/* DE3928 80241498 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE392C 8024149C AFB00010 */ sw $s0, 0x10($sp) -/* DE3930 802414A0 0080802D */ daddu $s0, $a0, $zero -/* DE3934 802414A4 AFBF0014 */ sw $ra, 0x14($sp) -/* DE3938 802414A8 8E02000C */ lw $v0, 0xc($s0) -/* DE393C 802414AC 0C0B1EAF */ jal get_variable -/* DE3940 802414B0 8C450000 */ lw $a1, ($v0) -/* DE3944 802414B4 00021140 */ sll $v0, $v0, 5 -/* DE3948 802414B8 AE000084 */ sw $zero, 0x84($s0) -/* DE394C 802414BC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DE3950 802414C0 00220821 */ addu $at, $at, $v0 -/* DE3954 802414C4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DE3958 802414C8 30420040 */ andi $v0, $v0, 0x40 -/* DE395C 802414CC 10400002 */ beqz $v0, .L802414D8 -/* DE3960 802414D0 24020001 */ addiu $v0, $zero, 1 -/* DE3964 802414D4 AE020084 */ sw $v0, 0x84($s0) -.L802414D8: -/* DE3968 802414D8 8FBF0014 */ lw $ra, 0x14($sp) -/* DE396C 802414DC 8FB00010 */ lw $s0, 0x10($sp) -/* DE3970 802414E0 24020002 */ addiu $v0, $zero, 2 -/* DE3974 802414E4 03E00008 */ jr $ra -/* DE3978 802414E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* DE397C 802414EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s deleted file mode 100644 index af10412f52..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D56D38 -/* D56D38 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56D3C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D56D40 80241190 0080802D */ daddu $s0, $a0, $zero -/* D56D44 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D56D48 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D56D4C 8024119C 0C0B1EAF */ jal get_variable -/* D56D50 802411A0 8C450000 */ lw $a1, ($v0) -/* D56D54 802411A4 00021140 */ sll $v0, $v0, 5 -/* D56D58 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D56D5C 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D56D60 802411B0 00220821 */ addu $at, $at, $v0 -/* D56D64 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D56D68 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D56D6C 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D56D70 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D56D74 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D56D78 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D56D7C 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D56D80 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D56D84 802411D4 03E00008 */ jr $ra -/* D56D88 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D56D8C 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s deleted file mode 100644 index 7b9aedc5ab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D62688 -/* D62688 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6268C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D62690 80241190 0080802D */ daddu $s0, $a0, $zero -/* D62694 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D62698 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D6269C 8024119C 0C0B1EAF */ jal get_variable -/* D626A0 802411A0 8C450000 */ lw $a1, ($v0) -/* D626A4 802411A4 00021140 */ sll $v0, $v0, 5 -/* D626A8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D626AC 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D626B0 802411B0 00220821 */ addu $at, $at, $v0 -/* D626B4 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D626B8 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D626BC 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D626C0 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D626C4 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D626C8 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D626CC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D626D0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D626D4 802411D4 03E00008 */ jr $ra -/* D626D8 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D626DC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s deleted file mode 100644 index 2cdd966250..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D63EC8 -/* D63EC8 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63ECC 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D63ED0 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D63ED4 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D63ED8 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D63EDC 802411CC 0C0B1EAF */ jal get_variable -/* D63EE0 802411D0 8C450000 */ lw $a1, ($v0) -/* D63EE4 802411D4 00021140 */ sll $v0, $v0, 5 -/* D63EE8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D63EEC 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D63EF0 802411E0 00220821 */ addu $at, $at, $v0 -/* D63EF4 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D63EF8 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D63EFC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D63F00 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D63F04 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D63F08 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D63F0C 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D63F10 80241200 24020002 */ addiu $v0, $zero, 2 -/* D63F14 80241204 03E00008 */ jr $ra -/* D63F18 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D63F1C 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s deleted file mode 100644 index e6c3810e5d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D68E88 -/* D68E88 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68E8C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D68E90 80241190 0080802D */ daddu $s0, $a0, $zero -/* D68E94 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D68E98 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D68E9C 8024119C 0C0B1EAF */ jal get_variable -/* D68EA0 802411A0 8C450000 */ lw $a1, ($v0) -/* D68EA4 802411A4 00021140 */ sll $v0, $v0, 5 -/* D68EA8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D68EAC 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D68EB0 802411B0 00220821 */ addu $at, $at, $v0 -/* D68EB4 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D68EB8 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D68EBC 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D68EC0 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D68EC4 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D68EC8 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D68ECC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D68ED0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D68ED4 802411D4 03E00008 */ jr $ra -/* D68ED8 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D68EDC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s deleted file mode 100644 index 531b0ab6d9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D7ABA8 -/* D7ABA8 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7ABAC 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D7ABB0 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D7ABB4 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D7ABB8 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D7ABBC 802411CC 0C0B1EAF */ jal get_variable -/* D7ABC0 802411D0 8C450000 */ lw $a1, ($v0) -/* D7ABC4 802411D4 00021140 */ sll $v0, $v0, 5 -/* D7ABC8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7ABCC 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D7ABD0 802411E0 00220821 */ addu $at, $at, $v0 -/* D7ABD4 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D7ABD8 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D7ABDC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D7ABE0 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D7ABE4 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D7ABE8 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7ABEC 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D7ABF0 80241200 24020002 */ addiu $v0, $zero, 2 -/* D7ABF4 80241204 03E00008 */ jr $ra -/* D7ABF8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7ABFC 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s deleted file mode 100644 index 63e76797cf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D7C458 -/* D7C458 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C45C 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D7C460 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D7C464 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D7C468 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D7C46C 802411CC 0C0B1EAF */ jal get_variable -/* D7C470 802411D0 8C450000 */ lw $a1, ($v0) -/* D7C474 802411D4 00021140 */ sll $v0, $v0, 5 -/* D7C478 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7C47C 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D7C480 802411E0 00220821 */ addu $at, $at, $v0 -/* D7C484 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D7C488 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D7C48C 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D7C490 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D7C494 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D7C498 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7C49C 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D7C4A0 80241200 24020002 */ addiu $v0, $zero, 2 -/* D7C4A4 80241204 03E00008 */ jr $ra -/* D7C4A8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7C4AC 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s deleted file mode 100644 index 56d903bf8b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BB8_D8FE08 -/* D8FE08 80242BB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8FE0C 80242BBC AFB00010 */ sw $s0, 0x10($sp) -/* D8FE10 80242BC0 0080802D */ daddu $s0, $a0, $zero -/* D8FE14 80242BC4 AFBF0014 */ sw $ra, 0x14($sp) -/* D8FE18 80242BC8 8E02000C */ lw $v0, 0xc($s0) -/* D8FE1C 80242BCC 0C0B1EAF */ jal get_variable -/* D8FE20 80242BD0 8C450000 */ lw $a1, ($v0) -/* D8FE24 80242BD4 00021140 */ sll $v0, $v0, 5 -/* D8FE28 80242BD8 AE000084 */ sw $zero, 0x84($s0) -/* D8FE2C 80242BDC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D8FE30 80242BE0 00220821 */ addu $at, $at, $v0 -/* D8FE34 80242BE4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D8FE38 80242BE8 30420040 */ andi $v0, $v0, 0x40 -/* D8FE3C 80242BEC 10400002 */ beqz $v0, .L80242BF8 -/* D8FE40 80242BF0 24020001 */ addiu $v0, $zero, 1 -/* D8FE44 80242BF4 AE020084 */ sw $v0, 0x84($s0) -.L80242BF8: -/* D8FE48 80242BF8 8FBF0014 */ lw $ra, 0x14($sp) -/* D8FE4C 80242BFC 8FB00010 */ lw $s0, 0x10($sp) -/* D8FE50 80242C00 24020002 */ addiu $v0, $zero, 2 -/* D8FE54 80242C04 03E00008 */ jr $ra -/* D8FE58 80242C08 27BD0018 */ addiu $sp, $sp, 0x18 -/* D8FE5C 80242C0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s deleted file mode 100644 index 3648ece98f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF8_CF9A68 -/* CF9A68 80241EF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF9A6C 80241EFC AFB00010 */ sw $s0, 0x10($sp) -/* CF9A70 80241F00 0080802D */ daddu $s0, $a0, $zero -/* CF9A74 80241F04 AFBF0014 */ sw $ra, 0x14($sp) -/* CF9A78 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* CF9A7C 80241F0C 0C0B1EAF */ jal get_variable -/* CF9A80 80241F10 8C450000 */ lw $a1, ($v0) -/* CF9A84 80241F14 00021140 */ sll $v0, $v0, 5 -/* CF9A88 80241F18 AE000084 */ sw $zero, 0x84($s0) -/* CF9A8C 80241F1C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* CF9A90 80241F20 00220821 */ addu $at, $at, $v0 -/* CF9A94 80241F24 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* CF9A98 80241F28 30420040 */ andi $v0, $v0, 0x40 -/* CF9A9C 80241F2C 10400002 */ beqz $v0, .L80241F38 -/* CF9AA0 80241F30 24020001 */ addiu $v0, $zero, 1 -/* CF9AA4 80241F34 AE020084 */ sw $v0, 0x84($s0) -.L80241F38: -/* CF9AA8 80241F38 8FBF0014 */ lw $ra, 0x14($sp) -/* CF9AAC 80241F3C 8FB00010 */ lw $s0, 0x10($sp) -/* CF9AB0 80241F40 24020002 */ addiu $v0, $zero, 2 -/* CF9AB4 80241F44 03E00008 */ jr $ra -/* CF9AB8 80241F48 27BD0018 */ addiu $sp, $sp, 0x18 -/* CF9ABC 80241F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s deleted file mode 100644 index 403bdbdf18..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_D37A68 -/* D37A68 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D37A6C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* D37A70 80240270 0080802D */ daddu $s0, $a0, $zero -/* D37A74 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* D37A78 80240278 8E02000C */ lw $v0, 0xc($s0) -/* D37A7C 8024027C 0C0B1EAF */ jal get_variable -/* D37A80 80240280 8C450000 */ lw $a1, ($v0) -/* D37A84 80240284 00021140 */ sll $v0, $v0, 5 -/* D37A88 80240288 AE000084 */ sw $zero, 0x84($s0) -/* D37A8C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D37A90 80240290 00220821 */ addu $at, $at, $v0 -/* D37A94 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D37A98 80240298 30420040 */ andi $v0, $v0, 0x40 -/* D37A9C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* D37AA0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* D37AA4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* D37AA8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* D37AAC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* D37AB0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* D37AB4 802402B4 03E00008 */ jr $ra -/* D37AB8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s deleted file mode 100644 index de36c223b6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_86CCB8 -/* 86CCB8 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86CCBC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* 86CCC0 80240580 0080802D */ daddu $s0, $a0, $zero -/* 86CCC4 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* 86CCC8 80240588 8E02000C */ lw $v0, 0xc($s0) -/* 86CCCC 8024058C 0C0B1EAF */ jal get_variable -/* 86CCD0 80240590 8C450000 */ lw $a1, ($v0) -/* 86CCD4 80240594 00021140 */ sll $v0, $v0, 5 -/* 86CCD8 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 86CCDC 8024059C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 86CCE0 802405A0 00220821 */ addu $at, $at, $v0 -/* 86CCE4 802405A4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 86CCE8 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* 86CCEC 802405AC 10400002 */ beqz $v0, .L802405B8 -/* 86CCF0 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 86CCF4 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* 86CCF8 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86CCFC 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* 86CD00 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 86CD04 802405C4 03E00008 */ jr $ra -/* 86CD08 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86CD0C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s deleted file mode 100644 index e9417584aa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E8_8756A8 -/* 8756A8 802408E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8756AC 802408EC AFB00010 */ sw $s0, 0x10($sp) -/* 8756B0 802408F0 0080802D */ daddu $s0, $a0, $zero -/* 8756B4 802408F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8756B8 802408F8 8E02000C */ lw $v0, 0xc($s0) -/* 8756BC 802408FC 0C0B1EAF */ jal get_variable -/* 8756C0 80240900 8C450000 */ lw $a1, ($v0) -/* 8756C4 80240904 00021140 */ sll $v0, $v0, 5 -/* 8756C8 80240908 AE000084 */ sw $zero, 0x84($s0) -/* 8756CC 8024090C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 8756D0 80240910 00220821 */ addu $at, $at, $v0 -/* 8756D4 80240914 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 8756D8 80240918 30420040 */ andi $v0, $v0, 0x40 -/* 8756DC 8024091C 10400002 */ beqz $v0, .L80240928 -/* 8756E0 80240920 24020001 */ addiu $v0, $zero, 1 -/* 8756E4 80240924 AE020084 */ sw $v0, 0x84($s0) -.L80240928: -/* 8756E8 80240928 8FBF0014 */ lw $ra, 0x14($sp) -/* 8756EC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* 8756F0 80240930 24020002 */ addiu $v0, $zero, 2 -/* 8756F4 80240934 03E00008 */ jr $ra -/* 8756F8 80240938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 1471fa65ca..08ae3e5fa4 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240268_C3D2E8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index d5b7c68242..df5f5c27fc 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240268_C4E158); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index 7a74c96951..16efad6d8a 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", begin_battle_C57158); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index deb9883e50..79a7d216f8 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238_A3B718); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C); diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 8139d4e67d..84e963a1d5 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240268_986748); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_802402BC_98679C); diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index 88c66109a5..5a85b2942f 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240268_918E18); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_802402BC_918E6C); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index eb4ec0bf20..26bb0f5f45 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_802405B8_B44D28); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index b8158372c1..c656a4150f 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240268_AF1EC8); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_802402BC_AF1F1C); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index b6fe6e8913..7ade274f5b 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index 7667f67e77..d311dc3f57 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240578_A59908); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index 45d3806333..df32b34791 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802409F8_C71E78); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index fc12fd89b2..2b40c4a695 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240268_BCEE58); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index f700b956d2..fa7b3fb67c 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8_DB83E8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 580b5ccca3..2c926ed605 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240988_DCD658); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index ed8e7fbb17..81b3f5db67 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241498_DE3928); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 5923069bbf..bf201d80df 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188_D56D38); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index b29e0eb8e5..b5aa5bfc93 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241188_D62688); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 36a4a29249..9b32793842 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802411B8_D63EC8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 0869525b6c..1e1f1de106 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241188_D68E88); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index bcea4c8d5c..43aee5fc08 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802411B8_D7ABA8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index f9804c79ff..b6851b8fee 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802411B8_D7C458); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 66476e5833..ad243b6b9f 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8_D8FE08); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 3da3677484..f7fc1e9651 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -84,4 +84,4 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241EF8_CF9A68); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index fee35719cc..0f9904054e 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240268_D37A68); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index 356fa762d9..ae8715539d 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240578_86CCB8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 3d5e6177df..afa714dfa2 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8_8756A8); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_8024093C_8756FC); diff --git a/src/world/common/CheckItemFlags40.inc.c b/src/world/common/CheckItemFlags40.inc.c new file mode 100644 index 0000000000..7c0bad9a33 --- /dev/null +++ b/src/world/common/CheckItemFlags40.inc.c @@ -0,0 +1,13 @@ +#include "common.h" + +static ApiStatus CheckItemFlags40(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 itemIndex = get_variable(script, *args++); + + script->varTable[0] = FALSE; + if (gItemTable[itemIndex].typeFlags & 0x40) { + script->varTable[0] = TRUE; + } + + return ApiStatus_DONE2; +} From 087b30ab35ba833d6064221456adbbfc0ab10af9 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 16:04:59 -0500 Subject: [PATCH 07/12] a couple more kmrs --- .../kmr_11/8DAFC0/func_80240EC0_8DAFC0.s | 28 ------------------- include/common_structs.h | 3 +- src/world/area_kmr/kmr_10/8D84D0.c | 15 ++++++++++ src/world/area_kmr/kmr_11/8DAFC0.c | 10 ++++++- 4 files changed, 26 insertions(+), 30 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s deleted file mode 100644 index 500303fb66..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC0_8DAFC0 -/* 8DAFC0 80240EC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DAFC4 80240EC4 AFB00010 */ sw $s0, 0x10($sp) -/* 8DAFC8 80240EC8 0080802D */ daddu $s0, $a0, $zero -/* 8DAFCC 80240ECC AFBF0014 */ sw $ra, 0x14($sp) -/* 8DAFD0 80240ED0 0C04417A */ jal get_entity_by_index -/* 8DAFD4 80240ED4 8E0400AC */ lw $a0, 0xac($s0) -/* 8DAFD8 80240ED8 0040182D */ daddu $v1, $v0, $zero -/* 8DAFDC 80240EDC C6000084 */ lwc1 $f0, 0x84($s0) -/* 8DAFE0 80240EE0 46800020 */ cvt.s.w $f0, $f0 -/* 8DAFE4 80240EE4 E4600048 */ swc1 $f0, 0x48($v1) -/* 8DAFE8 80240EE8 C6000088 */ lwc1 $f0, 0x88($s0) -/* 8DAFEC 80240EEC 46800020 */ cvt.s.w $f0, $f0 -/* 8DAFF0 80240EF0 E460004C */ swc1 $f0, 0x4c($v1) -/* 8DAFF4 80240EF4 C600008C */ lwc1 $f0, 0x8c($s0) -/* 8DAFF8 80240EF8 46800020 */ cvt.s.w $f0, $f0 -/* 8DAFFC 80240EFC E4600050 */ swc1 $f0, 0x50($v1) -/* 8DB000 80240F00 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DB004 80240F04 8FB00010 */ lw $s0, 0x10($sp) -/* 8DB008 80240F08 24020002 */ addiu $v0, $zero, 2 -/* 8DB00C 80240F0C 03E00008 */ jr $ra -/* 8DB010 80240F10 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8DB014 80240F14 00000000 */ nop -/* 8DB018 80240F18 00000000 */ nop -/* 8DB01C 80240F1C 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index 807d692c00..be64321f80 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -271,7 +271,8 @@ typedef struct Entity { /* 0x07 */ char unk_08[4]; /* 0x0B */ u8 alpha; /* reported by rain */ /* 0x0C */ s16 aabb[3]; - /* 0x12 */ char unk_12[4]; + /* 0x12 */ char unk_12[2]; + /* 0x14 */ s16 unk_14; /* 0x16 */ s16 shadowIndex; /* 0x18 */ char unk_18[16]; /* 0x28 */ Bytecode* boundScript; diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 7ade274f5b..2b64600489 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -8,7 +8,22 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/CheckItemFlags40.inc.c" +#ifdef NON_MATCHING +ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Entity *entity = get_entity_by_index(get_variable(script, *args++)); + s32 something = 0x1E4; + + if (entity == NULL) { + return ApiStatus_BLOCK; + } + + play_model_animation(entity->unk_14, 0x1E4); + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); +#endif ApiStatus func_80240304_8D87D4(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_kmr/kmr_11/8DAFC0.c b/src/world/area_kmr/kmr_11/8DAFC0.c index f2c56537a0..0ca706c981 100644 --- a/src/world/area_kmr/kmr_11/8DAFC0.c +++ b/src/world/area_kmr/kmr_11/8DAFC0.c @@ -1,3 +1,11 @@ #include "kmr_11.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DAFC0", func_80240EC0_8DAFC0); +ApiStatus func_80240EC0_8DAFC0(ScriptInstance* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + entity->position.x = script->varTable[0]; + entity->position.y = script->varTable[1]; + entity->position.z = script->varTable[2]; + + return ApiStatus_DONE2; +} From 202243349f52c7b02cefe143a9e14ee52ae9f203 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 16:10:37 -0500 Subject: [PATCH 08/12] format --- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 2b64600489..638c0b459b 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -11,7 +11,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #ifdef NON_MATCHING ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Entity *entity = get_entity_by_index(get_variable(script, *args++)); + Entity* entity = get_entity_by_index(get_variable(script, *args++)); s32 something = 0x1E4; if (entity == NULL) { From d604f179c83ffe109c477a5299e26e30193b1ec6 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 16:24:18 -0500 Subject: [PATCH 09/12] PR comments --- src/world/area_kmr/kmr_06/8D2A10.c | 6 +++--- src/world/area_kmr/kmr_10/8D84D0.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c index e16bb442c4..0844ff9259 100644 --- a/src/world/area_kmr/kmr_06/8D2A10.c +++ b/src/world/area_kmr/kmr_06/8D2A10.c @@ -26,9 +26,9 @@ ApiStatus func_80241CC8_8D31D8(ScriptInstance* script, s32 isInitialCall) { heap_free(mapVar11); heap_free(mapVar12); - set_variable(script, SI_MAP_VAR(10), 0); - set_variable(script, SI_MAP_VAR(11), 0); - set_variable(script, SI_MAP_VAR(12), 0); + set_variable(script, SI_MAP_VAR(10), NULL); + set_variable(script, SI_MAP_VAR(11), NULL); + set_variable(script, SI_MAP_VAR(12), NULL); return ApiStatus_DONE2; } diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 638c0b459b..0ff186c71c 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -12,7 +12,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Entity* entity = get_entity_by_index(get_variable(script, *args++)); - s32 something = 0x1E4; if (entity == NULL) { return ApiStatus_BLOCK; From d16d6a3c1a7f16fd3afb02e377d37b670c9f2458 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 16:31:54 -0500 Subject: [PATCH 10/12] comment --- src/world/area_kmr/kmr_10/8D84D0.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 0ff186c71c..30e9e15943 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -9,6 +9,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/CheckItemFlags40.inc.c" #ifdef NON_MATCHING +// 0x1E4 is probably a linker constant. We need to learn more about animations, +// play_model_animation, and entity->unk_14 before we can tackle this ApiStatus func_802402BC_8D878C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Entity* entity = get_entity_by_index(get_variable(script, *args++)); From cadd7693a9d27eb0ac69d6cc10ed433b8629b119 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 16:41:24 -0500 Subject: [PATCH 11/12] fixing paths --- .../code_7E2AA0/MakeDoorAdvanced.s | 394 ------------------ asm/nonmatchings/code_7E2AA0/func_802822A8.s | 31 -- asm/nonmatchings/code_7E2AA0/func_8028236C.s | 21 - asm/nonmatchings/code_7E2AA0/func_802823B0.s | 29 -- asm/nonmatchings/code_7E2AA0/func_80282414.s | 105 ----- asm/nonmatchings/code_7E2AA0/func_80282634.s | 60 --- asm/nonmatchings/code_7E2AA0/func_80282700.s | 36 -- .../script_api/7E2AA0}/func_80282594.s | 0 src/world/script_api/7E0E80.c | 38 +- src/world/script_api/7E2AA0.c | 16 +- src/world/script_api/7E3700.c | 48 +-- src/world/world.c | 48 +-- 12 files changed, 75 insertions(+), 751 deletions(-) delete mode 100644 asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s delete mode 100644 asm/nonmatchings/code_7E2AA0/func_802822A8.s delete mode 100644 asm/nonmatchings/code_7E2AA0/func_8028236C.s delete mode 100644 asm/nonmatchings/code_7E2AA0/func_802823B0.s delete mode 100644 asm/nonmatchings/code_7E2AA0/func_80282414.s delete mode 100644 asm/nonmatchings/code_7E2AA0/func_80282634.s delete mode 100644 asm/nonmatchings/code_7E2AA0/func_80282700.s rename asm/nonmatchings/{code_7E2AA0 => world/script_api/7E2AA0}/func_80282594.s (100%) diff --git a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s deleted file mode 100644 index 96d43f70bf..0000000000 --- a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s +++ /dev/null @@ -1,394 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel MakeDoorAdvanced -/* 7E2B2C 80281CAC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 7E2B30 80281CB0 AFB10034 */ sw $s1, 0x34($sp) -/* 7E2B34 80281CB4 0080882D */ daddu $s1, $a0, $zero -/* 7E2B38 80281CB8 AFBF0054 */ sw $ra, 0x54($sp) -/* 7E2B3C 80281CBC AFBE0050 */ sw $fp, 0x50($sp) -/* 7E2B40 80281CC0 AFB7004C */ sw $s7, 0x4c($sp) -/* 7E2B44 80281CC4 AFB60048 */ sw $s6, 0x48($sp) -/* 7E2B48 80281CC8 AFB50044 */ sw $s5, 0x44($sp) -/* 7E2B4C 80281CCC AFB40040 */ sw $s4, 0x40($sp) -/* 7E2B50 80281CD0 AFB3003C */ sw $s3, 0x3c($sp) -/* 7E2B54 80281CD4 AFB20038 */ sw $s2, 0x38($sp) -/* 7E2B58 80281CD8 AFB00030 */ sw $s0, 0x30($sp) -/* 7E2B5C 80281CDC 8E30000C */ lw $s0, 0xc($s1) -/* 7E2B60 80281CE0 0C00AB39 */ jal heap_malloc -/* 7E2B64 80281CE4 24040064 */ addiu $a0, $zero, 0x64 -/* 7E2B68 80281CE8 0220202D */ daddu $a0, $s1, $zero -/* 7E2B6C 80281CEC 0040902D */ daddu $s2, $v0, $zero -/* 7E2B70 80281CF0 AE400000 */ sw $zero, ($s2) -/* 7E2B74 80281CF4 8E050000 */ lw $a1, ($s0) -/* 7E2B78 80281CF8 0C0B1EAF */ jal get_variable -/* 7E2B7C 80281CFC 26100004 */ addiu $s0, $s0, 4 -/* 7E2B80 80281D00 0040982D */ daddu $s3, $v0, $zero -/* 7E2B84 80281D04 32620FFF */ andi $v0, $s3, 0xfff -/* 7E2B88 80281D08 AE420004 */ sw $v0, 4($s2) -/* 7E2B8C 80281D0C 3262F000 */ andi $v0, $s3, 0xf000 -/* 7E2B90 80281D10 00021303 */ sra $v0, $v0, 0xc -/* 7E2B94 80281D14 A6420008 */ sh $v0, 8($s2) -/* 7E2B98 80281D18 A640000A */ sh $zero, 0xa($s2) -/* 7E2B9C 80281D1C 8E050000 */ lw $a1, ($s0) -/* 7E2BA0 80281D20 26100004 */ addiu $s0, $s0, 4 -/* 7E2BA4 80281D24 0C0B1EAF */ jal get_variable -/* 7E2BA8 80281D28 0220202D */ daddu $a0, $s1, $zero -/* 7E2BAC 80281D2C 8E050000 */ lw $a1, ($s0) -/* 7E2BB0 80281D30 26100004 */ addiu $s0, $s0, 4 -/* 7E2BB4 80281D34 0220202D */ daddu $a0, $s1, $zero -/* 7E2BB8 80281D38 0C0B1EAF */ jal get_variable -/* 7E2BBC 80281D3C AFA2002C */ sw $v0, 0x2c($sp) -/* 7E2BC0 80281D40 8E050000 */ lw $a1, ($s0) -/* 7E2BC4 80281D44 26100004 */ addiu $s0, $s0, 4 -/* 7E2BC8 80281D48 0220202D */ daddu $a0, $s1, $zero -/* 7E2BCC 80281D4C 0C0B1EAF */ jal get_variable -/* 7E2BD0 80281D50 0040F02D */ daddu $fp, $v0, $zero -/* 7E2BD4 80281D54 8E050000 */ lw $a1, ($s0) -/* 7E2BD8 80281D58 26100004 */ addiu $s0, $s0, 4 -/* 7E2BDC 80281D5C 0220202D */ daddu $a0, $s1, $zero -/* 7E2BE0 80281D60 0C0B1EAF */ jal get_variable -/* 7E2BE4 80281D64 0040A82D */ daddu $s5, $v0, $zero -/* 7E2BE8 80281D68 8E050000 */ lw $a1, ($s0) -/* 7E2BEC 80281D6C 26100004 */ addiu $s0, $s0, 4 -/* 7E2BF0 80281D70 0220202D */ daddu $a0, $s1, $zero -/* 7E2BF4 80281D74 0C0B1EAF */ jal get_variable -/* 7E2BF8 80281D78 0040B82D */ daddu $s7, $v0, $zero -/* 7E2BFC 80281D7C 0040A02D */ daddu $s4, $v0, $zero -/* 7E2C00 80281D80 AE540060 */ sw $s4, 0x60($s2) -/* 7E2C04 80281D84 8E050000 */ lw $a1, ($s0) -/* 7E2C08 80281D88 26100004 */ addiu $s0, $s0, 4 -/* 7E2C0C 80281D8C 0C0B1EAF */ jal get_variable -/* 7E2C10 80281D90 0220202D */ daddu $a0, $s1, $zero -/* 7E2C14 80281D94 8E050000 */ lw $a1, ($s0) -/* 7E2C18 80281D98 26100004 */ addiu $s0, $s0, 4 -/* 7E2C1C 80281D9C 0220202D */ daddu $a0, $s1, $zero -/* 7E2C20 80281DA0 0C0B1EAF */ jal get_variable -/* 7E2C24 80281DA4 0040B02D */ daddu $s6, $v0, $zero -/* 7E2C28 80281DA8 AE42003C */ sw $v0, 0x3c($s2) -/* 7E2C2C 80281DAC 8E050000 */ lw $a1, ($s0) -/* 7E2C30 80281DB0 0C0B1EAF */ jal get_variable -/* 7E2C34 80281DB4 0220202D */ daddu $a0, $s1, $zero -/* 7E2C38 80281DB8 12A00003 */ beqz $s5, .L80281DC8 -/* 7E2C3C 80281DBC AE42005C */ sw $v0, 0x5c($s2) -/* 7E2C40 80281DC0 36730800 */ ori $s3, $s3, 0x800 -/* 7E2C44 80281DC4 AE530004 */ sw $s3, 4($s2) -.L80281DC8: -/* 7E2C48 80281DC8 0280202D */ daddu $a0, $s4, $zero -/* 7E2C4C 80281DCC 27A50018 */ addiu $a1, $sp, 0x18 -/* 7E2C50 80281DD0 27B0001C */ addiu $s0, $sp, 0x1c -/* 7E2C54 80281DD4 0200302D */ daddu $a2, $s0, $zero -/* 7E2C58 80281DD8 0C016F84 */ jal get_collider_center -/* 7E2C5C 80281DDC 27A70020 */ addiu $a3, $sp, 0x20 -/* 7E2C60 80281DE0 0280202D */ daddu $a0, $s4, $zero -/* 7E2C64 80281DE4 27A50024 */ addiu $a1, $sp, 0x24 -/* 7E2C68 80281DE8 0200302D */ daddu $a2, $s0, $zero -/* 7E2C6C 80281DEC 0C016F76 */ jal func_8005BDD8 -/* 7E2C70 80281DF0 27A70028 */ addiu $a3, $sp, 0x28 -/* 7E2C74 80281DF4 326300FF */ andi $v1, $s3, 0xff -/* 7E2C78 80281DF8 2C620008 */ sltiu $v0, $v1, 8 -/* 7E2C7C 80281DFC 104000F0 */ beqz $v0, .L802821C0 -/* 7E2C80 80281E00 00031080 */ sll $v0, $v1, 2 -/* 7E2C84 80281E04 3C018028 */ lui $at, 0x8028 -/* 7E2C88 80281E08 00220821 */ addu $at, $at, $v0 -/* 7E2C8C 80281E0C 8C226500 */ lw $v0, 0x6500($at) -/* 7E2C90 80281E10 00400008 */ jr $v0 -/* 7E2C94 80281E14 00000000 */ nop -/* 7E2C98 80281E18 C7AA0024 */ lwc1 $f10, 0x24($sp) -/* 7E2C9C 80281E1C 3C0141F0 */ lui $at, 0x41f0 -/* 7E2CA0 80281E20 44811000 */ mtc1 $at, $f2 -/* 7E2CA4 80281E24 00000000 */ nop -/* 7E2CA8 80281E28 46025302 */ mul.s $f12, $f10, $f2 -/* 7E2CAC 80281E2C 00000000 */ nop -/* 7E2CB0 80281E30 C7A60028 */ lwc1 $f6, 0x28($sp) -/* 7E2CB4 80281E34 3C0141A0 */ lui $at, 0x41a0 -/* 7E2CB8 80281E38 44810000 */ mtc1 $at, $f0 -/* 7E2CBC 80281E3C 00000000 */ nop -/* 7E2CC0 80281E40 46003102 */ mul.s $f4, $f6, $f0 -/* 7E2CC4 80281E44 00000000 */ nop -/* 7E2CC8 80281E48 46023182 */ mul.s $f6, $f6, $f2 -/* 7E2CCC 80281E4C 00000000 */ nop -/* 7E2CD0 80281E50 46005282 */ mul.s $f10, $f10, $f0 -/* 7E2CD4 80281E54 00000000 */ nop -/* 7E2CD8 80281E58 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2CDC 80281E5C 460C1200 */ add.s $f8, $f2, $f12 -/* 7E2CE0 80281E60 460C1081 */ sub.s $f2, $f2, $f12 -/* 7E2CE4 80281E64 46044201 */ sub.s $f8, $f8, $f4 -/* 7E2CE8 80281E68 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2CEC 80281E6C 46060100 */ add.s $f4, $f0, $f6 -/* 7E2CF0 80281E70 46060001 */ sub.s $f0, $f0, $f6 -/* 7E2CF4 80281E74 E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2CF8 80281E78 080A0819 */ j .L80282064 -/* 7E2CFC 80281E7C 460A2100 */ add.s $f4, $f4, $f10 -/* 7E2D00 80281E80 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 7E2D04 80281E84 3C014270 */ lui $at, 0x4270 -/* 7E2D08 80281E88 44812000 */ mtc1 $at, $f4 -/* 7E2D0C 80281E8C 00000000 */ nop -/* 7E2D10 80281E90 46044302 */ mul.s $f12, $f8, $f4 -/* 7E2D14 80281E94 00000000 */ nop -/* 7E2D18 80281E98 C7A60028 */ lwc1 $f6, 0x28($sp) -/* 7E2D1C 80281E9C 3C0141A0 */ lui $at, 0x41a0 -/* 7E2D20 80281EA0 44815000 */ mtc1 $at, $f10 -/* 7E2D24 80281EA4 00000000 */ nop -/* 7E2D28 80281EA8 460A3382 */ mul.s $f14, $f6, $f10 -/* 7E2D2C 80281EAC 00000000 */ nop -/* 7E2D30 80281EB0 46043102 */ mul.s $f4, $f6, $f4 -/* 7E2D34 80281EB4 00000000 */ nop -/* 7E2D38 80281EB8 460A4282 */ mul.s $f10, $f8, $f10 -/* 7E2D3C 80281EBC 00000000 */ nop -/* 7E2D40 80281EC0 3C0141F0 */ lui $at, 0x41f0 -/* 7E2D44 80281EC4 44810000 */ mtc1 $at, $f0 -/* 7E2D48 80281EC8 00000000 */ nop -/* 7E2D4C 80281ECC 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2D50 80281ED0 00000000 */ nop -/* 7E2D54 80281ED4 46003182 */ mul.s $f6, $f6, $f0 -/* 7E2D58 80281ED8 00000000 */ nop -/* 7E2D5C 80281EDC C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2D60 80281EE0 460C1300 */ add.s $f12, $f2, $f12 -/* 7E2D64 80281EE4 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2D68 80281EE8 46040100 */ add.s $f4, $f0, $f4 -/* 7E2D6C 80281EEC 46081081 */ sub.s $f2, $f2, $f8 -/* 7E2D70 80281EF0 46060001 */ sub.s $f0, $f0, $f6 -/* 7E2D74 80281EF4 460E6301 */ sub.s $f12, $f12, $f14 -/* 7E2D78 80281EF8 E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2D7C 80281EFC 080A083D */ j .L802820F4 -/* 7E2D80 80281F00 460A2100 */ add.s $f4, $f4, $f10 -/* 7E2D84 80281F04 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 7E2D88 80281F08 3C0141F0 */ lui $at, 0x41f0 -/* 7E2D8C 80281F0C 44813000 */ mtc1 $at, $f6 -/* 7E2D90 80281F10 00000000 */ nop -/* 7E2D94 80281F14 46064282 */ mul.s $f10, $f8, $f6 -/* 7E2D98 80281F18 00000000 */ nop -/* 7E2D9C 80281F1C C7A40028 */ lwc1 $f4, 0x28($sp) -/* 7E2DA0 80281F20 46062182 */ mul.s $f6, $f4, $f6 -/* 7E2DA4 80281F24 00000000 */ nop -/* 7E2DA8 80281F28 3C0141A0 */ lui $at, 0x41a0 -/* 7E2DAC 80281F2C 44810000 */ mtc1 $at, $f0 -/* 7E2DB0 80281F30 00000000 */ nop -/* 7E2DB4 80281F34 46002102 */ mul.s $f4, $f4, $f0 -/* 7E2DB8 80281F38 00000000 */ nop -/* 7E2DBC 80281F3C 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2DC0 80281F40 00000000 */ nop -/* 7E2DC4 80281F44 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2DC8 80281F48 460A1300 */ add.s $f12, $f2, $f10 -/* 7E2DCC 80281F4C 460A1081 */ sub.s $f2, $f2, $f10 -/* 7E2DD0 80281F50 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2DD4 80281F54 46060280 */ add.s $f10, $f0, $f6 -/* 7E2DD8 80281F58 46060001 */ sub.s $f0, $f0, $f6 -/* 7E2DDC 80281F5C 46041081 */ sub.s $f2, $f2, $f4 -/* 7E2DE0 80281F60 E64C000C */ swc1 $f12, 0xc($s2) -/* 7E2DE4 80281F64 46080001 */ sub.s $f0, $f0, $f8 -/* 7E2DE8 80281F68 E64A0010 */ swc1 $f10, 0x10($s2) -/* 7E2DEC 80281F6C 080A086F */ j .L802821BC -/* 7E2DF0 80281F70 E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2DF4 80281F74 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 7E2DF8 80281F78 3C0141F0 */ lui $at, 0x41f0 -/* 7E2DFC 80281F7C 44813000 */ mtc1 $at, $f6 -/* 7E2E00 80281F80 00000000 */ nop -/* 7E2E04 80281F84 46064282 */ mul.s $f10, $f8, $f6 -/* 7E2E08 80281F88 00000000 */ nop -/* 7E2E0C 80281F8C C7A40028 */ lwc1 $f4, 0x28($sp) -/* 7E2E10 80281F90 46062182 */ mul.s $f6, $f4, $f6 -/* 7E2E14 80281F94 00000000 */ nop -/* 7E2E18 80281F98 3C014270 */ lui $at, 0x4270 -/* 7E2E1C 80281F9C 44811000 */ mtc1 $at, $f2 -/* 7E2E20 80281FA0 00000000 */ nop -/* 7E2E24 80281FA4 46024302 */ mul.s $f12, $f8, $f2 -/* 7E2E28 80281FA8 00000000 */ nop -/* 7E2E2C 80281FAC 3C0141A0 */ lui $at, 0x41a0 -/* 7E2E30 80281FB0 44810000 */ mtc1 $at, $f0 -/* 7E2E34 80281FB4 00000000 */ nop -/* 7E2E38 80281FB8 46002382 */ mul.s $f14, $f4, $f0 -/* 7E2E3C 80281FBC 00000000 */ nop -/* 7E2E40 80281FC0 46022102 */ mul.s $f4, $f4, $f2 -/* 7E2E44 80281FC4 00000000 */ nop -/* 7E2E48 80281FC8 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2E4C 80281FCC 00000000 */ nop -/* 7E2E50 80281FD0 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2E54 80281FD4 460A1280 */ add.s $f10, $f2, $f10 -/* 7E2E58 80281FD8 460C1081 */ sub.s $f2, $f2, $f12 -/* 7E2E5C 80281FDC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2E60 80281FE0 46060180 */ add.s $f6, $f0, $f6 -/* 7E2E64 80281FE4 46040001 */ sub.s $f0, $f0, $f4 -/* 7E2E68 80281FE8 460E1081 */ sub.s $f2, $f2, $f14 -/* 7E2E6C 80281FEC E64A000C */ swc1 $f10, 0xc($s2) -/* 7E2E70 80281FF0 46080001 */ sub.s $f0, $f0, $f8 -/* 7E2E74 80281FF4 E6460010 */ swc1 $f6, 0x10($s2) -/* 7E2E78 80281FF8 080A086F */ j .L802821BC -/* 7E2E7C 80281FFC E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2E80 80282000 C7AA0024 */ lwc1 $f10, 0x24($sp) -/* 7E2E84 80282004 3C0141F0 */ lui $at, 0x41f0 -/* 7E2E88 80282008 44811000 */ mtc1 $at, $f2 -/* 7E2E8C 8028200C 00000000 */ nop -/* 7E2E90 80282010 46025302 */ mul.s $f12, $f10, $f2 -/* 7E2E94 80282014 00000000 */ nop -/* 7E2E98 80282018 C7A60028 */ lwc1 $f6, 0x28($sp) -/* 7E2E9C 8028201C 3C0141A0 */ lui $at, 0x41a0 -/* 7E2EA0 80282020 44810000 */ mtc1 $at, $f0 -/* 7E2EA4 80282024 00000000 */ nop -/* 7E2EA8 80282028 46003102 */ mul.s $f4, $f6, $f0 -/* 7E2EAC 8028202C 00000000 */ nop -/* 7E2EB0 80282030 46023182 */ mul.s $f6, $f6, $f2 -/* 7E2EB4 80282034 00000000 */ nop -/* 7E2EB8 80282038 46005282 */ mul.s $f10, $f10, $f0 -/* 7E2EBC 8028203C 00000000 */ nop -/* 7E2EC0 80282040 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2EC4 80282044 460C1200 */ add.s $f8, $f2, $f12 -/* 7E2EC8 80282048 460C1081 */ sub.s $f2, $f2, $f12 -/* 7E2ECC 8028204C 46044200 */ add.s $f8, $f8, $f4 -/* 7E2ED0 80282050 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2ED4 80282054 46060100 */ add.s $f4, $f0, $f6 -/* 7E2ED8 80282058 46060001 */ sub.s $f0, $f0, $f6 -/* 7E2EDC 8028205C E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2EE0 80282060 460A2101 */ sub.s $f4, $f4, $f10 -.L80282064: -/* 7E2EE4 80282064 E6400018 */ swc1 $f0, 0x18($s2) -/* 7E2EE8 80282068 E648000C */ swc1 $f8, 0xc($s2) -/* 7E2EEC 8028206C 080A0870 */ j .L802821C0 -/* 7E2EF0 80282070 E6440010 */ swc1 $f4, 0x10($s2) -/* 7E2EF4 80282074 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 7E2EF8 80282078 3C014270 */ lui $at, 0x4270 -/* 7E2EFC 8028207C 44812000 */ mtc1 $at, $f4 -/* 7E2F00 80282080 00000000 */ nop -/* 7E2F04 80282084 46044302 */ mul.s $f12, $f8, $f4 -/* 7E2F08 80282088 00000000 */ nop -/* 7E2F0C 8028208C C7A60028 */ lwc1 $f6, 0x28($sp) -/* 7E2F10 80282090 3C0141A0 */ lui $at, 0x41a0 -/* 7E2F14 80282094 44815000 */ mtc1 $at, $f10 -/* 7E2F18 80282098 00000000 */ nop -/* 7E2F1C 8028209C 460A3382 */ mul.s $f14, $f6, $f10 -/* 7E2F20 802820A0 00000000 */ nop -/* 7E2F24 802820A4 46043102 */ mul.s $f4, $f6, $f4 -/* 7E2F28 802820A8 00000000 */ nop -/* 7E2F2C 802820AC 460A4282 */ mul.s $f10, $f8, $f10 -/* 7E2F30 802820B0 00000000 */ nop -/* 7E2F34 802820B4 3C0141F0 */ lui $at, 0x41f0 -/* 7E2F38 802820B8 44810000 */ mtc1 $at, $f0 -/* 7E2F3C 802820BC 00000000 */ nop -/* 7E2F40 802820C0 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2F44 802820C4 00000000 */ nop -/* 7E2F48 802820C8 46003182 */ mul.s $f6, $f6, $f0 -/* 7E2F4C 802820CC 00000000 */ nop -/* 7E2F50 802820D0 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2F54 802820D4 460C1300 */ add.s $f12, $f2, $f12 -/* 7E2F58 802820D8 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2F5C 802820DC 46040100 */ add.s $f4, $f0, $f4 -/* 7E2F60 802820E0 46081081 */ sub.s $f2, $f2, $f8 -/* 7E2F64 802820E4 46060001 */ sub.s $f0, $f0, $f6 -/* 7E2F68 802820E8 460E6300 */ add.s $f12, $f12, $f14 -/* 7E2F6C 802820EC E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2F70 802820F0 460A2101 */ sub.s $f4, $f4, $f10 -.L802820F4: -/* 7E2F74 802820F4 E6400018 */ swc1 $f0, 0x18($s2) -/* 7E2F78 802820F8 E64C000C */ swc1 $f12, 0xc($s2) -/* 7E2F7C 802820FC 080A0870 */ j .L802821C0 -/* 7E2F80 80282100 E6440010 */ swc1 $f4, 0x10($s2) -/* 7E2F84 80282104 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 7E2F88 80282108 3C0141F0 */ lui $at, 0x41f0 -/* 7E2F8C 8028210C 44813000 */ mtc1 $at, $f6 -/* 7E2F90 80282110 00000000 */ nop -/* 7E2F94 80282114 46064282 */ mul.s $f10, $f8, $f6 -/* 7E2F98 80282118 00000000 */ nop -/* 7E2F9C 8028211C C7A40028 */ lwc1 $f4, 0x28($sp) -/* 7E2FA0 80282120 46062182 */ mul.s $f6, $f4, $f6 -/* 7E2FA4 80282124 00000000 */ nop -/* 7E2FA8 80282128 3C0141A0 */ lui $at, 0x41a0 -/* 7E2FAC 8028212C 44810000 */ mtc1 $at, $f0 -/* 7E2FB0 80282130 00000000 */ nop -/* 7E2FB4 80282134 46002102 */ mul.s $f4, $f4, $f0 -/* 7E2FB8 80282138 00000000 */ nop -/* 7E2FBC 8028213C 46004202 */ mul.s $f8, $f8, $f0 -/* 7E2FC0 80282140 00000000 */ nop -/* 7E2FC4 80282144 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 7E2FC8 80282148 460A1300 */ add.s $f12, $f2, $f10 -/* 7E2FCC 8028214C 460A1081 */ sub.s $f2, $f2, $f10 -/* 7E2FD0 80282150 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E2FD4 80282154 46060280 */ add.s $f10, $f0, $f6 -/* 7E2FD8 80282158 46060001 */ sub.s $f0, $f0, $f6 -/* 7E2FDC 8028215C 46041080 */ add.s $f2, $f2, $f4 -/* 7E2FE0 80282160 E64C000C */ swc1 $f12, 0xc($s2) -/* 7E2FE4 80282164 46080000 */ add.s $f0, $f0, $f8 -/* 7E2FE8 80282168 E64A0010 */ swc1 $f10, 0x10($s2) -/* 7E2FEC 8028216C 080A086F */ j .L802821BC -/* 7E2FF0 80282170 E6420014 */ swc1 $f2, 0x14($s2) -/* 7E2FF4 80282174 C7A60024 */ lwc1 $f6, 0x24($sp) -/* 7E2FF8 80282178 3C0141F0 */ lui $at, 0x41f0 -/* 7E2FFC 8028217C 44810000 */ mtc1 $at, $f0 -/* 7E3000 80282180 00000000 */ nop -/* 7E3004 80282184 46003182 */ mul.s $f6, $f6, $f0 -/* 7E3008 80282188 00000000 */ nop -/* 7E300C 8028218C C7A20028 */ lwc1 $f2, 0x28($sp) -/* 7E3010 80282190 46001082 */ mul.s $f2, $f2, $f0 -/* 7E3014 80282194 00000000 */ nop -/* 7E3018 80282198 C7A40018 */ lwc1 $f4, 0x18($sp) -/* 7E301C 8028219C 46062200 */ add.s $f8, $f4, $f6 -/* 7E3020 802821A0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E3024 802821A4 46020280 */ add.s $f10, $f0, $f2 -/* 7E3028 802821A8 46062101 */ sub.s $f4, $f4, $f6 -/* 7E302C 802821AC 46020001 */ sub.s $f0, $f0, $f2 -/* 7E3030 802821B0 E648000C */ swc1 $f8, 0xc($s2) -/* 7E3034 802821B4 E64A0010 */ swc1 $f10, 0x10($s2) -/* 7E3038 802821B8 E6440014 */ swc1 $f4, 0x14($s2) -.L802821BC: -/* 7E303C 802821BC E6400018 */ swc1 $f0, 0x18($s2) -.L802821C0: -/* 7E3040 802821C0 3C048028 */ lui $a0, 0x8028 -/* 7E3044 802821C4 248447D4 */ addiu $a0, $a0, 0x47d4 -/* 7E3048 802821C8 3C02800B */ lui $v0, %hi(gCameras) -/* 7E304C 802821CC 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 7E3050 802821D0 C6400014 */ lwc1 $f0, 0x14($s2) -/* 7E3054 802821D4 C6420018 */ lwc1 $f2, 0x18($s2) -/* 7E3058 802821D8 C644000C */ lwc1 $f4, 0xc($s2) -/* 7E305C 802821DC C6460010 */ lwc1 $f6, 0x10($s2) -/* 7E3060 802821E0 8FA8002C */ lw $t0, 0x2c($sp) -/* 7E3064 802821E4 24050100 */ addiu $a1, $zero, 0x100 -/* 7E3068 802821E8 AE48002C */ sw $t0, 0x2c($s2) -/* 7E306C 802821EC AE5E0030 */ sw $fp, 0x30($s2) -/* 7E3070 802821F0 AE550034 */ sw $s5, 0x34($s2) -/* 7E3074 802821F4 AE570038 */ sw $s7, 0x38($s2) -/* 7E3078 802821F8 E640001C */ swc1 $f0, 0x1c($s2) -/* 7E307C 802821FC E6420020 */ swc1 $f2, 0x20($s2) -/* 7E3080 80282200 E6440024 */ swc1 $f4, 0x24($s2) -/* 7E3084 80282204 E6460028 */ swc1 $f6, 0x28($s2) -/* 7E3088 80282208 8443002C */ lh $v1, 0x2c($v0) -/* 7E308C 8028220C 0280302D */ daddu $a2, $s4, $zero -/* 7E3090 80282210 AE430040 */ sw $v1, 0x40($s2) -/* 7E3094 80282214 8443002E */ lh $v1, 0x2e($v0) -/* 7E3098 80282218 0000382D */ daddu $a3, $zero, $zero -/* 7E309C 8028221C AE430044 */ sw $v1, 0x44($s2) -/* 7E30A0 80282220 84420030 */ lh $v0, 0x30($v0) -/* 7E30A4 80282224 24100003 */ addiu $s0, $zero, 3 -/* 7E30A8 80282228 AE420048 */ sw $v0, 0x48($s2) -/* 7E30AC 8028222C AFB20010 */ sw $s2, 0x10($sp) -/* 7E30B0 80282230 0C0B10AA */ jal bind_trigger_1 -/* 7E30B4 80282234 AFB00014 */ sw $s0, 0x14($sp) -/* 7E30B8 80282238 32620800 */ andi $v0, $s3, 0x800 -/* 7E30BC 8028223C 10400005 */ beqz $v0, .L80282254 -/* 7E30C0 80282240 24050040 */ addiu $a1, $zero, 0x40 -/* 7E30C4 80282244 3C048028 */ lui $a0, 0x8028 -/* 7E30C8 80282248 24844F80 */ addiu $a0, $a0, 0x4f80 -/* 7E30CC 8028224C 080A0899 */ j .L80282264 -/* 7E30D0 80282250 02C0302D */ daddu $a2, $s6, $zero -.L80282254: -/* 7E30D4 80282254 3C048028 */ lui $a0, 0x8028 -/* 7E30D8 80282258 24844F80 */ addiu $a0, $a0, 0x4f80 -/* 7E30DC 8028225C 24050100 */ addiu $a1, $zero, 0x100 -/* 7E30E0 80282260 02C0302D */ daddu $a2, $s6, $zero -.L80282264: -/* 7E30E4 80282264 24070001 */ addiu $a3, $zero, 1 -/* 7E30E8 80282268 AFB20010 */ sw $s2, 0x10($sp) -/* 7E30EC 8028226C 0C0B10AA */ jal bind_trigger_1 -/* 7E30F0 80282270 AFB00014 */ sw $s0, 0x14($sp) -/* 7E30F4 80282274 8FBF0054 */ lw $ra, 0x54($sp) -/* 7E30F8 80282278 8FBE0050 */ lw $fp, 0x50($sp) -/* 7E30FC 8028227C 8FB7004C */ lw $s7, 0x4c($sp) -/* 7E3100 80282280 8FB60048 */ lw $s6, 0x48($sp) -/* 7E3104 80282284 8FB50044 */ lw $s5, 0x44($sp) -/* 7E3108 80282288 8FB40040 */ lw $s4, 0x40($sp) -/* 7E310C 8028228C 8FB3003C */ lw $s3, 0x3c($sp) -/* 7E3110 80282290 8FB20038 */ lw $s2, 0x38($sp) -/* 7E3114 80282294 8FB10034 */ lw $s1, 0x34($sp) -/* 7E3118 80282298 8FB00030 */ lw $s0, 0x30($sp) -/* 7E311C 8028229C 24020002 */ addiu $v0, $zero, 2 -/* 7E3120 802822A0 03E00008 */ jr $ra -/* 7E3124 802822A4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/code_7E2AA0/func_802822A8.s b/asm/nonmatchings/code_7E2AA0/func_802822A8.s deleted file mode 100644 index ab3b55dccd..0000000000 --- a/asm/nonmatchings/code_7E2AA0/func_802822A8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802822A8 -/* 7E3128 802822A8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7E312C 802822AC AFBF002C */ sw $ra, 0x2c($sp) -/* 7E3130 802822B0 AFB00028 */ sw $s0, 0x28($sp) -/* 7E3134 802822B4 8C82000C */ lw $v0, 0xc($a0) -/* 7E3138 802822B8 8C450000 */ lw $a1, ($v0) -/* 7E313C 802822BC 0C0B1EAF */ jal get_variable -/* 7E3140 802822C0 8C900074 */ lw $s0, 0x74($a0) -/* 7E3144 802822C4 27A50018 */ addiu $a1, $sp, 0x18 -/* 7E3148 802822C8 27A6001C */ addiu $a2, $sp, 0x1c -/* 7E314C 802822CC 27A70020 */ addiu $a3, $sp, 0x20 -/* 7E3150 802822D0 8E040060 */ lw $a0, 0x60($s0) -/* 7E3154 802822D4 0C016F84 */ jal get_collider_center -/* 7E3158 802822D8 0040802D */ daddu $s0, $v0, $zero -/* 7E315C 802822DC 0200202D */ daddu $a0, $s0, $zero -/* 7E3160 802822E0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 7E3164 802822E4 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 7E3168 802822E8 44060000 */ mfc1 $a2, $f0 -/* 7E316C 802822EC 44071000 */ mfc1 $a3, $f2 -/* 7E3170 802822F0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 7E3174 802822F4 0000282D */ daddu $a1, $zero, $zero -/* 7E3178 802822F8 0C052757 */ jal play_sound_at_position -/* 7E317C 802822FC E7A00010 */ swc1 $f0, 0x10($sp) -/* 7E3180 80282300 8FBF002C */ lw $ra, 0x2c($sp) -/* 7E3184 80282304 8FB00028 */ lw $s0, 0x28($sp) -/* 7E3188 80282308 24020002 */ addiu $v0, $zero, 2 -/* 7E318C 8028230C 03E00008 */ jr $ra -/* 7E3190 80282310 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_7E2AA0/func_8028236C.s b/asm/nonmatchings/code_7E2AA0/func_8028236C.s deleted file mode 100644 index 81bfaff00a..0000000000 --- a/asm/nonmatchings/code_7E2AA0/func_8028236C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8028236C -/* 7E31EC 8028236C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E31F0 80282370 AFBF0014 */ sw $ra, 0x14($sp) -/* 7E31F4 80282374 AFB00010 */ sw $s0, 0x10($sp) -/* 7E31F8 80282378 8C82000C */ lw $v0, 0xc($a0) -/* 7E31FC 8028237C 8C450000 */ lw $a1, ($v0) -/* 7E3200 80282380 0C0B1EAF */ jal get_variable -/* 7E3204 80282384 8C900074 */ lw $s0, 0x74($a0) -/* 7E3208 80282388 00021080 */ sll $v0, $v0, 2 -/* 7E320C 8028238C 02028021 */ addu $s0, $s0, $v0 -/* 7E3210 80282390 0C0B1059 */ jal does_script_exist -/* 7E3214 80282394 8E04004C */ lw $a0, 0x4c($s0) -/* 7E3218 80282398 2C420001 */ sltiu $v0, $v0, 1 -/* 7E321C 8028239C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7E3220 802823A0 8FB00010 */ lw $s0, 0x10($sp) -/* 7E3224 802823A4 00021040 */ sll $v0, $v0, 1 -/* 7E3228 802823A8 03E00008 */ jr $ra -/* 7E322C 802823AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7E2AA0/func_802823B0.s b/asm/nonmatchings/code_7E2AA0/func_802823B0.s deleted file mode 100644 index 0bb756e36c..0000000000 --- a/asm/nonmatchings/code_7E2AA0/func_802823B0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802823B0 -/* 7E3230 802823B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E3234 802823B4 AFB00010 */ sw $s0, 0x10($sp) -/* 7E3238 802823B8 0080802D */ daddu $s0, $a0, $zero -/* 7E323C 802823BC AFBF001C */ sw $ra, 0x1c($sp) -/* 7E3240 802823C0 AFB20018 */ sw $s2, 0x18($sp) -/* 7E3244 802823C4 AFB10014 */ sw $s1, 0x14($sp) -/* 7E3248 802823C8 8E11000C */ lw $s1, 0xc($s0) -/* 7E324C 802823CC 8E120074 */ lw $s2, 0x74($s0) -/* 7E3250 802823D0 8E250000 */ lw $a1, ($s1) -/* 7E3254 802823D4 0C0B1EAF */ jal get_variable -/* 7E3258 802823D8 26310004 */ addiu $s1, $s1, 4 -/* 7E325C 802823DC 0200202D */ daddu $a0, $s0, $zero -/* 7E3260 802823E0 8E250000 */ lw $a1, ($s1) -/* 7E3264 802823E4 0C0B1EAF */ jal get_variable -/* 7E3268 802823E8 0040802D */ daddu $s0, $v0, $zero -/* 7E326C 802823EC 00108080 */ sll $s0, $s0, 2 -/* 7E3270 802823F0 02509021 */ addu $s2, $s2, $s0 -/* 7E3274 802823F4 AE42004C */ sw $v0, 0x4c($s2) -/* 7E3278 802823F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E327C 802823FC 8FB20018 */ lw $s2, 0x18($sp) -/* 7E3280 80282400 8FB10014 */ lw $s1, 0x14($sp) -/* 7E3284 80282404 8FB00010 */ lw $s0, 0x10($sp) -/* 7E3288 80282408 24020002 */ addiu $v0, $zero, 2 -/* 7E328C 8028240C 03E00008 */ jr $ra -/* 7E3290 80282410 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E2AA0/func_80282414.s b/asm/nonmatchings/code_7E2AA0/func_80282414.s deleted file mode 100644 index b59342864a..0000000000 --- a/asm/nonmatchings/code_7E2AA0/func_80282414.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80282414 -/* 7E3294 80282414 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E3298 80282418 AFB10014 */ sw $s1, 0x14($sp) -/* 7E329C 8028241C 0080882D */ daddu $s1, $a0, $zero -/* 7E32A0 80282420 AFBF001C */ sw $ra, 0x1c($sp) -/* 7E32A4 80282424 AFB20018 */ sw $s2, 0x18($sp) -/* 7E32A8 80282428 AFB00010 */ sw $s0, 0x10($sp) -/* 7E32AC 8028242C 10A0000A */ beqz $a1, .L80282458 -/* 7E32B0 80282430 8E320088 */ lw $s2, 0x88($s1) -/* 7E32B4 80282434 8E220084 */ lw $v0, 0x84($s1) -/* 7E32B8 80282438 54400007 */ bnel $v0, $zero, .L80282458 -/* 7E32BC 8028243C AE200074 */ sw $zero, 0x74($s1) -/* 7E32C0 80282440 962400C2 */ lhu $a0, 0xc2($s1) -/* 7E32C4 80282444 2405FFFF */ addiu $a1, $zero, -1 -/* 7E32C8 80282448 24060001 */ addiu $a2, $zero, 1 -/* 7E32CC 8028244C 0C046E54 */ jal func_8011B950 -/* 7E32D0 80282450 00C0382D */ daddu $a3, $a2, $zero -/* 7E32D4 80282454 AE200074 */ sw $zero, 0x74($s1) -.L80282458: -/* 7E32D8 80282458 8E220074 */ lw $v0, 0x74($s1) -/* 7E32DC 8028245C 24420020 */ addiu $v0, $v0, 0x20 -/* 7E32E0 80282460 AE220074 */ sw $v0, 0x74($s1) -/* 7E32E4 80282464 28420100 */ slti $v0, $v0, 0x100 -/* 7E32E8 80282468 14400002 */ bnez $v0, .L80282474 -/* 7E32EC 8028246C 240200FF */ addiu $v0, $zero, 0xff -/* 7E32F0 80282470 AE220074 */ sw $v0, 0x74($s1) -.L80282474: -/* 7E32F4 80282474 8E220084 */ lw $v0, 0x84($s1) -/* 7E32F8 80282478 14400004 */ bnez $v0, .L8028248C -/* 7E32FC 8028247C 240200FF */ addiu $v0, $zero, 0xff -/* 7E3300 80282480 8E300074 */ lw $s0, 0x74($s1) -/* 7E3304 80282484 080A0926 */ j .L80282498 -/* 7E3308 80282488 0000202D */ daddu $a0, $zero, $zero -.L8028248C: -/* 7E330C 8028248C 8E230074 */ lw $v1, 0x74($s1) -/* 7E3310 80282490 00438023 */ subu $s0, $v0, $v1 -/* 7E3314 80282494 0000202D */ daddu $a0, $zero, $zero -.L80282498: -/* 7E3318 80282498 0080282D */ daddu $a1, $a0, $zero -/* 7E331C 8028249C 0080302D */ daddu $a2, $a0, $zero -/* 7E3320 802824A0 0C046F97 */ jal set_background_color_blend -/* 7E3324 802824A4 320700FF */ andi $a3, $s0, 0xff -/* 7E3328 802824A8 240600FF */ addiu $a2, $zero, 0xff -/* 7E332C 802824AC 8E420040 */ lw $v0, 0x40($s2) -/* 7E3330 802824B0 00D03023 */ subu $a2, $a2, $s0 -/* 7E3334 802824B4 00460018 */ mult $v0, $a2 -/* 7E3338 802824B8 00001012 */ mflo $v0 -/* 7E333C 802824BC 8E450044 */ lw $a1, 0x44($s2) -/* 7E3340 802824C0 00000000 */ nop -/* 7E3344 802824C4 00A60018 */ mult $a1, $a2 -/* 7E3348 802824C8 00002812 */ mflo $a1 -/* 7E334C 802824CC 3C078080 */ lui $a3, 0x8080 -/* 7E3350 802824D0 34E78081 */ ori $a3, $a3, 0x8081 -/* 7E3354 802824D4 00470018 */ mult $v0, $a3 -/* 7E3358 802824D8 00001810 */ mfhi $v1 -/* 7E335C 802824DC 00000000 */ nop -/* 7E3360 802824E0 00000000 */ nop -/* 7E3364 802824E4 00A70018 */ mult $a1, $a3 -/* 7E3368 802824E8 00004010 */ mfhi $t0 -/* 7E336C 802824EC 8E440048 */ lw $a0, 0x48($s2) -/* 7E3370 802824F0 00621821 */ addu $v1, $v1, $v0 -/* 7E3374 802824F4 00860018 */ mult $a0, $a2 -/* 7E3378 802824F8 000319C3 */ sra $v1, $v1, 7 -/* 7E337C 802824FC 000217C3 */ sra $v0, $v0, 0x1f -/* 7E3380 80282500 00621823 */ subu $v1, $v1, $v0 -/* 7E3384 80282504 3C06800B */ lui $a2, %hi(gCameras) -/* 7E3388 80282508 24C61D80 */ addiu $a2, $a2, %lo(gCameras) -/* 7E338C 8028250C 00002012 */ mflo $a0 -/* 7E3390 80282510 01051021 */ addu $v0, $t0, $a1 -/* 7E3394 80282514 000211C3 */ sra $v0, $v0, 7 -/* 7E3398 80282518 00870018 */ mult $a0, $a3 -/* 7E339C 8028251C 00052FC3 */ sra $a1, $a1, 0x1f -/* 7E33A0 80282520 00451023 */ subu $v0, $v0, $a1 -/* 7E33A4 80282524 A4C3002C */ sh $v1, 0x2c($a2) -/* 7E33A8 80282528 A4C2002E */ sh $v0, 0x2e($a2) -/* 7E33AC 8028252C 00001810 */ mfhi $v1 -/* 7E33B0 80282530 00641021 */ addu $v0, $v1, $a0 -/* 7E33B4 80282534 000211C3 */ sra $v0, $v0, 7 -/* 7E33B8 80282538 000427C3 */ sra $a0, $a0, 0x1f -/* 7E33BC 8028253C 00441023 */ subu $v0, $v0, $a0 -/* 7E33C0 80282540 A4C20030 */ sh $v0, 0x30($a2) -/* 7E33C4 80282544 8E220074 */ lw $v0, 0x74($s1) -/* 7E33C8 80282548 284200FF */ slti $v0, $v0, 0xff -/* 7E33CC 8028254C 1440000B */ bnez $v0, .L8028257C -/* 7E33D0 80282550 0000102D */ daddu $v0, $zero, $zero -/* 7E33D4 80282554 8E230084 */ lw $v1, 0x84($s1) -/* 7E33D8 80282558 24020003 */ addiu $v0, $zero, 3 -/* 7E33DC 8028255C 14620007 */ bne $v1, $v0, .L8028257C -/* 7E33E0 80282560 24020002 */ addiu $v0, $zero, 2 -/* 7E33E4 80282564 962400C2 */ lhu $a0, 0xc2($s1) -/* 7E33E8 80282568 2405FFFF */ addiu $a1, $zero, -1 -/* 7E33EC 8028256C 0000302D */ daddu $a2, $zero, $zero -/* 7E33F0 80282570 0C046E54 */ jal func_8011B950 -/* 7E33F4 80282574 24070001 */ addiu $a3, $zero, 1 -/* 7E33F8 80282578 24020002 */ addiu $v0, $zero, 2 -.L8028257C: -/* 7E33FC 8028257C 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E3400 80282580 8FB20018 */ lw $s2, 0x18($sp) -/* 7E3404 80282584 8FB10014 */ lw $s1, 0x14($sp) -/* 7E3408 80282588 8FB00010 */ lw $s0, 0x10($sp) -/* 7E340C 8028258C 03E00008 */ jr $ra -/* 7E3410 80282590 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E2AA0/func_80282634.s b/asm/nonmatchings/code_7E2AA0/func_80282634.s deleted file mode 100644 index b6ca262f0c..0000000000 --- a/asm/nonmatchings/code_7E2AA0/func_80282634.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80282634 -/* 7E34B4 80282634 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E34B8 80282638 AFBF0020 */ sw $ra, 0x20($sp) -/* 7E34BC 8028263C AFB3001C */ sw $s3, 0x1c($sp) -/* 7E34C0 80282640 AFB20018 */ sw $s2, 0x18($sp) -/* 7E34C4 80282644 AFB10014 */ sw $s1, 0x14($sp) -/* 7E34C8 80282648 AFB00010 */ sw $s0, 0x10($sp) -/* 7E34CC 8028264C 8C820074 */ lw $v0, 0x74($a0) -/* 7E34D0 80282650 8C51005C */ lw $s1, 0x5c($v0) -/* 7E34D4 80282654 12200022 */ beqz $s1, .L802826E0 -/* 7E34D8 80282658 0000802D */ daddu $s0, $zero, $zero -/* 7E34DC 8028265C 2413FFFC */ addiu $s3, $zero, -4 -/* 7E34E0 80282660 3C120080 */ lui $s2, 0x80 -.L80282664: -/* 7E34E4 80282664 0C00E2B7 */ jal get_npc_by_index -/* 7E34E8 80282668 0200202D */ daddu $a0, $s0, $zero -/* 7E34EC 8028266C 0040182D */ daddu $v1, $v0, $zero -/* 7E34F0 80282670 50600009 */ beql $v1, $zero, .L80282698 -/* 7E34F4 80282674 26100001 */ addiu $s0, $s0, 1 -/* 7E34F8 80282678 8C640000 */ lw $a0, ($v1) -/* 7E34FC 8028267C 10800006 */ beqz $a0, .L80282698 -/* 7E3500 80282680 26100001 */ addiu $s0, $s0, 1 -/* 7E3504 80282684 806200A4 */ lb $v0, 0xa4($v1) -/* 7E3508 80282688 10530003 */ beq $v0, $s3, .L80282698 -/* 7E350C 8028268C 00000000 */ nop -/* 7E3510 80282690 00921025 */ or $v0, $a0, $s2 -/* 7E3514 80282694 AC620000 */ sw $v0, ($v1) -.L80282698: -/* 7E3518 80282698 2A020040 */ slti $v0, $s0, 0x40 -/* 7E351C 8028269C 1440FFF1 */ bnez $v0, .L80282664 -/* 7E3520 802826A0 00000000 */ nop -/* 7E3524 802826A4 2412FFFF */ addiu $s2, $zero, -1 -/* 7E3528 802826A8 3C10FF7F */ lui $s0, 0xff7f -/* 7E352C 802826AC 3610FFFF */ ori $s0, $s0, 0xffff -.L802826B0: -/* 7E3530 802826B0 8E240000 */ lw $a0, ($s1) -/* 7E3534 802826B4 1092000B */ beq $a0, $s2, .L802826E4 -/* 7E3538 802826B8 24020002 */ addiu $v0, $zero, 2 -/* 7E353C 802826BC 0C00EAD2 */ jal get_npc_safe -/* 7E3540 802826C0 26310004 */ addiu $s1, $s1, 4 -/* 7E3544 802826C4 0040182D */ daddu $v1, $v0, $zero -/* 7E3548 802826C8 1060FFF9 */ beqz $v1, .L802826B0 -/* 7E354C 802826CC 00000000 */ nop -/* 7E3550 802826D0 8C620000 */ lw $v0, ($v1) -/* 7E3554 802826D4 00501024 */ and $v0, $v0, $s0 -/* 7E3558 802826D8 080A09AC */ j .L802826B0 -/* 7E355C 802826DC AC620000 */ sw $v0, ($v1) -.L802826E0: -/* 7E3560 802826E0 24020002 */ addiu $v0, $zero, 2 -.L802826E4: -/* 7E3564 802826E4 8FBF0020 */ lw $ra, 0x20($sp) -/* 7E3568 802826E8 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E356C 802826EC 8FB20018 */ lw $s2, 0x18($sp) -/* 7E3570 802826F0 8FB10014 */ lw $s1, 0x14($sp) -/* 7E3574 802826F4 8FB00010 */ lw $s0, 0x10($sp) -/* 7E3578 802826F8 03E00008 */ jr $ra -/* 7E357C 802826FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7E2AA0/func_80282700.s b/asm/nonmatchings/code_7E2AA0/func_80282700.s deleted file mode 100644 index 43648b447a..0000000000 --- a/asm/nonmatchings/code_7E2AA0/func_80282700.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80282700 -/* 7E3580 80282700 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E3584 80282704 AFBF0018 */ sw $ra, 0x18($sp) -/* 7E3588 80282708 AFB10014 */ sw $s1, 0x14($sp) -/* 7E358C 8028270C AFB00010 */ sw $s0, 0x10($sp) -/* 7E3590 80282710 8C820074 */ lw $v0, 0x74($a0) -/* 7E3594 80282714 8C42005C */ lw $v0, 0x5c($v0) -/* 7E3598 80282718 10400010 */ beqz $v0, .L8028275C -/* 7E359C 8028271C 0000802D */ daddu $s0, $zero, $zero -/* 7E35A0 80282720 3C11FF7F */ lui $s1, 0xff7f -/* 7E35A4 80282724 3631FFFF */ ori $s1, $s1, 0xffff -.L80282728: -/* 7E35A8 80282728 0C00E2B7 */ jal get_npc_by_index -/* 7E35AC 8028272C 0200202D */ daddu $a0, $s0, $zero -/* 7E35B0 80282730 0040182D */ daddu $v1, $v0, $zero -/* 7E35B4 80282734 10600006 */ beqz $v1, .L80282750 -/* 7E35B8 80282738 26100001 */ addiu $s0, $s0, 1 -/* 7E35BC 8028273C 8C620000 */ lw $v0, ($v1) -/* 7E35C0 80282740 10400003 */ beqz $v0, .L80282750 -/* 7E35C4 80282744 00000000 */ nop -/* 7E35C8 80282748 00511024 */ and $v0, $v0, $s1 -/* 7E35CC 8028274C AC620000 */ sw $v0, ($v1) -.L80282750: -/* 7E35D0 80282750 2A020040 */ slti $v0, $s0, 0x40 -/* 7E35D4 80282754 1440FFF4 */ bnez $v0, .L80282728 -/* 7E35D8 80282758 00000000 */ nop -.L8028275C: -/* 7E35DC 8028275C 24020002 */ addiu $v0, $zero, 2 -/* 7E35E0 80282760 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E35E4 80282764 8FB10014 */ lw $s1, 0x14($sp) -/* 7E35E8 80282768 8FB00010 */ lw $s0, 0x10($sp) -/* 7E35EC 8028276C 03E00008 */ jr $ra -/* 7E35F0 80282770 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E2AA0/func_80282594.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_80282594.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 4b8e83951d..2f02eeb2ae 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -1,39 +1,39 @@ #include "common.h" -INCLUDE_ASM(s32, "code_7e0e80", func_80280000); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280000); -INCLUDE_ASM(s32, "code_7e0e80", func_80280088); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280088); -INCLUDE_ASM(s32, "code_7e0e80", func_8028017C); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028017C); -INCLUDE_ASM(s32, "code_7e0e80", func_80280208); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280208); -INCLUDE_ASM(s32, "code_7e0e80", func_802802D0); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802802D0); -INCLUDE_ASM(s32, "code_7e0e80", func_8028035C); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028035C); -INCLUDE_ASM(s32, "code_7e0e80", func_802803C8); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802803C8); -INCLUDE_ASM(s32, "code_7e0e80", func_80280410); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280410); -INCLUDE_ASM(s32, "code_7e0e80", func_8028051C); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_8028051C); -INCLUDE_ASM(s32, "code_7e0e80", func_80280954); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280954); -INCLUDE_ASM(s32, "code_7e0e80", func_80280AC4); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280AC4); -INCLUDE_ASM(s32, "code_7e0e80", func_80280B44); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B44); -INCLUDE_ASM(s32, "code_7e0e80", func_80280B78); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B78); -INCLUDE_ASM(s32, "code_7e0e80", func_80280BD0); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280BD0); -INCLUDE_ASM(s32, "code_7e0e80", func_80281434); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80281434); -INCLUDE_ASM(s32, "code_7e0e80", func_802814D0); +INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802814D0); -INCLUDE_ASM(s32, "code_7e0e80", draw_shop_items); +INCLUDE_ASM(s32, "world/script_api/7E0E80", draw_shop_items); -INCLUDE_ASM(s32, "code_7e0e80", MakeShop); +INCLUDE_ASM(s32, "world/script_api/7E0E80", MakeShop); -INCLUDE_ASM(s32, "code_7e0e80", MakeShopOwner); +INCLUDE_ASM(s32, "world/script_api/7E0E80", MakeShopOwner); diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c index 339305f3b6..0b3b7469f3 100644 --- a/src/world/script_api/7E2AA0.c +++ b/src/world/script_api/7E2AA0.c @@ -36,9 +36,9 @@ ApiStatus func_80281C84(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_7E2AA0", MakeDoorAdvanced); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", MakeDoorAdvanced); -INCLUDE_ASM(s32, "code_7E2AA0", func_802822A8); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_802822A8); ApiStatus func_80282314(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[1].s = script->varTable[1]; @@ -57,11 +57,11 @@ ApiStatus func_80282338(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_7E2AA0", func_8028236C); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_8028236C); -INCLUDE_ASM(s32, "code_7E2AA0", func_802823B0); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_802823B0); -INCLUDE_ASM(s32, "code_7E2AA0", func_80282414); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282414); #ifdef NON_MATCHING ApiStatus func_80282594(ScriptInstance* script, s32 isInitialCall) { @@ -83,7 +83,7 @@ ApiStatus func_80282594(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_7E2AA0", func_80282594); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282594); #endif ApiStatus func_802825FC(ScriptInstance* script, s32 isInitialCall) { @@ -102,9 +102,9 @@ ApiStatus func_80282624(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_7E2AA0", func_80282634); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282634); -INCLUDE_ASM(s32, "code_7E2AA0", func_80282700); +INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_80282700); ApiStatus func_80282774(ScriptInstance* script, s32 isInitialCall) { DoorStuff* doorStuff = (DoorStuff*)script->functionTemp[1].s; diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index 042ed09145..e0f3b56f63 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -1,16 +1,16 @@ #include "common.h" -INCLUDE_ASM(s32, "code_7E3700", func_80282880); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80282880); -INCLUDE_ASM(s32, "code_7E3700", func_802828DC); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_802828DC); -INCLUDE_ASM(s32, "code_7E3700", func_80282C40); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80282C40); -INCLUDE_ASM(s32, "code_7E3700", func_80282E30); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80282E30); -INCLUDE_ASM(s32, "code_7E3700", func_80283080); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283080); -INCLUDE_ASM(s32, "code_7E3700", func_80283174); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283174); ApiStatus CheckActionState(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -21,38 +21,38 @@ ApiStatus CheckActionState(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_7E3700", func_80283240); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283240); -INCLUDE_ASM(s32, "code_7E3700", CreatePushBlockGrid); +INCLUDE_ASM(s32, "world/script_api/7E3700", CreatePushBlockGrid); -INCLUDE_ASM(s32, "code_7E3700", SetPushBlock); +INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlock); -INCLUDE_ASM(s32, "code_7E3700", GetPushBlock); +INCLUDE_ASM(s32, "world/script_api/7E3700", GetPushBlock); -INCLUDE_ASM(s32, "code_7E3700", GetGridIndexFromPos); +INCLUDE_ASM(s32, "world/script_api/7E3700", GetGridIndexFromPos); -INCLUDE_ASM(s32, "code_7E3700", SetPushBlockFallEffect); +INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlockFallEffect); -INCLUDE_ASM(s32, "code_7E3700", func_80283810); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283810); -INCLUDE_ASM(s32, "code_7E3700", TeleportPartnerToPlayer); +INCLUDE_ASM(s32, "world/script_api/7E3700", TeleportPartnerToPlayer); -INCLUDE_ASM(s32, "code_7E3700", func_80283908); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283908); -INCLUDE_ASM(s32, "code_7E3700", func_80283A50); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283A50); -INCLUDE_ASM(s32, "code_7E3700", func_80283B88); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283B88); -INCLUDE_ASM(s32, "code_7E3700", func_80283BB0); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283BB0); -INCLUDE_ASM(s32, "code_7E3700", func_80283BD0); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283BD0); -INCLUDE_ASM(s32, "code_7E3700", func_80283C34); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283C34); -INCLUDE_ASM(s32, "code_7E3700", func_80283D00); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283D00); -INCLUDE_ASM(s32, "code_7E3700", func_80283D6C); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283D6C); -INCLUDE_ASM(s32, "code_7E3700", func_80283DF0); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283DF0); -INCLUDE_ASM(s32, "code_7E3700", func_80283E2C); +INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283E2C); diff --git a/src/world/world.c b/src/world/world.c index 378d91329e..01a8eb0eff 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -2,47 +2,47 @@ #include "ld_addrs.h" #include "map.h" -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0); +INCLUDE_ASM(s32, "world/world", func_80058DD0); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84); +INCLUDE_ASM(s32, "world/world", func_80058E84); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88); +INCLUDE_ASM(s32, "world/world", func_80058F88); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008); +INCLUDE_ASM(s32, "world/world", func_80059008); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C); +INCLUDE_ASM(s32, "world/world", func_8005904C); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310); +INCLUDE_ASM(s32, "world/world", func_80059310); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0); +INCLUDE_ASM(s32, "world/world", func_800598A0); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8); +INCLUDE_ASM(s32, "world/world", func_80059AB8); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4); +INCLUDE_ASM(s32, "world/world", func_80059BD4); void func_80059C80(void) { } -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88); +INCLUDE_ASM(s32, "world/world", func_80059C88); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C); +INCLUDE_ASM(s32, "world/world", func_80059C9C); void func_80059D48(void) { } -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50); +INCLUDE_ASM(s32, "world/world", func_80059D50); -INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects); +INCLUDE_ASM(s32, "world/world", render_effects); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94); +INCLUDE_ASM(s32, "world/world", func_80059F94); -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC); +INCLUDE_ASM(s32, "world/world", func_8005A2BC); -INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect); +INCLUDE_ASM(s32, "world/world", remove_effect); -INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects); +INCLUDE_ASM(s32, "world/world", remove_all_effects); -INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect); +INCLUDE_ASM(s32, "world/world", play_effect); void load_world_script_api(void) { dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM); @@ -64,17 +64,17 @@ static const s32 rodata_73DA0[] = { 0x25735F74, 0x65780000, // "%s_tex" }; -INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs); +INCLUDE_ASM(s32, "world/world", load_map_by_IDs); -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config); +INCLUDE_ASM(s32, "world/world", get_current_map_config); -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header); +INCLUDE_ASM(s32, "world/world", get_current_map_header); -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name); +INCLUDE_ASM(s32, "world/world", get_map_IDs_by_name); -INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize); +INCLUDE_ASM(void*, "world/world", load_asset_by_name, char* name, s32* decompressedSize); -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset); +INCLUDE_ASM(s32, "world/world", get_asset_offset); #define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), area##_maps, "area_" #area, jp_name } From d86bb8d66b7dcdf6c2a447306371d87cebe03114 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 16:51:08 -0500 Subject: [PATCH 12/12] Deleting junk --- asm/nonmatchings/code_16F740/func_80246B2C.s | 6 - .../code_341d0_len_20d0/func_80058DD0.s | 51 -- .../code_341d0_len_20d0/func_80058E84.s | 70 -- .../code_341d0_len_20d0/func_80058F88.s | 36 -- .../code_341d0_len_20d0/func_80059008.s | 23 - .../code_341d0_len_20d0/func_8005904C.s | 191 ------ .../code_341d0_len_20d0/func_80059310.s | 375 ----------- .../code_341d0_len_20d0/func_800598A0.s | 140 ---- .../code_341d0_len_20d0/func_80059AB8.s | 77 --- .../code_341d0_len_20d0/func_80059BD4.s | 50 -- .../code_341d0_len_20d0/func_80059C88.s | 9 - .../code_341d0_len_20d0/func_80059C9C.s | 49 -- .../code_341d0_len_20d0/func_80059D50.s | 121 ---- .../code_341d0_len_20d0/func_80059F94.s | 211 ------ .../code_341d0_len_20d0/func_8005A2BC.s | 122 ---- .../code_341d0_len_20d0/get_asset_offset.s | 58 -- .../get_current_map_config.s | 8 - .../get_current_map_header.s | 8 - .../code_341d0_len_20d0/get_map_IDs_by_name.s | 70 -- .../code_341d0_len_20d0/load_asset_by_name.s | 64 -- .../code_341d0_len_20d0/load_map_by_IDs.s | 333 ---------- .../code_341d0_len_20d0/play_effect.s | 101 --- .../code_341d0_len_20d0/remove_all_effects.s | 40 -- .../code_341d0_len_20d0/remove_effect.s | 45 -- .../code_341d0_len_20d0/render_effects.s | 48 -- .../code_7E3700/CreatePushBlockGrid.s | 112 ---- .../code_7E3700/GetGridIndexFromPos.s | 65 -- asm/nonmatchings/code_7E3700/GetPushBlock.s | 70 -- asm/nonmatchings/code_7E3700/SetPushBlock.s | 86 --- .../code_7E3700/SetPushBlockFallEffect.s | 29 - .../code_7E3700/TeleportPartnerToPlayer.s | 41 -- asm/nonmatchings/code_7E3700/func_80282880.s | 27 - asm/nonmatchings/code_7E3700/func_802828DC.s | 224 ------- asm/nonmatchings/code_7E3700/func_80282C40.s | 133 ---- asm/nonmatchings/code_7E3700/func_80282E30.s | 160 ----- asm/nonmatchings/code_7E3700/func_80283080.s | 65 -- asm/nonmatchings/code_7E3700/func_80283174.s | 33 - asm/nonmatchings/code_7E3700/func_80283240.s | 48 -- asm/nonmatchings/code_7E3700/func_80283810.s | 33 - asm/nonmatchings/code_7E3700/func_80283908.s | 88 --- asm/nonmatchings/code_7E3700/func_80283A50.s | 85 --- asm/nonmatchings/code_7E3700/func_80283B88.s | 14 - asm/nonmatchings/code_7E3700/func_80283BB0.s | 12 - asm/nonmatchings/code_7E3700/func_80283BD0.s | 30 - asm/nonmatchings/code_7E3700/func_80283C34.s | 55 -- asm/nonmatchings/code_7E3700/func_80283D00.s | 33 - asm/nonmatchings/code_7E3700/func_80283D6C.s | 39 -- asm/nonmatchings/code_7E3700/func_80283DF0.s | 19 - asm/nonmatchings/code_7E3700/func_80283E2C.s | 25 - asm/nonmatchings/code_7e0e80/MakeShop.s | 233 ------- asm/nonmatchings/code_7e0e80/MakeShopOwner.s | 22 - .../code_7e0e80/draw_shop_items.s | 221 ------- asm/nonmatchings/code_7e0e80/func_80280000.s | 38 -- asm/nonmatchings/code_7e0e80/func_80280088.s | 68 -- asm/nonmatchings/code_7e0e80/func_8028017C.s | 39 -- asm/nonmatchings/code_7e0e80/func_80280208.s | 55 -- asm/nonmatchings/code_7e0e80/func_802802D0.s | 39 -- asm/nonmatchings/code_7e0e80/func_8028035C.s | 31 - asm/nonmatchings/code_7e0e80/func_802803C8.s | 24 - asm/nonmatchings/code_7e0e80/func_80280410.s | 73 --- asm/nonmatchings/code_7e0e80/func_8028051C.s | 297 --------- asm/nonmatchings/code_7e0e80/func_80280954.s | 104 --- asm/nonmatchings/code_7e0e80/func_80280AC4.s | 40 -- asm/nonmatchings/code_7e0e80/func_80280B44.s | 17 - asm/nonmatchings/code_7e0e80/func_80280B78.s | 29 - asm/nonmatchings/code_7e0e80/func_80280BD0.s | 604 ------------------ asm/nonmatchings/code_7e0e80/func_80281434.s | 43 -- asm/nonmatchings/code_7e0e80/func_802814D0.s | 25 - .../end_01/E05390/func_802428C0_E07C20.s | 20 - .../end_01/E05390/func_80242900_E07C60.s | 37 -- .../end_01/E05390/func_80242978_E07CD8.s | 67 -- .../end_01/E05390/func_80242A68_E07DC8.s | 69 -- .../end_01/E05390/func_80242B68_E07EC8.s | 69 -- .../end_01/E05390/func_80242C68_E07FC8.s | 15 - .../end_01/E05390/func_80242C94_E07FF4.s | 27 - .../mim_06/BA4CF0/func_80242B04_BA7284.s | 4 +- 76 files changed, 2 insertions(+), 6140 deletions(-) delete mode 100644 asm/nonmatchings/code_16F740/func_80246B2C.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059008.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059310.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/play_effect.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/remove_effect.s delete mode 100644 asm/nonmatchings/code_341d0_len_20d0/render_effects.s delete mode 100644 asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s delete mode 100644 asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s delete mode 100644 asm/nonmatchings/code_7E3700/GetPushBlock.s delete mode 100644 asm/nonmatchings/code_7E3700/SetPushBlock.s delete mode 100644 asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s delete mode 100644 asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80282880.s delete mode 100644 asm/nonmatchings/code_7E3700/func_802828DC.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80282C40.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80282E30.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283080.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283174.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283240.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283810.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283908.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283A50.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283B88.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283BB0.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283BD0.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283C34.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283D00.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283D6C.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283DF0.s delete mode 100644 asm/nonmatchings/code_7E3700/func_80283E2C.s delete mode 100644 asm/nonmatchings/code_7e0e80/MakeShop.s delete mode 100644 asm/nonmatchings/code_7e0e80/MakeShopOwner.s delete mode 100644 asm/nonmatchings/code_7e0e80/draw_shop_items.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280000.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280088.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_8028017C.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280208.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_802802D0.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_8028035C.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_802803C8.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280410.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_8028051C.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280954.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280AC4.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280B44.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280B78.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80280BD0.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_80281434.s delete mode 100644 asm/nonmatchings/code_7e0e80/func_802814D0.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s delete mode 100644 asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s diff --git a/asm/nonmatchings/code_16F740/func_80246B2C.s b/asm/nonmatchings/code_16F740/func_80246B2C.s deleted file mode 100644 index fca63b0631..0000000000 --- a/asm/nonmatchings/code_16F740/func_80246B2C.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80246B2C -/* 17540C 80246B2C 03E00008 */ jr $ra -/* 175410 80246B30 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s deleted file mode 100644 index aeabcebb6e..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80058DD0 -/* 341D0 80058DD0 24050007 */ addiu $a1, $zero, 7 -/* 341D4 80058DD4 2486000E */ addiu $a2, $a0, 0xe -/* 341D8 80058DD8 84830000 */ lh $v1, ($a0) -/* 341DC 80058DDC 24020001 */ addiu $v0, $zero, 1 -/* 341E0 80058DE0 AC82002C */ sw $v0, 0x2c($a0) -/* 341E4 80058DE4 00431807 */ srav $v1, $v1, $v0 -/* 341E8 80058DE8 0060382D */ daddu $a3, $v1, $zero -/* 341EC 80058DEC 24024000 */ addiu $v0, $zero, 0x4000 -/* 341F0 80058DF0 00431023 */ subu $v0, $v0, $v1 -/* 341F4 80058DF4 A4820002 */ sh $v0, 2($a0) -.L80058DF8: -/* 341F8 80058DF8 A4C00008 */ sh $zero, 8($a2) -/* 341FC 80058DFC 24A5FFFF */ addiu $a1, $a1, -1 -/* 34200 80058E00 04A1FFFD */ bgez $a1, .L80058DF8 -/* 34204 80058E04 24C6FFFE */ addiu $a2, $a2, -2 -/* 34208 80058E08 00071400 */ sll $v0, $a3, 0x10 -/* 3420C 80058E0C 00021403 */ sra $v0, $v0, 0x10 -/* 34210 80058E10 3C013F10 */ lui $at, 0x3f10 -/* 34214 80058E14 44811800 */ mtc1 $at, $f3 -/* 34218 80058E18 44801000 */ mtc1 $zero, $f2 -/* 3421C 80058E1C 44820000 */ mtc1 $v0, $f0 -/* 34220 80058E20 00000000 */ nop -/* 34224 80058E24 46800021 */ cvt.d.w $f0, $f0 -/* 34228 80058E28 46220082 */ mul.d $f2, $f0, $f2 -/* 3422C 80058E2C 00000000 */ nop -/* 34230 80058E30 24050009 */ addiu $a1, $zero, 9 -/* 34234 80058E34 3C0140D0 */ lui $at, 0x40d0 -/* 34238 80058E38 44813800 */ mtc1 $at, $f7 -/* 3423C 80058E3C 44803000 */ mtc1 $zero, $f6 -/* 34240 80058E40 24830012 */ addiu $v1, $a0, 0x12 -/* 34244 80058E44 A4870018 */ sh $a3, 0x18($a0) -/* 34248 80058E48 46201106 */ mov.d $f4, $f2 -.L80058E4C: -/* 3424C 80058E4C 46241082 */ mul.d $f2, $f2, $f4 -/* 34250 80058E50 00000000 */ nop -/* 34254 80058E54 46261002 */ mul.d $f0, $f2, $f6 -/* 34258 80058E58 00000000 */ nop -/* 3425C 80058E5C 24A50001 */ addiu $a1, $a1, 1 -/* 34260 80058E60 4620020D */ trunc.w.d $f8, $f0 -/* 34264 80058E64 44024000 */ mfc1 $v0, $f8 -/* 34268 80058E68 00000000 */ nop -/* 3426C 80058E6C A4620008 */ sh $v0, 8($v1) -/* 34270 80058E70 28A20010 */ slti $v0, $a1, 0x10 -/* 34274 80058E74 1440FFF5 */ bnez $v0, .L80058E4C -/* 34278 80058E78 24630002 */ addiu $v1, $v1, 2 -/* 3427C 80058E7C 03E00008 */ jr $ra -/* 34280 80058E80 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s deleted file mode 100644 index 226b4c4634..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80058E84 -/* 34284 80058E84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 34288 80058E88 AFB3001C */ sw $s3, 0x1c($sp) -/* 3428C 80058E8C 0080982D */ daddu $s3, $a0, $zero -/* 34290 80058E90 AFB20018 */ sw $s2, 0x18($sp) -/* 34294 80058E94 00C0902D */ daddu $s2, $a2, $zero -/* 34298 80058E98 0240202D */ daddu $a0, $s2, $zero -/* 3429C 80058E9C AFB40020 */ sw $s4, 0x20($sp) -/* 342A0 80058EA0 00A0A02D */ daddu $s4, $a1, $zero -/* 342A4 80058EA4 24050004 */ addiu $a1, $zero, 4 -/* 342A8 80058EA8 24060030 */ addiu $a2, $zero, 0x30 -/* 342AC 80058EAC AFBF0024 */ sw $ra, 0x24($sp) -/* 342B0 80058EB0 AFB10014 */ sw $s1, 0x14($sp) -/* 342B4 80058EB4 0C015FE4 */ jal alHeapAlloc -/* 342B8 80058EB8 AFB00010 */ sw $s0, 0x10($sp) -/* 342BC 80058EBC 0240202D */ daddu $a0, $s2, $zero -/* 342C0 80058EC0 24050A10 */ addiu $a1, $zero, 0xa10 -/* 342C4 80058EC4 24060002 */ addiu $a2, $zero, 2 -/* 342C8 80058EC8 0C015FE4 */ jal alHeapAlloc -/* 342CC 80058ECC AE62000C */ sw $v0, 0xc($s3) -/* 342D0 80058ED0 0000882D */ daddu $s1, $zero, $zero -/* 342D4 80058ED4 AE620000 */ sw $v0, ($s3) -/* 342D8 80058ED8 0240202D */ daddu $a0, $s2, $zero -.L80058EDC: -/* 342DC 80058EDC 24050001 */ addiu $a1, $zero, 1 -/* 342E0 80058EE0 24060010 */ addiu $a2, $zero, 0x10 -/* 342E4 80058EE4 3223FFFF */ andi $v1, $s1, 0xffff -/* 342E8 80058EE8 00A31004 */ sllv $v0, $v1, $a1 -/* 342EC 80058EEC 00431021 */ addu $v0, $v0, $v1 -/* 342F0 80058EF0 8E70000C */ lw $s0, 0xc($s3) -/* 342F4 80058EF4 00021100 */ sll $v0, $v0, 4 -/* 342F8 80058EF8 0C015FE4 */ jal alHeapAlloc -/* 342FC 80058EFC 02028021 */ addu $s0, $s0, $v0 -/* 34300 80058F00 0240202D */ daddu $a0, $s2, $zero -/* 34304 80058F04 24050001 */ addiu $a1, $zero, 1 -/* 34308 80058F08 24060020 */ addiu $a2, $zero, 0x20 -/* 3430C 80058F0C 0C015FE4 */ jal alHeapAlloc -/* 34310 80058F10 AE02002C */ sw $v0, 0x2c($s0) -/* 34314 80058F14 0240202D */ daddu $a0, $s2, $zero -/* 34318 80058F18 24050001 */ addiu $a1, $zero, 1 -/* 3431C 80058F1C 8E03002C */ lw $v1, 0x2c($s0) -/* 34320 80058F20 24060030 */ addiu $a2, $zero, 0x30 -/* 34324 80058F24 0C015FE4 */ jal alHeapAlloc -/* 34328 80058F28 AC620000 */ sw $v0, ($v1) -/* 3432C 80058F2C 0240202D */ daddu $a0, $s2, $zero -/* 34330 80058F30 24050001 */ addiu $a1, $zero, 1 -/* 34334 80058F34 24060008 */ addiu $a2, $zero, 8 -/* 34338 80058F38 0C015FE4 */ jal alHeapAlloc -/* 3433C 80058F3C AE020024 */ sw $v0, 0x24($s0) -/* 34340 80058F40 8E030024 */ lw $v1, 0x24($s0) -/* 34344 80058F44 26310001 */ addiu $s1, $s1, 1 -/* 34348 80058F48 AC620028 */ sw $v0, 0x28($v1) -/* 3434C 80058F4C 3222FFFF */ andi $v0, $s1, 0xffff -/* 34350 80058F50 2C420004 */ sltiu $v0, $v0, 4 -/* 34354 80058F54 1440FFE1 */ bnez $v0, .L80058EDC -/* 34358 80058F58 0240202D */ daddu $a0, $s2, $zero -/* 3435C 80058F5C 0260202D */ daddu $a0, $s3, $zero -/* 34360 80058F60 0C016413 */ jal func_8005904C -/* 34364 80058F64 328500FF */ andi $a1, $s4, 0xff -/* 34368 80058F68 8FBF0024 */ lw $ra, 0x24($sp) -/* 3436C 80058F6C 8FB40020 */ lw $s4, 0x20($sp) -/* 34370 80058F70 8FB3001C */ lw $s3, 0x1c($sp) -/* 34374 80058F74 8FB20018 */ lw $s2, 0x18($sp) -/* 34378 80058F78 8FB10014 */ lw $s1, 0x14($sp) -/* 3437C 80058F7C 8FB00010 */ lw $s0, 0x10($sp) -/* 34380 80058F80 03E00008 */ jr $ra -/* 34384 80058F84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s deleted file mode 100644 index 2aec790b72..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80058F88 -/* 34388 80058F88 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3438C 80058F8C AFB10014 */ sw $s1, 0x14($sp) -/* 34390 80058F90 0080882D */ daddu $s1, $a0, $zero -/* 34394 80058F94 AFB00010 */ sw $s0, 0x10($sp) -/* 34398 80058F98 00A0802D */ daddu $s0, $a1, $zero -/* 3439C 80058F9C 0200202D */ daddu $a0, $s0, $zero -/* 343A0 80058FA0 24051420 */ addiu $a1, $zero, 0x1420 -/* 343A4 80058FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 343A8 80058FA8 0C015FE4 */ jal alHeapAlloc -/* 343AC 80058FAC 24060002 */ addiu $a2, $zero, 2 -/* 343B0 80058FB0 0200202D */ daddu $a0, $s0, $zero -/* 343B4 80058FB4 24050001 */ addiu $a1, $zero, 1 -/* 343B8 80058FB8 24060030 */ addiu $a2, $zero, 0x30 -/* 343BC 80058FBC 0C015FE4 */ jal alHeapAlloc -/* 343C0 80058FC0 AE220000 */ sw $v0, ($s1) -/* 343C4 80058FC4 0200202D */ daddu $a0, $s0, $zero -/* 343C8 80058FC8 24050001 */ addiu $a1, $zero, 1 -/* 343CC 80058FCC 24060008 */ addiu $a2, $zero, 8 -/* 343D0 80058FD0 0C015FE4 */ jal alHeapAlloc -/* 343D4 80058FD4 AE220010 */ sw $v0, 0x10($s1) -/* 343D8 80058FD8 0220202D */ daddu $a0, $s1, $zero -/* 343DC 80058FDC 0000282D */ daddu $a1, $zero, $zero -/* 343E0 80058FE0 00A0302D */ daddu $a2, $a1, $zero -/* 343E4 80058FE4 8C830010 */ lw $v1, 0x10($a0) -/* 343E8 80058FE8 24075000 */ addiu $a3, $zero, 0x5000 -/* 343EC 80058FEC 0C016402 */ jal func_80059008 -/* 343F0 80058FF0 AC620028 */ sw $v0, 0x28($v1) -/* 343F4 80058FF4 8FBF0018 */ lw $ra, 0x18($sp) -/* 343F8 80058FF8 8FB10014 */ lw $s1, 0x14($sp) -/* 343FC 80058FFC 8FB00010 */ lw $s0, 0x10($sp) -/* 34400 80059000 03E00008 */ jr $ra -/* 34404 80059004 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s deleted file mode 100644 index b4094302e5..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059008 -/* 34408 80059008 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3440C 8005900C 00071400 */ sll $v0, $a3, 0x10 -/* 34410 80059010 AFBF0010 */ sw $ra, 0x10($sp) -/* 34414 80059014 A4850006 */ sh $a1, 6($a0) -/* 34418 80059018 10400008 */ beqz $v0, .L8005903C -/* 3441C 8005901C A4860008 */ sh $a2, 8($a0) -/* 34420 80059020 8C820010 */ lw $v0, 0x10($a0) -/* 34424 80059024 AC82000C */ sw $v0, 0xc($a0) -/* 34428 80059028 A4470000 */ sh $a3, ($v0) -/* 3442C 8005902C 0C016374 */ jal func_80058DD0 -/* 34430 80059030 8C84000C */ lw $a0, 0xc($a0) -/* 34434 80059034 08016410 */ j .L80059040 -/* 34438 80059038 00000000 */ nop -.L8005903C: -/* 3443C 8005903C AC80000C */ sw $zero, 0xc($a0) -.L80059040: -/* 34440 80059040 8FBF0010 */ lw $ra, 0x10($sp) -/* 34444 80059044 03E00008 */ jr $ra -/* 34448 80059048 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s b/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s deleted file mode 100644 index a3c371c8e1..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s +++ /dev/null @@ -1,191 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005904C -/* 3444C 8005904C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 34450 80059050 AFB3001C */ sw $s3, 0x1c($sp) -/* 34454 80059054 0080982D */ daddu $s3, $a0, $zero -/* 34458 80059058 30A500FF */ andi $a1, $a1, 0xff -/* 3445C 8005905C 24A5FFFF */ addiu $a1, $a1, -1 -/* 34460 80059060 2CA2000A */ sltiu $v0, $a1, 0xa -/* 34464 80059064 AFBF0020 */ sw $ra, 0x20($sp) -/* 34468 80059068 AFB20018 */ sw $s2, 0x18($sp) -/* 3446C 8005906C AFB10014 */ sw $s1, 0x14($sp) -/* 34470 80059070 AFB00010 */ sw $s0, 0x10($sp) -/* 34474 80059074 8E660000 */ lw $a2, ($s3) -/* 34478 80059078 10400021 */ beqz $v0, .L80059100 -/* 3447C 8005907C 00051080 */ sll $v0, $a1, 2 -/* 34480 80059080 3C01800A */ lui $at, 0x800a -/* 34484 80059084 00220821 */ addu $at, $at, $v0 -/* 34488 80059088 8C228940 */ lw $v0, -0x76c0($at) -/* 3448C 8005908C 00400008 */ jr $v0 -/* 34490 80059090 00000000 */ nop -/* 34494 80059094 3C048008 */ lui $a0, 0x8008 -/* 34498 80059098 08016442 */ j .L80059108 -/* 3449C 8005909C 2484EFE0 */ addiu $a0, $a0, -0x1020 -/* 344A0 800590A0 3C048008 */ lui $a0, 0x8008 -/* 344A4 800590A4 08016442 */ j .L80059108 -/* 344A8 800590A8 2484F158 */ addiu $a0, $a0, -0xea8 -/* 344AC 800590AC 3C048008 */ lui $a0, 0x8008 -/* 344B0 800590B0 08016442 */ j .L80059108 -/* 344B4 800590B4 2484F180 */ addiu $a0, $a0, -0xe80 -/* 344B8 800590B8 3C048008 */ lui $a0, 0x8008 -/* 344BC 800590BC 08016442 */ j .L80059108 -/* 344C0 800590C0 2484F1A8 */ addiu $a0, $a0, -0xe58 -/* 344C4 800590C4 3C048008 */ lui $a0, 0x8008 -/* 344C8 800590C8 08016442 */ j .L80059108 -/* 344CC 800590CC 8C84F1F8 */ lw $a0, -0xe08($a0) -/* 344D0 800590D0 3C048008 */ lui $a0, 0x8008 -/* 344D4 800590D4 08016442 */ j .L80059108 -/* 344D8 800590D8 8C84F1FC */ lw $a0, -0xe04($a0) -/* 344DC 800590DC 3C048008 */ lui $a0, 0x8008 -/* 344E0 800590E0 08016442 */ j .L80059108 -/* 344E4 800590E4 8C84F200 */ lw $a0, -0xe00($a0) -/* 344E8 800590E8 3C048008 */ lui $a0, 0x8008 -/* 344EC 800590EC 08016442 */ j .L80059108 -/* 344F0 800590F0 8C84F204 */ lw $a0, -0xdfc($a0) -/* 344F4 800590F4 3C048008 */ lui $a0, 0x8008 -/* 344F8 800590F8 08016442 */ j .L80059108 -/* 344FC 800590FC 2484F048 */ addiu $a0, $a0, -0xfb8 -.L80059100: -/* 34500 80059100 3C048008 */ lui $a0, 0x8008 -/* 34504 80059104 2484F1D0 */ addiu $a0, $a0, -0xe30 -.L80059108: -/* 34508 80059108 90820003 */ lbu $v0, 3($a0) -/* 3450C 8005910C A2620010 */ sb $v0, 0x10($s3) -/* 34510 80059110 8C830004 */ lw $v1, 4($a0) -/* 34514 80059114 8E620000 */ lw $v0, ($s3) -/* 34518 80059118 24110507 */ addiu $s1, $zero, 0x507 -/* 3451C 8005911C AE620004 */ sw $v0, 4($s3) -/* 34520 80059120 00031040 */ sll $v0, $v1, 1 -/* 34524 80059124 00431021 */ addu $v0, $v0, $v1 -/* 34528 80059128 000210C0 */ sll $v0, $v0, 3 -/* 3452C 8005912C 00431023 */ subu $v0, $v0, $v1 -/* 34530 80059130 000210C0 */ sll $v0, $v0, 3 -/* 34534 80059134 AE620008 */ sw $v0, 8($s3) -.L80059138: -/* 34538 80059138 ACC00000 */ sw $zero, ($a2) -/* 3453C 8005913C 2631FFFF */ addiu $s1, $s1, -1 -/* 34540 80059140 0621FFFD */ bgez $s1, .L80059138 -/* 34544 80059144 24C60004 */ addiu $a2, $a2, 4 -/* 34548 80059148 92620010 */ lbu $v0, 0x10($s3) -/* 3454C 8005914C 10400069 */ beqz $v0, .L800592F4 -/* 34550 80059150 0000882D */ daddu $s1, $zero, $zero -/* 34554 80059154 0220902D */ daddu $s2, $s1, $zero -/* 34558 80059158 24020002 */ addiu $v0, $zero, 2 -/* 3455C 8005915C 00421004 */ sllv $v0, $v0, $v0 -/* 34560 80059160 00448021 */ addu $s0, $v0, $a0 -.L80059164: -/* 34564 80059164 8E62000C */ lw $v0, 0xc($s3) -/* 34568 80059168 8E030000 */ lw $v1, ($s0) -/* 3456C 8005916C 26100004 */ addiu $s0, $s0, 4 -/* 34570 80059170 00522021 */ addu $a0, $v0, $s2 -/* 34574 80059174 00031040 */ sll $v0, $v1, 1 -/* 34578 80059178 00431021 */ addu $v0, $v0, $v1 -/* 3457C 8005917C 000210C0 */ sll $v0, $v0, 3 -/* 34580 80059180 00431023 */ subu $v0, $v0, $v1 -/* 34584 80059184 000210C0 */ sll $v0, $v0, 3 -/* 34588 80059188 AC820000 */ sw $v0, ($a0) -/* 3458C 8005918C 8E030000 */ lw $v1, ($s0) -/* 34590 80059190 26100004 */ addiu $s0, $s0, 4 -/* 34594 80059194 00031040 */ sll $v0, $v1, 1 -/* 34598 80059198 00431021 */ addu $v0, $v0, $v1 -/* 3459C 8005919C 000210C0 */ sll $v0, $v0, 3 -/* 345A0 800591A0 00431023 */ subu $v0, $v0, $v1 -/* 345A4 800591A4 000210C0 */ sll $v0, $v0, 3 -/* 345A8 800591A8 AC820004 */ sw $v0, 4($a0) -/* 345AC 800591AC 96020002 */ lhu $v0, 2($s0) -/* 345B0 800591B0 26100004 */ addiu $s0, $s0, 4 -/* 345B4 800591B4 A482000A */ sh $v0, 0xa($a0) -/* 345B8 800591B8 96020002 */ lhu $v0, 2($s0) -/* 345BC 800591BC 26100004 */ addiu $s0, $s0, 4 -/* 345C0 800591C0 A4820008 */ sh $v0, 8($a0) -/* 345C4 800591C4 96020002 */ lhu $v0, 2($s0) -/* 345C8 800591C8 26100004 */ addiu $s0, $s0, 4 -/* 345CC 800591CC A482000C */ sh $v0, 0xc($a0) -/* 345D0 800591D0 8E020000 */ lw $v0, ($s0) -/* 345D4 800591D4 50400033 */ beql $v0, $zero, .L800592A4 -/* 345D8 800591D8 AC800028 */ sw $zero, 0x28($a0) -/* 345DC 800591DC 26100004 */ addiu $s0, $s0, 4 -/* 345E0 800591E0 44820000 */ mtc1 $v0, $f0 -/* 345E4 800591E4 00000000 */ nop -/* 345E8 800591E8 46800020 */ cvt.s.w $f0, $f0 -/* 345EC 800591EC 3C01447A */ lui $at, 0x447a -/* 345F0 800591F0 44811000 */ mtc1 $at, $f2 -/* 345F4 800591F4 8C830004 */ lw $v1, 4($a0) -/* 345F8 800591F8 8C820000 */ lw $v0, ($a0) -/* 345FC 800591FC 46020003 */ div.s $f0, $f0, $f2 -/* 34600 80059200 46000021 */ cvt.d.s $f0, $f0 -/* 34604 80059204 00621823 */ subu $v1, $v1, $v0 -/* 34608 80059208 46200000 */ add.d $f0, $f0, $f0 -/* 3460C 8005920C 3C028008 */ lui $v0, 0x8008 -/* 34610 80059210 8C428E50 */ lw $v0, -0x71b0($v0) -/* 34614 80059214 44832000 */ mtc1 $v1, $f4 -/* 34618 80059218 00000000 */ nop -/* 3461C 8005921C 46802121 */ cvt.d.w $f4, $f4 -/* 34620 80059220 C4420008 */ lwc1 $f2, 8($v0) -/* 34624 80059224 468010A1 */ cvt.d.w $f2, $f2 -/* 34628 80059228 46220003 */ div.d $f0, $f0, $f2 -/* 3462C 8005922C 46200020 */ cvt.s.d $f0, $f0 -/* 34630 80059230 E4800010 */ swc1 $f0, 0x10($a0) -/* 34634 80059234 C6000000 */ lwc1 $f0, ($s0) -/* 34638 80059238 46800020 */ cvt.s.w $f0, $f0 -/* 3463C 8005923C 26100004 */ addiu $s0, $s0, 4 -/* 34640 80059240 3C01800A */ lui $at, 0x800a -/* 34644 80059244 D4228968 */ ldc1 $f2, -0x7698($at) -/* 34648 80059248 46000021 */ cvt.d.s $f0, $f0 -/* 3464C 8005924C 04610006 */ bgez $v1, .L80059268 -/* 34650 80059250 46220083 */ div.d $f2, $f0, $f2 -/* 34654 80059254 3C0141F0 */ lui $at, 0x41f0 -/* 34658 80059258 44810800 */ mtc1 $at, $f1 -/* 3465C 8005925C 44800000 */ mtc1 $zero, $f0 -/* 34660 80059260 00000000 */ nop -/* 34664 80059264 46202100 */ add.d $f4, $f4, $f0 -.L80059268: -/* 34668 80059268 46241002 */ mul.d $f0, $f2, $f4 -/* 3466C 8005926C 00000000 */ nop -/* 34670 80059270 3C013F80 */ lui $at, 0x3f80 -/* 34674 80059274 44811000 */ mtc1 $at, $f2 -/* 34678 80059278 8C82002C */ lw $v0, 0x2c($a0) -/* 3467C 8005927C AC800018 */ sw $zero, 0x18($a0) -/* 34680 80059280 E4820014 */ swc1 $f2, 0x14($a0) -/* 34684 80059284 AC820028 */ sw $v0, 0x28($a0) -/* 34688 80059288 46200020 */ cvt.s.d $f0, $f0 -/* 3468C 8005928C E480001C */ swc1 $f0, 0x1c($a0) -/* 34690 80059290 AC400008 */ sw $zero, 8($v0) -/* 34694 80059294 8C830028 */ lw $v1, 0x28($a0) -/* 34698 80059298 24020001 */ addiu $v0, $zero, 1 -/* 3469C 8005929C 080164AA */ j .L800592A8 -/* 346A0 800592A0 AC62000C */ sw $v0, 0xc($v1) -.L800592A4: -/* 346A4 800592A4 26100008 */ addiu $s0, $s0, 8 -.L800592A8: -/* 346A8 800592A8 8E020000 */ lw $v0, ($s0) -/* 346AC 800592AC 5040000A */ beql $v0, $zero, .L800592D8 -/* 346B0 800592B0 AC800020 */ sw $zero, 0x20($a0) -/* 346B4 800592B4 8C830024 */ lw $v1, 0x24($a0) -/* 346B8 800592B8 AC830020 */ sw $v1, 0x20($a0) -/* 346BC 800592BC 96020002 */ lhu $v0, 2($s0) -/* 346C0 800592C0 A4620000 */ sh $v0, ($v1) -/* 346C4 800592C4 8C840020 */ lw $a0, 0x20($a0) -/* 346C8 800592C8 0C016374 */ jal func_80058DD0 -/* 346CC 800592CC 26100004 */ addiu $s0, $s0, 4 -/* 346D0 800592D0 080164B8 */ j .L800592E0 -/* 346D4 800592D4 26520030 */ addiu $s2, $s2, 0x30 -.L800592D8: -/* 346D8 800592D8 26100004 */ addiu $s0, $s0, 4 -/* 346DC 800592DC 26520030 */ addiu $s2, $s2, 0x30 -.L800592E0: -/* 346E0 800592E0 92620010 */ lbu $v0, 0x10($s3) -/* 346E4 800592E4 26310001 */ addiu $s1, $s1, 1 -/* 346E8 800592E8 0222102A */ slt $v0, $s1, $v0 -/* 346EC 800592EC 1440FF9D */ bnez $v0, .L80059164 -/* 346F0 800592F0 00000000 */ nop -.L800592F4: -/* 346F4 800592F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 346F8 800592F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 346FC 800592FC 8FB20018 */ lw $s2, 0x18($sp) -/* 34700 80059300 8FB10014 */ lw $s1, 0x14($sp) -/* 34704 80059304 8FB00010 */ lw $s0, 0x10($sp) -/* 34708 80059308 03E00008 */ jr $ra -/* 3470C 8005930C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s deleted file mode 100644 index c21b3f1924..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s +++ /dev/null @@ -1,375 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059310 -/* 34710 80059310 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 34714 80059314 AFB00030 */ sw $s0, 0x30($sp) -/* 34718 80059318 00A0802D */ daddu $s0, $a1, $zero -/* 3471C 8005931C AFB10034 */ sw $s1, 0x34($sp) -/* 34720 80059320 00C0882D */ daddu $s1, $a2, $zero -/* 34724 80059324 AFB60048 */ sw $s6, 0x48($sp) -/* 34728 80059328 24F60170 */ addiu $s6, $a3, 0x170 -/* 3472C 8005932C 32220FFF */ andi $v0, $s1, 0xfff -/* 34730 80059330 3C030617 */ lui $v1, 0x617 -/* 34734 80059334 00431025 */ or $v0, $v0, $v1 -/* 34738 80059338 AFBF0054 */ sw $ra, 0x54($sp) -/* 3473C 8005933C AFBE0050 */ sw $fp, 0x50($sp) -/* 34740 80059340 AFB7004C */ sw $s7, 0x4c($sp) -/* 34744 80059344 AFB50044 */ sw $s5, 0x44($sp) -/* 34748 80059348 AFB40040 */ sw $s4, 0x40($sp) -/* 3474C 8005934C AFB3003C */ sw $s3, 0x3c($sp) -/* 34750 80059350 AFB20038 */ sw $s2, 0x38($sp) -/* 34754 80059354 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 34758 80059358 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 3475C 8005935C AFA40068 */ sw $a0, 0x68($sp) -/* 34760 80059360 A7A70026 */ sh $a3, 0x26($sp) -/* 34764 80059364 A7A0001E */ sh $zero, 0x1e($sp) -/* 34768 80059368 AE020000 */ sw $v0, ($s0) -/* 3476C 8005936C 8FA80068 */ lw $t0, 0x68($sp) -/* 34770 80059370 26120008 */ addiu $s2, $s0, 8 -/* 34774 80059374 8D040004 */ lw $a0, 4($t0) -/* 34778 80059378 0C0187A4 */ jal osVirtualToPhysical -/* 3477C 8005937C 24F302E0 */ addiu $s3, $a3, 0x2e0 -/* 34780 80059380 0240202D */ daddu $a0, $s2, $zero -/* 34784 80059384 3C0300FF */ lui $v1, 0xff -/* 34788 80059388 3463FFFF */ ori $v1, $v1, 0xffff -/* 3478C 8005938C AE020004 */ sw $v0, 4($s0) -/* 34790 80059390 00111400 */ sll $v0, $s1, 0x10 -/* 34794 80059394 00021403 */ sra $v0, $v0, 0x10 -/* 34798 80059398 00431024 */ and $v0, $v0, $v1 -/* 3479C 8005939C 3C030200 */ lui $v1, 0x200 -/* 347A0 800593A0 00431025 */ or $v0, $v0, $v1 -/* 347A4 800593A4 AC820000 */ sw $v0, ($a0) -/* 347A8 800593A8 24020170 */ addiu $v0, $zero, 0x170 -/* 347AC 800593AC AC820004 */ sw $v0, 4($a0) -/* 347B0 800593B0 8FA80068 */ lw $t0, 0x68($sp) -/* 347B4 800593B4 0000A02D */ daddu $s4, $zero, $zero -/* 347B8 800593B8 91020010 */ lbu $v0, 0x10($t0) -/* 347BC 800593BC 26520008 */ addiu $s2, $s2, 8 -/* 347C0 800593C0 1040011D */ beqz $v0, .L80059838 -/* 347C4 800593C4 A7B10028 */ sh $s1, 0x28($sp) -/* 347C8 800593C8 00131400 */ sll $v0, $s3, 0x10 -/* 347CC 800593CC 3C014700 */ lui $at, 0x4700 -/* 347D0 800593D0 4481B000 */ mtc1 $at, $f22 -/* 347D4 800593D4 00021403 */ sra $v0, $v0, 0x10 -/* 347D8 800593D8 AFA2002C */ sw $v0, 0x2c($sp) -.L800593DC: -/* 347DC 800593DC 97A8001E */ lhu $t0, 0x1e($sp) -/* 347E0 800593E0 00081400 */ sll $v0, $t0, 0x10 -/* 347E4 800593E4 00021403 */ sra $v0, $v0, 0x10 -/* 347E8 800593E8 00021840 */ sll $v1, $v0, 1 -/* 347EC 800593EC 00621821 */ addu $v1, $v1, $v0 -/* 347F0 800593F0 8FA80068 */ lw $t0, 0x68($sp) -/* 347F4 800593F4 00031900 */ sll $v1, $v1, 4 -/* 347F8 800593F8 8D02000C */ lw $v0, 0xc($t0) -/* 347FC 800593FC 8D040004 */ lw $a0, 4($t0) -/* 34800 80059400 00439821 */ addu $s3, $v0, $v1 -/* 34804 80059404 8E620000 */ lw $v0, ($s3) -/* 34808 80059408 8D030000 */ lw $v1, ($t0) -/* 3480C 8005940C 00021040 */ sll $v0, $v0, 1 -/* 34810 80059410 0082B823 */ subu $s7, $a0, $v0 -/* 34814 80059414 02E3102B */ sltu $v0, $s7, $v1 -/* 34818 80059418 10400004 */ beqz $v0, .L8005942C -/* 3481C 8005941C 00000000 */ nop -/* 34820 80059420 8D020008 */ lw $v0, 8($t0) -/* 34824 80059424 00021040 */ sll $v0, $v0, 1 -/* 34828 80059428 02E2B821 */ addu $s7, $s7, $v0 -.L8005942C: -/* 3482C 8005942C 8E620004 */ lw $v0, 4($s3) -/* 34830 80059430 00021040 */ sll $v0, $v0, 1 -/* 34834 80059434 0082F023 */ subu $fp, $a0, $v0 -/* 34838 80059438 03C3102B */ sltu $v0, $fp, $v1 -/* 3483C 8005943C 10400005 */ beqz $v0, .L80059454 -/* 34840 80059440 00000000 */ nop -/* 34844 80059444 8FA80068 */ lw $t0, 0x68($sp) -/* 34848 80059448 8D020008 */ lw $v0, 8($t0) -/* 3484C 8005944C 00021040 */ sll $v0, $v0, 1 -/* 34850 80059450 03C2F021 */ addu $fp, $fp, $v0 -.L80059454: -/* 34854 80059454 16F40005 */ bne $s7, $s4, .L8005946C -/* 34858 80059458 0240802D */ daddu $s0, $s2, $zero -/* 3485C 8005945C 02C0102D */ daddu $v0, $s6, $zero -/* 34860 80059460 97B60026 */ lhu $s6, 0x26($sp) -/* 34864 80059464 08016524 */ j .L80059490 -/* 34868 80059468 A7A20026 */ sh $v0, 0x26($sp) -.L8005946C: -/* 3486C 8005946C 26520008 */ addiu $s2, $s2, 8 -/* 34870 80059470 02E0202D */ daddu $a0, $s7, $zero -/* 34874 80059474 97A80026 */ lhu $t0, 0x26($sp) -/* 34878 80059478 3C030417 */ lui $v1, 0x417 -/* 3487C 8005947C 31020FFF */ andi $v0, $t0, 0xfff -/* 34880 80059480 00431025 */ or $v0, $v0, $v1 -/* 34884 80059484 0C0187A4 */ jal osVirtualToPhysical -/* 34888 80059488 AE020000 */ sw $v0, ($s0) -/* 3488C 8005948C AE020004 */ sw $v0, 4($s0) -.L80059490: -/* 34890 80059490 8E620028 */ lw $v0, 0x28($s3) -/* 34894 80059494 10400068 */ beqz $v0, .L80059638 -/* 34898 80059498 0260202D */ daddu $a0, $s3, $zero -/* 3489C 8005949C 8E700004 */ lw $s0, 4($s3) -/* 348A0 800594A0 8E620000 */ lw $v0, ($s3) -/* 348A4 800594A4 240500B8 */ addiu $a1, $zero, 0xb8 -/* 348A8 800594A8 0C0166F5 */ jal func_80059BD4 -/* 348AC 800594AC 02028023 */ subu $s0, $s0, $v0 -/* 348B0 800594B0 44901000 */ mtc1 $s0, $f2 -/* 348B4 800594B4 00000000 */ nop -/* 348B8 800594B8 468010A0 */ cvt.s.w $f2, $f2 -/* 348BC 800594BC 46020103 */ div.s $f4, $f0, $f2 -/* 348C0 800594C0 46162002 */ mul.s $f0, $f4, $f22 -/* 348C4 800594C4 00000000 */ nop -/* 348C8 800594C8 4600018D */ trunc.w.s $f6, $f0 -/* 348CC 800594CC 44023000 */ mfc1 $v0, $f6 -/* 348D0 800594D0 3C013800 */ lui $at, 0x3800 -/* 348D4 800594D4 44810000 */ mtc1 $at, $f0 -/* 348D8 800594D8 44822000 */ mtc1 $v0, $f4 -/* 348DC 800594DC 00000000 */ nop -/* 348E0 800594E0 46802120 */ cvt.s.w $f4, $f4 -/* 348E4 800594E4 46002102 */ mul.s $f4, $f4, $f0 -/* 348E8 800594E8 00000000 */ nop -/* 348EC 800594EC 3C013FF0 */ lui $at, 0x3ff0 -/* 348F0 800594F0 44811800 */ mtc1 $at, $f3 -/* 348F4 800594F4 44801000 */ mtc1 $zero, $f2 -/* 348F8 800594F8 46002021 */ cvt.d.s $f0, $f4 -/* 348FC 800594FC 46201081 */ sub.d $f2, $f2, $f0 -/* 34900 80059500 3C014338 */ lui $at, 0x4338 -/* 34904 80059504 44812000 */ mtc1 $at, $f4 -/* 34908 80059508 46201520 */ cvt.s.d $f20, $f2 -/* 3490C 8005950C 4604A102 */ mul.s $f4, $f20, $f4 -/* 34910 80059510 00000000 */ nop -/* 34914 80059514 8E620028 */ lw $v0, 0x28($s3) -/* 34918 80059518 C4400008 */ lwc1 $f0, 8($v0) -/* 3491C 8005951C 46040000 */ add.s $f0, $f0, $f4 -/* 34920 80059520 4600018D */ trunc.w.s $f6, $f0 -/* 34924 80059524 44143000 */ mfc1 $s4, $f6 -/* 34928 80059528 00000000 */ nop -/* 3492C 8005952C 44941000 */ mtc1 $s4, $f2 -/* 34930 80059530 00000000 */ nop -/* 34934 80059534 468010A0 */ cvt.s.w $f2, $f2 -/* 34938 80059538 46020001 */ sub.s $f0, $f0, $f2 -/* 3493C 8005953C E4400008 */ swc1 $f0, 8($v0) -/* 34940 80059540 8E630018 */ lw $v1, 0x18($s3) -/* 34944 80059544 8E620004 */ lw $v0, 4($s3) -/* 34948 80059548 8FA80068 */ lw $t0, 0x68($sp) -/* 3494C 8005954C 00621823 */ subu $v1, $v1, $v0 -/* 34950 80059550 8D020004 */ lw $v0, 4($t0) -/* 34954 80059554 00031840 */ sll $v1, $v1, 1 -/* 34958 80059558 00432821 */ addu $a1, $v0, $v1 -/* 3495C 8005955C 30A20007 */ andi $v0, $a1, 7 -/* 34960 80059560 00021843 */ sra $v1, $v0, 1 -/* 34964 80059564 0003A840 */ sll $s5, $v1, 1 -/* 34968 80059568 8D020000 */ lw $v0, ($t0) -/* 3496C 8005956C 00B52823 */ subu $a1, $a1, $s5 -/* 34970 80059570 00A2102B */ sltu $v0, $a1, $v0 -/* 34974 80059574 10400004 */ beqz $v0, .L80059588 -/* 34978 80059578 00000000 */ nop -/* 3497C 8005957C 8D020008 */ lw $v0, 8($t0) -/* 34980 80059580 00021040 */ sll $v0, $v0, 1 -/* 34984 80059584 00A22821 */ addu $a1, $a1, $v0 -.L80059588: -/* 34988 80059588 8FA40068 */ lw $a0, 0x68($sp) -/* 3498C 8005958C 8FA6002C */ lw $a2, 0x2c($sp) -/* 34990 80059590 02833821 */ addu $a3, $s4, $v1 -/* 34994 80059594 0C0166AE */ jal func_80059AB8 -/* 34998 80059598 AFB20010 */ sw $s2, 0x10($sp) -/* 3499C 8005959C 0040902D */ daddu $s2, $v0, $zero -/* 349A0 800595A0 4616A002 */ mul.s $f0, $f20, $f22 -/* 349A4 800595A4 00000000 */ nop -/* 349A8 800595A8 00168C00 */ sll $s1, $s6, 0x10 -/* 349AC 800595AC 8E630028 */ lw $v1, 0x28($s3) -/* 349B0 800595B0 8C640000 */ lw $a0, ($v1) -/* 349B4 800595B4 4600018D */ trunc.w.s $f6, $f0 -/* 349B8 800595B8 44103000 */ mfc1 $s0, $f6 -/* 349BC 800595BC 0C0187A4 */ jal osVirtualToPhysical -/* 349C0 800595C0 00118E03 */ sra $s1, $s1, 0x18 -/* 349C4 800595C4 3C0300FF */ lui $v1, 0xff -/* 349C8 800595C8 3463FFFF */ ori $v1, $v1, 0xffff -/* 349CC 800595CC 0240202D */ daddu $a0, $s2, $zero -/* 349D0 800595D0 00431024 */ and $v0, $v0, $v1 -/* 349D4 800595D4 3C030500 */ lui $v1, 0x500 -/* 349D8 800595D8 00431025 */ or $v0, $v0, $v1 -/* 349DC 800595DC 3210FFFF */ andi $s0, $s0, 0xffff -/* 349E0 800595E0 00108380 */ sll $s0, $s0, 0xe -/* 349E4 800595E4 32310003 */ andi $s1, $s1, 3 -/* 349E8 800595E8 AC820000 */ sw $v0, ($a0) -/* 349EC 800595EC 8E620028 */ lw $v0, 0x28($s3) -/* 349F0 800595F0 8FA8002C */ lw $t0, 0x2c($sp) -/* 349F4 800595F4 8C43000C */ lw $v1, 0xc($v0) -/* 349F8 800595F8 01151021 */ addu $v0, $t0, $s5 -/* 349FC 800595FC 30420FFF */ andi $v0, $v0, 0xfff -/* 34A00 80059600 00021080 */ sll $v0, $v0, 2 -/* 34A04 80059604 00031F80 */ sll $v1, $v1, 0x1e -/* 34A08 80059608 00701825 */ or $v1, $v1, $s0 -/* 34A0C 8005960C 00621825 */ or $v1, $v1, $v0 -/* 34A10 80059610 00711825 */ or $v1, $v1, $s1 -/* 34A14 80059614 AC830004 */ sw $v1, 4($a0) -/* 34A18 80059618 8E620028 */ lw $v0, 0x28($s3) -/* 34A1C 8005961C AC40000C */ sw $zero, 0xc($v0) -/* 34A20 80059620 8E620018 */ lw $v0, 0x18($s3) -/* 34A24 80059624 26520008 */ addiu $s2, $s2, 8 -/* 34A28 80059628 2442FF48 */ addiu $v0, $v0, -0xb8 -/* 34A2C 8005962C 00541021 */ addu $v0, $v0, $s4 -/* 34A30 80059630 08016597 */ j .L8005965C -/* 34A34 80059634 AE620018 */ sw $v0, 0x18($s3) -.L80059638: -/* 34A38 80059638 0240802D */ daddu $s0, $s2, $zero -/* 34A3C 8005963C 26520008 */ addiu $s2, $s2, 8 -/* 34A40 80059640 03C0202D */ daddu $a0, $fp, $zero -/* 34A44 80059644 32C20FFF */ andi $v0, $s6, 0xfff -/* 34A48 80059648 3C030417 */ lui $v1, 0x417 -/* 34A4C 8005964C 00431025 */ or $v0, $v0, $v1 -/* 34A50 80059650 0C0187A4 */ jal osVirtualToPhysical -/* 34A54 80059654 AE020000 */ sw $v0, ($s0) -/* 34A58 80059658 AE020004 */ sw $v0, 4($s0) -.L8005965C: -/* 34A5C 8005965C 86620008 */ lh $v0, 8($s3) -/* 34A60 80059660 10400018 */ beqz $v0, .L800596C4 -/* 34A64 80059664 0240282D */ daddu $a1, $s2, $zero -/* 34A68 80059668 32C4FFFF */ andi $a0, $s6, 0xffff -/* 34A6C 8005966C 97A80026 */ lhu $t0, 0x26($sp) -/* 34A70 80059670 96630008 */ lhu $v1, 8($s3) -/* 34A74 80059674 00081400 */ sll $v0, $t0, 0x10 -/* 34A78 80059678 00441025 */ or $v0, $v0, $a0 -/* 34A7C 8005967C 3C080C00 */ lui $t0, 0xc00 -/* 34A80 80059680 00681825 */ or $v1, $v1, $t0 -/* 34A84 80059684 ACA20004 */ sw $v0, 4($a1) -/* 34A88 80059688 ACA30000 */ sw $v1, ($a1) -/* 34A8C 8005968C 8E620028 */ lw $v0, 0x28($s3) -/* 34A90 80059690 1440000C */ bnez $v0, .L800596C4 -/* 34A94 80059694 26520008 */ addiu $s2, $s2, 8 -/* 34A98 80059698 8E620020 */ lw $v0, 0x20($s3) -/* 34A9C 8005969C 14400009 */ bnez $v0, .L800596C4 -/* 34AA0 800596A0 0240802D */ daddu $s0, $s2, $zero -/* 34AA4 800596A4 26520008 */ addiu $s2, $s2, 8 -/* 34AA8 800596A8 03C0202D */ daddu $a0, $fp, $zero -/* 34AAC 800596AC 32C20FFF */ andi $v0, $s6, 0xfff -/* 34AB0 800596B0 3C080617 */ lui $t0, 0x617 -/* 34AB4 800596B4 00481025 */ or $v0, $v0, $t0 -/* 34AB8 800596B8 0C0187A4 */ jal osVirtualToPhysical -/* 34ABC 800596BC AE020000 */ sw $v0, ($s0) -/* 34AC0 800596C0 AE020004 */ sw $v0, 4($s0) -.L800596C4: -/* 34AC4 800596C4 8662000A */ lh $v0, 0xa($s3) -/* 34AC8 800596C8 10400014 */ beqz $v0, .L8005971C -/* 34ACC 800596CC 0240302D */ daddu $a2, $s2, $zero -/* 34AD0 800596D0 26520008 */ addiu $s2, $s2, 8 -/* 34AD4 800596D4 0240802D */ daddu $s0, $s2, $zero -/* 34AD8 800596D8 26520008 */ addiu $s2, $s2, 8 -/* 34ADC 800596DC 00161400 */ sll $v0, $s6, 0x10 -/* 34AE0 800596E0 3C080C00 */ lui $t0, 0xc00 -/* 34AE4 800596E4 97A50026 */ lhu $a1, 0x26($sp) -/* 34AE8 800596E8 9663000A */ lhu $v1, 0xa($s3) -/* 34AEC 800596EC 00451025 */ or $v0, $v0, $a1 -/* 34AF0 800596F0 00681825 */ or $v1, $v1, $t0 -/* 34AF4 800596F4 ACC20004 */ sw $v0, 4($a2) -/* 34AF8 800596F8 ACC30000 */ sw $v1, ($a2) -/* 34AFC 800596FC 97A80026 */ lhu $t0, 0x26($sp) -/* 34B00 80059700 02E0202D */ daddu $a0, $s7, $zero -/* 34B04 80059704 31020FFF */ andi $v0, $t0, 0xfff -/* 34B08 80059708 3C080617 */ lui $t0, 0x617 -/* 34B0C 8005970C 00481025 */ or $v0, $v0, $t0 -/* 34B10 80059710 0C0187A4 */ jal osVirtualToPhysical -/* 34B14 80059714 AE020000 */ sw $v0, ($s0) -/* 34B18 80059718 AE020004 */ sw $v0, 4($s0) -.L8005971C: -/* 34B1C 8005971C 8E620020 */ lw $v0, 0x20($s3) -/* 34B20 80059720 10400020 */ beqz $v0, .L800597A4 -/* 34B24 80059724 3C020B00 */ lui $v0, 0xb00 -/* 34B28 80059728 34420020 */ ori $v0, $v0, 0x20 -/* 34B2C 8005972C 0240882D */ daddu $s1, $s2, $zero -/* 34B30 80059730 00168400 */ sll $s0, $s6, 0x10 -/* 34B34 80059734 AE220000 */ sw $v0, ($s1) -/* 34B38 80059738 8E640020 */ lw $a0, 0x20($s3) -/* 34B3C 8005973C 00108603 */ sra $s0, $s0, 0x18 -/* 34B40 80059740 0C0187A4 */ jal osVirtualToPhysical -/* 34B44 80059744 24840008 */ addiu $a0, $a0, 8 -/* 34B48 80059748 26520008 */ addiu $s2, $s2, 8 -/* 34B4C 8005974C AE220004 */ sw $v0, 4($s1) -/* 34B50 80059750 0240882D */ daddu $s1, $s2, $zero -/* 34B54 80059754 8E620020 */ lw $v0, 0x20($s3) -/* 34B58 80059758 3C030E00 */ lui $v1, 0xe00 -/* 34B5C 8005975C 9044002F */ lbu $a0, 0x2f($v0) -/* 34B60 80059760 94420002 */ lhu $v0, 2($v0) -/* 34B64 80059764 00042400 */ sll $a0, $a0, 0x10 -/* 34B68 80059768 00431025 */ or $v0, $v0, $v1 -/* 34B6C 8005976C 00822025 */ or $a0, $a0, $v0 -/* 34B70 80059770 AE240000 */ sw $a0, ($s1) -/* 34B74 80059774 8E620020 */ lw $v0, 0x20($s3) -/* 34B78 80059778 8C440028 */ lw $a0, 0x28($v0) -/* 34B7C 8005977C 0C0187A4 */ jal osVirtualToPhysical -/* 34B80 80059780 00108600 */ sll $s0, $s0, 0x18 -/* 34B84 80059784 3C0300FF */ lui $v1, 0xff -/* 34B88 80059788 3463FFFF */ ori $v1, $v1, 0xffff -/* 34B8C 8005978C 00431024 */ and $v0, $v0, $v1 -/* 34B90 80059790 02028025 */ or $s0, $s0, $v0 -/* 34B94 80059794 AE300004 */ sw $s0, 4($s1) -/* 34B98 80059798 8E620020 */ lw $v0, 0x20($s3) -/* 34B9C 8005979C 26520008 */ addiu $s2, $s2, 8 -/* 34BA0 800597A0 AC40002C */ sw $zero, 0x2c($v0) -.L800597A4: -/* 34BA4 800597A4 8E620028 */ lw $v0, 0x28($s3) -/* 34BA8 800597A8 14400009 */ bnez $v0, .L800597D0 -/* 34BAC 800597AC 0240802D */ daddu $s0, $s2, $zero -/* 34BB0 800597B0 26520008 */ addiu $s2, $s2, 8 -/* 34BB4 800597B4 03C0202D */ daddu $a0, $fp, $zero -/* 34BB8 800597B8 32C20FFF */ andi $v0, $s6, 0xfff -/* 34BBC 800597BC 3C080617 */ lui $t0, 0x617 -/* 34BC0 800597C0 00481025 */ or $v0, $v0, $t0 -/* 34BC4 800597C4 0C0187A4 */ jal osVirtualToPhysical -/* 34BC8 800597C8 AE020000 */ sw $v0, ($s0) -/* 34BCC 800597CC AE020004 */ sw $v0, 4($s0) -.L800597D0: -/* 34BD0 800597D0 8662000C */ lh $v0, 0xc($s3) -/* 34BD4 800597D4 1040000A */ beqz $v0, .L80059800 -/* 34BD8 800597D8 0240282D */ daddu $a1, $s2, $zero -/* 34BDC 800597DC 26520008 */ addiu $s2, $s2, 8 -/* 34BE0 800597E0 00161400 */ sll $v0, $s6, 0x10 -/* 34BE4 800597E4 3C080C00 */ lui $t0, 0xc00 -/* 34BE8 800597E8 97A40028 */ lhu $a0, 0x28($sp) -/* 34BEC 800597EC 9663000C */ lhu $v1, 0xc($s3) -/* 34BF0 800597F0 00441025 */ or $v0, $v0, $a0 -/* 34BF4 800597F4 00681825 */ or $v1, $v1, $t0 -/* 34BF8 800597F8 ACA20004 */ sw $v0, 4($a1) -/* 34BFC 800597FC ACA30000 */ sw $v1, ($a1) -.L80059800: -/* 34C00 80059800 97A8001E */ lhu $t0, 0x1e($sp) -/* 34C04 80059804 25030001 */ addiu $v1, $t0, 1 -/* 34C08 80059808 A7A3001E */ sh $v1, 0x1e($sp) -/* 34C0C 8005980C 00031C00 */ sll $v1, $v1, 0x10 -/* 34C10 80059810 8FA80068 */ lw $t0, 0x68($sp) -/* 34C14 80059814 8E620004 */ lw $v0, 4($s3) -/* 34C18 80059818 8D040004 */ lw $a0, 4($t0) -/* 34C1C 8005981C 00021040 */ sll $v0, $v0, 1 -/* 34C20 80059820 0082A021 */ addu $s4, $a0, $v0 -/* 34C24 80059824 91020010 */ lbu $v0, 0x10($t0) -/* 34C28 80059828 00031C03 */ sra $v1, $v1, 0x10 -/* 34C2C 8005982C 0062182A */ slt $v1, $v1, $v0 -/* 34C30 80059830 1460FEEA */ bnez $v1, .L800593DC -/* 34C34 80059834 00000000 */ nop -.L80059838: -/* 34C38 80059838 8FA80068 */ lw $t0, 0x68($sp) -/* 34C3C 8005983C 8D030004 */ lw $v1, 4($t0) -/* 34C40 80059840 8D020008 */ lw $v0, 8($t0) -/* 34C44 80059844 8D040000 */ lw $a0, ($t0) -/* 34C48 80059848 24630170 */ addiu $v1, $v1, 0x170 -/* 34C4C 8005984C 00021040 */ sll $v0, $v0, 1 -/* 34C50 80059850 00821021 */ addu $v0, $a0, $v0 -/* 34C54 80059854 AD030004 */ sw $v1, 4($t0) -/* 34C58 80059858 0062182B */ sltu $v1, $v1, $v0 -/* 34C5C 8005985C 50600001 */ beql $v1, $zero, .L80059864 -/* 34C60 80059860 AD040004 */ sw $a0, 4($t0) -.L80059864: -/* 34C64 80059864 0240102D */ daddu $v0, $s2, $zero -/* 34C68 80059868 8FBF0054 */ lw $ra, 0x54($sp) -/* 34C6C 8005986C 8FBE0050 */ lw $fp, 0x50($sp) -/* 34C70 80059870 8FB7004C */ lw $s7, 0x4c($sp) -/* 34C74 80059874 8FB60048 */ lw $s6, 0x48($sp) -/* 34C78 80059878 8FB50044 */ lw $s5, 0x44($sp) -/* 34C7C 8005987C 8FB40040 */ lw $s4, 0x40($sp) -/* 34C80 80059880 8FB3003C */ lw $s3, 0x3c($sp) -/* 34C84 80059884 8FB20038 */ lw $s2, 0x38($sp) -/* 34C88 80059888 8FB10034 */ lw $s1, 0x34($sp) -/* 34C8C 8005988C 8FB00030 */ lw $s0, 0x30($sp) -/* 34C90 80059890 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 34C94 80059894 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 34C98 80059898 03E00008 */ jr $ra -/* 34C9C 8005989C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s b/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s deleted file mode 100644 index fab9b05da6..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800598A0 -/* 34CA0 800598A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 34CA4 800598A4 00063400 */ sll $a2, $a2, 0x10 -/* 34CA8 800598A8 00063403 */ sra $a2, $a2, 0x10 -/* 34CAC 800598AC 2CC20008 */ sltiu $v0, $a2, 8 -/* 34CB0 800598B0 1040007D */ beqz $v0, .L80059AA8 -/* 34CB4 800598B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 34CB8 800598B8 00061080 */ sll $v0, $a2, 2 -/* 34CBC 800598BC 3C01800A */ lui $at, 0x800a -/* 34CC0 800598C0 00220821 */ addu $at, $at, $v0 -/* 34CC4 800598C4 8C228970 */ lw $v0, -0x7690($at) -/* 34CC8 800598C8 00400008 */ jr $v0 -/* 34CCC 800598CC 00000000 */ nop -/* 34CD0 800598D0 00051400 */ sll $v0, $a1, 0x10 -/* 34CD4 800598D4 00021403 */ sra $v0, $v0, 0x10 -/* 34CD8 800598D8 00021840 */ sll $v1, $v0, 1 -/* 34CDC 800598DC 00621821 */ addu $v1, $v1, $v0 -/* 34CE0 800598E0 8C82000C */ lw $v0, 0xc($a0) -/* 34CE4 800598E4 00031900 */ sll $v1, $v1, 4 -/* 34CE8 800598E8 00621821 */ addu $v1, $v1, $v0 -/* 34CEC 800598EC 2402FFF8 */ addiu $v0, $zero, -8 -/* 34CF0 800598F0 00E21024 */ and $v0, $a3, $v0 -/* 34CF4 800598F4 080166AA */ j .L80059AA8 -/* 34CF8 800598F8 AC620000 */ sw $v0, ($v1) -/* 34CFC 800598FC 00051400 */ sll $v0, $a1, 0x10 -/* 34D00 80059900 00021403 */ sra $v0, $v0, 0x10 -/* 34D04 80059904 00021840 */ sll $v1, $v0, 1 -/* 34D08 80059908 00621821 */ addu $v1, $v1, $v0 -/* 34D0C 8005990C 8C82000C */ lw $v0, 0xc($a0) -/* 34D10 80059910 00031900 */ sll $v1, $v1, 4 -/* 34D14 80059914 00621821 */ addu $v1, $v1, $v0 -/* 34D18 80059918 2402FFF8 */ addiu $v0, $zero, -8 -/* 34D1C 8005991C 00E21024 */ and $v0, $a3, $v0 -/* 34D20 80059920 080166AA */ j .L80059AA8 -/* 34D24 80059924 AC620004 */ sw $v0, 4($v1) -/* 34D28 80059928 00051400 */ sll $v0, $a1, 0x10 -/* 34D2C 8005992C 00021403 */ sra $v0, $v0, 0x10 -/* 34D30 80059930 00021840 */ sll $v1, $v0, 1 -/* 34D34 80059934 00621821 */ addu $v1, $v1, $v0 -/* 34D38 80059938 8C82000C */ lw $v0, 0xc($a0) -/* 34D3C 8005993C 00031900 */ sll $v1, $v1, 4 -/* 34D40 80059940 00621821 */ addu $v1, $v1, $v0 -/* 34D44 80059944 080166AA */ j .L80059AA8 -/* 34D48 80059948 A4670008 */ sh $a3, 8($v1) -/* 34D4C 8005994C 00051400 */ sll $v0, $a1, 0x10 -/* 34D50 80059950 00021403 */ sra $v0, $v0, 0x10 -/* 34D54 80059954 00021840 */ sll $v1, $v0, 1 -/* 34D58 80059958 00621821 */ addu $v1, $v1, $v0 -/* 34D5C 8005995C 8C82000C */ lw $v0, 0xc($a0) -/* 34D60 80059960 00031900 */ sll $v1, $v1, 4 -/* 34D64 80059964 00621821 */ addu $v1, $v1, $v0 -/* 34D68 80059968 080166AA */ j .L80059AA8 -/* 34D6C 8005996C A467000A */ sh $a3, 0xa($v1) -/* 34D70 80059970 00051400 */ sll $v0, $a1, 0x10 -/* 34D74 80059974 00021403 */ sra $v0, $v0, 0x10 -/* 34D78 80059978 00021840 */ sll $v1, $v0, 1 -/* 34D7C 8005997C 00621821 */ addu $v1, $v1, $v0 -/* 34D80 80059980 8C82000C */ lw $v0, 0xc($a0) -/* 34D84 80059984 00031900 */ sll $v1, $v1, 4 -/* 34D88 80059988 00621821 */ addu $v1, $v1, $v0 -/* 34D8C 8005998C 080166AA */ j .L80059AA8 -/* 34D90 80059990 A467000C */ sh $a3, 0xc($v1) -/* 34D94 80059994 00051400 */ sll $v0, $a1, 0x10 -/* 34D98 80059998 00021403 */ sra $v0, $v0, 0x10 -/* 34D9C 8005999C 00021840 */ sll $v1, $v0, 1 -/* 34DA0 800599A0 00621821 */ addu $v1, $v1, $v0 -/* 34DA4 800599A4 00031900 */ sll $v1, $v1, 4 -/* 34DA8 800599A8 44870000 */ mtc1 $a3, $f0 -/* 34DAC 800599AC 00000000 */ nop -/* 34DB0 800599B0 46800020 */ cvt.s.w $f0, $f0 -/* 34DB4 800599B4 3C01447A */ lui $at, 0x447a -/* 34DB8 800599B8 44811000 */ mtc1 $at, $f2 -/* 34DBC 800599BC 8C82000C */ lw $v0, 0xc($a0) -/* 34DC0 800599C0 3C048008 */ lui $a0, 0x8008 -/* 34DC4 800599C4 8C848E50 */ lw $a0, -0x71b0($a0) -/* 34DC8 800599C8 46020003 */ div.s $f0, $f0, $f2 -/* 34DCC 800599CC 46000021 */ cvt.d.s $f0, $f0 -/* 34DD0 800599D0 46200000 */ add.d $f0, $f0, $f0 -/* 34DD4 800599D4 00621821 */ addu $v1, $v1, $v0 -/* 34DD8 800599D8 C4820008 */ lwc1 $f2, 8($a0) -/* 34DDC 800599DC 468010A1 */ cvt.d.w $f2, $f2 -/* 34DE0 800599E0 46220003 */ div.d $f0, $f0, $f2 -/* 34DE4 800599E4 46200020 */ cvt.s.d $f0, $f0 -/* 34DE8 800599E8 080166AA */ j .L80059AA8 -/* 34DEC 800599EC E4600010 */ swc1 $f0, 0x10($v1) -/* 34DF0 800599F0 00051400 */ sll $v0, $a1, 0x10 -/* 34DF4 800599F4 00021403 */ sra $v0, $v0, 0x10 -/* 34DF8 800599F8 00021840 */ sll $v1, $v0, 1 -/* 34DFC 800599FC 00621821 */ addu $v1, $v1, $v0 -/* 34E00 80059A00 00031900 */ sll $v1, $v1, 4 -/* 34E04 80059A04 44870000 */ mtc1 $a3, $f0 -/* 34E08 80059A08 00000000 */ nop -/* 34E0C 80059A0C 46800020 */ cvt.s.w $f0, $f0 -/* 34E10 80059A10 46000021 */ cvt.d.s $f0, $f0 -/* 34E14 80059A14 8C82000C */ lw $v0, 0xc($a0) -/* 34E18 80059A18 3C01800A */ lui $at, 0x800a -/* 34E1C 80059A1C D4228990 */ ldc1 $f2, -0x7670($at) -/* 34E20 80059A20 00622021 */ addu $a0, $v1, $v0 -/* 34E24 80059A24 8C830004 */ lw $v1, 4($a0) -/* 34E28 80059A28 8C820000 */ lw $v0, ($a0) -/* 34E2C 80059A2C 00621823 */ subu $v1, $v1, $v0 -/* 34E30 80059A30 44832000 */ mtc1 $v1, $f4 -/* 34E34 80059A34 00000000 */ nop -/* 34E38 80059A38 46802121 */ cvt.d.w $f4, $f4 -/* 34E3C 80059A3C 04610006 */ bgez $v1, .L80059A58 -/* 34E40 80059A40 46220083 */ div.d $f2, $f0, $f2 -/* 34E44 80059A44 3C0141F0 */ lui $at, 0x41f0 -/* 34E48 80059A48 44810800 */ mtc1 $at, $f1 -/* 34E4C 80059A4C 44800000 */ mtc1 $zero, $f0 -/* 34E50 80059A50 00000000 */ nop -/* 34E54 80059A54 46202100 */ add.d $f4, $f4, $f0 -.L80059A58: -/* 34E58 80059A58 46241002 */ mul.d $f0, $f2, $f4 -/* 34E5C 80059A5C 00000000 */ nop -/* 34E60 80059A60 46200020 */ cvt.s.d $f0, $f0 -/* 34E64 80059A64 080166AA */ j .L80059AA8 -/* 34E68 80059A68 E480001C */ swc1 $f0, 0x1c($a0) -/* 34E6C 80059A6C 00051400 */ sll $v0, $a1, 0x10 -/* 34E70 80059A70 00021403 */ sra $v0, $v0, 0x10 -/* 34E74 80059A74 00021840 */ sll $v1, $v0, 1 -/* 34E78 80059A78 00621821 */ addu $v1, $v1, $v0 -/* 34E7C 80059A7C 8C82000C */ lw $v0, 0xc($a0) -/* 34E80 80059A80 00031900 */ sll $v1, $v1, 4 -/* 34E84 80059A84 00621021 */ addu $v0, $v1, $v0 -/* 34E88 80059A88 8C420020 */ lw $v0, 0x20($v0) -/* 34E8C 80059A8C 10400006 */ beqz $v0, .L80059AA8 -/* 34E90 80059A90 00000000 */ nop -/* 34E94 80059A94 A4470000 */ sh $a3, ($v0) -/* 34E98 80059A98 8C82000C */ lw $v0, 0xc($a0) -/* 34E9C 80059A9C 00621021 */ addu $v0, $v1, $v0 -/* 34EA0 80059AA0 0C016374 */ jal func_80058DD0 -/* 34EA4 80059AA4 8C440020 */ lw $a0, 0x20($v0) -.L80059AA8: -/* 34EA8 80059AA8 8FBF0010 */ lw $ra, 0x10($sp) -/* 34EAC 80059AAC 0000102D */ daddu $v0, $zero, $zero -/* 34EB0 80059AB0 03E00008 */ jr $ra -/* 34EB4 80059AB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s deleted file mode 100644 index 52a8841a34..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s +++ /dev/null @@ -1,77 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059AB8 -/* 34EB8 80059AB8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 34EBC 80059ABC AFB50024 */ sw $s5, 0x24($sp) -/* 34EC0 80059AC0 0080A82D */ daddu $s5, $a0, $zero -/* 34EC4 80059AC4 00A0202D */ daddu $a0, $a1, $zero -/* 34EC8 80059AC8 AFB60028 */ sw $s6, 0x28($sp) -/* 34ECC 80059ACC 00C0B02D */ daddu $s6, $a2, $zero -/* 34ED0 80059AD0 AFB40020 */ sw $s4, 0x20($sp) -/* 34ED4 80059AD4 8FB40040 */ lw $s4, 0x40($sp) -/* 34ED8 80059AD8 00073840 */ sll $a3, $a3, 1 -/* 34EDC 80059ADC AFB00010 */ sw $s0, 0x10($sp) -/* 34EE0 80059AE0 00878021 */ addu $s0, $a0, $a3 -/* 34EE4 80059AE4 AFBF002C */ sw $ra, 0x2c($sp) -/* 34EE8 80059AE8 AFB3001C */ sw $s3, 0x1c($sp) -/* 34EEC 80059AEC AFB20018 */ sw $s2, 0x18($sp) -/* 34EF0 80059AF0 AFB10014 */ sw $s1, 0x14($sp) -/* 34EF4 80059AF4 8EA20008 */ lw $v0, 8($s5) -/* 34EF8 80059AF8 8EA30000 */ lw $v1, ($s5) -/* 34EFC 80059AFC 00021040 */ sll $v0, $v0, 1 -/* 34F00 80059B00 00623021 */ addu $a2, $v1, $v0 -/* 34F04 80059B04 00D0102B */ sltu $v0, $a2, $s0 -/* 34F08 80059B08 1040001C */ beqz $v0, .L80059B7C -/* 34F0C 80059B0C 0280902D */ daddu $s2, $s4, $zero -/* 34F10 80059B10 26940008 */ addiu $s4, $s4, 8 -/* 34F14 80059B14 00C48823 */ subu $s1, $a2, $a0 -/* 34F18 80059B18 00118843 */ sra $s1, $s1, 1 -/* 34F1C 80059B1C 00118840 */ sll $s1, $s1, 1 -/* 34F20 80059B20 32230FFF */ andi $v1, $s1, 0xfff -/* 34F24 80059B24 00031B00 */ sll $v1, $v1, 0xc -/* 34F28 80059B28 32C20FFF */ andi $v0, $s6, 0xfff -/* 34F2C 80059B2C 3C130400 */ lui $s3, 0x400 -/* 34F30 80059B30 00531025 */ or $v0, $v0, $s3 -/* 34F34 80059B34 00621825 */ or $v1, $v1, $v0 -/* 34F38 80059B38 02068023 */ subu $s0, $s0, $a2 -/* 34F3C 80059B3C 00108043 */ sra $s0, $s0, 1 -/* 34F40 80059B40 0C0187A4 */ jal osVirtualToPhysical -/* 34F44 80059B44 AE430000 */ sw $v1, ($s2) -/* 34F48 80059B48 AE420004 */ sw $v0, 4($s2) -/* 34F4C 80059B4C 0280902D */ daddu $s2, $s4, $zero -/* 34F50 80059B50 00108040 */ sll $s0, $s0, 1 -/* 34F54 80059B54 32100FFF */ andi $s0, $s0, 0xfff -/* 34F58 80059B58 00108300 */ sll $s0, $s0, 0xc -/* 34F5C 80059B5C 02D18821 */ addu $s1, $s6, $s1 -/* 34F60 80059B60 32310FFF */ andi $s1, $s1, 0xfff -/* 34F64 80059B64 02338825 */ or $s1, $s1, $s3 -/* 34F68 80059B68 02118025 */ or $s0, $s0, $s1 -/* 34F6C 80059B6C AE500000 */ sw $s0, ($s2) -/* 34F70 80059B70 8EA40000 */ lw $a0, ($s5) -/* 34F74 80059B74 080166E7 */ j .L80059B9C -/* 34F78 80059B78 26940008 */ addiu $s4, $s4, 8 -.L80059B7C: -/* 34F7C 80059B7C 26940008 */ addiu $s4, $s4, 8 -/* 34F80 80059B80 30E20FFF */ andi $v0, $a3, 0xfff -/* 34F84 80059B84 00021300 */ sll $v0, $v0, 0xc -/* 34F88 80059B88 32C30FFF */ andi $v1, $s6, 0xfff -/* 34F8C 80059B8C 3C050400 */ lui $a1, 0x400 -/* 34F90 80059B90 00651825 */ or $v1, $v1, $a1 -/* 34F94 80059B94 00431025 */ or $v0, $v0, $v1 -/* 34F98 80059B98 AE420000 */ sw $v0, ($s2) -.L80059B9C: -/* 34F9C 80059B9C 0C0187A4 */ jal osVirtualToPhysical -/* 34FA0 80059BA0 00000000 */ nop -/* 34FA4 80059BA4 AE420004 */ sw $v0, 4($s2) -/* 34FA8 80059BA8 0280102D */ daddu $v0, $s4, $zero -/* 34FAC 80059BAC 8FBF002C */ lw $ra, 0x2c($sp) -/* 34FB0 80059BB0 8FB60028 */ lw $s6, 0x28($sp) -/* 34FB4 80059BB4 8FB50024 */ lw $s5, 0x24($sp) -/* 34FB8 80059BB8 8FB40020 */ lw $s4, 0x20($sp) -/* 34FBC 80059BBC 8FB3001C */ lw $s3, 0x1c($sp) -/* 34FC0 80059BC0 8FB20018 */ lw $s2, 0x18($sp) -/* 34FC4 80059BC4 8FB10014 */ lw $s1, 0x14($sp) -/* 34FC8 80059BC8 8FB00010 */ lw $s0, 0x10($sp) -/* 34FCC 80059BCC 03E00008 */ jr $ra -/* 34FD0 80059BD0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s deleted file mode 100644 index b15be47501..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059BD4 -/* 34FD4 80059BD4 C4800010 */ lwc1 $f0, 0x10($a0) -/* 34FD8 80059BD8 44851000 */ mtc1 $a1, $f2 -/* 34FDC 80059BDC 00000000 */ nop -/* 34FE0 80059BE0 468010A0 */ cvt.s.w $f2, $f2 -/* 34FE4 80059BE4 46020002 */ mul.s $f0, $f0, $f2 -/* 34FE8 80059BE8 00000000 */ nop -/* 34FEC 80059BEC C4820014 */ lwc1 $f2, 0x14($a0) -/* 34FF0 80059BF0 46001080 */ add.s $f2, $f2, $f0 -/* 34FF4 80059BF4 24820014 */ addiu $v0, $a0, 0x14 -/* 34FF8 80059BF8 3C014000 */ lui $at, 0x4000 -/* 34FFC 80059BFC 44810800 */ mtc1 $at, $f1 -/* 35000 80059C00 44800000 */ mtc1 $zero, $f0 -/* 35004 80059C04 46001121 */ cvt.d.s $f4, $f2 -/* 35008 80059C08 4624003C */ c.lt.d $f0, $f4 -/* 3500C 80059C0C 00000000 */ nop -/* 35010 80059C10 45000008 */ bc1f .L80059C34 -/* 35014 80059C14 E4820014 */ swc1 $f2, 0x14($a0) -/* 35018 80059C18 3C014010 */ lui $at, 0x4010 -/* 3501C 80059C1C 44810800 */ mtc1 $at, $f1 -/* 35020 80059C20 44800000 */ mtc1 $zero, $f0 -/* 35024 80059C24 00000000 */ nop -/* 35028 80059C28 46202001 */ sub.d $f0, $f4, $f0 -/* 3502C 80059C2C 0801670E */ j .L80059C38 -/* 35030 80059C30 46200020 */ cvt.s.d $f0, $f0 -.L80059C34: -/* 35034 80059C34 46001006 */ mov.s $f0, $f2 -.L80059C38: -/* 35038 80059C38 E4400000 */ swc1 $f0, ($v0) -/* 3503C 80059C3C C4820014 */ lwc1 $f2, 0x14($a0) -/* 35040 80059C40 44800000 */ mtc1 $zero, $f0 -/* 35044 80059C44 00000000 */ nop -/* 35048 80059C48 4600103C */ c.lt.s $f2, $f0 -/* 3504C 80059C4C 00000000 */ nop -/* 35050 80059C50 45030001 */ bc1tl .L80059C58 -/* 35054 80059C54 46001087 */ neg.s $f2, $f2 -.L80059C58: -/* 35058 80059C58 3C013FF0 */ lui $at, 0x3ff0 -/* 3505C 80059C5C 44810800 */ mtc1 $at, $f1 -/* 35060 80059C60 44800000 */ mtc1 $zero, $f0 -/* 35064 80059C64 460010A1 */ cvt.d.s $f2, $f2 -/* 35068 80059C68 46201081 */ sub.d $f2, $f2, $f0 -/* 3506C 80059C6C C480001C */ lwc1 $f0, 0x1c($a0) -/* 35070 80059C70 462010A0 */ cvt.s.d $f2, $f2 -/* 35074 80059C74 46020002 */ mul.s $f0, $f0, $f2 -/* 35078 80059C78 03E00008 */ jr $ra -/* 3507C 80059C7C 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s deleted file mode 100644 index 77d0e7ff62..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059C88 -/* 35088 80059C88 8C82000C */ lw $v0, 0xc($a0) -/* 3508C 80059C8C AC450004 */ sw $a1, 4($v0) -/* 35090 80059C90 AC460008 */ sw $a2, 8($v0) -/* 35094 80059C94 03E00008 */ jr $ra -/* 35098 80059C98 AC47000C */ sw $a3, 0xc($v0) diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s deleted file mode 100644 index 82c14cdfd6..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059C9C -/* 3509C 80059C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 350A0 80059CA0 2402000E */ addiu $v0, $zero, 0xe -/* 350A4 80059CA4 3C03800A */ lui $v1, 0x800a -/* 350A8 80059CA8 246341C0 */ addiu $v1, $v1, 0x41c0 -/* 350AC 80059CAC AFBF001C */ sw $ra, 0x1c($sp) -/* 350B0 80059CB0 AFB00018 */ sw $s0, 0x18($sp) -.L80059CB4: -/* 350B4 80059CB4 AC600000 */ sw $zero, ($v1) -/* 350B8 80059CB8 2442FFFF */ addiu $v0, $v0, -1 -/* 350BC 80059CBC 0441FFFD */ bgez $v0, .L80059CB4 -/* 350C0 80059CC0 2463FFE0 */ addiu $v1, $v1, -0x20 -/* 350C4 80059CC4 2402005F */ addiu $v0, $zero, 0x5f -/* 350C8 80059CC8 3C03800B */ lui $v1, 0x800b -/* 350CC 80059CCC 24634514 */ addiu $v1, $v1, 0x4514 -.L80059CD0: -/* 350D0 80059CD0 AC600000 */ sw $zero, ($v1) -/* 350D4 80059CD4 2442FFFF */ addiu $v0, $v0, -1 -/* 350D8 80059CD8 0441FFFD */ bgez $v0, .L80059CD0 -/* 350DC 80059CDC 2463FFFC */ addiu $v1, $v1, -4 -/* 350E0 80059CE0 0C019A58 */ jal osUnmapTLBAll -/* 350E4 80059CE4 00000000 */ nop -/* 350E8 80059CE8 3C0300FF */ lui $v1, 0xff -/* 350EC 80059CEC 3463FFFF */ ori $v1, $v1, 0xffff -/* 350F0 80059CF0 24040010 */ addiu $a0, $zero, 0x10 -/* 350F4 80059CF4 0000282D */ daddu $a1, $zero, $zero -/* 350F8 80059CF8 3C10E020 */ lui $s0, 0xe020 -/* 350FC 80059CFC 26100000 */ addiu $s0, $s0, 0 -/* 35100 80059D00 0200302D */ daddu $a2, $s0, $zero -/* 35104 80059D04 2402FFFF */ addiu $v0, $zero, -1 -/* 35108 80059D08 3C07801A */ lui $a3, 0x801a -/* 3510C 80059D0C 24E76000 */ addiu $a3, $a3, 0x6000 -/* 35110 80059D10 00E33824 */ and $a3, $a3, $v1 -/* 35114 80059D14 AFA20010 */ sw $v0, 0x10($sp) -/* 35118 80059D18 0C0199E8 */ jal osMapTLB -/* 3511C 80059D1C AFA20014 */ sw $v0, 0x14($sp) -/* 35120 80059D20 3C040032 */ lui $a0, 0x32 -/* 35124 80059D24 24845AD0 */ addiu $a0, $a0, 0x5ad0 -/* 35128 80059D28 3C050032 */ lui $a1, 0x32 -/* 3512C 80059D2C 24A56410 */ addiu $a1, $a1, 0x6410 -/* 35130 80059D30 0C00A5CF */ jal dma_copy -/* 35134 80059D34 0200302D */ daddu $a2, $s0, $zero -/* 35138 80059D38 8FBF001C */ lw $ra, 0x1c($sp) -/* 3513C 80059D3C 8FB00018 */ lw $s0, 0x18($sp) -/* 35140 80059D40 03E00008 */ jr $ra -/* 35144 80059D44 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s deleted file mode 100644 index eeae71c2ce..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059D50 -/* 35150 80059D50 3C02800A */ lui $v0, %hi(D_8009A650) -/* 35154 80059D54 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) -/* 35158 80059D58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3515C 80059D5C AFBF0020 */ sw $ra, 0x20($sp) -/* 35160 80059D60 AFB3001C */ sw $s3, 0x1c($sp) -/* 35164 80059D64 AFB20018 */ sw $s2, 0x18($sp) -/* 35168 80059D68 AFB10014 */ sw $s1, 0x14($sp) -/* 3516C 80059D6C 30420C00 */ andi $v0, $v0, 0xc00 -/* 35170 80059D70 14400059 */ bnez $v0, .L80059ED8 -/* 35174 80059D74 AFB00010 */ sw $s0, 0x10($sp) -/* 35178 80059D78 0000902D */ daddu $s2, $zero, $zero -/* 3517C 80059D7C 3C10800A */ lui $s0, 0x800a -/* 35180 80059D80 26104000 */ addiu $s0, $s0, 0x4000 -/* 35184 80059D84 24040003 */ addiu $a0, $zero, 3 -.L80059D88: -/* 35188 80059D88 8E030000 */ lw $v1, ($s0) -/* 3518C 80059D8C 30620001 */ andi $v0, $v1, 1 -/* 35190 80059D90 10400007 */ beqz $v0, .L80059DB0 -/* 35194 80059D94 26520001 */ addiu $s2, $s2, 1 -/* 35198 80059D98 30620002 */ andi $v0, $v1, 2 -/* 3519C 80059D9C 14400004 */ bnez $v0, .L80059DB0 -/* 351A0 80059DA0 00000000 */ nop -/* 351A4 80059DA4 34620002 */ ori $v0, $v1, 2 -/* 351A8 80059DA8 AE020000 */ sw $v0, ($s0) -/* 351AC 80059DAC AE04000C */ sw $a0, 0xc($s0) -.L80059DB0: -/* 351B0 80059DB0 2A42000F */ slti $v0, $s2, 0xf -/* 351B4 80059DB4 1440FFF4 */ bnez $v0, .L80059D88 -/* 351B8 80059DB8 26100020 */ addiu $s0, $s0, 0x20 -/* 351BC 80059DBC 0000902D */ daddu $s2, $zero, $zero -/* 351C0 80059DC0 2413FFFD */ addiu $s3, $zero, -3 -/* 351C4 80059DC4 3C11800B */ lui $s1, 0x800b -/* 351C8 80059DC8 26314398 */ addiu $s1, $s1, 0x4398 -.L80059DCC: -/* 351CC 80059DCC 8E300000 */ lw $s0, ($s1) -/* 351D0 80059DD0 52000020 */ beql $s0, $zero, .L80059E54 -/* 351D4 80059DD4 26520001 */ addiu $s2, $s2, 1 -/* 351D8 80059DD8 8E020000 */ lw $v0, ($s0) -/* 351DC 80059DDC 30420001 */ andi $v0, $v0, 1 -/* 351E0 80059DE0 5040001C */ beql $v0, $zero, .L80059E54 -/* 351E4 80059DE4 26520001 */ addiu $s2, $s2, 1 -/* 351E8 80059DE8 8E030010 */ lw $v1, 0x10($s0) -/* 351EC 80059DEC 8C620000 */ lw $v0, ($v1) -/* 351F0 80059DF0 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* 351F4 80059DF4 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* 351F8 80059DF8 00531024 */ and $v0, $v0, $s3 -/* 351FC 80059DFC AC620000 */ sw $v0, ($v1) -/* 35200 80059E00 80820070 */ lb $v0, 0x70($a0) -/* 35204 80059E04 10400007 */ beqz $v0, .L80059E24 -/* 35208 80059E08 00000000 */ nop -/* 3520C 80059E0C 8E020000 */ lw $v0, ($s0) -/* 35210 80059E10 30420004 */ andi $v0, $v0, 4 -/* 35214 80059E14 5040000F */ beql $v0, $zero, .L80059E54 -/* 35218 80059E18 26520001 */ addiu $s2, $s2, 1 -/* 3521C 80059E1C 0801678D */ j .L80059E34 -/* 35220 80059E20 00000000 */ nop -.L80059E24: -/* 35224 80059E24 8E020000 */ lw $v0, ($s0) -/* 35228 80059E28 30420004 */ andi $v0, $v0, 4 -/* 3522C 80059E2C 54400009 */ bnel $v0, $zero, .L80059E54 -/* 35230 80059E30 26520001 */ addiu $s2, $s2, 1 -.L80059E34: -/* 35234 80059E34 8E020010 */ lw $v0, 0x10($s0) -/* 35238 80059E38 8C420010 */ lw $v0, 0x10($v0) -/* 3523C 80059E3C 0040F809 */ jalr $v0 -/* 35240 80059E40 0200202D */ daddu $a0, $s0, $zero -/* 35244 80059E44 8E020000 */ lw $v0, ($s0) -/* 35248 80059E48 34420008 */ ori $v0, $v0, 8 -/* 3524C 80059E4C AE020000 */ sw $v0, ($s0) -/* 35250 80059E50 26520001 */ addiu $s2, $s2, 1 -.L80059E54: -/* 35254 80059E54 2A420060 */ slti $v0, $s2, 0x60 -/* 35258 80059E58 1440FFDC */ bnez $v0, .L80059DCC -/* 3525C 80059E5C 26310004 */ addiu $s1, $s1, 4 -/* 35260 80059E60 0000902D */ daddu $s2, $zero, $zero -/* 35264 80059E64 3C10800A */ lui $s0, 0x800a -/* 35268 80059E68 26104000 */ addiu $s0, $s0, 0x4000 -/* 3526C 80059E6C 2611001C */ addiu $s1, $s0, 0x1c -.L80059E70: -/* 35270 80059E70 8E030000 */ lw $v1, ($s0) -/* 35274 80059E74 30620001 */ andi $v0, $v1, 1 -/* 35278 80059E78 50400013 */ beql $v0, $zero, .L80059EC8 -/* 3527C 80059E7C 26520001 */ addiu $s2, $s2, 1 -/* 35280 80059E80 30620002 */ andi $v0, $v1, 2 -/* 35284 80059E84 50400010 */ beql $v0, $zero, .L80059EC8 -/* 35288 80059E88 26520001 */ addiu $s2, $s2, 1 -/* 3528C 80059E8C 8E22FFF0 */ lw $v0, -0x10($s1) -/* 35290 80059E90 10400003 */ beqz $v0, .L80059EA0 -/* 35294 80059E94 2442FFFF */ addiu $v0, $v0, -1 -/* 35298 80059E98 080167B1 */ j .L80059EC4 -/* 3529C 80059E9C AE22FFF0 */ sw $v0, -0x10($s1) -.L80059EA0: -/* 352A0 80059EA0 8E240000 */ lw $a0, ($s1) -/* 352A4 80059EA4 50800005 */ beql $a0, $zero, .L80059EBC -/* 352A8 80059EA8 AE000000 */ sw $zero, ($s0) -/* 352AC 80059EAC 0C00AB1E */ jal general_heap_free -/* 352B0 80059EB0 00000000 */ nop -/* 352B4 80059EB4 AE200000 */ sw $zero, ($s1) -/* 352B8 80059EB8 AE000000 */ sw $zero, ($s0) -.L80059EBC: -/* 352BC 80059EBC 0C019A48 */ jal osUnmapTLB -/* 352C0 80059EC0 0240202D */ daddu $a0, $s2, $zero -.L80059EC4: -/* 352C4 80059EC4 26520001 */ addiu $s2, $s2, 1 -.L80059EC8: -/* 352C8 80059EC8 26310020 */ addiu $s1, $s1, 0x20 -/* 352CC 80059ECC 2A42000F */ slti $v0, $s2, 0xf -/* 352D0 80059ED0 1440FFE7 */ bnez $v0, .L80059E70 -/* 352D4 80059ED4 26100020 */ addiu $s0, $s0, 0x20 -.L80059ED8: -/* 352D8 80059ED8 8FBF0020 */ lw $ra, 0x20($sp) -/* 352DC 80059EDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 352E0 80059EE0 8FB20018 */ lw $s2, 0x18($sp) -/* 352E4 80059EE4 8FB10014 */ lw $s1, 0x14($sp) -/* 352E8 80059EE8 8FB00010 */ lw $s0, 0x10($sp) -/* 352EC 80059EEC 03E00008 */ jr $ra -/* 352F0 80059EF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s deleted file mode 100644 index e02e9c8c07..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s +++ /dev/null @@ -1,211 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80059F94 -/* 35394 80059F94 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 35398 80059F98 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 3539C 80059F9C 3C014080 */ lui $at, 0x4080 -/* 353A0 80059FA0 4481A000 */ mtc1 $at, $f20 -/* 353A4 80059FA4 AFB10014 */ sw $s1, 0x14($sp) -/* 353A8 80059FA8 24110001 */ addiu $s1, $zero, 1 -/* 353AC 80059FAC AFB20018 */ sw $s2, 0x18($sp) -/* 353B0 80059FB0 0000902D */ daddu $s2, $zero, $zero -/* 353B4 80059FB4 AFB50024 */ sw $s5, 0x24($sp) -/* 353B8 80059FB8 3C15800B */ lui $s5, %hi(gCameras) -/* 353BC 80059FBC 26B51D80 */ addiu $s5, $s5, %lo(gCameras) -/* 353C0 80059FC0 AFB00010 */ sw $s0, 0x10($sp) -/* 353C4 80059FC4 3C10800A */ lui $s0, 0x800a -/* 353C8 80059FC8 2610A66C */ addiu $s0, $s0, -0x5994 -/* 353CC 80059FCC AFB40020 */ sw $s4, 0x20($sp) -/* 353D0 80059FD0 24140002 */ addiu $s4, $zero, 2 -/* 353D4 80059FD4 AFB3001C */ sw $s3, 0x1c($sp) -/* 353D8 80059FD8 3413FFFE */ ori $s3, $zero, 0xfffe -/* 353DC 80059FDC AFBF0028 */ sw $ra, 0x28($sp) -/* 353E0 80059FE0 00121080 */ sll $v0, $s2, 2 -.L80059FE4: -/* 353E4 80059FE4 3C0E800B */ lui $t6, 0x800b -/* 353E8 80059FE8 01C27021 */ addu $t6, $t6, $v0 -/* 353EC 80059FEC 8DCE4398 */ lw $t6, 0x4398($t6) -/* 353F0 80059FF0 51C000A5 */ beql $t6, $zero, .L8005A288 -/* 353F4 80059FF4 26520001 */ addiu $s2, $s2, 1 -/* 353F8 80059FF8 8DC30000 */ lw $v1, ($t6) -/* 353FC 80059FFC 30620001 */ andi $v0, $v1, 1 -/* 35400 8005A000 504000A1 */ beql $v0, $zero, .L8005A288 -/* 35404 8005A004 26520001 */ addiu $s2, $s2, 1 -/* 35408 8005A008 30620008 */ andi $v0, $v1, 8 -/* 3540C 8005A00C 5040009E */ beql $v0, $zero, .L8005A288 -/* 35410 8005A010 26520001 */ addiu $s2, $s2, 1 -/* 35414 8005A014 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 35418 8005A018 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 3541C 8005A01C 80420070 */ lb $v0, 0x70($v0) -/* 35420 8005A020 10400005 */ beqz $v0, .L8005A038 -/* 35424 8005A024 30620004 */ andi $v0, $v1, 4 -/* 35428 8005A028 50400097 */ beql $v0, $zero, .L8005A288 -/* 3542C 8005A02C 26520001 */ addiu $s2, $s2, 1 -/* 35430 8005A030 08016810 */ j .L8005A040 -/* 35434 8005A034 00000000 */ nop -.L8005A038: -/* 35438 8005A038 54400093 */ bnel $v0, $zero, .L8005A288 -/* 3543C 8005A03C 26520001 */ addiu $s2, $s2, 1 -.L8005A040: -/* 35440 8005A040 8DC20010 */ lw $v0, 0x10($t6) -/* 35444 8005A044 8C4F0018 */ lw $t7, 0x18($v0) -/* 35448 8005A048 3C028006 */ lui $v0, 0x8006 -/* 3544C 8005A04C 24429C80 */ addiu $v0, $v0, -0x6380 -/* 35450 8005A050 51E2008D */ beql $t7, $v0, .L8005A288 -/* 35454 8005A054 26520001 */ addiu $s2, $s2, 1 -/* 35458 8005A058 12200088 */ beqz $s1, .L8005A27C -/* 3545C 8005A05C 3C04DC08 */ lui $a0, 0xdc08 -/* 35460 8005A060 34840008 */ ori $a0, $a0, 8 -/* 35464 8005A064 3C06D9FF */ lui $a2, 0xd9ff -/* 35468 8005A068 34C6FFFF */ ori $a2, $a2, 0xffff -/* 3546C 8005A06C 3C050020 */ lui $a1, 0x20 -/* 35470 8005A070 34A50405 */ ori $a1, $a1, 0x405 -/* 35474 8005A074 3C07DB04 */ lui $a3, 0xdb04 -/* 35478 8005A078 34E70004 */ ori $a3, $a3, 4 -/* 3547C 8005A07C 3C08DB04 */ lui $t0, 0xdb04 -/* 35480 8005A080 3508000C */ ori $t0, $t0, 0xc -/* 35484 8005A084 3C09DB04 */ lui $t1, 0xdb04 -/* 35488 8005A088 35290014 */ ori $t1, $t1, 0x14 -/* 3548C 8005A08C 3C0ADB04 */ lui $t2, 0xdb04 -/* 35490 8005A090 8E0B0000 */ lw $t3, ($s0) -/* 35494 8005A094 354A001C */ ori $t2, $t2, 0x1c -/* 35498 8005A098 0160182D */ daddu $v1, $t3, $zero -/* 3549C 8005A09C 256B0008 */ addiu $t3, $t3, 8 -/* 354A0 8005A0A0 AE0B0000 */ sw $t3, ($s0) -/* 354A4 8005A0A4 3C0D8007 */ lui $t5, %hi(gCurrentCameraID) -/* 354A8 8005A0A8 8DAD7410 */ lw $t5, %lo(gCurrentCameraID)($t5) -/* 354AC 8005A0AC 3C02E700 */ lui $v0, 0xe700 -/* 354B0 8005A0B0 AC620000 */ sw $v0, ($v1) -/* 354B4 8005A0B4 25620008 */ addiu $v0, $t3, 8 -/* 354B8 8005A0B8 AC600004 */ sw $zero, 4($v1) -/* 354BC 8005A0BC AE020000 */ sw $v0, ($s0) -/* 354C0 8005A0C0 AD640000 */ sw $a0, ($t3) -/* 354C4 8005A0C4 3C04ED00 */ lui $a0, 0xed00 -/* 354C8 8005A0C8 000D1080 */ sll $v0, $t5, 2 -/* 354CC 8005A0CC 004D1021 */ addu $v0, $v0, $t5 -/* 354D0 8005A0D0 00021080 */ sll $v0, $v0, 2 -/* 354D4 8005A0D4 004D1023 */ subu $v0, $v0, $t5 -/* 354D8 8005A0D8 000218C0 */ sll $v1, $v0, 3 -/* 354DC 8005A0DC 00431021 */ addu $v0, $v0, $v1 -/* 354E0 8005A0E0 000210C0 */ sll $v0, $v0, 3 -/* 354E4 8005A0E4 00556021 */ addu $t4, $v0, $s5 -/* 354E8 8005A0E8 258200A0 */ addiu $v0, $t4, 0xa0 -/* 354EC 8005A0EC AD620004 */ sw $v0, 4($t3) -/* 354F0 8005A0F0 25620010 */ addiu $v0, $t3, 0x10 -/* 354F4 8005A0F4 AE020000 */ sw $v0, ($s0) -/* 354F8 8005A0F8 3C02D900 */ lui $v0, 0xd900 -/* 354FC 8005A0FC AD620008 */ sw $v0, 8($t3) -/* 35500 8005A100 25620018 */ addiu $v0, $t3, 0x18 -/* 35504 8005A104 AD60000C */ sw $zero, 0xc($t3) -/* 35508 8005A108 AE020000 */ sw $v0, ($s0) -/* 3550C 8005A10C 25620020 */ addiu $v0, $t3, 0x20 -/* 35510 8005A110 AD660010 */ sw $a2, 0x10($t3) -/* 35514 8005A114 AD650014 */ sw $a1, 0x14($t3) -/* 35518 8005A118 AE020000 */ sw $v0, ($s0) -/* 3551C 8005A11C 8583000E */ lh $v1, 0xe($t4) -/* 35520 8005A120 25620028 */ addiu $v0, $t3, 0x28 -/* 35524 8005A124 AE020000 */ sw $v0, ($s0) -/* 35528 8005A128 44831000 */ mtc1 $v1, $f2 -/* 3552C 8005A12C 00000000 */ nop -/* 35530 8005A130 468010A0 */ cvt.s.w $f2, $f2 -/* 35534 8005A134 46141082 */ mul.s $f2, $f2, $f20 -/* 35538 8005A138 00000000 */ nop -/* 3553C 8005A13C 85830010 */ lh $v1, 0x10($t4) -/* 35540 8005A140 25620030 */ addiu $v0, $t3, 0x30 -/* 35544 8005A144 AE020000 */ sw $v0, ($s0) -/* 35548 8005A148 25620038 */ addiu $v0, $t3, 0x38 -/* 3554C 8005A14C 44830000 */ mtc1 $v1, $f0 -/* 35550 8005A150 00000000 */ nop -/* 35554 8005A154 46800020 */ cvt.s.w $f0, $f0 -/* 35558 8005A158 46140002 */ mul.s $f0, $f0, $f20 -/* 3555C 8005A15C 00000000 */ nop -/* 35560 8005A160 AE020000 */ sw $v0, ($s0) -/* 35564 8005A164 4600110D */ trunc.w.s $f4, $f2 -/* 35568 8005A168 44032000 */ mfc1 $v1, $f4 -/* 3556C 8005A16C 00000000 */ nop -/* 35570 8005A170 30630FFF */ andi $v1, $v1, 0xfff -/* 35574 8005A174 00031B00 */ sll $v1, $v1, 0xc -/* 35578 8005A178 4600010D */ trunc.w.s $f4, $f0 -/* 3557C 8005A17C 44022000 */ mfc1 $v0, $f4 -/* 35580 8005A180 00000000 */ nop -/* 35584 8005A184 30420FFF */ andi $v0, $v0, 0xfff -/* 35588 8005A188 00441025 */ or $v0, $v0, $a0 -/* 3558C 8005A18C 00621825 */ or $v1, $v1, $v0 -/* 35590 8005A190 AD630018 */ sw $v1, 0x18($t3) -/* 35594 8005A194 8583000E */ lh $v1, 0xe($t4) -/* 35598 8005A198 8585000A */ lh $a1, 0xa($t4) -/* 3559C 8005A19C 85840010 */ lh $a0, 0x10($t4) -/* 355A0 8005A1A0 8586000C */ lh $a2, 0xc($t4) -/* 355A4 8005A1A4 25620040 */ addiu $v0, $t3, 0x40 -/* 355A8 8005A1A8 AE020000 */ sw $v0, ($s0) -/* 355AC 8005A1AC AD670020 */ sw $a3, 0x20($t3) -/* 355B0 8005A1B0 AD740024 */ sw $s4, 0x24($t3) -/* 355B4 8005A1B4 AD680028 */ sw $t0, 0x28($t3) -/* 355B8 8005A1B8 00651821 */ addu $v1, $v1, $a1 -/* 355BC 8005A1BC 44831000 */ mtc1 $v1, $f2 -/* 355C0 8005A1C0 00000000 */ nop -/* 355C4 8005A1C4 468010A0 */ cvt.s.w $f2, $f2 -/* 355C8 8005A1C8 46141082 */ mul.s $f2, $f2, $f20 -/* 355CC 8005A1CC 00000000 */ nop -/* 355D0 8005A1D0 AD74002C */ sw $s4, 0x2c($t3) -/* 355D4 8005A1D4 AD690030 */ sw $t1, 0x30($t3) -/* 355D8 8005A1D8 00862021 */ addu $a0, $a0, $a2 -/* 355DC 8005A1DC 44840000 */ mtc1 $a0, $f0 -/* 355E0 8005A1E0 00000000 */ nop -/* 355E4 8005A1E4 46800020 */ cvt.s.w $f0, $f0 -/* 355E8 8005A1E8 46140002 */ mul.s $f0, $f0, $f20 -/* 355EC 8005A1EC 00000000 */ nop -/* 355F0 8005A1F0 AD730034 */ sw $s3, 0x34($t3) -/* 355F4 8005A1F4 4600110D */ trunc.w.s $f4, $f2 -/* 355F8 8005A1F8 44032000 */ mfc1 $v1, $f4 -/* 355FC 8005A1FC 00000000 */ nop -/* 35600 8005A200 30630FFF */ andi $v1, $v1, 0xfff -/* 35604 8005A204 00031B00 */ sll $v1, $v1, 0xc -/* 35608 8005A208 4600010D */ trunc.w.s $f4, $f0 -/* 3560C 8005A20C 44022000 */ mfc1 $v0, $f4 -/* 35610 8005A210 00000000 */ nop -/* 35614 8005A214 30420FFF */ andi $v0, $v0, 0xfff -/* 35618 8005A218 00621825 */ or $v1, $v1, $v0 -/* 3561C 8005A21C AD63001C */ sw $v1, 0x1c($t3) -/* 35620 8005A220 AD6A0038 */ sw $t2, 0x38($t3) -/* 35624 8005A224 AD73003C */ sw $s3, 0x3c($t3) -/* 35628 8005A228 95820000 */ lhu $v0, ($t4) -/* 3562C 8005A22C 30420010 */ andi $v0, $v0, 0x10 -/* 35630 8005A230 14400012 */ bnez $v0, .L8005A27C -/* 35634 8005A234 0000882D */ daddu $s1, $zero, $zero -/* 35638 8005A238 3C04DA38 */ lui $a0, 0xda38 -/* 3563C 8005A23C 34840007 */ ori $a0, $a0, 7 -/* 35640 8005A240 25620048 */ addiu $v0, $t3, 0x48 -/* 35644 8005A244 AE020000 */ sw $v0, ($s0) -/* 35648 8005A248 3C02DB0E */ lui $v0, 0xdb0e -/* 3564C 8005A24C AD620040 */ sw $v0, 0x40($t3) -/* 35650 8005A250 95830038 */ lhu $v1, 0x38($t4) -/* 35654 8005A254 25620050 */ addiu $v0, $t3, 0x50 -/* 35658 8005A258 AE020000 */ sw $v0, ($s0) -/* 3565C 8005A25C 000D1180 */ sll $v0, $t5, 6 -/* 35660 8005A260 AD630044 */ sw $v1, 0x44($t3) -/* 35664 8005A264 3C03800A */ lui $v1, 0x800a -/* 35668 8005A268 8C63A674 */ lw $v1, -0x598c($v1) -/* 3566C 8005A26C 24420030 */ addiu $v0, $v0, 0x30 -/* 35670 8005A270 AD640048 */ sw $a0, 0x48($t3) -/* 35674 8005A274 00621821 */ addu $v1, $v1, $v0 -/* 35678 8005A278 AD63004C */ sw $v1, 0x4c($t3) -.L8005A27C: -/* 3567C 8005A27C 01E0F809 */ jalr $t7 -/* 35680 8005A280 01C0202D */ daddu $a0, $t6, $zero -/* 35684 8005A284 26520001 */ addiu $s2, $s2, 1 -.L8005A288: -/* 35688 8005A288 2A420060 */ slti $v0, $s2, 0x60 -/* 3568C 8005A28C 5440FF55 */ bnel $v0, $zero, .L80059FE4 -/* 35690 8005A290 00121080 */ sll $v0, $s2, 2 -/* 35694 8005A294 8FBF0028 */ lw $ra, 0x28($sp) -/* 35698 8005A298 8FB50024 */ lw $s5, 0x24($sp) -/* 3569C 8005A29C 8FB40020 */ lw $s4, 0x20($sp) -/* 356A0 8005A2A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 356A4 8005A2A4 8FB20018 */ lw $s2, 0x18($sp) -/* 356A8 8005A2A8 8FB10014 */ lw $s1, 0x14($sp) -/* 356AC 8005A2AC 8FB00010 */ lw $s0, 0x10($sp) -/* 356B0 8005A2B0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 356B4 8005A2B4 03E00008 */ jr $ra -/* 356B8 8005A2B8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s b/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s deleted file mode 100644 index 82657661e3..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005A2BC -/* 356BC 8005A2BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 356C0 8005A2C0 AFB20018 */ sw $s2, 0x18($sp) -/* 356C4 8005A2C4 0080902D */ daddu $s2, $a0, $zero -/* 356C8 8005A2C8 AFB00010 */ sw $s0, 0x10($sp) -/* 356CC 8005A2CC 0000802D */ daddu $s0, $zero, $zero -/* 356D0 8005A2D0 3C03800B */ lui $v1, 0x800b -/* 356D4 8005A2D4 24634398 */ addiu $v1, $v1, 0x4398 -/* 356D8 8005A2D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 356DC 8005A2DC AFB10014 */ sw $s1, 0x14($sp) -.L8005A2E0: -/* 356E0 8005A2E0 8C620000 */ lw $v0, ($v1) -/* 356E4 8005A2E4 10400006 */ beqz $v0, .L8005A300 -/* 356E8 8005A2E8 2A020060 */ slti $v0, $s0, 0x60 -/* 356EC 8005A2EC 26100001 */ addiu $s0, $s0, 1 -/* 356F0 8005A2F0 2A020060 */ slti $v0, $s0, 0x60 -/* 356F4 8005A2F4 1440FFFA */ bnez $v0, .L8005A2E0 -/* 356F8 8005A2F8 24630004 */ addiu $v1, $v1, 4 -/* 356FC 8005A2FC 2A020060 */ slti $v0, $s0, 0x60 -.L8005A300: -/* 35700 8005A300 14400003 */ bnez $v0, .L8005A310 -/* 35704 8005A304 00000000 */ nop -.L8005A308: -/* 35708 8005A308 080168C2 */ j .L8005A308 -/* 3570C 8005A30C 00000000 */ nop -.L8005A310: -/* 35710 8005A310 0C00AB0A */ jal general_heap_malloc -/* 35714 8005A314 24040014 */ addiu $a0, $zero, 0x14 -/* 35718 8005A318 00101880 */ sll $v1, $s0, 2 -/* 3571C 8005A31C 0040882D */ daddu $s1, $v0, $zero -/* 35720 8005A320 3C01800B */ lui $at, 0x800b -/* 35724 8005A324 00230821 */ addu $at, $at, $v1 -/* 35728 8005A328 AC314398 */ sw $s1, 0x4398($at) -/* 3572C 8005A32C 16200003 */ bnez $s1, .L8005A33C -/* 35730 8005A330 0000802D */ daddu $s0, $zero, $zero -.L8005A334: -/* 35734 8005A334 080168CD */ j .L8005A334 -/* 35738 8005A338 00000000 */ nop -.L8005A33C: -/* 3573C 8005A33C 3C04800A */ lui $a0, 0x800a -/* 35740 8005A340 24844000 */ addiu $a0, $a0, 0x4000 -/* 35744 8005A344 8E430004 */ lw $v1, 4($s2) -/* 35748 8005A348 24020001 */ addiu $v0, $zero, 1 -/* 3574C 8005A34C AE220000 */ sw $v0, ($s1) -/* 35750 8005A350 AE230004 */ sw $v1, 4($s1) -.L8005A354: -/* 35754 8005A354 8C820000 */ lw $v0, ($a0) -/* 35758 8005A358 30420001 */ andi $v0, $v0, 1 -/* 3575C 8005A35C 50400006 */ beql $v0, $zero, .L8005A378 -/* 35760 8005A360 26100001 */ addiu $s0, $s0, 1 -/* 35764 8005A364 8C830004 */ lw $v1, 4($a0) -/* 35768 8005A368 8E420004 */ lw $v0, 4($s2) -/* 3576C 8005A36C 10620006 */ beq $v1, $v0, .L8005A388 -/* 35770 8005A370 2A02000F */ slti $v0, $s0, 0xf -/* 35774 8005A374 26100001 */ addiu $s0, $s0, 1 -.L8005A378: -/* 35778 8005A378 2A02000F */ slti $v0, $s0, 0xf -/* 3577C 8005A37C 1440FFF5 */ bnez $v0, .L8005A354 -/* 35780 8005A380 24840020 */ addiu $a0, $a0, 0x20 -/* 35784 8005A384 2A02000F */ slti $v0, $s0, 0xf -.L8005A388: -/* 35788 8005A388 14400003 */ bnez $v0, .L8005A398 -/* 3578C 8005A38C 00000000 */ nop -.L8005A390: -/* 35790 8005A390 080168E4 */ j .L8005A390 -/* 35794 8005A394 00000000 */ nop -.L8005A398: -/* 35798 8005A398 8C820008 */ lw $v0, 8($a0) -/* 3579C 8005A39C 14400016 */ bnez $v0, .L8005A3F8 -/* 357A0 8005A3A0 24420001 */ addiu $v0, $v0, 1 -/* 357A4 8005A3A4 8E42000C */ lw $v0, 0xc($s2) -/* 357A8 8005A3A8 14400004 */ bnez $v0, .L8005A3BC -/* 357AC 8005A3AC AC820010 */ sw $v0, 0x10($a0) -/* 357B0 8005A3B0 3C028006 */ lui $v0, 0x8006 -/* 357B4 8005A3B4 24429C80 */ addiu $v0, $v0, -0x6380 -/* 357B8 8005A3B8 AC820014 */ sw $v0, 0x14($a0) -.L8005A3BC: -/* 357BC 8005A3BC 8E420010 */ lw $v0, 0x10($s2) -/* 357C0 8005A3C0 8C830018 */ lw $v1, 0x18($a0) -/* 357C4 8005A3C4 14600004 */ bnez $v1, .L8005A3D8 -/* 357C8 8005A3C8 AC820014 */ sw $v0, 0x14($a0) -/* 357CC 8005A3CC 3C028006 */ lui $v0, 0x8006 -/* 357D0 8005A3D0 24429C80 */ addiu $v0, $v0, -0x6380 -/* 357D4 8005A3D4 AC820018 */ sw $v0, 0x18($a0) -.L8005A3D8: -/* 357D8 8005A3D8 8E420014 */ lw $v0, 0x14($s2) -/* 357DC 8005A3DC 14400004 */ bnez $v0, .L8005A3F0 -/* 357E0 8005A3E0 AC820018 */ sw $v0, 0x18($a0) -/* 357E4 8005A3E4 3C028006 */ lui $v0, 0x8006 -/* 357E8 8005A3E8 24429C80 */ addiu $v0, $v0, -0x6380 -/* 357EC 8005A3EC AC820018 */ sw $v0, 0x18($a0) -.L8005A3F0: -/* 357F0 8005A3F0 8C820008 */ lw $v0, 8($a0) -/* 357F4 8005A3F4 24420001 */ addiu $v0, $v0, 1 -.L8005A3F8: -/* 357F8 8005A3F8 AC820008 */ sw $v0, 8($a0) -/* 357FC 8005A3FC AE240010 */ sw $a0, 0x10($s1) -/* 35800 8005A400 8E420008 */ lw $v0, 8($s2) -/* 35804 8005A404 10400003 */ beqz $v0, .L8005A414 -/* 35808 8005A408 00000000 */ nop -/* 3580C 8005A40C 0040F809 */ jalr $v0 -/* 35810 8005A410 0220202D */ daddu $a0, $s1, $zero -.L8005A414: -/* 35814 8005A414 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 35818 8005A418 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 3581C 8005A41C 80420070 */ lb $v0, 0x70($v0) -/* 35820 8005A420 10400005 */ beqz $v0, .L8005A438 -/* 35824 8005A424 0220102D */ daddu $v0, $s1, $zero -/* 35828 8005A428 8E220000 */ lw $v0, ($s1) -/* 3582C 8005A42C 34420004 */ ori $v0, $v0, 4 -/* 35830 8005A430 AE220000 */ sw $v0, ($s1) -/* 35834 8005A434 0220102D */ daddu $v0, $s1, $zero -.L8005A438: -/* 35838 8005A438 8FBF001C */ lw $ra, 0x1c($sp) -/* 3583C 8005A43C 8FB20018 */ lw $s2, 0x18($sp) -/* 35840 8005A440 8FB10014 */ lw $s1, 0x14($sp) -/* 35844 8005A444 8FB00010 */ lw $s0, 0x10($sp) -/* 35848 8005A448 03E00008 */ jr $ra -/* 3584C 8005A44C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s b/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s deleted file mode 100644 index fcb7cc7f75..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_asset_offset -/* 361D0 8005ADD0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 361D4 8005ADD4 AFB20038 */ sw $s2, 0x38($sp) -/* 361D8 8005ADD8 0080902D */ daddu $s2, $a0, $zero -/* 361DC 8005ADDC AFB3003C */ sw $s3, 0x3c($sp) -/* 361E0 8005ADE0 00A0982D */ daddu $s3, $a1, $zero -/* 361E4 8005ADE4 3C0401E4 */ lui $a0, 0x1e4 -/* 361E8 8005ADE8 34840020 */ ori $a0, $a0, 0x20 -/* 361EC 8005ADEC 3C0501E4 */ lui $a1, 0x1e4 -/* 361F0 8005ADF0 34A5003C */ ori $a1, $a1, 0x3c -/* 361F4 8005ADF4 27A60010 */ addiu $a2, $sp, 0x10 -/* 361F8 8005ADF8 AFBF0040 */ sw $ra, 0x40($sp) -/* 361FC 8005ADFC AFB10034 */ sw $s1, 0x34($sp) -/* 36200 8005AE00 0C00A5CF */ jal dma_copy -/* 36204 8005AE04 AFB00030 */ sw $s0, 0x30($sp) -/* 36208 8005AE08 8FA40020 */ lw $a0, 0x20($sp) -/* 3620C 8005AE0C 0C00AB39 */ jal heap_malloc -/* 36210 8005AE10 00000000 */ nop -/* 36214 8005AE14 0040882D */ daddu $s1, $v0, $zero -/* 36218 8005AE18 0220802D */ daddu $s0, $s1, $zero -/* 3621C 8005AE1C 3C0201E4 */ lui $v0, 0x1e4 -/* 36220 8005AE20 34420020 */ ori $v0, $v0, 0x20 -/* 36224 8005AE24 3C0401E4 */ lui $a0, 0x1e4 -/* 36228 8005AE28 34840020 */ ori $a0, $a0, 0x20 -/* 3622C 8005AE2C 8FA50020 */ lw $a1, 0x20($sp) -/* 36230 8005AE30 0220302D */ daddu $a2, $s1, $zero -/* 36234 8005AE34 0C00A5CF */ jal dma_copy -/* 36238 8005AE38 00A22821 */ addu $a1, $a1, $v0 -.L8005AE3C: -/* 3623C 8005AE3C 0200202D */ daddu $a0, $s0, $zero -/* 36240 8005AE40 0C01BB5C */ jal strcmp -/* 36244 8005AE44 0240282D */ daddu $a1, $s2, $zero -/* 36248 8005AE48 10400003 */ beqz $v0, .L8005AE58 -/* 3624C 8005AE4C 3C0301E4 */ lui $v1, 0x1e4 -/* 36250 8005AE50 08016B8F */ j .L8005AE3C -/* 36254 8005AE54 2610001C */ addiu $s0, $s0, 0x1c -.L8005AE58: -/* 36258 8005AE58 8E020014 */ lw $v0, 0x14($s0) -/* 3625C 8005AE5C 34630020 */ ori $v1, $v1, 0x20 -/* 36260 8005AE60 AE620000 */ sw $v0, ($s3) -/* 36264 8005AE64 8E100010 */ lw $s0, 0x10($s0) -/* 36268 8005AE68 0220202D */ daddu $a0, $s1, $zero -/* 3626C 8005AE6C 0C00AB4B */ jal heap_free -/* 36270 8005AE70 02038021 */ addu $s0, $s0, $v1 -/* 36274 8005AE74 0200102D */ daddu $v0, $s0, $zero -/* 36278 8005AE78 8FBF0040 */ lw $ra, 0x40($sp) -/* 3627C 8005AE7C 8FB3003C */ lw $s3, 0x3c($sp) -/* 36280 8005AE80 8FB20038 */ lw $s2, 0x38($sp) -/* 36284 8005AE84 8FB10034 */ lw $s1, 0x34($sp) -/* 36288 8005AE88 8FB00030 */ lw $s0, 0x30($sp) -/* 3628C 8005AE8C 03E00008 */ jr $ra -/* 36290 8005AE90 27BD0048 */ addiu $sp, $sp, 0x48 -/* 36294 8005AE94 00000000 */ nop -/* 36298 8005AE98 00000000 */ nop -/* 3629C 8005AE9C 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s deleted file mode 100644 index b59d381a0f..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_current_map_config -/* 35FD8 8005ABD8 3C02800A */ lui $v0, 0x800a -/* 35FDC 8005ABDC 8C4241E0 */ lw $v0, 0x41e0($v0) -/* 35FE0 8005ABE0 03E00008 */ jr $ra -/* 35FE4 8005ABE4 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s deleted file mode 100644 index 866291ad6f..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_current_map_header -/* 35FE8 8005ABE8 3C02800A */ lui $v0, 0x800a -/* 35FEC 8005ABEC 244241E8 */ addiu $v0, $v0, 0x41e8 -/* 35FF0 8005ABF0 03E00008 */ jr $ra -/* 35FF4 8005ABF4 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s deleted file mode 100644 index 72e6bb7711..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_map_IDs_by_name -/* 35FF8 8005ABF8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 35FFC 8005ABFC AFB50024 */ sw $s5, 0x24($sp) -/* 36000 8005AC00 0080A82D */ daddu $s5, $a0, $zero -/* 36004 8005AC04 AFB60028 */ sw $s6, 0x28($sp) -/* 36008 8005AC08 00A0B02D */ daddu $s6, $a1, $zero -/* 3600C 8005AC0C AFB7002C */ sw $s7, 0x2c($sp) -/* 36010 8005AC10 00C0B82D */ daddu $s7, $a2, $zero -/* 36014 8005AC14 3C028009 */ lui $v0, %hi(gAreas) -/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, %lo(gAreas) -/* 3601C 8005AC1C AFBF0030 */ sw $ra, 0x30($sp) -/* 36020 8005AC20 AFB40020 */ sw $s4, 0x20($sp) -/* 36024 8005AC24 AFB3001C */ sw $s3, 0x1c($sp) -/* 36028 8005AC28 AFB20018 */ sw $s2, 0x18($sp) -/* 3602C 8005AC2C AFB10014 */ sw $s1, 0x14($sp) -/* 36030 8005AC30 AFB00010 */ sw $s0, 0x10($sp) -/* 36034 8005AC34 8C440004 */ lw $a0, 4($v0) -/* 36038 8005AC38 1080001F */ beqz $a0, .L8005ACB8 -/* 3603C 8005AC3C 0000A02D */ daddu $s4, $zero, $zero -/* 36040 8005AC40 0280902D */ daddu $s2, $s4, $zero -.L8005AC44: -/* 36044 8005AC44 02421021 */ addu $v0, $s2, $v0 -/* 36048 8005AC48 8C420000 */ lw $v0, ($v0) -/* 3604C 8005AC4C 18400012 */ blez $v0, .L8005AC98 -/* 36050 8005AC50 0000802D */ daddu $s0, $zero, $zero -/* 36054 8005AC54 3C028009 */ lui $v0, %hi(gAreas) -/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, %lo(gAreas) -/* 3605C 8005AC5C 02429821 */ addu $s3, $s2, $v0 -/* 36060 8005AC60 0080882D */ daddu $s1, $a0, $zero -.L8005AC64: -/* 36064 8005AC64 8E240000 */ lw $a0, ($s1) -/* 36068 8005AC68 0C01BB5C */ jal strcmp -/* 3606C 8005AC6C 02A0282D */ daddu $a1, $s5, $zero -/* 36070 8005AC70 54400005 */ bnel $v0, $zero, .L8005AC88 -/* 36074 8005AC74 26100001 */ addiu $s0, $s0, 1 -/* 36078 8005AC78 24020001 */ addiu $v0, $zero, 1 -/* 3607C 8005AC7C A6D40000 */ sh $s4, ($s6) -/* 36080 8005AC80 08016B2F */ j .L8005ACBC -/* 36084 8005AC84 A6F00000 */ sh $s0, ($s7) -.L8005AC88: -/* 36088 8005AC88 8E620000 */ lw $v0, ($s3) -/* 3608C 8005AC8C 0202102A */ slt $v0, $s0, $v0 -/* 36090 8005AC90 1440FFF4 */ bnez $v0, .L8005AC64 -/* 36094 8005AC94 26310020 */ addiu $s1, $s1, 0x20 -.L8005AC98: -/* 36098 8005AC98 26520010 */ addiu $s2, $s2, 0x10 -/* 3609C 8005AC9C 3C048009 */ lui $a0, 0x8009 -/* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2 -/* 360A4 8005ACA4 8C8434F4 */ lw $a0, 0x34f4($a0) -/* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas) -/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas) -/* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44 -/* 360B4 8005ACB4 26940001 */ addiu $s4, $s4, 1 -.L8005ACB8: -/* 360B8 8005ACB8 0000102D */ daddu $v0, $zero, $zero -.L8005ACBC: -/* 360BC 8005ACBC 8FBF0030 */ lw $ra, 0x30($sp) -/* 360C0 8005ACC0 8FB7002C */ lw $s7, 0x2c($sp) -/* 360C4 8005ACC4 8FB60028 */ lw $s6, 0x28($sp) -/* 360C8 8005ACC8 8FB50024 */ lw $s5, 0x24($sp) -/* 360CC 8005ACCC 8FB40020 */ lw $s4, 0x20($sp) -/* 360D0 8005ACD0 8FB3001C */ lw $s3, 0x1c($sp) -/* 360D4 8005ACD4 8FB20018 */ lw $s2, 0x18($sp) -/* 360D8 8005ACD8 8FB10014 */ lw $s1, 0x14($sp) -/* 360DC 8005ACDC 8FB00010 */ lw $s0, 0x10($sp) -/* 360E0 8005ACE0 03E00008 */ jr $ra -/* 360E4 8005ACE4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s deleted file mode 100644 index 97be367b37..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_asset_by_name -/* 360E8 8005ACE8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 360EC 8005ACEC AFB00030 */ sw $s0, 0x30($sp) -/* 360F0 8005ACF0 0080802D */ daddu $s0, $a0, $zero -/* 360F4 8005ACF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 360F8 8005ACF8 00A0982D */ daddu $s3, $a1, $zero -/* 360FC 8005ACFC 3C0401E4 */ lui $a0, 0x1e4 -/* 36100 8005AD00 34840020 */ ori $a0, $a0, 0x20 -/* 36104 8005AD04 3C0501E4 */ lui $a1, 0x1e4 -/* 36108 8005AD08 34A5003C */ ori $a1, $a1, 0x3c -/* 3610C 8005AD0C 27A60010 */ addiu $a2, $sp, 0x10 -/* 36110 8005AD10 AFBF0040 */ sw $ra, 0x40($sp) -/* 36114 8005AD14 AFB20038 */ sw $s2, 0x38($sp) -/* 36118 8005AD18 0C00A5CF */ jal dma_copy -/* 3611C 8005AD1C AFB10034 */ sw $s1, 0x34($sp) -/* 36120 8005AD20 8FA40020 */ lw $a0, 0x20($sp) -/* 36124 8005AD24 0C00AB39 */ jal heap_malloc -/* 36128 8005AD28 00000000 */ nop -/* 3612C 8005AD2C 0040902D */ daddu $s2, $v0, $zero -/* 36130 8005AD30 0240882D */ daddu $s1, $s2, $zero -/* 36134 8005AD34 3C0201E4 */ lui $v0, 0x1e4 -/* 36138 8005AD38 34420020 */ ori $v0, $v0, 0x20 -/* 3613C 8005AD3C 3C0401E4 */ lui $a0, 0x1e4 -/* 36140 8005AD40 34840020 */ ori $a0, $a0, 0x20 -/* 36144 8005AD44 8FA50020 */ lw $a1, 0x20($sp) -/* 36148 8005AD48 0240302D */ daddu $a2, $s2, $zero -/* 3614C 8005AD4C 0C00A5CF */ jal dma_copy -/* 36150 8005AD50 00A22821 */ addu $a1, $a1, $v0 -.L8005AD54: -/* 36154 8005AD54 0220202D */ daddu $a0, $s1, $zero -/* 36158 8005AD58 0C01BB5C */ jal strcmp -/* 3615C 8005AD5C 0200282D */ daddu $a1, $s0, $zero -/* 36160 8005AD60 10400003 */ beqz $v0, .L8005AD70 -/* 36164 8005AD64 00000000 */ nop -/* 36168 8005AD68 08016B55 */ j .L8005AD54 -/* 3616C 8005AD6C 2631001C */ addiu $s1, $s1, 0x1c -.L8005AD70: -/* 36170 8005AD70 8E220018 */ lw $v0, 0x18($s1) -/* 36174 8005AD74 AE620000 */ sw $v0, ($s3) -/* 36178 8005AD78 0C00AB0A */ jal general_heap_malloc -/* 3617C 8005AD7C 8E240014 */ lw $a0, 0x14($s1) -/* 36180 8005AD80 3C0301E4 */ lui $v1, 0x1e4 -/* 36184 8005AD84 34630020 */ ori $v1, $v1, 0x20 -/* 36188 8005AD88 0040802D */ daddu $s0, $v0, $zero -/* 3618C 8005AD8C 0040302D */ daddu $a2, $v0, $zero -/* 36190 8005AD90 8E220010 */ lw $v0, 0x10($s1) -/* 36194 8005AD94 8E250014 */ lw $a1, 0x14($s1) -/* 36198 8005AD98 00432021 */ addu $a0, $v0, $v1 -/* 3619C 8005AD9C 00A32821 */ addu $a1, $a1, $v1 -/* 361A0 8005ADA0 0C00A5CF */ jal dma_copy -/* 361A4 8005ADA4 00452821 */ addu $a1, $v0, $a1 -/* 361A8 8005ADA8 0C00AB4B */ jal heap_free -/* 361AC 8005ADAC 0240202D */ daddu $a0, $s2, $zero -/* 361B0 8005ADB0 0200102D */ daddu $v0, $s0, $zero -/* 361B4 8005ADB4 8FBF0040 */ lw $ra, 0x40($sp) -/* 361B8 8005ADB8 8FB3003C */ lw $s3, 0x3c($sp) -/* 361BC 8005ADBC 8FB20038 */ lw $s2, 0x38($sp) -/* 361C0 8005ADC0 8FB10034 */ lw $s1, 0x34($sp) -/* 361C4 8005ADC4 8FB00030 */ lw $s0, 0x30($sp) -/* 361C8 8005ADC8 03E00008 */ jr $ra -/* 361CC 8005ADCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s deleted file mode 100644 index 34eb98d497..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s +++ /dev/null @@ -1,333 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel load_map_by_IDs -/* 35AF4 8005A6F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 35AF8 8005A6F8 AFB00038 */ sw $s0, 0x38($sp) -/* 35AFC 8005A6FC 00C0802D */ daddu $s0, $a2, $zero -/* 35B00 8005A700 AFB1003C */ sw $s1, 0x3c($sp) -/* 35B04 8005A704 0080882D */ daddu $s1, $a0, $zero -/* 35B08 8005A708 AFB30044 */ sw $s3, 0x44($sp) -/* 35B0C 8005A70C 00A0982D */ daddu $s3, $a1, $zero -/* 35B10 8005A710 AFB40048 */ sw $s4, 0x48($sp) -/* 35B14 8005A714 0000A02D */ daddu $s4, $zero, $zero -/* 35B18 8005A718 AFBF004C */ sw $ra, 0x4c($sp) -/* 35B1C 8005A71C 0C05260E */ jal func_80149838 -/* 35B20 8005A720 AFB20040 */ sw $s2, 0x40($sp) -/* 35B24 8005A724 3C05800A */ lui $a1, %hi(D_8009A650) -/* 35B28 8005A728 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) -/* 35B2C 8005A72C 2402FFBF */ addiu $v0, $zero, -0x41 -/* 35B30 8005A730 3C128007 */ lui $s2, %hi(gGameStatusPtr) -/* 35B34 8005A734 2652419C */ addiu $s2, $s2, %lo(gGameStatusPtr) -/* 35B38 8005A738 8CA30000 */ lw $v1, ($a1) -/* 35B3C 8005A73C 8E440000 */ lw $a0, ($s2) -/* 35B40 8005A740 00621824 */ and $v1, $v1, $v0 -/* 35B44 8005A744 2402FF7F */ addiu $v0, $zero, -0x81 -/* 35B48 8005A748 00621824 */ and $v1, $v1, $v0 -/* 35B4C 8005A74C ACA30000 */ sw $v1, ($a1) -/* 35B50 8005A750 0C00B458 */ jal func_8002D160 -/* 35B54 8005A754 A0800084 */ sb $zero, 0x84($a0) -/* 35B58 8005A758 0C0AC81E */ jal func_802B2078 -/* 35B5C 8005A75C 00108400 */ sll $s0, $s0, 0x10 -/* 35B60 8005A760 0C047624 */ jal func_8011D890 -/* 35B64 8005A764 00108403 */ sra $s0, $s0, 0x10 -/* 35B68 8005A768 0C048C2E */ jal clear_dynamic_entity_list -/* 35B6C 8005A76C 00000000 */ nop -/* 35B70 8005A770 0C0B0C77 */ jal clear_script_list -/* 35B74 8005A774 00000000 */ nop -/* 35B78 8005A778 12000005 */ beqz $s0, .L8005A790 -/* 35B7C 8005A77C 24020001 */ addiu $v0, $zero, 1 -/* 35B80 8005A780 12020008 */ beq $s0, $v0, .L8005A7A4 -/* 35B84 8005A784 00000000 */ nop -/* 35B88 8005A788 080169F0 */ j .L8005A7C0 -/* 35B8C 8005A78C 00000000 */ nop -.L8005A790: -/* 35B90 8005A790 0C0514E4 */ jal clear_area_flags -/* 35B94 8005A794 00000000 */ nop -/* 35B98 8005A798 8E420000 */ lw $v0, ($s2) -/* 35B9C 8005A79C 080169F0 */ j .L8005A7C0 -/* 35BA0 8005A7A0 A0400167 */ sb $zero, 0x167($v0) -.L8005A7A4: -/* 35BA4 8005A7A4 0C00AD24 */ jal fio_deserialize_state -/* 35BA8 8005A7A8 00000000 */ nop -/* 35BAC 8005A7AC 8E420000 */ lw $v0, ($s2) -/* 35BB0 8005A7B0 94510086 */ lhu $s1, 0x86($v0) -/* 35BB4 8005A7B4 9453008C */ lhu $s3, 0x8c($v0) -/* 35BB8 8005A7B8 A0500167 */ sb $s0, 0x167($v0) -/* 35BBC 8005A7BC A4510088 */ sh $s1, 0x88($v0) -.L8005A7C0: -/* 35BC0 8005A7C0 3C04800E */ lui $a0, 0x800e -/* 35BC4 8005A7C4 24849230 */ addiu $a0, $a0, -0x6dd0 -/* 35BC8 8005A7C8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 35BCC 8005A7CC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 35BD0 8005A7D0 00131C00 */ sll $v1, $s3, 0x10 -/* 35BD4 8005A7D4 AC400144 */ sw $zero, 0x144($v0) -/* 35BD8 8005A7D8 00111400 */ sll $v0, $s1, 0x10 -/* 35BDC 8005A7DC 00021303 */ sra $v0, $v0, 0xc -/* 35BE0 8005A7E0 3C018009 */ lui $at, 0x8009 -/* 35BE4 8005A7E4 00220821 */ addu $at, $at, $v0 -/* 35BE8 8005A7E8 8C2234F4 */ lw $v0, 0x34f4($at) -/* 35BEC 8005A7EC 00031AC3 */ sra $v1, $v1, 0xb -/* 35BF0 8005A7F0 00439021 */ addu $s2, $v0, $v1 -/* 35BF4 8005A7F4 8E460000 */ lw $a2, ($s2) -/* 35BF8 8005A7F8 3C05800A */ lui $a1, 0x800a -/* 35BFC 8005A7FC 0C01953C */ jal sprintf -/* 35C00 8005A800 24A58A10 */ addiu $a1, $a1, -0x75f0 -/* 35C04 8005A804 3C04800E */ lui $a0, 0x800e -/* 35C08 8005A808 248491E0 */ addiu $a0, $a0, -0x6e20 -/* 35C0C 8005A80C 8E460000 */ lw $a2, ($s2) -/* 35C10 8005A810 3C05800A */ lui $a1, 0x800a -/* 35C14 8005A814 0C01953C */ jal sprintf -/* 35C18 8005A818 24A58A1C */ addiu $a1, $a1, -0x75e4 -/* 35C1C 8005A81C 8E450000 */ lw $a1, ($s2) -/* 35C20 8005A820 0C01BB50 */ jal strcpy -/* 35C24 8005A824 27A40018 */ addiu $a0, $sp, 0x18 -/* 35C28 8005A828 3C04800B */ lui $a0, 0x800b -/* 35C2C 8005A82C 24840CF0 */ addiu $a0, $a0, 0xcf0 -/* 35C30 8005A830 3C05800A */ lui $a1, 0x800a -/* 35C34 8005A834 24A58A24 */ addiu $a1, $a1, -0x75dc -/* 35C38 8005A838 27A60018 */ addiu $a2, $sp, 0x18 -/* 35C3C 8005A83C 0C01953C */ jal sprintf -/* 35C40 8005A840 A3A0001B */ sb $zero, 0x1b($sp) -/* 35C44 8005A844 8E450014 */ lw $a1, 0x14($s2) -/* 35C48 8005A848 3C01800A */ lui $at, 0x800a -/* 35C4C 8005A84C AC3241E0 */ sw $s2, 0x41e0($at) -/* 35C50 8005A850 10A00005 */ beqz $a1, .L8005A868 -/* 35C54 8005A854 00000000 */ nop -/* 35C58 8005A858 3C04800E */ lui $a0, 0x800e -/* 35C5C 8005A85C 24849668 */ addiu $a0, $a0, -0x6998 -/* 35C60 8005A860 0C01BB50 */ jal strcpy -/* 35C64 8005A864 00000000 */ nop -.L8005A868: -/* 35C68 8005A868 0C0169B0 */ jal load_world_script_api -/* 35C6C 8005A86C 00000000 */ nop -/* 35C70 8005A870 8E440008 */ lw $a0, 8($s2) -/* 35C74 8005A874 10800004 */ beqz $a0, .L8005A888 -/* 35C78 8005A878 00000000 */ nop -/* 35C7C 8005A87C 8E45000C */ lw $a1, 0xc($s2) -/* 35C80 8005A880 0C00A5CF */ jal dma_copy -/* 35C84 8005A884 8E460010 */ lw $a2, 0x10($s2) -.L8005A888: -/* 35C88 8005A888 8E420004 */ lw $v0, 4($s2) -/* 35C8C 8005A88C 3C03800A */ lui $v1, 0x800a -/* 35C90 8005A890 246341E8 */ addiu $v1, $v1, 0x41e8 -/* 35C94 8005A894 24440040 */ addiu $a0, $v0, 0x40 -.L8005A898: -/* 35C98 8005A898 8C480000 */ lw $t0, ($v0) -/* 35C9C 8005A89C 8C490004 */ lw $t1, 4($v0) -/* 35CA0 8005A8A0 8C4A0008 */ lw $t2, 8($v0) -/* 35CA4 8005A8A4 8C4B000C */ lw $t3, 0xc($v0) -/* 35CA8 8005A8A8 AC680000 */ sw $t0, ($v1) -/* 35CAC 8005A8AC AC690004 */ sw $t1, 4($v1) -/* 35CB0 8005A8B0 AC6A0008 */ sw $t2, 8($v1) -/* 35CB4 8005A8B4 AC6B000C */ sw $t3, 0xc($v1) -/* 35CB8 8005A8B8 24420010 */ addiu $v0, $v0, 0x10 -/* 35CBC 8005A8BC 1444FFF6 */ bne $v0, $a0, .L8005A898 -/* 35CC0 8005A8C0 24630010 */ addiu $v1, $v1, 0x10 -/* 35CC4 8005A8C4 8E420018 */ lw $v0, 0x18($s2) -/* 35CC8 8005A8C8 3C13800A */ lui $s3, 0x800a -/* 35CCC 8005A8CC 267341E8 */ addiu $s3, $s3, 0x41e8 -/* 35CD0 8005A8D0 10400004 */ beqz $v0, .L8005A8E4 -/* 35CD4 8005A8D4 00000000 */ nop -/* 35CD8 8005A8D8 0040F809 */ jalr $v0 -/* 35CDC 8005A8DC 00000000 */ nop -/* 35CE0 8005A8E0 0040A02D */ daddu $s4, $v0, $zero -.L8005A8E4: -/* 35CE4 8005A8E4 16800015 */ bnez $s4, .L8005A93C -/* 35CE8 8005A8E8 00000000 */ nop -/* 35CEC 8005A8EC 3C04800E */ lui $a0, 0x800e -/* 35CF0 8005A8F0 24849230 */ addiu $a0, $a0, -0x6dd0 -/* 35CF4 8005A8F4 0C016B3A */ jal load_asset_by_name -/* 35CF8 8005A8F8 27A50030 */ addiu $a1, $sp, 0x30 -/* 35CFC 8005A8FC 0040882D */ daddu $s1, $v0, $zero -/* 35D00 8005A900 0220202D */ daddu $a0, $s1, $zero -/* 35D04 8005A904 3C108021 */ lui $s0, 0x8021 -/* 35D08 8005A908 26100000 */ addiu $s0, $s0, 0 -/* 35D0C 8005A90C 0C01BB7C */ jal decode_yay0 -/* 35D10 8005A910 0200282D */ daddu $a1, $s0, $zero -/* 35D14 8005A914 0C00AB1E */ jal general_heap_free -/* 35D18 8005A918 0220202D */ daddu $a0, $s1, $zero -/* 35D1C 8005A91C 8E020000 */ lw $v0, ($s0) -/* 35D20 8005A920 8E030008 */ lw $v1, 8($s0) -/* 35D24 8005A924 8E04000C */ lw $a0, 0xc($s0) -/* 35D28 8005A928 8E050010 */ lw $a1, 0x10($s0) -/* 35D2C 8005A92C AE620000 */ sw $v0, ($s3) -/* 35D30 8005A930 AE630028 */ sw $v1, 0x28($s3) -/* 35D34 8005A934 AE64002C */ sw $a0, 0x2c($s3) -/* 35D38 8005A938 AE650030 */ sw $a1, 0x30($s3) -.L8005A93C: -/* 35D3C 8005A93C 8E420014 */ lw $v0, 0x14($s2) -/* 35D40 8005A940 10400005 */ beqz $v0, .L8005A958 -/* 35D44 8005A944 00000000 */ nop -/* 35D48 8005A948 3C04800E */ lui $a0, 0x800e -/* 35D4C 8005A94C 24849668 */ addiu $a0, $a0, -0x6998 -/* 35D50 8005A950 0C05175C */ jal load_map_bg -/* 35D54 8005A954 00000000 */ nop -.L8005A958: -/* 35D58 8005A958 0C00B458 */ jal func_8002D160 -/* 35D5C 8005A95C 00000000 */ nop -/* 35D60 8005A960 0C0AC81E */ jal func_802B2078 -/* 35D64 8005A964 00000000 */ nop -/* 35D68 8005A968 0C05259C */ jal func_80149670 -/* 35D6C 8005A96C 0000202D */ daddu $a0, $zero, $zero -/* 35D70 8005A970 0C048C2E */ jal clear_dynamic_entity_list -/* 35D74 8005A974 00000000 */ nop -/* 35D78 8005A978 0C0B0C77 */ jal clear_script_list -/* 35D7C 8005A97C 00000000 */ nop -/* 35D80 8005A980 0C00B7BD */ jal create_cameras_a -/* 35D84 8005A984 00000000 */ nop -/* 35D88 8005A988 3C108007 */ lui $s0, %hi(gGameStatusPtr) -/* 35D8C 8005A98C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) -/* 35D90 8005A990 8E020000 */ lw $v0, ($s0) -/* 35D94 8005A994 0C0B763E */ jal func_802DD8F8 -/* 35D98 8005A998 80440084 */ lb $a0, 0x84($v0) -/* 35D9C 8005A99C 0C047889 */ jal func_8011E224 -/* 35DA0 8005A9A0 00000000 */ nop -/* 35DA4 8005A9A4 0C0482EC */ jal clear_virtual_models -/* 35DA8 8005A9A8 00000000 */ nop -/* 35DAC 8005A9AC 0C00E12F */ jal clear_npcs -/* 35DB0 8005A9B0 00000000 */ nop -/* 35DB4 8005A9B4 0C050440 */ jal func_80141100 -/* 35DB8 8005A9B8 00000000 */ nop -/* 35DBC 8005A9BC 0C0515A0 */ jal clear_trigger_data -/* 35DC0 8005A9C0 00000000 */ nop -/* 35DC4 8005A9C4 0C045751 */ jal clear_model_data -/* 35DC8 8005A9C8 00000000 */ nop -/* 35DCC 8005A9CC 0C052010 */ jal func_80148040 -/* 35DD0 8005A9D0 00000000 */ nop -/* 35DD4 8005A9D4 0C05177E */ jal func_80145DF8 -/* 35DD8 8005A9D8 00000000 */ nop -/* 35DDC 8005A9DC 8E020000 */ lw $v0, ($s0) -/* 35DE0 8005A9E0 804300A8 */ lb $v1, 0xa8($v0) -/* 35DE4 8005A9E4 2402FFFF */ addiu $v0, $zero, -1 -/* 35DE8 8005A9E8 14620003 */ bne $v1, $v0, .L8005A9F8 -/* 35DEC 8005A9EC 00000000 */ nop -/* 35DF0 8005A9F0 0C04E062 */ jal func_80138188 -/* 35DF4 8005A9F4 00000000 */ nop -.L8005A9F8: -/* 35DF8 8005A9F8 16800005 */ bnez $s4, .L8005AA10 -/* 35DFC 8005A9FC 00000000 */ nop -/* 35E00 8005AA00 0C016BE5 */ jal initialize_collision -/* 35E04 8005AA04 00000000 */ nop -/* 35E08 8005AA08 0C016BF0 */ jal load_hit_asset -/* 35E0C 8005AA0C 00000000 */ nop -.L8005AA10: -/* 35E10 8005AA10 0C01CACC */ jal func_80072B30 -/* 35E14 8005AA14 00000000 */ nop -/* 35E18 8005AA18 0C00F900 */ jal clear_encounter_status -/* 35E1C 8005AA1C 00000000 */ nop -/* 35E20 8005AA20 0C04432E */ jal clear_entity_data -/* 35E24 8005AA24 24040001 */ addiu $a0, $zero, 1 -/* 35E28 8005AA28 0C016727 */ jal func_80059C9C -/* 35E2C 8005AA2C 00000000 */ nop -/* 35E30 8005AA30 0C037F14 */ jal clear_player_status -/* 35E34 8005AA34 00000000 */ nop -/* 35E38 8005AA38 0C037F1D */ jal func_800DFC74 -/* 35E3C 8005AA3C 00000000 */ nop -/* 35E40 8005AA40 0C03AD1D */ jal partner_reset_data -/* 35E44 8005AA44 00000000 */ nop -/* 35E48 8005AA48 0C048D9D */ jal clear_printers -/* 35E4C 8005AA4C 00000000 */ nop -/* 35E50 8005AA50 0C04C3FC */ jal clear_item_entity_data -/* 35E54 8005AA54 00000000 */ nop -/* 35E58 8005AA58 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 35E5C 8005AA5C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 35E60 8005AA60 C4400084 */ lwc1 $f0, 0x84($v0) -/* 35E64 8005AA64 E4400080 */ swc1 $f0, 0x80($v0) -/* 35E68 8005AA68 8E42001C */ lw $v0, 0x1c($s2) -/* 35E6C 8005AA6C 30420003 */ andi $v0, $v0, 3 -/* 35E70 8005AA70 00021080 */ sll $v0, $v0, 2 -/* 35E74 8005AA74 3C048009 */ lui $a0, 0x8009 -/* 35E78 8005AA78 00822021 */ addu $a0, $a0, $v0 -/* 35E7C 8005AA7C 0C0525FF */ jal func_801497FC -/* 35E80 8005AA80 8C84FF60 */ lw $a0, -0xa0($a0) -/* 35E84 8005AA84 0C052580 */ jal func_80149600 -/* 35E88 8005AA88 00000000 */ nop -/* 35E8C 8005AA8C 1680000B */ bnez $s4, .L8005AABC -/* 35E90 8005AA90 00000000 */ nop -/* 35E94 8005AA94 3C04800B */ lui $a0, 0x800b -/* 35E98 8005AA98 24840CF0 */ addiu $a0, $a0, 0xcf0 -/* 35E9C 8005AA9C 0C016B74 */ jal get_asset_offset -/* 35EA0 8005AAA0 27A50030 */ addiu $a1, $sp, 0x30 -/* 35EA4 8005AAA4 8E640000 */ lw $a0, ($s3) -/* 35EA8 8005AAA8 10800004 */ beqz $a0, .L8005AABC -/* 35EAC 8005AAAC 00000000 */ nop -/* 35EB0 8005AAB0 8FA60030 */ lw $a2, 0x30($sp) -/* 35EB4 8005AAB4 0C046B52 */ jal load_data_for_models -/* 35EB8 8005AAB8 0040282D */ daddu $a1, $v0, $zero -.L8005AABC: -/* 35EBC 8005AABC 8E640038 */ lw $a0, 0x38($s3) -/* 35EC0 8005AAC0 50800005 */ beql $a0, $zero, .L8005AAD8 -/* 35EC4 8005AAC4 24040128 */ addiu $a0, $zero, 0x128 -/* 35EC8 8005AAC8 0C05178A */ jal read_background_size -/* 35ECC 8005AACC 00000000 */ nop -/* 35ED0 8005AAD0 08016ABA */ j .L8005AAE8 -/* 35ED4 8005AAD4 00000000 */ nop -.L8005AAD8: -/* 35ED8 8005AAD8 240500C8 */ addiu $a1, $zero, 0xc8 -/* 35EDC 8005AADC 2406000C */ addiu $a2, $zero, 0xc -/* 35EE0 8005AAE0 0C05179C */ jal set_background_size -/* 35EE4 8005AAE4 24070014 */ addiu $a3, $zero, 0x14 -.L8005AAE8: -/* 35EE8 8005AAE8 3C04800B */ lui $a0, %hi(gCameras) -/* 35EEC 8005AAEC 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 35EF0 8005AAF0 94820000 */ lhu $v0, ($a0) -/* 35EF4 8005AAF4 94830AB0 */ lhu $v1, 0xab0($a0) -/* 35EF8 8005AAF8 3C018007 */ lui $at, %hi(gCurrentCameraID) -/* 35EFC 8005AAFC AC207410 */ sw $zero, %lo(gCurrentCameraID)($at) -/* 35F00 8005AB00 34420002 */ ori $v0, $v0, 2 -/* 35F04 8005AB04 A4820000 */ sh $v0, ($a0) -/* 35F08 8005AB08 94820558 */ lhu $v0, 0x558($a0) -/* 35F0C 8005AB0C 34630002 */ ori $v1, $v1, 2 -/* 35F10 8005AB10 A4830AB0 */ sh $v1, 0xab0($a0) -/* 35F14 8005AB14 34420002 */ ori $v0, $v0, 2 -/* 35F18 8005AB18 A4820558 */ sh $v0, 0x558($a0) -/* 35F1C 8005AB1C 94821008 */ lhu $v0, 0x1008($a0) -/* 35F20 8005AB20 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 35F24 8005AB24 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 35F28 8005AB28 34420002 */ ori $v0, $v0, 2 -/* 35F2C 8005AB2C A4821008 */ sh $v0, 0x1008($a0) -/* 35F30 8005AB30 806300A8 */ lb $v1, 0xa8($v1) -/* 35F34 8005AB34 2402FFFF */ addiu $v0, $zero, -1 -/* 35F38 8005AB38 14620008 */ bne $v1, $v0, .L8005AB5C -/* 35F3C 8005AB3C 240200A2 */ addiu $v0, $zero, 0xa2 -/* 35F40 8005AB40 240200C8 */ addiu $v0, $zero, 0xc8 -/* 35F44 8005AB44 AFA20010 */ sw $v0, 0x10($sp) -/* 35F48 8005AB48 0000202D */ daddu $a0, $zero, $zero -/* 35F4C 8005AB4C 2405000C */ addiu $a1, $zero, 0xc -/* 35F50 8005AB50 24060014 */ addiu $a2, $zero, 0x14 -/* 35F54 8005AB54 08016ADC */ j .L8005AB70 -/* 35F58 8005AB58 24070128 */ addiu $a3, $zero, 0x128 -.L8005AB5C: -/* 35F5C 8005AB5C AFA20010 */ sw $v0, 0x10($sp) -/* 35F60 8005AB60 0000202D */ daddu $a0, $zero, $zero -/* 35F64 8005AB64 2405001D */ addiu $a1, $zero, 0x1d -/* 35F68 8005AB68 2406001C */ addiu $a2, $zero, 0x1c -/* 35F6C 8005AB6C 24070106 */ addiu $a3, $zero, 0x106 -.L8005AB70: -/* 35F70 8005AB70 0C00B8C5 */ jal set_cam_viewport -/* 35F74 8005AB74 00000000 */ nop -/* 35F78 8005AB78 0C039E4D */ jal initialize_status_menu -/* 35F7C 8005AB7C 00000000 */ nop -/* 35F80 8005AB80 0000282D */ daddu $a1, $zero, $zero -/* 35F84 8005AB84 00A0302D */ daddu $a2, $a1, $zero -/* 35F88 8005AB88 3C108007 */ lui $s0, %hi(gGameStatusPtr) -/* 35F8C 8005AB8C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) -/* 35F90 8005AB90 8E030000 */ lw $v1, ($s0) -/* 35F94 8005AB94 240203E8 */ addiu $v0, $zero, 0x3e8 -/* 35F98 8005AB98 A4620090 */ sh $v0, 0x90($v1) -/* 35F9C 8005AB9C A4620092 */ sh $v0, 0x92($v1) -/* 35FA0 8005ABA0 8E640010 */ lw $a0, 0x10($s3) -/* 35FA4 8005ABA4 0C0B0D74 */ jal start_script_in_group -/* 35FA8 8005ABA8 00A0382D */ daddu $a3, $a1, $zero -/* 35FAC 8005ABAC 8E030000 */ lw $v1, ($s0) -/* 35FB0 8005ABB0 8C420144 */ lw $v0, 0x144($v0) -/* 35FB4 8005ABB4 AC62006C */ sw $v0, 0x6c($v1) -/* 35FB8 8005ABB8 8FBF004C */ lw $ra, 0x4c($sp) -/* 35FBC 8005ABBC 8FB40048 */ lw $s4, 0x48($sp) -/* 35FC0 8005ABC0 8FB30044 */ lw $s3, 0x44($sp) -/* 35FC4 8005ABC4 8FB20040 */ lw $s2, 0x40($sp) -/* 35FC8 8005ABC8 8FB1003C */ lw $s1, 0x3c($sp) -/* 35FCC 8005ABCC 8FB00038 */ lw $s0, 0x38($sp) -/* 35FD0 8005ABD0 03E00008 */ jr $ra -/* 35FD4 8005ABD4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_341d0_len_20d0/play_effect.s b/asm/nonmatchings/code_341d0_len_20d0/play_effect.s deleted file mode 100644 index 5cf072e2dc..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/play_effect.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel play_effect -/* 35964 8005A564 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35968 8005A568 AFB20020 */ sw $s2, 0x20($sp) -/* 3596C 8005A56C 0080902D */ daddu $s2, $a0, $zero -/* 35970 8005A570 3C038008 */ lui $v1, 0x8008 -/* 35974 8005A574 2463F210 */ addiu $v1, $v1, -0xdf0 -/* 35978 8005A578 00121040 */ sll $v0, $s2, 1 -/* 3597C 8005A57C 00521021 */ addu $v0, $v0, $s2 -/* 35980 8005A580 000210C0 */ sll $v0, $v0, 3 -/* 35984 8005A584 AFB1001C */ sw $s1, 0x1c($sp) -/* 35988 8005A588 00438821 */ addu $s1, $v0, $v1 -/* 3598C 8005A58C 0000202D */ daddu $a0, $zero, $zero -/* 35990 8005A590 AFB00018 */ sw $s0, 0x18($sp) -/* 35994 8005A594 3C10800A */ lui $s0, 0x800a -/* 35998 8005A598 26104000 */ addiu $s0, $s0, 0x4000 -/* 3599C 8005A59C AFBF0024 */ sw $ra, 0x24($sp) -.L8005A5A0: -/* 359A0 8005A5A0 8E020000 */ lw $v0, ($s0) -/* 359A4 8005A5A4 30420001 */ andi $v0, $v0, 1 -/* 359A8 8005A5A8 50400005 */ beql $v0, $zero, .L8005A5C0 -/* 359AC 8005A5AC 24840001 */ addiu $a0, $a0, 1 -/* 359B0 8005A5B0 8E020004 */ lw $v0, 4($s0) -/* 359B4 8005A5B4 10520006 */ beq $v0, $s2, .L8005A5D0 -/* 359B8 8005A5B8 2882000F */ slti $v0, $a0, 0xf -/* 359BC 8005A5BC 24840001 */ addiu $a0, $a0, 1 -.L8005A5C0: -/* 359C0 8005A5C0 2882000F */ slti $v0, $a0, 0xf -/* 359C4 8005A5C4 1440FFF6 */ bnez $v0, .L8005A5A0 -/* 359C8 8005A5C8 26100020 */ addiu $s0, $s0, 0x20 -/* 359CC 8005A5CC 2882000F */ slti $v0, $a0, 0xf -.L8005A5D0: -/* 359D0 8005A5D0 14400030 */ bnez $v0, .L8005A694 -/* 359D4 8005A5D4 24020001 */ addiu $v0, $zero, 1 -/* 359D8 8005A5D8 0000202D */ daddu $a0, $zero, $zero -/* 359DC 8005A5DC 3C10800A */ lui $s0, 0x800a -/* 359E0 8005A5E0 26104000 */ addiu $s0, $s0, 0x4000 -.L8005A5E4: -/* 359E4 8005A5E4 8E020000 */ lw $v0, ($s0) -/* 359E8 8005A5E8 30420001 */ andi $v0, $v0, 1 -/* 359EC 8005A5EC 10400006 */ beqz $v0, .L8005A608 -/* 359F0 8005A5F0 2882000F */ slti $v0, $a0, 0xf -/* 359F4 8005A5F4 24840001 */ addiu $a0, $a0, 1 -/* 359F8 8005A5F8 2882000F */ slti $v0, $a0, 0xf -/* 359FC 8005A5FC 1440FFF9 */ bnez $v0, .L8005A5E4 -/* 35A00 8005A600 26100020 */ addiu $s0, $s0, 0x20 -/* 35A04 8005A604 2882000F */ slti $v0, $a0, 0xf -.L8005A608: -/* 35A08 8005A608 14400003 */ bnez $v0, .L8005A618 -/* 35A0C 8005A60C 3C0700FF */ lui $a3, 0xff -.L8005A610: -/* 35A10 8005A610 08016984 */ j .L8005A610 -/* 35A14 8005A614 00000000 */ nop -.L8005A618: -/* 35A18 8005A618 34E7FFFF */ ori $a3, $a3, 0xffff -/* 35A1C 8005A61C 0000282D */ daddu $a1, $zero, $zero -/* 35A20 8005A620 2402FFFF */ addiu $v0, $zero, -1 -/* 35A24 8005A624 3C038019 */ lui $v1, 0x8019 -/* 35A28 8005A628 24637000 */ addiu $v1, $v1, 0x7000 -/* 35A2C 8005A62C AFA20010 */ sw $v0, 0x10($sp) -/* 35A30 8005A630 AFA20014 */ sw $v0, 0x14($sp) -/* 35A34 8005A634 00041300 */ sll $v0, $a0, 0xc -/* 35A38 8005A638 00431021 */ addu $v0, $v0, $v1 -/* 35A3C 8005A63C 8E26000C */ lw $a2, 0xc($s1) -/* 35A40 8005A640 0C0199E8 */ jal osMapTLB -/* 35A44 8005A644 00473824 */ and $a3, $v0, $a3 -/* 35A48 8005A648 8E240004 */ lw $a0, 4($s1) -/* 35A4C 8005A64C 8E250008 */ lw $a1, 8($s1) -/* 35A50 8005A650 0C00A5CF */ jal dma_copy -/* 35A54 8005A654 8E26000C */ lw $a2, 0xc($s1) -/* 35A58 8005A658 8E220010 */ lw $v0, 0x10($s1) -/* 35A5C 8005A65C 5040000D */ beql $v0, $zero, .L8005A694 -/* 35A60 8005A660 24020001 */ addiu $v0, $zero, 1 -/* 35A64 8005A664 8E240014 */ lw $a0, 0x14($s1) -/* 35A68 8005A668 0C00AB0A */ jal general_heap_malloc -/* 35A6C 8005A66C 00822023 */ subu $a0, $a0, $v0 -/* 35A70 8005A670 14400003 */ bnez $v0, .L8005A680 -/* 35A74 8005A674 AE02001C */ sw $v0, 0x1c($s0) -.L8005A678: -/* 35A78 8005A678 0801699E */ j .L8005A678 -/* 35A7C 8005A67C 00000000 */ nop -.L8005A680: -/* 35A80 8005A680 8E240010 */ lw $a0, 0x10($s1) -/* 35A84 8005A684 8E250014 */ lw $a1, 0x14($s1) -/* 35A88 8005A688 0C00A5CF */ jal dma_copy -/* 35A8C 8005A68C 8E06001C */ lw $a2, 0x1c($s0) -/* 35A90 8005A690 24020001 */ addiu $v0, $zero, 1 -.L8005A694: -/* 35A94 8005A694 0040182D */ daddu $v1, $v0, $zero -/* 35A98 8005A698 AE120004 */ sw $s2, 4($s0) -/* 35A9C 8005A69C AE000008 */ sw $zero, 8($s0) -/* 35AA0 8005A6A0 AE030000 */ sw $v1, ($s0) -/* 35AA4 8005A6A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 35AA8 8005A6A8 8FB20020 */ lw $s2, 0x20($sp) -/* 35AAC 8005A6AC 8FB1001C */ lw $s1, 0x1c($sp) -/* 35AB0 8005A6B0 8FB00018 */ lw $s0, 0x18($sp) -/* 35AB4 8005A6B4 03E00008 */ jr $ra -/* 35AB8 8005A6B8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 35ABC 8005A6BC 00000000 */ nop diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s b/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s deleted file mode 100644 index 12613041d9..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel remove_all_effects -/* 358E0 8005A4E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 358E4 8005A4E4 AFB20018 */ sw $s2, 0x18($sp) -/* 358E8 8005A4E8 0000902D */ daddu $s2, $zero, $zero -/* 358EC 8005A4EC AFB10014 */ sw $s1, 0x14($sp) -/* 358F0 8005A4F0 3C11800B */ lui $s1, 0x800b -/* 358F4 8005A4F4 26314398 */ addiu $s1, $s1, 0x4398 -/* 358F8 8005A4F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 358FC 8005A4FC AFB00010 */ sw $s0, 0x10($sp) -.L8005A500: -/* 35900 8005A500 8E300000 */ lw $s0, ($s1) -/* 35904 8005A504 5200000E */ beql $s0, $zero, .L8005A540 -/* 35908 8005A508 26520001 */ addiu $s2, $s2, 1 -/* 3590C 8005A50C 8E020000 */ lw $v0, ($s0) -/* 35910 8005A510 30420004 */ andi $v0, $v0, 4 -/* 35914 8005A514 5040000A */ beql $v0, $zero, .L8005A540 -/* 35918 8005A518 26520001 */ addiu $s2, $s2, 1 -/* 3591C 8005A51C 8E04000C */ lw $a0, 0xc($s0) -/* 35920 8005A520 10800003 */ beqz $a0, .L8005A530 -/* 35924 8005A524 00000000 */ nop -/* 35928 8005A528 0C00AB1E */ jal general_heap_free -/* 3592C 8005A52C 00000000 */ nop -.L8005A530: -/* 35930 8005A530 0C00AB1E */ jal general_heap_free -/* 35934 8005A534 0200202D */ daddu $a0, $s0, $zero -/* 35938 8005A538 AE200000 */ sw $zero, ($s1) -/* 3593C 8005A53C 26520001 */ addiu $s2, $s2, 1 -.L8005A540: -/* 35940 8005A540 2A420060 */ slti $v0, $s2, 0x60 -/* 35944 8005A544 1440FFEE */ bnez $v0, .L8005A500 -/* 35948 8005A548 26310004 */ addiu $s1, $s1, 4 -/* 3594C 8005A54C 8FBF001C */ lw $ra, 0x1c($sp) -/* 35950 8005A550 8FB20018 */ lw $s2, 0x18($sp) -/* 35954 8005A554 8FB10014 */ lw $s1, 0x14($sp) -/* 35958 8005A558 8FB00010 */ lw $s0, 0x10($sp) -/* 3595C 8005A55C 03E00008 */ jr $ra -/* 35960 8005A560 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s b/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s deleted file mode 100644 index e445cf8a4d..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel remove_effect -/* 35850 8005A450 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 35854 8005A454 AFB10014 */ sw $s1, 0x14($sp) -/* 35858 8005A458 0080882D */ daddu $s1, $a0, $zero -/* 3585C 8005A45C AFB00010 */ sw $s0, 0x10($sp) -/* 35860 8005A460 0000802D */ daddu $s0, $zero, $zero -/* 35864 8005A464 3C03800B */ lui $v1, 0x800b -/* 35868 8005A468 24634398 */ addiu $v1, $v1, 0x4398 -/* 3586C 8005A46C AFBF0018 */ sw $ra, 0x18($sp) -.L8005A470: -/* 35870 8005A470 8C620000 */ lw $v0, ($v1) -/* 35874 8005A474 10510006 */ beq $v0, $s1, .L8005A490 -/* 35878 8005A478 2A020060 */ slti $v0, $s0, 0x60 -/* 3587C 8005A47C 26100001 */ addiu $s0, $s0, 1 -/* 35880 8005A480 2A020060 */ slti $v0, $s0, 0x60 -/* 35884 8005A484 1440FFFA */ bnez $v0, .L8005A470 -/* 35888 8005A488 24630004 */ addiu $v1, $v1, 4 -/* 3588C 8005A48C 2A020060 */ slti $v0, $s0, 0x60 -.L8005A490: -/* 35890 8005A490 14400003 */ bnez $v0, .L8005A4A0 -/* 35894 8005A494 00000000 */ nop -.L8005A498: -/* 35898 8005A498 08016926 */ j .L8005A498 -/* 3589C 8005A49C 00000000 */ nop -.L8005A4A0: -/* 358A0 8005A4A0 8E24000C */ lw $a0, 0xc($s1) -/* 358A4 8005A4A4 10800003 */ beqz $a0, .L8005A4B4 -/* 358A8 8005A4A8 00000000 */ nop -/* 358AC 8005A4AC 0C00AB1E */ jal general_heap_free -/* 358B0 8005A4B0 00000000 */ nop -.L8005A4B4: -/* 358B4 8005A4B4 0C00AB1E */ jal general_heap_free -/* 358B8 8005A4B8 0220202D */ daddu $a0, $s1, $zero -/* 358BC 8005A4BC 00101080 */ sll $v0, $s0, 2 -/* 358C0 8005A4C0 3C01800B */ lui $at, 0x800b -/* 358C4 8005A4C4 00220821 */ addu $at, $at, $v0 -/* 358C8 8005A4C8 AC204398 */ sw $zero, 0x4398($at) -/* 358CC 8005A4CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 358D0 8005A4D0 8FB10014 */ lw $s1, 0x14($sp) -/* 358D4 8005A4D4 8FB00010 */ lw $s0, 0x10($sp) -/* 358D8 8005A4D8 03E00008 */ jr $ra -/* 358DC 8005A4DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s b/asm/nonmatchings/code_341d0_len_20d0/render_effects.s deleted file mode 100644 index f0d191c036..0000000000 --- a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_effects -/* 352F4 80059EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 352F8 80059EF8 AFB10014 */ sw $s1, 0x14($sp) -/* 352FC 80059EFC 0000882D */ daddu $s1, $zero, $zero -/* 35300 80059F00 AFB00010 */ sw $s0, 0x10($sp) -/* 35304 80059F04 3C10800B */ lui $s0, 0x800b -/* 35308 80059F08 26104398 */ addiu $s0, $s0, 0x4398 -/* 3530C 80059F0C AFBF0018 */ sw $ra, 0x18($sp) -.L80059F10: -/* 35310 80059F10 8E040000 */ lw $a0, ($s0) -/* 35314 80059F14 50800017 */ beql $a0, $zero, .L80059F74 -/* 35318 80059F18 26310001 */ addiu $s1, $s1, 1 -/* 3531C 80059F1C 8C830000 */ lw $v1, ($a0) -/* 35320 80059F20 30620001 */ andi $v0, $v1, 1 -/* 35324 80059F24 50400013 */ beql $v0, $zero, .L80059F74 -/* 35328 80059F28 26310001 */ addiu $s1, $s1, 1 -/* 3532C 80059F2C 30620008 */ andi $v0, $v1, 8 -/* 35330 80059F30 50400010 */ beql $v0, $zero, .L80059F74 -/* 35334 80059F34 26310001 */ addiu $s1, $s1, 1 -/* 35338 80059F38 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 3533C 80059F3C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 35340 80059F40 80420070 */ lb $v0, 0x70($v0) -/* 35344 80059F44 10400005 */ beqz $v0, .L80059F5C -/* 35348 80059F48 30620004 */ andi $v0, $v1, 4 -/* 3534C 80059F4C 50400009 */ beql $v0, $zero, .L80059F74 -/* 35350 80059F50 26310001 */ addiu $s1, $s1, 1 -/* 35354 80059F54 080167D9 */ j .L80059F64 -/* 35358 80059F58 00000000 */ nop -.L80059F5C: -/* 3535C 80059F5C 54400005 */ bnel $v0, $zero, .L80059F74 -/* 35360 80059F60 26310001 */ addiu $s1, $s1, 1 -.L80059F64: -/* 35364 80059F64 8C820010 */ lw $v0, 0x10($a0) -/* 35368 80059F68 8C420014 */ lw $v0, 0x14($v0) -/* 3536C 80059F6C 0040F809 */ jalr $v0 -/* 35370 80059F70 26310001 */ addiu $s1, $s1, 1 -.L80059F74: -/* 35374 80059F74 2A220060 */ slti $v0, $s1, 0x60 -/* 35378 80059F78 1440FFE5 */ bnez $v0, .L80059F10 -/* 3537C 80059F7C 26100004 */ addiu $s0, $s0, 4 -/* 35380 80059F80 8FBF0018 */ lw $ra, 0x18($sp) -/* 35384 80059F84 8FB10014 */ lw $s1, 0x14($sp) -/* 35388 80059F88 8FB00010 */ lw $s0, 0x10($sp) -/* 3538C 80059F8C 03E00008 */ jr $ra -/* 35390 80059F90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s deleted file mode 100644 index bafb271ef5..0000000000 --- a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel CreatePushBlockGrid -/* 7E4160 802832E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7E4164 802832E4 AFB10014 */ sw $s1, 0x14($sp) -/* 7E4168 802832E8 0080882D */ daddu $s1, $a0, $zero -/* 7E416C 802832EC AFBF0034 */ sw $ra, 0x34($sp) -/* 7E4170 802832F0 AFBE0030 */ sw $fp, 0x30($sp) -/* 7E4174 802832F4 AFB7002C */ sw $s7, 0x2c($sp) -/* 7E4178 802832F8 AFB60028 */ sw $s6, 0x28($sp) -/* 7E417C 802832FC AFB50024 */ sw $s5, 0x24($sp) -/* 7E4180 80283300 AFB40020 */ sw $s4, 0x20($sp) -/* 7E4184 80283304 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E4188 80283308 AFB20018 */ sw $s2, 0x18($sp) -/* 7E418C 8028330C AFB00010 */ sw $s0, 0x10($sp) -/* 7E4190 80283310 8E30000C */ lw $s0, 0xc($s1) -/* 7E4194 80283314 8E050000 */ lw $a1, ($s0) -/* 7E4198 80283318 0C0B1EAF */ jal get_variable -/* 7E419C 8028331C 26100004 */ addiu $s0, $s0, 4 -/* 7E41A0 80283320 8E050000 */ lw $a1, ($s0) -/* 7E41A4 80283324 26100004 */ addiu $s0, $s0, 4 -/* 7E41A8 80283328 0220202D */ daddu $a0, $s1, $zero -/* 7E41AC 8028332C 0C0B1EAF */ jal get_variable -/* 7E41B0 80283330 0040902D */ daddu $s2, $v0, $zero -/* 7E41B4 80283334 8E050000 */ lw $a1, ($s0) -/* 7E41B8 80283338 26100004 */ addiu $s0, $s0, 4 -/* 7E41BC 8028333C 0220202D */ daddu $a0, $s1, $zero -/* 7E41C0 80283340 0C0B1EAF */ jal get_variable -/* 7E41C4 80283344 0040A82D */ daddu $s5, $v0, $zero -/* 7E41C8 80283348 8E050000 */ lw $a1, ($s0) -/* 7E41CC 8028334C 26100004 */ addiu $s0, $s0, 4 -/* 7E41D0 80283350 0220202D */ daddu $a0, $s1, $zero -/* 7E41D4 80283354 0C0B1EAF */ jal get_variable -/* 7E41D8 80283358 0040A02D */ daddu $s4, $v0, $zero -/* 7E41DC 8028335C 8E050000 */ lw $a1, ($s0) -/* 7E41E0 80283360 26100004 */ addiu $s0, $s0, 4 -/* 7E41E4 80283364 0220202D */ daddu $a0, $s1, $zero -/* 7E41E8 80283368 0C0B1EAF */ jal get_variable -/* 7E41EC 8028336C 0040F02D */ daddu $fp, $v0, $zero -/* 7E41F0 80283370 0220202D */ daddu $a0, $s1, $zero -/* 7E41F4 80283374 8E050000 */ lw $a1, ($s0) -/* 7E41F8 80283378 0C0B1EAF */ jal get_variable -/* 7E41FC 8028337C 0040B82D */ daddu $s7, $v0, $zero -/* 7E4200 80283380 02B40018 */ mult $s5, $s4 -/* 7E4204 80283384 26100004 */ addiu $s0, $s0, 4 -/* 7E4208 80283388 0220202D */ daddu $a0, $s1, $zero -/* 7E420C 8028338C 8E050000 */ lw $a1, ($s0) -/* 7E4210 80283390 00008812 */ mflo $s1 -/* 7E4214 80283394 0C0B1EAF */ jal get_variable -/* 7E4218 80283398 0040B02D */ daddu $s6, $v0, $zero -/* 7E421C 8028339C 2404001C */ addiu $a0, $zero, 0x1c -/* 7E4220 802833A0 0C00AB0A */ jal general_heap_malloc -/* 7E4224 802833A4 0040982D */ daddu $s3, $v0, $zero -/* 7E4228 802833A8 00129080 */ sll $s2, $s2, 2 -/* 7E422C 802833AC 0040802D */ daddu $s0, $v0, $zero -/* 7E4230 802833B0 3C01802E */ lui $at, 0x802e -/* 7E4234 802833B4 00320821 */ addu $at, $at, $s2 -/* 7E4238 802833B8 AC30BC88 */ sw $s0, -0x4378($at) -/* 7E423C 802833BC 0C00AB0A */ jal general_heap_malloc -/* 7E4240 802833C0 0220202D */ daddu $a0, $s1, $zero -/* 7E4244 802833C4 1660000D */ bnez $s3, .L802833FC -/* 7E4248 802833C8 AE020000 */ sw $v0, ($s0) -/* 7E424C 802833CC 1A200018 */ blez $s1, .L80283430 -/* 7E4250 802833D0 0000282D */ daddu $a1, $zero, $zero -/* 7E4254 802833D4 0220202D */ daddu $a0, $s1, $zero -.L802833D8: -/* 7E4258 802833D8 8E020000 */ lw $v0, ($s0) -/* 7E425C 802833DC 00451021 */ addu $v0, $v0, $a1 -/* 7E4260 802833E0 24A50001 */ addiu $a1, $a1, 1 -/* 7E4264 802833E4 A0400000 */ sb $zero, ($v0) -/* 7E4268 802833E8 00A4102A */ slt $v0, $a1, $a0 -/* 7E426C 802833EC 1440FFFA */ bnez $v0, .L802833D8 -/* 7E4270 802833F0 00000000 */ nop -/* 7E4274 802833F4 080A0D0D */ j .L80283434 -/* 7E4278 802833F8 A2150004 */ sb $s5, 4($s0) -.L802833FC: -/* 7E427C 802833FC 0000282D */ daddu $a1, $zero, $zero -/* 7E4280 80283400 1A20000B */ blez $s1, .L80283430 -/* 7E4284 80283404 0260302D */ daddu $a2, $s3, $zero -/* 7E4288 80283408 0220202D */ daddu $a0, $s1, $zero -/* 7E428C 8028340C 00C51021 */ addu $v0, $a2, $a1 -.L80283410: -/* 7E4290 80283410 8E030000 */ lw $v1, ($s0) -/* 7E4294 80283414 90420000 */ lbu $v0, ($v0) -/* 7E4298 80283418 00651821 */ addu $v1, $v1, $a1 -/* 7E429C 8028341C 24A50001 */ addiu $a1, $a1, 1 -/* 7E42A0 80283420 A0620000 */ sb $v0, ($v1) -/* 7E42A4 80283424 00A4102A */ slt $v0, $a1, $a0 -/* 7E42A8 80283428 1440FFF9 */ bnez $v0, .L80283410 -/* 7E42AC 8028342C 00C51021 */ addu $v0, $a2, $a1 -.L80283430: -/* 7E42B0 80283430 A2150004 */ sb $s5, 4($s0) -.L80283434: -/* 7E42B4 80283434 A2140005 */ sb $s4, 5($s0) -/* 7E42B8 80283438 AE1E0008 */ sw $fp, 8($s0) -/* 7E42BC 8028343C AE17000C */ sw $s7, 0xc($s0) -/* 7E42C0 80283440 AE160010 */ sw $s6, 0x10($s0) -/* 7E42C4 80283444 AE000014 */ sw $zero, 0x14($s0) -/* 7E42C8 80283448 8FBF0034 */ lw $ra, 0x34($sp) -/* 7E42CC 8028344C 8FBE0030 */ lw $fp, 0x30($sp) -/* 7E42D0 80283450 8FB7002C */ lw $s7, 0x2c($sp) -/* 7E42D4 80283454 8FB60028 */ lw $s6, 0x28($sp) -/* 7E42D8 80283458 8FB50024 */ lw $s5, 0x24($sp) -/* 7E42DC 8028345C 8FB40020 */ lw $s4, 0x20($sp) -/* 7E42E0 80283460 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E42E4 80283464 8FB20018 */ lw $s2, 0x18($sp) -/* 7E42E8 80283468 8FB10014 */ lw $s1, 0x14($sp) -/* 7E42EC 8028346C 8FB00010 */ lw $s0, 0x10($sp) -/* 7E42F0 80283470 24020002 */ addiu $v0, $zero, 2 -/* 7E42F4 80283474 03E00008 */ jr $ra -/* 7E42F8 80283478 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s deleted file mode 100644 index 659b71eac8..0000000000 --- a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetGridIndexFromPos -/* 7E4538 802836B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E453C 802836BC AFB3001C */ sw $s3, 0x1c($sp) -/* 7E4540 802836C0 0080982D */ daddu $s3, $a0, $zero -/* 7E4544 802836C4 AFBF0020 */ sw $ra, 0x20($sp) -/* 7E4548 802836C8 AFB20018 */ sw $s2, 0x18($sp) -/* 7E454C 802836CC AFB10014 */ sw $s1, 0x14($sp) -/* 7E4550 802836D0 AFB00010 */ sw $s0, 0x10($sp) -/* 7E4554 802836D4 8E70000C */ lw $s0, 0xc($s3) -/* 7E4558 802836D8 8E050000 */ lw $a1, ($s0) -/* 7E455C 802836DC 0C0B1EAF */ jal get_variable -/* 7E4560 802836E0 26100004 */ addiu $s0, $s0, 4 -/* 7E4564 802836E4 8E050000 */ lw $a1, ($s0) -/* 7E4568 802836E8 26100004 */ addiu $s0, $s0, 4 -/* 7E456C 802836EC 0260202D */ daddu $a0, $s3, $zero -/* 7E4570 802836F0 0C0B1EAF */ jal get_variable -/* 7E4574 802836F4 0040882D */ daddu $s1, $v0, $zero -/* 7E4578 802836F8 0040902D */ daddu $s2, $v0, $zero -/* 7E457C 802836FC 8E050000 */ lw $a1, ($s0) -/* 7E4580 80283700 26100004 */ addiu $s0, $s0, 4 -/* 7E4584 80283704 0C0B1EAF */ jal get_variable -/* 7E4588 80283708 0260202D */ daddu $a0, $s3, $zero -/* 7E458C 8028370C 8E050000 */ lw $a1, ($s0) -/* 7E4590 80283710 0C0B1EAF */ jal get_variable -/* 7E4594 80283714 0260202D */ daddu $a0, $s3, $zero -/* 7E4598 80283718 00118880 */ sll $s1, $s1, 2 -/* 7E459C 8028371C 3C04802E */ lui $a0, 0x802e -/* 7E45A0 80283720 00912021 */ addu $a0, $a0, $s1 -/* 7E45A4 80283724 8C84BC88 */ lw $a0, -0x4378($a0) -/* 7E45A8 80283728 3C0651EB */ lui $a2, 0x51eb -/* 7E45AC 8028372C 8C830008 */ lw $v1, 8($a0) -/* 7E45B0 80283730 34C6851F */ ori $a2, $a2, 0x851f -/* 7E45B4 80283734 02439023 */ subu $s2, $s2, $v1 -/* 7E45B8 80283738 02460018 */ mult $s2, $a2 -/* 7E45BC 8028373C 26100004 */ addiu $s0, $s0, 4 -/* 7E45C0 80283740 8E050000 */ lw $a1, ($s0) -/* 7E45C4 80283744 8E100004 */ lw $s0, 4($s0) -/* 7E45C8 80283748 8C830010 */ lw $v1, 0x10($a0) -/* 7E45CC 8028374C 00003810 */ mfhi $a3 -/* 7E45D0 80283750 0260202D */ daddu $a0, $s3, $zero -/* 7E45D4 80283754 00431023 */ subu $v0, $v0, $v1 -/* 7E45D8 80283758 00460018 */ mult $v0, $a2 -/* 7E45DC 8028375C 001297C3 */ sra $s2, $s2, 0x1f -/* 7E45E0 80283760 000730C3 */ sra $a2, $a3, 3 -/* 7E45E4 80283764 00D23023 */ subu $a2, $a2, $s2 -/* 7E45E8 80283768 000217C3 */ sra $v0, $v0, 0x1f -/* 7E45EC 8028376C 00001810 */ mfhi $v1 -/* 7E45F0 80283770 000388C3 */ sra $s1, $v1, 3 -/* 7E45F4 80283774 0C0B2026 */ jal set_variable -/* 7E45F8 80283778 02228823 */ subu $s1, $s1, $v0 -/* 7E45FC 8028377C 0260202D */ daddu $a0, $s3, $zero -/* 7E4600 80283780 0200282D */ daddu $a1, $s0, $zero -/* 7E4604 80283784 0C0B2026 */ jal set_variable -/* 7E4608 80283788 0220302D */ daddu $a2, $s1, $zero -/* 7E460C 8028378C 8FBF0020 */ lw $ra, 0x20($sp) -/* 7E4610 80283790 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E4614 80283794 8FB20018 */ lw $s2, 0x18($sp) -/* 7E4618 80283798 8FB10014 */ lw $s1, 0x14($sp) -/* 7E461C 8028379C 8FB00010 */ lw $s0, 0x10($sp) -/* 7E4620 802837A0 24020002 */ addiu $v0, $zero, 2 -/* 7E4624 802837A4 03E00008 */ jr $ra -/* 7E4628 802837A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7E3700/GetPushBlock.s b/asm/nonmatchings/code_7E3700/GetPushBlock.s deleted file mode 100644 index a977ae3e7f..0000000000 --- a/asm/nonmatchings/code_7E3700/GetPushBlock.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel GetPushBlock -/* 7E4440 802835C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E4444 802835C4 AFB40020 */ sw $s4, 0x20($sp) -/* 7E4448 802835C8 0080A02D */ daddu $s4, $a0, $zero -/* 7E444C 802835CC AFBF0024 */ sw $ra, 0x24($sp) -/* 7E4450 802835D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E4454 802835D4 AFB20018 */ sw $s2, 0x18($sp) -/* 7E4458 802835D8 AFB10014 */ sw $s1, 0x14($sp) -/* 7E445C 802835DC AFB00010 */ sw $s0, 0x10($sp) -/* 7E4460 802835E0 8E90000C */ lw $s0, 0xc($s4) -/* 7E4464 802835E4 8E050000 */ lw $a1, ($s0) -/* 7E4468 802835E8 0C0B1EAF */ jal get_variable -/* 7E446C 802835EC 26100004 */ addiu $s0, $s0, 4 -/* 7E4470 802835F0 8E050000 */ lw $a1, ($s0) -/* 7E4474 802835F4 26100004 */ addiu $s0, $s0, 4 -/* 7E4478 802835F8 0280202D */ daddu $a0, $s4, $zero -/* 7E447C 802835FC 0C0B1EAF */ jal get_variable -/* 7E4480 80283600 0040882D */ daddu $s1, $v0, $zero -/* 7E4484 80283604 0280202D */ daddu $a0, $s4, $zero -/* 7E4488 80283608 8E050000 */ lw $a1, ($s0) -/* 7E448C 8028360C 0C0B1EAF */ jal get_variable -/* 7E4490 80283610 0040982D */ daddu $s3, $v0, $zero -/* 7E4494 80283614 00118880 */ sll $s1, $s1, 2 -/* 7E4498 80283618 26100004 */ addiu $s0, $s0, 4 -/* 7E449C 8028361C 3C12802E */ lui $s2, 0x802e -/* 7E44A0 80283620 02519021 */ addu $s2, $s2, $s1 -/* 7E44A4 80283624 8E52BC88 */ lw $s2, -0x4378($s2) -/* 7E44A8 80283628 92430004 */ lbu $v1, 4($s2) -/* 7E44AC 8028362C 8E100000 */ lw $s0, ($s0) -/* 7E44B0 80283630 0263182A */ slt $v1, $s3, $v1 -/* 7E44B4 80283634 10600009 */ beqz $v1, .L8028365C -/* 7E44B8 80283638 0040882D */ daddu $s1, $v0, $zero -/* 7E44BC 8028363C 06600008 */ bltz $s3, .L80283660 -/* 7E44C0 80283640 0280202D */ daddu $a0, $s4, $zero -/* 7E44C4 80283644 92420005 */ lbu $v0, 5($s2) -/* 7E44C8 80283648 0222102A */ slt $v0, $s1, $v0 -/* 7E44CC 8028364C 10400005 */ beqz $v0, .L80283664 -/* 7E44D0 80283650 0200282D */ daddu $a1, $s0, $zero -/* 7E44D4 80283654 06210005 */ bgez $s1, .L8028366C -/* 7E44D8 80283658 00000000 */ nop -.L8028365C: -/* 7E44DC 8028365C 0280202D */ daddu $a0, $s4, $zero -.L80283660: -/* 7E44E0 80283660 0200282D */ daddu $a1, $s0, $zero -.L80283664: -/* 7E44E4 80283664 0C0B2026 */ jal set_variable -/* 7E44E8 80283668 24060003 */ addiu $a2, $zero, 3 -.L8028366C: -/* 7E44EC 8028366C 92420004 */ lbu $v0, 4($s2) -/* 7E44F0 80283670 02220018 */ mult $s1, $v0 -/* 7E44F4 80283674 0280202D */ daddu $a0, $s4, $zero -/* 7E44F8 80283678 8E420000 */ lw $v0, ($s2) -/* 7E44FC 8028367C 00003812 */ mflo $a3 -/* 7E4500 80283680 02671821 */ addu $v1, $s3, $a3 -/* 7E4504 80283684 00431021 */ addu $v0, $v0, $v1 -/* 7E4508 80283688 90460000 */ lbu $a2, ($v0) -/* 7E450C 8028368C 0C0B2026 */ jal set_variable -/* 7E4510 80283690 0200282D */ daddu $a1, $s0, $zero -/* 7E4514 80283694 8FBF0024 */ lw $ra, 0x24($sp) -/* 7E4518 80283698 8FB40020 */ lw $s4, 0x20($sp) -/* 7E451C 8028369C 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E4520 802836A0 8FB20018 */ lw $s2, 0x18($sp) -/* 7E4524 802836A4 8FB10014 */ lw $s1, 0x14($sp) -/* 7E4528 802836A8 8FB00010 */ lw $s0, 0x10($sp) -/* 7E452C 802836AC 24020002 */ addiu $v0, $zero, 2 -/* 7E4530 802836B0 03E00008 */ jr $ra -/* 7E4534 802836B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7E3700/SetPushBlock.s b/asm/nonmatchings/code_7E3700/SetPushBlock.s deleted file mode 100644 index 6be07e2913..0000000000 --- a/asm/nonmatchings/code_7E3700/SetPushBlock.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetPushBlock -/* 7E42FC 8028347C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 7E4300 80283480 AFB30034 */ sw $s3, 0x34($sp) -/* 7E4304 80283484 0080982D */ daddu $s3, $a0, $zero -/* 7E4308 80283488 AFBF0038 */ sw $ra, 0x38($sp) -/* 7E430C 8028348C AFB20030 */ sw $s2, 0x30($sp) -/* 7E4310 80283490 AFB1002C */ sw $s1, 0x2c($sp) -/* 7E4314 80283494 AFB00028 */ sw $s0, 0x28($sp) -/* 7E4318 80283498 8E70000C */ lw $s0, 0xc($s3) -/* 7E431C 8028349C 8E050000 */ lw $a1, ($s0) -/* 7E4320 802834A0 0C0B1EAF */ jal get_variable -/* 7E4324 802834A4 26100004 */ addiu $s0, $s0, 4 -/* 7E4328 802834A8 8E050000 */ lw $a1, ($s0) -/* 7E432C 802834AC 26100004 */ addiu $s0, $s0, 4 -/* 7E4330 802834B0 0260202D */ daddu $a0, $s3, $zero -/* 7E4334 802834B4 0C0B1EAF */ jal get_variable -/* 7E4338 802834B8 0040882D */ daddu $s1, $v0, $zero -/* 7E433C 802834BC 8E050000 */ lw $a1, ($s0) -/* 7E4340 802834C0 26100004 */ addiu $s0, $s0, 4 -/* 7E4344 802834C4 0260202D */ daddu $a0, $s3, $zero -/* 7E4348 802834C8 0C0B1EAF */ jal get_variable -/* 7E434C 802834CC 0040902D */ daddu $s2, $v0, $zero -/* 7E4350 802834D0 0260202D */ daddu $a0, $s3, $zero -/* 7E4354 802834D4 8E050000 */ lw $a1, ($s0) -/* 7E4358 802834D8 0C0B1EAF */ jal get_variable -/* 7E435C 802834DC 0040802D */ daddu $s0, $v0, $zero -/* 7E4360 802834E0 00118880 */ sll $s1, $s1, 2 -/* 7E4364 802834E4 3C01802E */ lui $at, 0x802e -/* 7E4368 802834E8 00310821 */ addu $at, $at, $s1 -/* 7E436C 802834EC 8C31BC88 */ lw $s1, -0x4378($at) -/* 7E4370 802834F0 92230004 */ lbu $v1, 4($s1) -/* 7E4374 802834F4 02030018 */ mult $s0, $v1 -/* 7E4378 802834F8 8E230000 */ lw $v1, ($s1) -/* 7E437C 802834FC 00004012 */ mflo $t0 -/* 7E4380 80283500 02482021 */ addu $a0, $s2, $t0 -/* 7E4384 80283504 00641821 */ addu $v1, $v1, $a0 -/* 7E4388 80283508 A0620000 */ sb $v0, ($v1) -/* 7E438C 8028350C 24030001 */ addiu $v1, $zero, 1 -/* 7E4390 80283510 14430023 */ bne $v0, $v1, .L802835A0 -/* 7E4394 80283514 3C028000 */ lui $v0, 0x8000 -/* 7E4398 80283518 3C04802F */ lui $a0, 0x802f -/* 7E439C 8028351C 2484A2BC */ addiu $a0, $a0, -0x5d44 -/* 7E43A0 80283520 8E250008 */ lw $a1, 8($s1) -/* 7E43A4 80283524 8E26000C */ lw $a2, 0xc($s1) -/* 7E43A8 80283528 8E270010 */ lw $a3, 0x10($s1) -/* 7E43AC 8028352C AFA20020 */ sw $v0, 0x20($sp) -/* 7E43B0 80283530 00721004 */ sllv $v0, $s2, $v1 -/* 7E43B4 80283534 00521021 */ addu $v0, $v0, $s2 -/* 7E43B8 80283538 000210C0 */ sll $v0, $v0, 3 -/* 7E43BC 8028353C 00521021 */ addu $v0, $v0, $s2 -/* 7E43C0 80283540 AFA00010 */ sw $zero, 0x10($sp) -/* 7E43C4 80283544 AFA00014 */ sw $zero, 0x14($sp) -/* 7E43C8 80283548 AFA00018 */ sw $zero, 0x18($sp) -/* 7E43CC 8028354C AFA0001C */ sw $zero, 0x1c($sp) -/* 7E43D0 80283550 00A22821 */ addu $a1, $a1, $v0 -/* 7E43D4 80283554 24A5000C */ addiu $a1, $a1, 0xc -/* 7E43D8 80283558 00701004 */ sllv $v0, $s0, $v1 -/* 7E43DC 8028355C 00501021 */ addu $v0, $v0, $s0 -/* 7E43E0 80283560 000210C0 */ sll $v0, $v0, 3 -/* 7E43E4 80283564 00501021 */ addu $v0, $v0, $s0 -/* 7E43E8 80283568 00E23821 */ addu $a3, $a3, $v0 -/* 7E43EC 8028356C 0C044631 */ jal create_entity -/* 7E43F0 80283570 24E7000C */ addiu $a3, $a3, 0xc -/* 7E43F4 80283574 3C048028 */ lui $a0, 0x8028 -/* 7E43F8 80283578 24845674 */ addiu $a0, $a0, 0x5674 -/* 7E43FC 8028357C 24050040 */ addiu $a1, $zero, 0x40 -/* 7E4400 80283580 0040802D */ daddu $s0, $v0, $zero -/* 7E4404 80283584 26064000 */ addiu $a2, $s0, 0x4000 -/* 7E4408 80283588 0220382D */ daddu $a3, $s1, $zero -/* 7E440C 8028358C 24020003 */ addiu $v0, $zero, 3 -/* 7E4410 80283590 AFB00010 */ sw $s0, 0x10($sp) -/* 7E4414 80283594 0C0B10AA */ jal bind_trigger_1 -/* 7E4418 80283598 AFA20014 */ sw $v0, 0x14($sp) -/* 7E441C 8028359C AE700084 */ sw $s0, 0x84($s3) -.L802835A0: -/* 7E4420 802835A0 8FBF0038 */ lw $ra, 0x38($sp) -/* 7E4424 802835A4 8FB30034 */ lw $s3, 0x34($sp) -/* 7E4428 802835A8 8FB20030 */ lw $s2, 0x30($sp) -/* 7E442C 802835AC 8FB1002C */ lw $s1, 0x2c($sp) -/* 7E4430 802835B0 8FB00028 */ lw $s0, 0x28($sp) -/* 7E4434 802835B4 24020002 */ addiu $v0, $zero, 2 -/* 7E4438 802835B8 03E00008 */ jr $ra -/* 7E443C 802835BC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s deleted file mode 100644 index 2060f0f909..0000000000 --- a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetPushBlockFallEffect -/* 7E462C 802837AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E4630 802837B0 AFB10014 */ sw $s1, 0x14($sp) -/* 7E4634 802837B4 0080882D */ daddu $s1, $a0, $zero -/* 7E4638 802837B8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7E463C 802837BC AFB00010 */ sw $s0, 0x10($sp) -/* 7E4640 802837C0 8E30000C */ lw $s0, 0xc($s1) -/* 7E4644 802837C4 8E050000 */ lw $a1, ($s0) -/* 7E4648 802837C8 0C0B1EAF */ jal get_variable -/* 7E464C 802837CC 26100004 */ addiu $s0, $s0, 4 -/* 7E4650 802837D0 0220202D */ daddu $a0, $s1, $zero -/* 7E4654 802837D4 8E050000 */ lw $a1, ($s0) -/* 7E4658 802837D8 0C0B1EAF */ jal get_variable -/* 7E465C 802837DC 0040802D */ daddu $s0, $v0, $zero -/* 7E4660 802837E0 00108080 */ sll $s0, $s0, 2 -/* 7E4664 802837E4 3C03802E */ lui $v1, 0x802e -/* 7E4668 802837E8 00701821 */ addu $v1, $v1, $s0 -/* 7E466C 802837EC 8C63BC88 */ lw $v1, -0x4378($v1) -/* 7E4670 802837F0 AC620014 */ sw $v0, 0x14($v1) -/* 7E4674 802837F4 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E4678 802837F8 8FB10014 */ lw $s1, 0x14($sp) -/* 7E467C 802837FC 8FB00010 */ lw $s0, 0x10($sp) -/* 7E4680 80283800 24020002 */ addiu $v0, $zero, 2 -/* 7E4684 80283804 03E00008 */ jr $ra -/* 7E4688 80283808 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7E468C 8028380C 00000000 */ nop diff --git a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s deleted file mode 100644 index 3af1e3c00a..0000000000 --- a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel TeleportPartnerToPlayer -/* 7E46FC 8028387C 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 7E4700 80283880 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 7E4704 80283884 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E4708 80283888 AFB10014 */ sw $s1, 0x14($sp) -/* 7E470C 8028388C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 7E4710 80283890 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 7E4714 80283894 AFB20018 */ sw $s2, 0x18($sp) -/* 7E4718 80283898 0220902D */ daddu $s2, $s1, $zero -/* 7E471C 8028389C AFBF001C */ sw $ra, 0x1c($sp) -/* 7E4720 802838A0 10400012 */ beqz $v0, .L802838EC -/* 7E4724 802838A4 AFB00010 */ sw $s0, 0x10($sp) -/* 7E4728 802838A8 0C00EABB */ jal get_npc_unsafe -/* 7E472C 802838AC 2404FFFC */ addiu $a0, $zero, -4 -/* 7E4730 802838B0 C6200028 */ lwc1 $f0, 0x28($s1) -/* 7E4734 802838B4 0040802D */ daddu $s0, $v0, $zero -/* 7E4738 802838B8 E6000038 */ swc1 $f0, 0x38($s0) -/* 7E473C 802838BC C6200030 */ lwc1 $f0, 0x30($s1) -/* 7E4740 802838C0 0C03A969 */ jal is_current_partner_flying -/* 7E4744 802838C4 E6000040 */ swc1 $f0, 0x40($s0) -/* 7E4748 802838C8 10400003 */ beqz $v0, .L802838D8 -/* 7E474C 802838CC 00000000 */ nop -/* 7E4750 802838D0 C620002C */ lwc1 $f0, 0x2c($s1) -/* 7E4754 802838D4 E600003C */ swc1 $f0, 0x3c($s0) -.L802838D8: -/* 7E4758 802838D8 8E450080 */ lw $a1, 0x80($s2) -/* 7E475C 802838DC 0C00ECD0 */ jal set_npc_yaw -/* 7E4760 802838E0 0200202D */ daddu $a0, $s0, $zero -/* 7E4764 802838E4 0C03BD17 */ jal clear_partner_move_history -/* 7E4768 802838E8 0200202D */ daddu $a0, $s0, $zero -.L802838EC: -/* 7E476C 802838EC 24020002 */ addiu $v0, $zero, 2 -/* 7E4770 802838F0 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E4774 802838F4 8FB20018 */ lw $s2, 0x18($sp) -/* 7E4778 802838F8 8FB10014 */ lw $s1, 0x14($sp) -/* 7E477C 802838FC 8FB00010 */ lw $s0, 0x10($sp) -/* 7E4780 80283900 03E00008 */ jr $ra -/* 7E4784 80283904 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80282880.s b/asm/nonmatchings/code_7E3700/func_80282880.s deleted file mode 100644 index f06a66e3ff..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80282880.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80282880 -/* 7E3700 80282880 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7E3704 80282884 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7E3708 80282888 C4420028 */ lwc1 $f2, 0x28($v0) -/* 7E370C 8028288C C4800084 */ lwc1 $f0, 0x84($a0) -/* 7E3710 80282890 46800020 */ cvt.s.w $f0, $f0 -/* 7E3714 80282894 46020001 */ sub.s $f0, $f0, $f2 -/* 7E3718 80282898 3C013F00 */ lui $at, 0x3f00 -/* 7E371C 8028289C 44812000 */ mtc1 $at, $f4 -/* 7E3720 802828A0 00000000 */ nop -/* 7E3724 802828A4 46040002 */ mul.s $f0, $f0, $f4 -/* 7E3728 802828A8 00000000 */ nop -/* 7E372C 802828AC 46001080 */ add.s $f2, $f2, $f0 -/* 7E3730 802828B0 E4420028 */ swc1 $f2, 0x28($v0) -/* 7E3734 802828B4 C4420030 */ lwc1 $f2, 0x30($v0) -/* 7E3738 802828B8 C480008C */ lwc1 $f0, 0x8c($a0) -/* 7E373C 802828BC 46800020 */ cvt.s.w $f0, $f0 -/* 7E3740 802828C0 46020001 */ sub.s $f0, $f0, $f2 -/* 7E3744 802828C4 46040002 */ mul.s $f0, $f0, $f4 -/* 7E3748 802828C8 00000000 */ nop -/* 7E374C 802828CC 46001080 */ add.s $f2, $f2, $f0 -/* 7E3750 802828D0 E4420030 */ swc1 $f2, 0x30($v0) -/* 7E3754 802828D4 03E00008 */ jr $ra -/* 7E3758 802828D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_7E3700/func_802828DC.s b/asm/nonmatchings/code_7E3700/func_802828DC.s deleted file mode 100644 index bf3521561b..0000000000 --- a/asm/nonmatchings/code_7E3700/func_802828DC.s +++ /dev/null @@ -1,224 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802828DC -/* 7E375C 802828DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 7E3760 802828E0 AFB20018 */ sw $s2, 0x18($sp) -/* 7E3764 802828E4 0080902D */ daddu $s2, $a0, $zero -/* 7E3768 802828E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 7E376C 802828EC AFB3001C */ sw $s3, 0x1c($sp) -/* 7E3770 802828F0 AFB10014 */ sw $s1, 0x14($sp) -/* 7E3774 802828F4 AFB00010 */ sw $s0, 0x10($sp) -/* 7E3778 802828F8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 7E377C 802828FC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 7E3780 80282900 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 7E3784 80282904 8E4400B0 */ lw $a0, 0xb0($s2) -/* 7E3788 80282908 0C04417A */ jal get_entity_by_index -/* 7E378C 8028290C 00A0802D */ daddu $s0, $a1, $zero -/* 7E3790 80282910 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* 7E3794 80282914 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* 7E3798 80282918 1200001A */ beqz $s0, .L80282984 -/* 7E379C 8028291C 0040882D */ daddu $s1, $v0, $zero -/* 7E37A0 80282920 AE400070 */ sw $zero, 0x70($s2) -/* 7E37A4 80282924 C6600028 */ lwc1 $f0, 0x28($s3) -/* 7E37A8 80282928 4600018D */ trunc.w.s $f6, $f0 -/* 7E37AC 8028292C E6460084 */ swc1 $f6, 0x84($s2) -/* 7E37B0 80282930 C660002C */ lwc1 $f0, 0x2c($s3) -/* 7E37B4 80282934 4600018D */ trunc.w.s $f6, $f0 -/* 7E37B8 80282938 E6460088 */ swc1 $f6, 0x88($s2) -/* 7E37BC 8028293C C6600030 */ lwc1 $f0, 0x30($s3) -/* 7E37C0 80282940 4600018D */ trunc.w.s $f6, $f0 -/* 7E37C4 80282944 E646008C */ swc1 $f6, 0x8c($s2) -/* 7E37C8 80282948 C6200048 */ lwc1 $f0, 0x48($s1) -/* 7E37CC 8028294C 4600018D */ trunc.w.s $f6, $f0 -/* 7E37D0 80282950 E6460090 */ swc1 $f6, 0x90($s2) -/* 7E37D4 80282954 C620004C */ lwc1 $f0, 0x4c($s1) -/* 7E37D8 80282958 4600018D */ trunc.w.s $f6, $f0 -/* 7E37DC 8028295C E6460094 */ swc1 $f6, 0x94($s2) -/* 7E37E0 80282960 C6200050 */ lwc1 $f0, 0x50($s1) -/* 7E37E4 80282964 4600018D */ trunc.w.s $f6, $f0 -/* 7E37E8 80282968 E6460098 */ swc1 $f6, 0x98($s2) -/* 7E37EC 8028296C C6200060 */ lwc1 $f0, 0x60($s1) -/* 7E37F0 80282970 4600018D */ trunc.w.s $f6, $f0 -/* 7E37F4 80282974 E64600A8 */ swc1 $f6, 0xa8($s2) -/* 7E37F8 80282978 C6200068 */ lwc1 $f0, 0x68($s1) -/* 7E37FC 8028297C 4600018D */ trunc.w.s $f6, $f0 -/* 7E3800 80282980 E64600B4 */ swc1 $f6, 0xb4($s2) -.L80282984: -/* 7E3804 80282984 8E420070 */ lw $v0, 0x70($s2) -/* 7E3808 80282988 00021080 */ sll $v0, $v0, 2 -/* 7E380C 8028298C 3C018028 */ lui $at, 0x8028 -/* 7E3810 80282990 00220821 */ addu $at, $at, $v0 -/* 7E3814 80282994 C4245640 */ lwc1 $f4, 0x5640($at) -/* 7E3818 80282998 C642009C */ lwc1 $f2, 0x9c($s2) -/* 7E381C 8028299C 468010A0 */ cvt.s.w $f2, $f2 -/* 7E3820 802829A0 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3824 802829A4 00000000 */ nop -/* 7E3828 802829A8 3C0141C8 */ lui $at, 0x41c8 -/* 7E382C 802829AC 4481C000 */ mtc1 $at, $f24 -/* 7E3830 802829B0 00000000 */ nop -/* 7E3834 802829B4 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3838 802829B8 00000000 */ nop -/* 7E383C 802829BC C6400084 */ lwc1 $f0, 0x84($s2) -/* 7E3840 802829C0 46800020 */ cvt.s.w $f0, $f0 -/* 7E3844 802829C4 46020000 */ add.s $f0, $f0, $f2 -/* 7E3848 802829C8 E6600028 */ swc1 $f0, 0x28($s3) -/* 7E384C 802829CC C64200A0 */ lwc1 $f2, 0xa0($s2) -/* 7E3850 802829D0 468010A0 */ cvt.s.w $f2, $f2 -/* 7E3854 802829D4 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3858 802829D8 00000000 */ nop -/* 7E385C 802829DC 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3860 802829E0 00000000 */ nop -/* 7E3864 802829E4 C6400088 */ lwc1 $f0, 0x88($s2) -/* 7E3868 802829E8 46800020 */ cvt.s.w $f0, $f0 -/* 7E386C 802829EC 46020000 */ add.s $f0, $f0, $f2 -/* 7E3870 802829F0 E660002C */ swc1 $f0, 0x2c($s3) -/* 7E3874 802829F4 C64200A4 */ lwc1 $f2, 0xa4($s2) -/* 7E3878 802829F8 468010A0 */ cvt.s.w $f2, $f2 -/* 7E387C 802829FC 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3880 80282A00 00000000 */ nop -/* 7E3884 80282A04 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3888 80282A08 00000000 */ nop -/* 7E388C 80282A0C C640008C */ lwc1 $f0, 0x8c($s2) -/* 7E3890 80282A10 46800020 */ cvt.s.w $f0, $f0 -/* 7E3894 80282A14 46020000 */ add.s $f0, $f0, $f2 -/* 7E3898 80282A18 E6600030 */ swc1 $f0, 0x30($s3) -/* 7E389C 80282A1C C642009C */ lwc1 $f2, 0x9c($s2) -/* 7E38A0 80282A20 468010A0 */ cvt.s.w $f2, $f2 -/* 7E38A4 80282A24 46041082 */ mul.s $f2, $f2, $f4 -/* 7E38A8 80282A28 00000000 */ nop -/* 7E38AC 80282A2C 46181082 */ mul.s $f2, $f2, $f24 -/* 7E38B0 80282A30 00000000 */ nop -/* 7E38B4 80282A34 C6400090 */ lwc1 $f0, 0x90($s2) -/* 7E38B8 80282A38 46800020 */ cvt.s.w $f0, $f0 -/* 7E38BC 80282A3C 46020000 */ add.s $f0, $f0, $f2 -/* 7E38C0 80282A40 E6200048 */ swc1 $f0, 0x48($s1) -/* 7E38C4 80282A44 C64200A0 */ lwc1 $f2, 0xa0($s2) -/* 7E38C8 80282A48 468010A0 */ cvt.s.w $f2, $f2 -/* 7E38CC 80282A4C 46041082 */ mul.s $f2, $f2, $f4 -/* 7E38D0 80282A50 00000000 */ nop -/* 7E38D4 80282A54 46181082 */ mul.s $f2, $f2, $f24 -/* 7E38D8 80282A58 00000000 */ nop -/* 7E38DC 80282A5C C6400094 */ lwc1 $f0, 0x94($s2) -/* 7E38E0 80282A60 46800020 */ cvt.s.w $f0, $f0 -/* 7E38E4 80282A64 46020000 */ add.s $f0, $f0, $f2 -/* 7E38E8 80282A68 E620004C */ swc1 $f0, 0x4c($s1) -/* 7E38EC 80282A6C C64200A4 */ lwc1 $f2, 0xa4($s2) -/* 7E38F0 80282A70 468010A0 */ cvt.s.w $f2, $f2 -/* 7E38F4 80282A74 46041082 */ mul.s $f2, $f2, $f4 -/* 7E38F8 80282A78 00000000 */ nop -/* 7E38FC 80282A7C 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3900 80282A80 00000000 */ nop -/* 7E3904 80282A84 C6400098 */ lwc1 $f0, 0x98($s2) -/* 7E3908 80282A88 46800020 */ cvt.s.w $f0, $f0 -/* 7E390C 80282A8C 46020000 */ add.s $f0, $f0, $f2 -/* 7E3910 80282A90 E6200050 */ swc1 $f0, 0x50($s1) -/* 7E3914 80282A94 8E420070 */ lw $v0, 0x70($s2) -/* 7E3918 80282A98 2842000C */ slti $v0, $v0, 0xc -/* 7E391C 80282A9C 1040004D */ beqz $v0, .L80282BD4 -/* 7E3920 80282AA0 00000000 */ nop -/* 7E3924 80282AA4 C642009C */ lwc1 $f2, 0x9c($s2) -/* 7E3928 80282AA8 468010A0 */ cvt.s.w $f2, $f2 -/* 7E392C 80282AAC 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3930 80282AB0 00000000 */ nop -/* 7E3934 80282AB4 3C01C2B4 */ lui $at, 0xc2b4 -/* 7E3938 80282AB8 44810000 */ mtc1 $at, $f0 -/* 7E393C 80282ABC 00000000 */ nop -/* 7E3940 80282AC0 46001082 */ mul.s $f2, $f2, $f0 -/* 7E3944 80282AC4 00000000 */ nop -/* 7E3948 80282AC8 C64000B4 */ lwc1 $f0, 0xb4($s2) -/* 7E394C 80282ACC 46800020 */ cvt.s.w $f0, $f0 -/* 7E3950 80282AD0 46020000 */ add.s $f0, $f0, $f2 -/* 7E3954 80282AD4 E6200068 */ swc1 $f0, 0x68($s1) -/* 7E3958 80282AD8 C64200A4 */ lwc1 $f2, 0xa4($s2) -/* 7E395C 80282ADC 468010A0 */ cvt.s.w $f2, $f2 -/* 7E3960 80282AE0 46041082 */ mul.s $f2, $f2, $f4 -/* 7E3964 80282AE4 00000000 */ nop -/* 7E3968 80282AE8 3C0142B4 */ lui $at, 0x42b4 -/* 7E396C 80282AEC 4481B000 */ mtc1 $at, $f22 -/* 7E3970 80282AF0 00000000 */ nop -/* 7E3974 80282AF4 46161082 */ mul.s $f2, $f2, $f22 -/* 7E3978 80282AF8 00000000 */ nop -/* 7E397C 80282AFC 46162582 */ mul.s $f22, $f4, $f22 -/* 7E3980 80282B00 00000000 */ nop -/* 7E3984 80282B04 C64000A8 */ lwc1 $f0, 0xa8($s2) -/* 7E3988 80282B08 46800020 */ cvt.s.w $f0, $f0 -/* 7E398C 80282B0C 46020000 */ add.s $f0, $f0, $f2 -/* 7E3990 80282B10 4600B306 */ mov.s $f12, $f22 -/* 7E3994 80282B14 0C00A8BB */ jal sin_deg -/* 7E3998 80282B18 E6200060 */ swc1 $f0, 0x60($s1) -/* 7E399C 80282B1C 46180002 */ mul.s $f0, $f0, $f24 -/* 7E39A0 80282B20 00000000 */ nop -/* 7E39A4 80282B24 3C013FE0 */ lui $at, 0x3fe0 -/* 7E39A8 80282B28 4481A800 */ mtc1 $at, $f21 -/* 7E39AC 80282B2C 4480A000 */ mtc1 $zero, $f20 -/* 7E39B0 80282B30 46000021 */ cvt.d.s $f0, $f0 -/* 7E39B4 80282B34 46340002 */ mul.d $f0, $f0, $f20 -/* 7E39B8 80282B38 00000000 */ nop -/* 7E39BC 80282B3C C622004C */ lwc1 $f2, 0x4c($s1) -/* 7E39C0 80282B40 460010A1 */ cvt.d.s $f2, $f2 -/* 7E39C4 80282B44 46201080 */ add.d $f2, $f2, $f0 -/* 7E39C8 80282B48 4600B306 */ mov.s $f12, $f22 -/* 7E39CC 80282B4C 462010A0 */ cvt.s.d $f2, $f2 -/* 7E39D0 80282B50 0C00A8BB */ jal sin_deg -/* 7E39D4 80282B54 E622004C */ swc1 $f2, 0x4c($s1) -/* 7E39D8 80282B58 C642009C */ lwc1 $f2, 0x9c($s2) -/* 7E39DC 80282B5C 468010A0 */ cvt.s.w $f2, $f2 -/* 7E39E0 80282B60 46001082 */ mul.s $f2, $f2, $f0 -/* 7E39E4 80282B64 00000000 */ nop -/* 7E39E8 80282B68 46181082 */ mul.s $f2, $f2, $f24 -/* 7E39EC 80282B6C 00000000 */ nop -/* 7E39F0 80282B70 460010A1 */ cvt.d.s $f2, $f2 -/* 7E39F4 80282B74 46341082 */ mul.d $f2, $f2, $f20 -/* 7E39F8 80282B78 00000000 */ nop -/* 7E39FC 80282B7C C6200048 */ lwc1 $f0, 0x48($s1) -/* 7E3A00 80282B80 46000021 */ cvt.d.s $f0, $f0 -/* 7E3A04 80282B84 46220001 */ sub.d $f0, $f0, $f2 -/* 7E3A08 80282B88 4600B306 */ mov.s $f12, $f22 -/* 7E3A0C 80282B8C 46200020 */ cvt.s.d $f0, $f0 -/* 7E3A10 80282B90 0C00A8BB */ jal sin_deg -/* 7E3A14 80282B94 E6200048 */ swc1 $f0, 0x48($s1) -/* 7E3A18 80282B98 C64200A4 */ lwc1 $f2, 0xa4($s2) -/* 7E3A1C 80282B9C 468010A0 */ cvt.s.w $f2, $f2 -/* 7E3A20 80282BA0 46001082 */ mul.s $f2, $f2, $f0 -/* 7E3A24 80282BA4 00000000 */ nop -/* 7E3A28 80282BA8 46181082 */ mul.s $f2, $f2, $f24 -/* 7E3A2C 80282BAC 00000000 */ nop -/* 7E3A30 80282BB0 460010A1 */ cvt.d.s $f2, $f2 -/* 7E3A34 80282BB4 46341082 */ mul.d $f2, $f2, $f20 -/* 7E3A38 80282BB8 00000000 */ nop -/* 7E3A3C 80282BBC C6200050 */ lwc1 $f0, 0x50($s1) -/* 7E3A40 80282BC0 46000021 */ cvt.d.s $f0, $f0 -/* 7E3A44 80282BC4 46220001 */ sub.d $f0, $f0, $f2 -/* 7E3A48 80282BC8 46200020 */ cvt.s.d $f0, $f0 -/* 7E3A4C 80282BCC 080A0AF9 */ j .L80282BE4 -/* 7E3A50 80282BD0 E6200050 */ swc1 $f0, 0x50($s1) -.L80282BD4: -/* 7E3A54 80282BD4 44800000 */ mtc1 $zero, $f0 -/* 7E3A58 80282BD8 00000000 */ nop -/* 7E3A5C 80282BDC E6200060 */ swc1 $f0, 0x60($s1) -/* 7E3A60 80282BE0 E6200068 */ swc1 $f0, 0x68($s1) -.L80282BE4: -/* 7E3A64 80282BE4 C6600028 */ lwc1 $f0, 0x28($s3) -/* 7E3A68 80282BE8 C662002C */ lwc1 $f2, 0x2c($s3) -/* 7E3A6C 80282BEC C6640030 */ lwc1 $f4, 0x30($s3) -/* 7E3A70 80282BF0 3C02800B */ lui $v0, %hi(gCameras) -/* 7E3A74 80282BF4 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 7E3A78 80282BF8 E4400060 */ swc1 $f0, 0x60($v0) -/* 7E3A7C 80282BFC E4420064 */ swc1 $f2, 0x64($v0) -/* 7E3A80 80282C00 E4440068 */ swc1 $f4, 0x68($v0) -/* 7E3A84 80282C04 8E430070 */ lw $v1, 0x70($s2) -/* 7E3A88 80282C08 24630001 */ addiu $v1, $v1, 1 -/* 7E3A8C 80282C0C 3862000D */ xori $v0, $v1, 0xd -/* 7E3A90 80282C10 AE430070 */ sw $v1, 0x70($s2) -/* 7E3A94 80282C14 8FBF0020 */ lw $ra, 0x20($sp) -/* 7E3A98 80282C18 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E3A9C 80282C1C 8FB20018 */ lw $s2, 0x18($sp) -/* 7E3AA0 80282C20 8FB10014 */ lw $s1, 0x14($sp) -/* 7E3AA4 80282C24 8FB00010 */ lw $s0, 0x10($sp) -/* 7E3AA8 80282C28 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 7E3AAC 80282C2C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 7E3AB0 80282C30 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 7E3AB4 80282C34 2C420001 */ sltiu $v0, $v0, 1 -/* 7E3AB8 80282C38 03E00008 */ jr $ra -/* 7E3ABC 80282C3C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_7E3700/func_80282C40.s b/asm/nonmatchings/code_7E3700/func_80282C40.s deleted file mode 100644 index 23ea3d1d15..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80282C40.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80282C40 -/* 7E3AC0 80282C40 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 7E3AC4 80282C44 AFB30034 */ sw $s3, 0x34($sp) -/* 7E3AC8 80282C48 0080982D */ daddu $s3, $a0, $zero -/* 7E3ACC 80282C4C AFB00028 */ sw $s0, 0x28($sp) -/* 7E3AD0 80282C50 AFBF0038 */ sw $ra, 0x38($sp) -/* 7E3AD4 80282C54 AFB20030 */ sw $s2, 0x30($sp) -/* 7E3AD8 80282C58 AFB1002C */ sw $s1, 0x2c($sp) -/* 7E3ADC 80282C5C 8E6400B0 */ lw $a0, 0xb0($s3) -/* 7E3AE0 80282C60 8E7200AC */ lw $s2, 0xac($s3) -/* 7E3AE4 80282C64 0C04417A */ jal get_entity_by_index -/* 7E3AE8 80282C68 00A0802D */ daddu $s0, $a1, $zero -/* 7E3AEC 80282C6C 12000023 */ beqz $s0, .L80282CFC -/* 7E3AF0 80282C70 0040882D */ daddu $s1, $v0, $zero -/* 7E3AF4 80282C74 0000202D */ daddu $a0, $zero, $zero -/* 7E3AF8 80282C78 27A50018 */ addiu $a1, $sp, 0x18 -/* 7E3AFC 80282C7C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7E3B00 80282C80 27A6001C */ addiu $a2, $sp, 0x1c -/* 7E3B04 80282C84 27A70020 */ addiu $a3, $sp, 0x20 -/* 7E3B08 80282C88 AE600070 */ sw $zero, 0x70($s3) -/* 7E3B0C 80282C8C C620004C */ lwc1 $f0, 0x4c($s1) -/* 7E3B10 80282C90 3C01420C */ lui $at, 0x420c -/* 7E3B14 80282C94 44811000 */ mtc1 $at, $f2 -/* 7E3B18 80282C98 4600020D */ trunc.w.s $f8, $f0 -/* 7E3B1C 80282C9C E6680084 */ swc1 $f8, 0x84($s3) -/* 7E3B20 80282CA0 E7A20024 */ swc1 $f2, 0x24($sp) -/* 7E3B24 80282CA4 C6260048 */ lwc1 $f6, 0x48($s1) -/* 7E3B28 80282CA8 C620004C */ lwc1 $f0, 0x4c($s1) -/* 7E3B2C 80282CAC 3C0140A0 */ lui $at, 0x40a0 -/* 7E3B30 80282CB0 44811000 */ mtc1 $at, $f2 -/* 7E3B34 80282CB4 C6240050 */ lwc1 $f4, 0x50($s1) -/* 7E3B38 80282CB8 46020000 */ add.s $f0, $f0, $f2 -/* 7E3B3C 80282CBC E7A60018 */ swc1 $f6, 0x18($sp) -/* 7E3B40 80282CC0 E7A40020 */ swc1 $f4, 0x20($sp) -/* 7E3B44 80282CC4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 7E3B48 80282CC8 0C0372DF */ jal func_800DCB7C -/* 7E3B4C 80282CCC AFA20010 */ sw $v0, 0x10($sp) -/* 7E3B50 80282CD0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 7E3B54 80282CD4 4600120D */ trunc.w.s $f8, $f2 -/* 7E3B58 80282CD8 10400008 */ beqz $v0, .L80282CFC -/* 7E3B5C 80282CDC E6680074 */ swc1 $f8, 0x74($s3) -/* 7E3B60 80282CE0 3C0140C0 */ lui $at, 0x40c0 -/* 7E3B64 80282CE4 44810000 */ mtc1 $at, $f0 -/* 7E3B68 80282CE8 00000000 */ nop -/* 7E3B6C 80282CEC 4600103E */ c.le.s $f2, $f0 -/* 7E3B70 80282CF0 00000000 */ nop -/* 7E3B74 80282CF4 45010047 */ bc1t .L80282E14 -/* 7E3B78 80282CF8 24020002 */ addiu $v0, $zero, 2 -.L80282CFC: -/* 7E3B7C 80282CFC 8E420014 */ lw $v0, 0x14($s2) -/* 7E3B80 80282D00 10400019 */ beqz $v0, .L80282D68 -/* 7E3B84 80282D04 0220202D */ daddu $a0, $s1, $zero -/* 7E3B88 80282D08 0040F809 */ jalr $v0 -/* 7E3B8C 80282D0C 0260282D */ daddu $a1, $s3, $zero -/* 7E3B90 80282D10 10400040 */ beqz $v0, .L80282E14 -/* 7E3B94 80282D14 0000102D */ daddu $v0, $zero, $zero -/* 7E3B98 80282D18 C6460008 */ lwc1 $f6, 8($s2) -/* 7E3B9C 80282D1C 468031A0 */ cvt.s.w $f6, $f6 -/* 7E3BA0 80282D20 C6400010 */ lwc1 $f0, 0x10($s2) -/* 7E3BA4 80282D24 46800020 */ cvt.s.w $f0, $f0 -/* 7E3BA8 80282D28 C6220050 */ lwc1 $f2, 0x50($s1) -/* 7E3BAC 80282D2C 3C0141C8 */ lui $at, 0x41c8 -/* 7E3BB0 80282D30 44812000 */ mtc1 $at, $f4 -/* 7E3BB4 80282D34 46001081 */ sub.s $f2, $f2, $f0 -/* 7E3BB8 80282D38 C6200048 */ lwc1 $f0, 0x48($s1) -/* 7E3BBC 80282D3C 92420004 */ lbu $v0, 4($s2) -/* 7E3BC0 80282D40 46060001 */ sub.s $f0, $f0, $f6 -/* 7E3BC4 80282D44 46041083 */ div.s $f2, $f2, $f4 -/* 7E3BC8 80282D48 4600120D */ trunc.w.s $f8, $f2 -/* 7E3BCC 80282D4C 44034000 */ mfc1 $v1, $f8 -/* 7E3BD0 80282D50 00000000 */ nop -/* 7E3BD4 80282D54 00620018 */ mult $v1, $v0 -/* 7E3BD8 80282D58 24020001 */ addiu $v0, $zero, 1 -/* 7E3BDC 80282D5C 8E430000 */ lw $v1, ($s2) -/* 7E3BE0 80282D60 080A0B7D */ j .L80282DF4 -/* 7E3BE4 80282D64 46040003 */ div.s $f0, $f0, $f4 -.L80282D68: -/* 7E3BE8 80282D68 8E620070 */ lw $v0, 0x70($s3) -/* 7E3BEC 80282D6C 3C0141C8 */ lui $at, 0x41c8 -/* 7E3BF0 80282D70 44813000 */ mtc1 $at, $f6 -/* 7E3BF4 80282D74 00021080 */ sll $v0, $v0, 2 -/* 7E3BF8 80282D78 3C018028 */ lui $at, 0x8028 -/* 7E3BFC 80282D7C 00220821 */ addu $at, $at, $v0 -/* 7E3C00 80282D80 C4225640 */ lwc1 $f2, 0x5640($at) -/* 7E3C04 80282D84 46061082 */ mul.s $f2, $f2, $f6 -/* 7E3C08 80282D88 00000000 */ nop -/* 7E3C0C 80282D8C C6600084 */ lwc1 $f0, 0x84($s3) -/* 7E3C10 80282D90 46800020 */ cvt.s.w $f0, $f0 -/* 7E3C14 80282D94 46020001 */ sub.s $f0, $f0, $f2 -/* 7E3C18 80282D98 E620004C */ swc1 $f0, 0x4c($s1) -/* 7E3C1C 80282D9C 8E620070 */ lw $v0, 0x70($s3) -/* 7E3C20 80282DA0 2403000D */ addiu $v1, $zero, 0xd -/* 7E3C24 80282DA4 24420001 */ addiu $v0, $v0, 1 -/* 7E3C28 80282DA8 14430019 */ bne $v0, $v1, .L80282E10 -/* 7E3C2C 80282DAC AE620070 */ sw $v0, 0x70($s3) -/* 7E3C30 80282DB0 C6400010 */ lwc1 $f0, 0x10($s2) -/* 7E3C34 80282DB4 46800020 */ cvt.s.w $f0, $f0 -/* 7E3C38 80282DB8 C6220050 */ lwc1 $f2, 0x50($s1) -/* 7E3C3C 80282DBC C6440008 */ lwc1 $f4, 8($s2) -/* 7E3C40 80282DC0 46802120 */ cvt.s.w $f4, $f4 -/* 7E3C44 80282DC4 46001081 */ sub.s $f2, $f2, $f0 -/* 7E3C48 80282DC8 C6200048 */ lwc1 $f0, 0x48($s1) -/* 7E3C4C 80282DCC 92420004 */ lbu $v0, 4($s2) -/* 7E3C50 80282DD0 46040001 */ sub.s $f0, $f0, $f4 -/* 7E3C54 80282DD4 46061083 */ div.s $f2, $f2, $f6 -/* 7E3C58 80282DD8 4600120D */ trunc.w.s $f8, $f2 -/* 7E3C5C 80282DDC 44034000 */ mfc1 $v1, $f8 -/* 7E3C60 80282DE0 00000000 */ nop -/* 7E3C64 80282DE4 00620018 */ mult $v1, $v0 -/* 7E3C68 80282DE8 24020001 */ addiu $v0, $zero, 1 -/* 7E3C6C 80282DEC 8E430000 */ lw $v1, ($s2) -/* 7E3C70 80282DF0 46060003 */ div.s $f0, $f0, $f6 -.L80282DF4: -/* 7E3C74 80282DF4 4600020D */ trunc.w.s $f8, $f0 -/* 7E3C78 80282DF8 44044000 */ mfc1 $a0, $f8 -/* 7E3C7C 80282DFC 00004012 */ mflo $t0 -/* 7E3C80 80282E00 00882021 */ addu $a0, $a0, $t0 -/* 7E3C84 80282E04 00641821 */ addu $v1, $v1, $a0 -/* 7E3C88 80282E08 080A0B85 */ j .L80282E14 -/* 7E3C8C 80282E0C A0600000 */ sb $zero, ($v1) -.L80282E10: -/* 7E3C90 80282E10 0000102D */ daddu $v0, $zero, $zero -.L80282E14: -/* 7E3C94 80282E14 8FBF0038 */ lw $ra, 0x38($sp) -/* 7E3C98 80282E18 8FB30034 */ lw $s3, 0x34($sp) -/* 7E3C9C 80282E1C 8FB20030 */ lw $s2, 0x30($sp) -/* 7E3CA0 80282E20 8FB1002C */ lw $s1, 0x2c($sp) -/* 7E3CA4 80282E24 8FB00028 */ lw $s0, 0x28($sp) -/* 7E3CA8 80282E28 03E00008 */ jr $ra -/* 7E3CAC 80282E2C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_7E3700/func_80282E30.s b/asm/nonmatchings/code_7E3700/func_80282E30.s deleted file mode 100644 index c76b40eceb..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80282E30.s +++ /dev/null @@ -1,160 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80282E30 -/* 7E3CB0 80282E30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E3CB4 80282E34 AFB00010 */ sw $s0, 0x10($sp) -/* 7E3CB8 80282E38 0080802D */ daddu $s0, $a0, $zero -/* 7E3CBC 80282E3C AFBF0018 */ sw $ra, 0x18($sp) -/* 7E3CC0 80282E40 AFB10014 */ sw $s1, 0x14($sp) -/* 7E3CC4 80282E44 8E0400B0 */ lw $a0, 0xb0($s0) -/* 7E3CC8 80282E48 0C04417A */ jal get_entity_by_index -/* 7E3CCC 80282E4C 8E1100AC */ lw $s1, 0xac($s0) -/* 7E3CD0 80282E50 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 7E3CD4 80282E54 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 7E3CD8 80282E58 0040502D */ daddu $t2, $v0, $zero -/* 7E3CDC 80282E5C C4600028 */ lwc1 $f0, 0x28($v1) -/* 7E3CE0 80282E60 C462002C */ lwc1 $f2, 0x2c($v1) -/* 7E3CE4 80282E64 8E2D0008 */ lw $t5, 8($s1) -/* 7E3CE8 80282E68 8E2B000C */ lw $t3, 0xc($s1) -/* 7E3CEC 80282E6C 8E2C0010 */ lw $t4, 0x10($s1) -/* 7E3CF0 80282E70 4600010D */ trunc.w.s $f4, $f0 -/* 7E3CF4 80282E74 44042000 */ mfc1 $a0, $f4 -/* 7E3CF8 80282E78 4600110D */ trunc.w.s $f4, $f2 -/* 7E3CFC 80282E7C 44092000 */ mfc1 $t1, $f4 -/* 7E3D00 80282E80 008D2023 */ subu $a0, $a0, $t5 -/* 7E3D04 80282E84 C4600030 */ lwc1 $f0, 0x30($v1) -/* 7E3D08 80282E88 012B4823 */ subu $t1, $t1, $t3 -/* 7E3D0C 80282E8C 4600010D */ trunc.w.s $f4, $f0 -/* 7E3D10 80282E90 44082000 */ mfc1 $t0, $f4 -/* 7E3D14 80282E94 04810002 */ bgez $a0, .L80282EA0 -/* 7E3D18 80282E98 010C4023 */ subu $t0, $t0, $t4 -/* 7E3D1C 80282E9C 2484FFE7 */ addiu $a0, $a0, -0x19 -.L80282EA0: -/* 7E3D20 80282EA0 05020001 */ bltzl $t0, .L80282EA8 -/* 7E3D24 80282EA4 2508FFE7 */ addiu $t0, $t0, -0x19 -.L80282EA8: -/* 7E3D28 80282EA8 3C0551EB */ lui $a1, 0x51eb -/* 7E3D2C 80282EAC 34A5851F */ ori $a1, $a1, 0x851f -/* 7E3D30 80282EB0 00850018 */ mult $a0, $a1 -/* 7E3D34 80282EB4 00001810 */ mfhi $v1 -/* 7E3D38 80282EB8 00000000 */ nop -/* 7E3D3C 80282EBC 00000000 */ nop -/* 7E3D40 80282EC0 01250018 */ mult $t1, $a1 -/* 7E3D44 80282EC4 000417C3 */ sra $v0, $a0, 0x1f -/* 7E3D48 80282EC8 00003010 */ mfhi $a2 -/* 7E3D4C 80282ECC 000318C3 */ sra $v1, $v1, 3 -/* 7E3D50 80282ED0 00622023 */ subu $a0, $v1, $v0 -/* 7E3D54 80282ED4 01050018 */ mult $t0, $a1 -/* 7E3D58 80282ED8 000917C3 */ sra $v0, $t1, 0x1f -/* 7E3D5C 80282EDC 000618C3 */ sra $v1, $a2, 3 -/* 7E3D60 80282EE0 00624823 */ subu $t1, $v1, $v0 -/* 7E3D64 80282EE4 000817C3 */ sra $v0, $t0, 0x1f -/* 7E3D68 80282EE8 00003810 */ mfhi $a3 -/* 7E3D6C 80282EEC 000718C3 */ sra $v1, $a3, 3 -/* 7E3D70 80282EF0 00624023 */ subu $t0, $v1, $v0 -/* 7E3D74 80282EF4 0080382D */ daddu $a3, $a0, $zero -/* 7E3D78 80282EF8 00041040 */ sll $v0, $a0, 1 -/* 7E3D7C 80282EFC 00441021 */ addu $v0, $v0, $a0 -/* 7E3D80 80282F00 000210C0 */ sll $v0, $v0, 3 -/* 7E3D84 80282F04 00822021 */ addu $a0, $a0, $v0 -/* 7E3D88 80282F08 00091040 */ sll $v0, $t1, 1 -/* 7E3D8C 80282F0C 00491021 */ addu $v0, $v0, $t1 -/* 7E3D90 80282F10 000210C0 */ sll $v0, $v0, 3 -/* 7E3D94 80282F14 01224821 */ addu $t1, $t1, $v0 -/* 7E3D98 80282F18 0100302D */ daddu $a2, $t0, $zero -/* 7E3D9C 80282F1C 00081040 */ sll $v0, $t0, 1 -/* 7E3DA0 80282F20 00481021 */ addu $v0, $v0, $t0 -/* 7E3DA4 80282F24 000210C0 */ sll $v0, $v0, 3 -/* 7E3DA8 80282F28 01024021 */ addu $t0, $t0, $v0 -/* 7E3DAC 80282F2C 2482000C */ addiu $v0, $a0, 0xc -/* 7E3DB0 80282F30 004D2021 */ addu $a0, $v0, $t5 -/* 7E3DB4 80282F34 012B4821 */ addu $t1, $t1, $t3 -/* 7E3DB8 80282F38 2502000C */ addiu $v0, $t0, 0xc -/* 7E3DBC 80282F3C 004C4021 */ addu $t0, $v0, $t4 -/* 7E3DC0 80282F40 AE040084 */ sw $a0, 0x84($s0) -/* 7E3DC4 80282F44 AE090088 */ sw $t1, 0x88($s0) -/* 7E3DC8 80282F48 AE08008C */ sw $t0, 0x8c($s0) -/* 7E3DCC 80282F4C C5400048 */ lwc1 $f0, 0x48($t2) -/* 7E3DD0 80282F50 4600010D */ trunc.w.s $f4, $f0 -/* 7E3DD4 80282F54 44042000 */ mfc1 $a0, $f4 -/* 7E3DD8 80282F58 00000000 */ nop -/* 7E3DDC 80282F5C AE040090 */ sw $a0, 0x90($s0) -/* 7E3DE0 80282F60 C540004C */ lwc1 $f0, 0x4c($t2) -/* 7E3DE4 80282F64 4600010D */ trunc.w.s $f4, $f0 -/* 7E3DE8 80282F68 E6040094 */ swc1 $f4, 0x94($s0) -/* 7E3DEC 80282F6C C5400050 */ lwc1 $f0, 0x50($t2) -/* 7E3DF0 80282F70 4600010D */ trunc.w.s $f4, $f0 -/* 7E3DF4 80282F74 44032000 */ mfc1 $v1, $f4 -/* 7E3DF8 80282F78 00000000 */ nop -/* 7E3DFC 80282F7C AE030098 */ sw $v1, 0x98($s0) -/* 7E3E00 80282F80 8E220008 */ lw $v0, 8($s1) -/* 7E3E04 80282F84 00822023 */ subu $a0, $a0, $v0 -/* 7E3E08 80282F88 00850018 */ mult $a0, $a1 -/* 7E3E0C 80282F8C 8E220010 */ lw $v0, 0x10($s1) -/* 7E3E10 80282F90 00005010 */ mfhi $t2 -/* 7E3E14 80282F94 00624023 */ subu $t0, $v1, $v0 -/* 7E3E18 80282F98 000417C3 */ sra $v0, $a0, 0x1f -/* 7E3E1C 80282F9C 01050018 */ mult $t0, $a1 -/* 7E3E20 80282FA0 000A18C3 */ sra $v1, $t2, 3 -/* 7E3E24 80282FA4 00625023 */ subu $t2, $v1, $v0 -/* 7E3E28 80282FA8 01472823 */ subu $a1, $t2, $a3 -/* 7E3E2C 80282FAC 000817C3 */ sra $v0, $t0, 0x1f -/* 7E3E30 80282FB0 00004810 */ mfhi $t1 -/* 7E3E34 80282FB4 000918C3 */ sra $v1, $t1, 3 -/* 7E3E38 80282FB8 00621023 */ subu $v0, $v1, $v0 -/* 7E3E3C 80282FBC 10A00005 */ beqz $a1, .L80282FD4 -/* 7E3E40 80282FC0 00462023 */ subu $a0, $v0, $a2 -/* 7E3E44 80282FC4 10800004 */ beqz $a0, .L80282FD8 -/* 7E3E48 80282FC8 01453021 */ addu $a2, $t2, $a1 -/* 7E3E4C 80282FCC 0000202D */ daddu $a0, $zero, $zero -/* 7E3E50 80282FD0 0080282D */ daddu $a1, $a0, $zero -.L80282FD4: -/* 7E3E54 80282FD4 01453021 */ addu $a2, $t2, $a1 -.L80282FD8: -/* 7E3E58 80282FD8 00441821 */ addu $v1, $v0, $a0 -/* 7E3E5C 80282FDC AE05009C */ sw $a1, 0x9c($s0) -/* 7E3E60 80282FE0 AE0000A0 */ sw $zero, 0xa0($s0) -/* 7E3E64 80282FE4 14A00005 */ bnez $a1, .L80282FFC -/* 7E3E68 80282FE8 AE0400A4 */ sw $a0, 0xa4($s0) -/* 7E3E6C 80282FEC 14800003 */ bnez $a0, .L80282FFC -/* 7E3E70 80282FF0 24020002 */ addiu $v0, $zero, 2 -/* 7E3E74 80282FF4 080A0C1B */ j .L8028306C -/* 7E3E78 80282FF8 AE0200A8 */ sw $v0, 0xa8($s0) -.L80282FFC: -/* 7E3E7C 80282FFC 92240004 */ lbu $a0, 4($s1) -/* 7E3E80 80283000 00C4102A */ slt $v0, $a2, $a0 -/* 7E3E84 80283004 10400017 */ beqz $v0, .L80283064 -/* 7E3E88 80283008 24020001 */ addiu $v0, $zero, 1 -/* 7E3E8C 8028300C 04C20016 */ bltzl $a2, .L80283068 -/* 7E3E90 80283010 AE0200A8 */ sw $v0, 0xa8($s0) -/* 7E3E94 80283014 92220005 */ lbu $v0, 5($s1) -/* 7E3E98 80283018 0062102A */ slt $v0, $v1, $v0 -/* 7E3E9C 8028301C 10400011 */ beqz $v0, .L80283064 -/* 7E3EA0 80283020 24020001 */ addiu $v0, $zero, 1 -/* 7E3EA4 80283024 0460000F */ bltz $v1, .L80283064 -/* 7E3EA8 80283028 00640018 */ mult $v1, $a0 -/* 7E3EAC 8028302C 8E220000 */ lw $v0, ($s1) -/* 7E3EB0 80283030 00007012 */ mflo $t6 -/* 7E3EB4 80283034 00CE1821 */ addu $v1, $a2, $t6 -/* 7E3EB8 80283038 00431021 */ addu $v0, $v0, $v1 -/* 7E3EBC 8028303C 90420000 */ lbu $v0, ($v0) -/* 7E3EC0 80283040 14400008 */ bnez $v0, .L80283064 -/* 7E3EC4 80283044 24020001 */ addiu $v0, $zero, 1 -/* 7E3EC8 80283048 3C038016 */ lui $v1, %hi(gCollisionStatus) -/* 7E3ECC 8028304C 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) -/* 7E3ED0 80283050 2402FFFF */ addiu $v0, $zero, -1 -/* 7E3ED4 80283054 10620003 */ beq $v1, $v0, .L80283064 -/* 7E3ED8 80283058 24020001 */ addiu $v0, $zero, 1 -/* 7E3EDC 8028305C 080A0C1A */ j .L80283068 -/* 7E3EE0 80283060 AE0000A8 */ sw $zero, 0xa8($s0) -.L80283064: -/* 7E3EE4 80283064 AE0200A8 */ sw $v0, 0xa8($s0) -.L80283068: -/* 7E3EE8 80283068 24020002 */ addiu $v0, $zero, 2 -.L8028306C: -/* 7E3EEC 8028306C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E3EF0 80283070 8FB10014 */ lw $s1, 0x14($sp) -/* 7E3EF4 80283074 8FB00010 */ lw $s0, 0x10($sp) -/* 7E3EF8 80283078 03E00008 */ jr $ra -/* 7E3EFC 8028307C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80283080.s b/asm/nonmatchings/code_7E3700/func_80283080.s deleted file mode 100644 index f3ad6ab99a..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283080.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283080 -/* 7E3F00 80283080 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E3F04 80283084 AFB00010 */ sw $s0, 0x10($sp) -/* 7E3F08 80283088 0080802D */ daddu $s0, $a0, $zero -/* 7E3F0C 8028308C AFBF0018 */ sw $ra, 0x18($sp) -/* 7E3F10 80283090 AFB10014 */ sw $s1, 0x14($sp) -/* 7E3F14 80283094 8E0400B0 */ lw $a0, 0xb0($s0) -/* 7E3F18 80283098 0C04417A */ jal get_entity_by_index -/* 7E3F1C 8028309C 8E1100AC */ lw $s1, 0xac($s0) -/* 7E3F20 802830A0 3C0551EB */ lui $a1, 0x51eb -/* 7E3F24 802830A4 34A5851F */ ori $a1, $a1, 0x851f -/* 7E3F28 802830A8 C4400050 */ lwc1 $f0, 0x50($v0) -/* 7E3F2C 802830AC 8E240010 */ lw $a0, 0x10($s1) -/* 7E3F30 802830B0 4600008D */ trunc.w.s $f2, $f0 -/* 7E3F34 802830B4 44031000 */ mfc1 $v1, $f2 -/* 7E3F38 802830B8 00000000 */ nop -/* 7E3F3C 802830BC 00641823 */ subu $v1, $v1, $a0 -/* 7E3F40 802830C0 00650018 */ mult $v1, $a1 -/* 7E3F44 802830C4 C4400048 */ lwc1 $f0, 0x48($v0) -/* 7E3F48 802830C8 8E220008 */ lw $v0, 8($s1) -/* 7E3F4C 802830CC 00003810 */ mfhi $a3 -/* 7E3F50 802830D0 4600008D */ trunc.w.s $f2, $f0 -/* 7E3F54 802830D4 44061000 */ mfc1 $a2, $f2 -/* 7E3F58 802830D8 00000000 */ nop -/* 7E3F5C 802830DC 00C23023 */ subu $a2, $a2, $v0 -/* 7E3F60 802830E0 00C50018 */ mult $a2, $a1 -/* 7E3F64 802830E4 00031FC3 */ sra $v1, $v1, 0x1f -/* 7E3F68 802830E8 8E0200A4 */ lw $v0, 0xa4($s0) -/* 7E3F6C 802830EC 000738C3 */ sra $a3, $a3, 3 -/* 7E3F70 802830F0 00E33823 */ subu $a3, $a3, $v1 -/* 7E3F74 802830F4 00002810 */ mfhi $a1 -/* 7E3F78 802830F8 92230004 */ lbu $v1, 4($s1) -/* 7E3F7C 802830FC 00E21021 */ addu $v0, $a3, $v0 -/* 7E3F80 80283100 00430018 */ mult $v0, $v1 -/* 7E3F84 80283104 8E04009C */ lw $a0, 0x9c($s0) -/* 7E3F88 80283108 00001012 */ mflo $v0 -/* 7E3F8C 8028310C 000637C3 */ sra $a2, $a2, 0x1f -/* 7E3F90 80283110 000528C3 */ sra $a1, $a1, 3 -/* 7E3F94 80283114 00E30018 */ mult $a3, $v1 -/* 7E3F98 80283118 00A62823 */ subu $a1, $a1, $a2 -/* 7E3F9C 8028311C 00A42021 */ addu $a0, $a1, $a0 -/* 7E3FA0 80283120 00822021 */ addu $a0, $a0, $v0 -/* 7E3FA4 80283124 8E230000 */ lw $v1, ($s1) -/* 7E3FA8 80283128 00004812 */ mflo $t1 -/* 7E3FAC 8028312C 00A91021 */ addu $v0, $a1, $t1 -/* 7E3FB0 80283130 00621021 */ addu $v0, $v1, $v0 -/* 7E3FB4 80283134 90420000 */ lbu $v0, ($v0) -/* 7E3FB8 80283138 00641821 */ addu $v1, $v1, $a0 -/* 7E3FBC 8028313C A0620000 */ sb $v0, ($v1) -/* 7E3FC0 80283140 92220004 */ lbu $v0, 4($s1) -/* 7E3FC4 80283144 00E20018 */ mult $a3, $v0 -/* 7E3FC8 80283148 8E230000 */ lw $v1, ($s1) -/* 7E3FCC 8028314C 00003012 */ mflo $a2 -/* 7E3FD0 80283150 00A62821 */ addu $a1, $a1, $a2 -/* 7E3FD4 80283154 00651821 */ addu $v1, $v1, $a1 -/* 7E3FD8 80283158 A0600000 */ sb $zero, ($v1) -/* 7E3FDC 8028315C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E3FE0 80283160 8FB10014 */ lw $s1, 0x14($sp) -/* 7E3FE4 80283164 8FB00010 */ lw $s0, 0x10($sp) -/* 7E3FE8 80283168 24020002 */ addiu $v0, $zero, 2 -/* 7E3FEC 8028316C 03E00008 */ jr $ra -/* 7E3FF0 80283170 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80283174.s b/asm/nonmatchings/code_7E3700/func_80283174.s deleted file mode 100644 index 9ba84c5043..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283174.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283174 -/* 7E3FF4 80283174 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* 7E3FF8 80283178 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 7E3FFC 8028317C 8C8200B0 */ lw $v0, 0xb0($a0) -/* 7E4000 80283180 3C038016 */ lui $v1, %hi(gCollisionStatus) -/* 7E4004 80283184 8463A550 */ lh $v1, %lo(gCollisionStatus)($v1) -/* 7E4008 80283188 24424000 */ addiu $v0, $v0, 0x4000 -/* 7E400C 8028318C 5462000F */ bnel $v1, $v0, .L802831CC -/* 7E4010 80283190 AC8000B8 */ sw $zero, 0xb8($a0) -/* 7E4014 80283194 80A300B4 */ lb $v1, 0xb4($a1) -/* 7E4018 80283198 24020014 */ addiu $v0, $zero, 0x14 -/* 7E401C 8028319C 10620005 */ beq $v1, $v0, .L802831B4 -/* 7E4020 802831A0 24020001 */ addiu $v0, $zero, 1 -/* 7E4024 802831A4 10620003 */ beq $v1, $v0, .L802831B4 -/* 7E4028 802831A8 24020002 */ addiu $v0, $zero, 2 -/* 7E402C 802831AC 54620009 */ bnel $v1, $v0, .L802831D4 -/* 7E4030 802831B0 AC8000B8 */ sw $zero, 0xb8($a0) -.L802831B4: -/* 7E4034 802831B4 8CA20004 */ lw $v0, 4($a1) -/* 7E4038 802831B8 30420001 */ andi $v0, $v0, 1 -/* 7E403C 802831BC 54400003 */ bnel $v0, $zero, .L802831CC -/* 7E4040 802831C0 AC8000B8 */ sw $zero, 0xb8($a0) -/* 7E4044 802831C4 24020001 */ addiu $v0, $zero, 1 -/* 7E4048 802831C8 AC8200B8 */ sw $v0, 0xb8($a0) -.L802831CC: -/* 7E404C 802831CC 03E00008 */ jr $ra -/* 7E4050 802831D0 24020002 */ addiu $v0, $zero, 2 -.L802831D4: -/* 7E4054 802831D4 03E00008 */ jr $ra -/* 7E4058 802831D8 00000000 */ nop diff --git a/asm/nonmatchings/code_7E3700/func_80283240.s b/asm/nonmatchings/code_7E3700/func_80283240.s deleted file mode 100644 index 9ed41dd265..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283240.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283240 -/* 7E40C0 80283240 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E40C4 80283244 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E40C8 80283248 0080982D */ daddu $s3, $a0, $zero -/* 7E40CC 8028324C AFB10014 */ sw $s1, 0x14($sp) -/* 7E40D0 80283250 0000882D */ daddu $s1, $zero, $zero -/* 7E40D4 80283254 AFBF0024 */ sw $ra, 0x24($sp) -/* 7E40D8 80283258 AFB40020 */ sw $s4, 0x20($sp) -/* 7E40DC 8028325C AFB20018 */ sw $s2, 0x18($sp) -/* 7E40E0 80283260 AFB00010 */ sw $s0, 0x10($sp) -/* 7E40E4 80283264 8E62000C */ lw $v0, 0xc($s3) -/* 7E40E8 80283268 8C450004 */ lw $a1, 4($v0) -/* 7E40EC 8028326C 8C540000 */ lw $s4, ($v0) -/* 7E40F0 80283270 0C0B1EAF */ jal get_variable -/* 7E40F4 80283274 0220802D */ daddu $s0, $s1, $zero -/* 7E40F8 80283278 0040902D */ daddu $s2, $v0, $zero -.L8028327C: -/* 7E40FC 8028327C 0C0B11E4 */ jal get_script_by_index -/* 7E4100 80283280 0200202D */ daddu $a0, $s0, $zero -/* 7E4104 80283284 10400006 */ beqz $v0, .L802832A0 -/* 7E4108 80283288 26100001 */ addiu $s0, $s0, 1 -/* 7E410C 8028328C 8C42015C */ lw $v0, 0x15c($v0) -/* 7E4110 80283290 14520004 */ bne $v0, $s2, .L802832A4 -/* 7E4114 80283294 2A020080 */ slti $v0, $s0, 0x80 -/* 7E4118 80283298 080A0CAB */ j .L802832AC -/* 7E411C 8028329C 24110001 */ addiu $s1, $zero, 1 -.L802832A0: -/* 7E4120 802832A0 2A020080 */ slti $v0, $s0, 0x80 -.L802832A4: -/* 7E4124 802832A4 1440FFF5 */ bnez $v0, .L8028327C -/* 7E4128 802832A8 00000000 */ nop -.L802832AC: -/* 7E412C 802832AC 0260202D */ daddu $a0, $s3, $zero -/* 7E4130 802832B0 0280282D */ daddu $a1, $s4, $zero -/* 7E4134 802832B4 0C0B2026 */ jal set_variable -/* 7E4138 802832B8 0220302D */ daddu $a2, $s1, $zero -/* 7E413C 802832BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7E4140 802832C0 8FB40020 */ lw $s4, 0x20($sp) -/* 7E4144 802832C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E4148 802832C8 8FB20018 */ lw $s2, 0x18($sp) -/* 7E414C 802832CC 8FB10014 */ lw $s1, 0x14($sp) -/* 7E4150 802832D0 8FB00010 */ lw $s0, 0x10($sp) -/* 7E4154 802832D4 24020002 */ addiu $v0, $zero, 2 -/* 7E4158 802832D8 03E00008 */ jr $ra -/* 7E415C 802832DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7E3700/func_80283810.s b/asm/nonmatchings/code_7E3700/func_80283810.s deleted file mode 100644 index 6059f9801d..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283810.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283810 -/* 7E4690 80283810 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E4694 80283814 AFB00010 */ sw $s0, 0x10($sp) -/* 7E4698 80283818 0080802D */ daddu $s0, $a0, $zero -/* 7E469C 8028381C AFBF0014 */ sw $ra, 0x14($sp) -/* 7E46A0 80283820 0C03AD8E */ jal partner_get_ride_script -/* 7E46A4 80283824 AE0000AC */ sw $zero, 0xac($s0) -/* 7E46A8 80283828 1040000F */ beqz $v0, .L80283868 -/* 7E46AC 8028382C 00000000 */ nop -/* 7E46B0 80283830 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* 7E46B4 80283834 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* 7E46B8 80283838 14400003 */ bnez $v0, .L80283848 -/* 7E46BC 8028383C 24020001 */ addiu $v0, $zero, 1 -/* 7E46C0 80283840 080A0E1A */ j .L80283868 -/* 7E46C4 80283844 AE0000AC */ sw $zero, 0xac($s0) -.L80283848: -/* 7E46C8 80283848 0C03AD8E */ jal partner_get_ride_script -/* 7E46CC 8028384C AE0200AC */ sw $v0, 0xac($s0) -/* 7E46D0 80283850 AE0200B0 */ sw $v0, 0xb0($s0) -/* 7E46D4 80283854 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7E46D8 80283858 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7E46DC 8028385C C4400080 */ lwc1 $f0, 0x80($v0) -/* 7E46E0 80283860 4600008D */ trunc.w.s $f2, $f0 -/* 7E46E4 80283864 E60200B8 */ swc1 $f2, 0xb8($s0) -.L80283868: -/* 7E46E8 80283868 8FBF0014 */ lw $ra, 0x14($sp) -/* 7E46EC 8028386C 8FB00010 */ lw $s0, 0x10($sp) -/* 7E46F0 80283870 24020002 */ addiu $v0, $zero, 2 -/* 7E46F4 80283874 03E00008 */ jr $ra -/* 7E46F8 80283878 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/code_7E3700/func_80283908.s deleted file mode 100644 index e00af2cf6e..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283908.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283908 -/* 7E4788 80283908 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 7E478C 8028390C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 7E4790 80283910 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E4794 80283914 AFB00010 */ sw $s0, 0x10($sp) -/* 7E4798 80283918 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 7E479C 8028391C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 7E47A0 80283920 AFBF001C */ sw $ra, 0x1c($sp) -/* 7E47A4 80283924 AFB20018 */ sw $s2, 0x18($sp) -/* 7E47A8 80283928 AFB10014 */ sw $s1, 0x14($sp) -/* 7E47AC 8028392C 84620160 */ lh $v0, 0x160($v1) -/* 7E47B0 80283930 0200882D */ daddu $s1, $s0, $zero -/* 7E47B4 80283934 44820000 */ mtc1 $v0, $f0 -/* 7E47B8 80283938 00000000 */ nop -/* 7E47BC 8028393C 46800020 */ cvt.s.w $f0, $f0 -/* 7E47C0 80283940 E6000028 */ swc1 $f0, 0x28($s0) -/* 7E47C4 80283944 84620162 */ lh $v0, 0x162($v1) -/* 7E47C8 80283948 3C04800B */ lui $a0, %hi(gCameras) -/* 7E47CC 8028394C 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 7E47D0 80283950 44820000 */ mtc1 $v0, $f0 -/* 7E47D4 80283954 00000000 */ nop -/* 7E47D8 80283958 46800020 */ cvt.s.w $f0, $f0 -/* 7E47DC 8028395C E600002C */ swc1 $f0, 0x2c($s0) -/* 7E47E0 80283960 84620164 */ lh $v0, 0x164($v1) -/* 7E47E4 80283964 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 7E47E8 80283968 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7E47EC 8028396C 44820000 */ mtc1 $v0, $f0 -/* 7E47F0 80283970 00000000 */ nop -/* 7E47F4 80283974 46800020 */ cvt.s.w $f0, $f0 -/* 7E47F8 80283978 00031080 */ sll $v0, $v1, 2 -/* 7E47FC 8028397C 00431021 */ addu $v0, $v0, $v1 -/* 7E4800 80283980 00021080 */ sll $v0, $v0, 2 -/* 7E4804 80283984 00431023 */ subu $v0, $v0, $v1 -/* 7E4808 80283988 000218C0 */ sll $v1, $v0, 3 -/* 7E480C 8028398C 00431021 */ addu $v0, $v0, $v1 -/* 7E4810 80283990 000210C0 */ sll $v0, $v0, 3 -/* 7E4814 80283994 E6000030 */ swc1 $f0, 0x30($s0) -/* 7E4818 80283998 3C038011 */ lui $v1, %hi(gPlayerData+0x12) -/* 7E481C 8028399C 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) -/* 7E4820 802839A0 10600022 */ beqz $v1, .L80283A2C -/* 7E4824 802839A4 00449021 */ addu $s2, $v0, $a0 -/* 7E4828 802839A8 0C00EABB */ jal get_npc_unsafe -/* 7E482C 802839AC 2404FFFC */ addiu $a0, $zero, -4 -/* 7E4830 802839B0 C60200A8 */ lwc1 $f2, 0xa8($s0) -/* 7E4834 802839B4 3C014334 */ lui $at, 0x4334 -/* 7E4838 802839B8 44810000 */ mtc1 $at, $f0 -/* 7E483C 802839BC 3C01C2B4 */ lui $at, 0xc2b4 -/* 7E4840 802839C0 44816000 */ mtc1 $at, $f12 -/* 7E4844 802839C4 4600103C */ c.lt.s $f2, $f0 -/* 7E4848 802839C8 00000000 */ nop -/* 7E484C 802839CC 45000003 */ bc1f .L802839DC -/* 7E4850 802839D0 0040802D */ daddu $s0, $v0, $zero -/* 7E4854 802839D4 3C0142B4 */ lui $at, 0x42b4 -/* 7E4858 802839D8 44816000 */ mtc1 $at, $f12 -.L802839DC: -/* 7E485C 802839DC 0C00A6C9 */ jal clamp_angle -/* 7E4860 802839E0 00000000 */ nop -/* 7E4864 802839E4 C6220028 */ lwc1 $f2, 0x28($s1) -/* 7E4868 802839E8 E6020038 */ swc1 $f2, 0x38($s0) -/* 7E486C 802839EC C622002C */ lwc1 $f2, 0x2c($s1) -/* 7E4870 802839F0 E602003C */ swc1 $f2, 0x3c($s0) -/* 7E4874 802839F4 C6220030 */ lwc1 $f2, 0x30($s1) -/* 7E4878 802839F8 26040038 */ addiu $a0, $s0, 0x38 -/* 7E487C 802839FC E6020040 */ swc1 $f2, 0x40($s0) -/* 7E4880 80283A00 862200B2 */ lh $v0, 0xb2($s1) -/* 7E4884 80283A04 44070000 */ mfc1 $a3, $f0 -/* 7E4888 80283A08 24420005 */ addiu $v0, $v0, 5 -/* 7E488C 80283A0C 44822000 */ mtc1 $v0, $f4 -/* 7E4890 80283A10 00000000 */ nop -/* 7E4894 80283A14 46802120 */ cvt.s.w $f4, $f4 -/* 7E4898 80283A18 44062000 */ mfc1 $a2, $f4 -/* 7E489C 80283A1C 0C00A7E7 */ jal add_vec2D_polar -/* 7E48A0 80283A20 26050040 */ addiu $a1, $s0, 0x40 -/* 7E48A4 80283A24 0C03BCCA */ jal enable_partner_ai -/* 7E48A8 80283A28 00000000 */ nop -.L80283A2C: -/* 7E48AC 80283A2C 24020001 */ addiu $v0, $zero, 1 -/* 7E48B0 80283A30 A6420008 */ sh $v0, 8($s2) -/* 7E48B4 80283A34 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E48B8 80283A38 8FB20018 */ lw $s2, 0x18($sp) -/* 7E48BC 80283A3C 8FB10014 */ lw $s1, 0x14($sp) -/* 7E48C0 80283A40 8FB00010 */ lw $s0, 0x10($sp) -/* 7E48C4 80283A44 24020002 */ addiu $v0, $zero, 2 -/* 7E48C8 80283A48 03E00008 */ jr $ra -/* 7E48CC 80283A4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80283A50.s b/asm/nonmatchings/code_7E3700/func_80283A50.s deleted file mode 100644 index 6fbf4c9b88..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283A50.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283A50 -/* 7E48D0 80283A50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E48D4 80283A54 AFB20018 */ sw $s2, 0x18($sp) -/* 7E48D8 80283A58 0080902D */ daddu $s2, $a0, $zero -/* 7E48DC 80283A5C AFB00010 */ sw $s0, 0x10($sp) -/* 7E48E0 80283A60 00A0802D */ daddu $s0, $a1, $zero -/* 7E48E4 80283A64 AFBF001C */ sw $ra, 0x1c($sp) -/* 7E48E8 80283A68 0C016AFA */ jal get_current_map_header -/* 7E48EC 80283A6C AFB10014 */ sw $s1, 0x14($sp) -/* 7E48F0 80283A70 0000302D */ daddu $a2, $zero, $zero -/* 7E48F4 80283A74 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 7E48F8 80283A78 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 7E48FC 80283A7C 12000021 */ beqz $s0, .L80283B04 -/* 7E4900 80283A80 0040282D */ daddu $a1, $v0, $zero -/* 7E4904 80283A84 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* 7E4908 80283A88 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* 7E490C 80283A8C 8482008E */ lh $v0, 0x8e($a0) -/* 7E4910 80283A90 8CA30014 */ lw $v1, 0x14($a1) -/* 7E4914 80283A94 00021100 */ sll $v0, $v0, 4 -/* 7E4918 80283A98 00431021 */ addu $v0, $v0, $v1 -/* 7E491C 80283A9C C4400000 */ lwc1 $f0, ($v0) -/* 7E4920 80283AA0 E6200028 */ swc1 $f0, 0x28($s1) -/* 7E4924 80283AA4 8482008E */ lh $v0, 0x8e($a0) -/* 7E4928 80283AA8 8CA30014 */ lw $v1, 0x14($a1) -/* 7E492C 80283AAC 00021100 */ sll $v0, $v0, 4 -/* 7E4930 80283AB0 00431021 */ addu $v0, $v0, $v1 -/* 7E4934 80283AB4 C4400008 */ lwc1 $f0, 8($v0) -/* 7E4938 80283AB8 E6200030 */ swc1 $f0, 0x30($s1) -/* 7E493C 80283ABC 8482008E */ lh $v0, 0x8e($a0) -/* 7E4940 80283AC0 8CA30014 */ lw $v1, 0x14($a1) -/* 7E4944 80283AC4 00021100 */ sll $v0, $v0, 4 -/* 7E4948 80283AC8 00431021 */ addu $v0, $v0, $v1 -/* 7E494C 80283ACC C4400004 */ lwc1 $f0, 4($v0) -/* 7E4950 80283AD0 4600018D */ trunc.w.s $f6, $f0 -/* 7E4954 80283AD4 44023000 */ mfc1 $v0, $f6 -/* 7E4958 80283AD8 00000000 */ nop -/* 7E495C 80283ADC AE42008C */ sw $v0, 0x8c($s2) -/* 7E4960 80283AE0 2442FFD8 */ addiu $v0, $v0, -0x28 -/* 7E4964 80283AE4 44820000 */ mtc1 $v0, $f0 -/* 7E4968 80283AE8 00000000 */ nop -/* 7E496C 80283AEC 46800020 */ cvt.s.w $f0, $f0 -/* 7E4970 80283AF0 8E220000 */ lw $v0, ($s1) -/* 7E4974 80283AF4 3C030400 */ lui $v1, 0x400 -/* 7E4978 80283AF8 E620002C */ swc1 $f0, 0x2c($s1) -/* 7E497C 80283AFC 080A0ED2 */ j .L80283B48 -/* 7E4980 80283B00 00431025 */ or $v0, $v0, $v1 -.L80283B04: -/* 7E4984 80283B04 C622002C */ lwc1 $f2, 0x2c($s1) -/* 7E4988 80283B08 3C013F80 */ lui $at, 0x3f80 -/* 7E498C 80283B0C 44810000 */ mtc1 $at, $f0 -/* 7E4990 80283B10 00000000 */ nop -/* 7E4994 80283B14 46001080 */ add.s $f2, $f2, $f0 -/* 7E4998 80283B18 E622002C */ swc1 $f2, 0x2c($s1) -/* 7E499C 80283B1C C640008C */ lwc1 $f0, 0x8c($s2) -/* 7E49A0 80283B20 46800020 */ cvt.s.w $f0, $f0 -/* 7E49A4 80283B24 4600103C */ c.lt.s $f2, $f0 -/* 7E49A8 80283B28 00000000 */ nop -/* 7E49AC 80283B2C 45010007 */ bc1t .L80283B4C -/* 7E49B0 80283B30 3C03FBFF */ lui $v1, 0xfbff -/* 7E49B4 80283B34 3463FFFF */ ori $v1, $v1, 0xffff -/* 7E49B8 80283B38 8E220000 */ lw $v0, ($s1) -/* 7E49BC 80283B3C 24060002 */ addiu $a2, $zero, 2 -/* 7E49C0 80283B40 E620002C */ swc1 $f0, 0x2c($s1) -/* 7E49C4 80283B44 00431024 */ and $v0, $v0, $v1 -.L80283B48: -/* 7E49C8 80283B48 AE220000 */ sw $v0, ($s1) -.L80283B4C: -/* 7E49CC 80283B4C C6200028 */ lwc1 $f0, 0x28($s1) -/* 7E49D0 80283B50 C622002C */ lwc1 $f2, 0x2c($s1) -/* 7E49D4 80283B54 C6240030 */ lwc1 $f4, 0x30($s1) -/* 7E49D8 80283B58 3C03800B */ lui $v1, %hi(gCameras) -/* 7E49DC 80283B5C 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 7E49E0 80283B60 E4600060 */ swc1 $f0, 0x60($v1) -/* 7E49E4 80283B64 E4620064 */ swc1 $f2, 0x64($v1) -/* 7E49E8 80283B68 E4640068 */ swc1 $f4, 0x68($v1) -/* 7E49EC 80283B6C 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E49F0 80283B70 8FB20018 */ lw $s2, 0x18($sp) -/* 7E49F4 80283B74 8FB10014 */ lw $s1, 0x14($sp) -/* 7E49F8 80283B78 8FB00010 */ lw $s0, 0x10($sp) -/* 7E49FC 80283B7C 00C0102D */ daddu $v0, $a2, $zero -/* 7E4A00 80283B80 03E00008 */ jr $ra -/* 7E4A04 80283B84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80283B88.s b/asm/nonmatchings/code_7E3700/func_80283B88.s deleted file mode 100644 index 79ef737efa..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283B88.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283B88 -/* 7E4A08 80283B88 3C0141A0 */ lui $at, 0x41a0 -/* 7E4A0C 80283B8C 44816000 */ mtc1 $at, $f12 -/* 7E4A10 80283B90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E4A14 80283B94 AFBF0010 */ sw $ra, 0x10($sp) -/* 7E4A18 80283B98 0C03BCE5 */ jal func_800EF394 -/* 7E4A1C 80283B9C 00000000 */ nop -/* 7E4A20 80283BA0 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E4A24 80283BA4 24020002 */ addiu $v0, $zero, 2 -/* 7E4A28 80283BA8 03E00008 */ jr $ra -/* 7E4A2C 80283BAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7E3700/func_80283BB0.s b/asm/nonmatchings/code_7E3700/func_80283BB0.s deleted file mode 100644 index ad0f9c2619..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283BB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283BB0 -/* 7E4A30 80283BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E4A34 80283BB4 AFBF0010 */ sw $ra, 0x10($sp) -/* 7E4A38 80283BB8 0C03BCE9 */ jal func_800EF3A4 -/* 7E4A3C 80283BBC 00000000 */ nop -/* 7E4A40 80283BC0 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E4A44 80283BC4 24020002 */ addiu $v0, $zero, 2 -/* 7E4A48 80283BC8 03E00008 */ jr $ra -/* 7E4A4C 80283BCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7E3700/func_80283BD0.s b/asm/nonmatchings/code_7E3700/func_80283BD0.s deleted file mode 100644 index 3703e72e46..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283BD0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283BD0 -/* 7E4A50 80283BD0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E4A54 80283BD4 AFB00010 */ sw $s0, 0x10($sp) -/* 7E4A58 80283BD8 0080802D */ daddu $s0, $a0, $zero -/* 7E4A5C 80283BDC AFB10014 */ sw $s1, 0x14($sp) -/* 7E4A60 80283BE0 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 7E4A64 80283BE4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 7E4A68 80283BE8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7E4A6C 80283BEC 10A00008 */ beqz $a1, .L80283C10 -/* 7E4A70 80283BF0 8E02000C */ lw $v0, 0xc($s0) -/* 7E4A74 80283BF4 0C0B1EAF */ jal get_variable -/* 7E4A78 80283BF8 8C450000 */ lw $a1, ($v0) -/* 7E4A7C 80283BFC AE020070 */ sw $v0, 0x70($s0) -/* 7E4A80 80283C00 8E250080 */ lw $a1, 0x80($s1) -/* 7E4A84 80283C04 8E26005C */ lw $a2, 0x5c($s1) -/* 7E4A88 80283C08 0C0389DE */ jal move_player -/* 7E4A8C 80283C0C 0040202D */ daddu $a0, $v0, $zero -.L80283C10: -/* 7E4A90 80283C10 8E030070 */ lw $v1, 0x70($s0) -/* 7E4A94 80283C14 2463FFFF */ addiu $v1, $v1, -1 -/* 7E4A98 80283C18 AE030070 */ sw $v1, 0x70($s0) -/* 7E4A9C 80283C1C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E4AA0 80283C20 8FB10014 */ lw $s1, 0x14($sp) -/* 7E4AA4 80283C24 8FB00010 */ lw $s0, 0x10($sp) -/* 7E4AA8 80283C28 000317C2 */ srl $v0, $v1, 0x1f -/* 7E4AAC 80283C2C 03E00008 */ jr $ra -/* 7E4AB0 80283C30 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80283C34.s b/asm/nonmatchings/code_7E3700/func_80283C34.s deleted file mode 100644 index 30588c716d..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283C34.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283C34 -/* 7E4AB4 80283C34 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E4AB8 80283C38 AFB20018 */ sw $s2, 0x18($sp) -/* 7E4ABC 80283C3C 0080902D */ daddu $s2, $a0, $zero -/* 7E4AC0 80283C40 AFBF0020 */ sw $ra, 0x20($sp) -/* 7E4AC4 80283C44 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E4AC8 80283C48 AFB10014 */ sw $s1, 0x14($sp) -/* 7E4ACC 80283C4C AFB00010 */ sw $s0, 0x10($sp) -/* 7E4AD0 80283C50 0C016AFA */ jal get_current_map_header -/* 7E4AD4 80283C54 8E50000C */ lw $s0, 0xc($s2) -/* 7E4AD8 80283C58 0240202D */ daddu $a0, $s2, $zero -/* 7E4ADC 80283C5C 8C530014 */ lw $s3, 0x14($v0) -/* 7E4AE0 80283C60 8E050000 */ lw $a1, ($s0) -/* 7E4AE4 80283C64 0C0B1EAF */ jal get_variable -/* 7E4AE8 80283C68 26100004 */ addiu $s0, $s0, 4 -/* 7E4AEC 80283C6C 8E050000 */ lw $a1, ($s0) -/* 7E4AF0 80283C70 26100004 */ addiu $s0, $s0, 4 -/* 7E4AF4 80283C74 00028900 */ sll $s1, $v0, 4 -/* 7E4AF8 80283C78 02338821 */ addu $s1, $s1, $s3 -/* 7E4AFC 80283C7C C6200000 */ lwc1 $f0, ($s1) -/* 7E4B00 80283C80 4600008D */ trunc.w.s $f2, $f0 -/* 7E4B04 80283C84 44061000 */ mfc1 $a2, $f2 -/* 7E4B08 80283C88 0C0B2026 */ jal set_variable -/* 7E4B0C 80283C8C 0240202D */ daddu $a0, $s2, $zero -/* 7E4B10 80283C90 8E050000 */ lw $a1, ($s0) -/* 7E4B14 80283C94 26100004 */ addiu $s0, $s0, 4 -/* 7E4B18 80283C98 C6200004 */ lwc1 $f0, 4($s1) -/* 7E4B1C 80283C9C 4600008D */ trunc.w.s $f2, $f0 -/* 7E4B20 80283CA0 44061000 */ mfc1 $a2, $f2 -/* 7E4B24 80283CA4 0C0B2026 */ jal set_variable -/* 7E4B28 80283CA8 0240202D */ daddu $a0, $s2, $zero -/* 7E4B2C 80283CAC 8E050000 */ lw $a1, ($s0) -/* 7E4B30 80283CB0 26100004 */ addiu $s0, $s0, 4 -/* 7E4B34 80283CB4 C6200008 */ lwc1 $f0, 8($s1) -/* 7E4B38 80283CB8 4600008D */ trunc.w.s $f2, $f0 -/* 7E4B3C 80283CBC 44061000 */ mfc1 $a2, $f2 -/* 7E4B40 80283CC0 0C0B2026 */ jal set_variable -/* 7E4B44 80283CC4 0240202D */ daddu $a0, $s2, $zero -/* 7E4B48 80283CC8 C620000C */ lwc1 $f0, 0xc($s1) -/* 7E4B4C 80283CCC 8E050000 */ lw $a1, ($s0) -/* 7E4B50 80283CD0 4600008D */ trunc.w.s $f2, $f0 -/* 7E4B54 80283CD4 44061000 */ mfc1 $a2, $f2 -/* 7E4B58 80283CD8 0C0B2026 */ jal set_variable -/* 7E4B5C 80283CDC 0240202D */ daddu $a0, $s2, $zero -/* 7E4B60 80283CE0 8FBF0020 */ lw $ra, 0x20($sp) -/* 7E4B64 80283CE4 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E4B68 80283CE8 8FB20018 */ lw $s2, 0x18($sp) -/* 7E4B6C 80283CEC 8FB10014 */ lw $s1, 0x14($sp) -/* 7E4B70 80283CF0 8FB00010 */ lw $s0, 0x10($sp) -/* 7E4B74 80283CF4 24020002 */ addiu $v0, $zero, 2 -/* 7E4B78 80283CF8 03E00008 */ jr $ra -/* 7E4B7C 80283CFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7E3700/func_80283D00.s b/asm/nonmatchings/code_7E3700/func_80283D00.s deleted file mode 100644 index cac5108f20..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283D00.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283D00 -/* 7E4B80 80283D00 0080282D */ daddu $a1, $a0, $zero -/* 7E4B84 80283D04 8CA20090 */ lw $v0, 0x90($a1) -/* 7E4B88 80283D08 04400009 */ bltz $v0, .L80283D30 -/* 7E4B8C 80283D0C 2403FFFF */ addiu $v1, $zero, -1 -/* 7E4B90 80283D10 3C02802E */ lui $v0, 0x802e -/* 7E4B94 80283D14 2442BD28 */ addiu $v0, $v0, -0x42d8 -/* 7E4B98 80283D18 8CA4008C */ lw $a0, 0x8c($a1) -/* 7E4B9C 80283D1C AC430004 */ sw $v1, 4($v0) -/* 7E4BA0 80283D20 3C01802E */ lui $at, 0x802e -/* 7E4BA4 80283D24 AC23BC7C */ sw $v1, -0x4384($at) -/* 7E4BA8 80283D28 080A0F55 */ j .L80283D54 -/* 7E4BAC 80283D2C AC440000 */ sw $a0, ($v0) -.L80283D30: -/* 7E4BB0 80283D30 3C02802E */ lui $v0, 0x802e -/* 7E4BB4 80283D34 2442BC7C */ addiu $v0, $v0, -0x4384 -/* 7E4BB8 80283D38 8CA4008C */ lw $a0, 0x8c($a1) -/* 7E4BBC 80283D3C AC430004 */ sw $v1, 4($v0) -/* 7E4BC0 80283D40 3C01802E */ lui $at, 0x802e -/* 7E4BC4 80283D44 AC23BD28 */ sw $v1, -0x42d8($at) -/* 7E4BC8 80283D48 AC440000 */ sw $a0, ($v0) -/* 7E4BCC 80283D4C 3C02802E */ lui $v0, 0x802e -/* 7E4BD0 80283D50 2442BD28 */ addiu $v0, $v0, -0x42d8 -.L80283D54: -/* 7E4BD4 80283D54 ACA2008C */ sw $v0, 0x8c($a1) -/* 7E4BD8 80283D58 3C02802E */ lui $v0, 0x802e -/* 7E4BDC 80283D5C 2442BC7C */ addiu $v0, $v0, -0x4384 -/* 7E4BE0 80283D60 ACA20090 */ sw $v0, 0x90($a1) -/* 7E4BE4 80283D64 03E00008 */ jr $ra -/* 7E4BE8 80283D68 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_7E3700/func_80283D6C.s b/asm/nonmatchings/code_7E3700/func_80283D6C.s deleted file mode 100644 index c14c4cbc3f..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283D6C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283D6C -/* 7E4BEC 80283D6C 0080282D */ daddu $a1, $a0, $zero -/* 7E4BF0 80283D70 8CA20090 */ lw $v0, 0x90($a1) -/* 7E4BF4 80283D74 0440000C */ bltz $v0, .L80283DA8 -/* 7E4BF8 80283D78 00000000 */ nop -/* 7E4BFC 80283D7C 8CA2008C */ lw $v0, 0x8c($a1) -/* 7E4C00 80283D80 3C03802E */ lui $v1, 0x802e -/* 7E4C04 80283D84 2463BD28 */ addiu $v1, $v1, -0x42d8 -/* 7E4C08 80283D88 AC620000 */ sw $v0, ($v1) -/* 7E4C0C 80283D8C 8CA40094 */ lw $a0, 0x94($a1) -/* 7E4C10 80283D90 2402FFFF */ addiu $v0, $zero, -1 -/* 7E4C14 80283D94 AC620008 */ sw $v0, 8($v1) -/* 7E4C18 80283D98 3C01802E */ lui $at, 0x802e -/* 7E4C1C 80283D9C AC22BC7C */ sw $v0, -0x4384($at) -/* 7E4C20 80283DA0 080A0F74 */ j .L80283DD0 -/* 7E4C24 80283DA4 AC640004 */ sw $a0, 4($v1) -.L80283DA8: -/* 7E4C28 80283DA8 8CA2008C */ lw $v0, 0x8c($a1) -/* 7E4C2C 80283DAC 3C03802E */ lui $v1, 0x802e -/* 7E4C30 80283DB0 2463BC7C */ addiu $v1, $v1, -0x4384 -/* 7E4C34 80283DB4 AC620000 */ sw $v0, ($v1) -/* 7E4C38 80283DB8 8CA40094 */ lw $a0, 0x94($a1) -/* 7E4C3C 80283DBC 2402FFFF */ addiu $v0, $zero, -1 -/* 7E4C40 80283DC0 AC620008 */ sw $v0, 8($v1) -/* 7E4C44 80283DC4 3C01802E */ lui $at, 0x802e -/* 7E4C48 80283DC8 AC22BD28 */ sw $v0, -0x42d8($at) -/* 7E4C4C 80283DCC AC640004 */ sw $a0, 4($v1) -.L80283DD0: -/* 7E4C50 80283DD0 3C02802E */ lui $v0, 0x802e -/* 7E4C54 80283DD4 2442BD28 */ addiu $v0, $v0, -0x42d8 -/* 7E4C58 80283DD8 ACA2008C */ sw $v0, 0x8c($a1) -/* 7E4C5C 80283DDC 3C02802E */ lui $v0, 0x802e -/* 7E4C60 80283DE0 2442BC7C */ addiu $v0, $v0, -0x4384 -/* 7E4C64 80283DE4 ACA20090 */ sw $v0, 0x90($a1) -/* 7E4C68 80283DE8 03E00008 */ jr $ra -/* 7E4C6C 80283DEC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_7E3700/func_80283DF0.s b/asm/nonmatchings/code_7E3700/func_80283DF0.s deleted file mode 100644 index 987b888572..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283DF0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283DF0 -/* 7E4C70 80283DF0 3C03802E */ lui $v1, 0x802e -/* 7E4C74 80283DF4 2463BD28 */ addiu $v1, $v1, -0x42d8 -/* 7E4C78 80283DF8 8C82008C */ lw $v0, 0x8c($a0) -/* 7E4C7C 80283DFC 2406FFFF */ addiu $a2, $zero, -1 -/* 7E4C80 80283E00 AC660004 */ sw $a2, 4($v1) -/* 7E4C84 80283E04 AC620000 */ sw $v0, ($v1) -/* 7E4C88 80283E08 8C850090 */ lw $a1, 0x90($a0) -/* 7E4C8C 80283E0C 3C02802E */ lui $v0, 0x802e -/* 7E4C90 80283E10 2442BC7C */ addiu $v0, $v0, -0x4384 -/* 7E4C94 80283E14 AC460004 */ sw $a2, 4($v0) -/* 7E4C98 80283E18 AC450000 */ sw $a1, ($v0) -/* 7E4C9C 80283E1C AC820090 */ sw $v0, 0x90($a0) -/* 7E4CA0 80283E20 24020002 */ addiu $v0, $zero, 2 -/* 7E4CA4 80283E24 03E00008 */ jr $ra -/* 7E4CA8 80283E28 AC83008C */ sw $v1, 0x8c($a0) diff --git a/asm/nonmatchings/code_7E3700/func_80283E2C.s b/asm/nonmatchings/code_7E3700/func_80283E2C.s deleted file mode 100644 index 6b1f36df10..0000000000 --- a/asm/nonmatchings/code_7E3700/func_80283E2C.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80283E2C -/* 7E4CAC 80283E2C 8C82008C */ lw $v0, 0x8c($a0) -/* 7E4CB0 80283E30 3C05802E */ lui $a1, 0x802e -/* 7E4CB4 80283E34 24A5BD28 */ addiu $a1, $a1, -0x42d8 -/* 7E4CB8 80283E38 ACA20000 */ sw $v0, ($a1) -/* 7E4CBC 80283E3C 8C820094 */ lw $v0, 0x94($a0) -/* 7E4CC0 80283E40 2406FFFF */ addiu $a2, $zero, -1 -/* 7E4CC4 80283E44 ACA60008 */ sw $a2, 8($a1) -/* 7E4CC8 80283E48 ACA20004 */ sw $v0, 4($a1) -/* 7E4CCC 80283E4C 8C830090 */ lw $v1, 0x90($a0) -/* 7E4CD0 80283E50 3C02802E */ lui $v0, 0x802e -/* 7E4CD4 80283E54 2442BC7C */ addiu $v0, $v0, -0x4384 -/* 7E4CD8 80283E58 AC430000 */ sw $v1, ($v0) -/* 7E4CDC 80283E5C 8C830098 */ lw $v1, 0x98($a0) -/* 7E4CE0 80283E60 AC460008 */ sw $a2, 8($v0) -/* 7E4CE4 80283E64 AC430004 */ sw $v1, 4($v0) -/* 7E4CE8 80283E68 AC820090 */ sw $v0, 0x90($a0) -/* 7E4CEC 80283E6C 24020002 */ addiu $v0, $zero, 2 -/* 7E4CF0 80283E70 03E00008 */ jr $ra -/* 7E4CF4 80283E74 AC85008C */ sw $a1, 0x8c($a0) -/* 7E4CF8 80283E78 00000000 */ nop -/* 7E4CFC 80283E7C 00000000 */ nop diff --git a/asm/nonmatchings/code_7e0e80/MakeShop.s b/asm/nonmatchings/code_7e0e80/MakeShop.s deleted file mode 100644 index a65ddabbd8..0000000000 --- a/asm/nonmatchings/code_7e0e80/MakeShop.s +++ /dev/null @@ -1,233 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel MakeShop -/* 7E26E0 80281860 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7E26E4 80281864 AFB10044 */ sw $s1, 0x44($sp) -/* 7E26E8 80281868 0080882D */ daddu $s1, $a0, $zero -/* 7E26EC 8028186C AFBF0064 */ sw $ra, 0x64($sp) -/* 7E26F0 80281870 AFBE0060 */ sw $fp, 0x60($sp) -/* 7E26F4 80281874 AFB7005C */ sw $s7, 0x5c($sp) -/* 7E26F8 80281878 AFB60058 */ sw $s6, 0x58($sp) -/* 7E26FC 8028187C AFB50054 */ sw $s5, 0x54($sp) -/* 7E2700 80281880 AFB40050 */ sw $s4, 0x50($sp) -/* 7E2704 80281884 AFB3004C */ sw $s3, 0x4c($sp) -/* 7E2708 80281888 AFB20048 */ sw $s2, 0x48($sp) -/* 7E270C 8028188C AFB00040 */ sw $s0, 0x40($sp) -/* 7E2710 80281890 8E30000C */ lw $s0, 0xc($s1) -/* 7E2714 80281894 8E050000 */ lw $a1, ($s0) -/* 7E2718 80281898 0C0B1EAF */ jal get_variable -/* 7E271C 8028189C 26100004 */ addiu $s0, $s0, 4 -/* 7E2720 802818A0 8E050000 */ lw $a1, ($s0) -/* 7E2724 802818A4 26100004 */ addiu $s0, $s0, 4 -/* 7E2728 802818A8 0220202D */ daddu $a0, $s1, $zero -/* 7E272C 802818AC 0C0B1EAF */ jal get_variable -/* 7E2730 802818B0 0040A82D */ daddu $s5, $v0, $zero -/* 7E2734 802818B4 8E050000 */ lw $a1, ($s0) -/* 7E2738 802818B8 26100004 */ addiu $s0, $s0, 4 -/* 7E273C 802818BC 0220202D */ daddu $a0, $s1, $zero -/* 7E2740 802818C0 0C0B1EAF */ jal get_variable -/* 7E2744 802818C4 0040982D */ daddu $s3, $v0, $zero -/* 7E2748 802818C8 0220202D */ daddu $a0, $s1, $zero -/* 7E274C 802818CC 8E050000 */ lw $a1, ($s0) -/* 7E2750 802818D0 0C0B1EAF */ jal get_variable -/* 7E2754 802818D4 0040882D */ daddu $s1, $v0, $zero -/* 7E2758 802818D8 2404035C */ addiu $a0, $zero, 0x35c -/* 7E275C 802818DC 0C00AB39 */ jal heap_malloc -/* 7E2760 802818E0 0040802D */ daddu $s0, $v0, $zero -/* 7E2764 802818E4 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 7E2768 802818E8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 7E276C 802818EC 0040A02D */ daddu $s4, $v0, $zero -/* 7E2770 802818F0 AC740144 */ sw $s4, 0x144($v1) -/* 7E2774 802818F4 AE950014 */ sw $s5, 0x14($s4) -/* 7E2778 802818F8 AE930018 */ sw $s3, 0x18($s4) -/* 7E277C 802818FC AE91001C */ sw $s1, 0x1c($s4) -/* 7E2780 80281900 AE900024 */ sw $s0, 0x24($s4) -/* 7E2784 80281904 8E620000 */ lw $v0, ($s3) -/* 7E2788 80281908 10400005 */ beqz $v0, .L80281920 -/* 7E278C 8028190C 0000902D */ daddu $s2, $zero, $zero -.L80281910: -/* 7E2790 80281910 2673000C */ addiu $s3, $s3, 0xc -/* 7E2794 80281914 8E620000 */ lw $v0, ($s3) -/* 7E2798 80281918 1440FFFD */ bnez $v0, .L80281910 -/* 7E279C 8028191C 26520001 */ addiu $s2, $s2, 1 -.L80281920: -/* 7E27A0 80281920 A6920002 */ sh $s2, 2($s4) -/* 7E27A4 80281924 12200008 */ beqz $s1, .L80281948 -/* 7E27A8 80281928 0000902D */ daddu $s2, $zero, $zero -/* 7E27AC 8028192C 8E220000 */ lw $v0, ($s1) -/* 7E27B0 80281930 10400005 */ beqz $v0, .L80281948 -/* 7E27B4 80281934 00000000 */ nop -.L80281938: -/* 7E27B8 80281938 2631000C */ addiu $s1, $s1, 0xc -/* 7E27BC 8028193C 8E220000 */ lw $v0, ($s1) -/* 7E27C0 80281940 1440FFFD */ bnez $v0, .L80281938 -/* 7E27C4 80281944 26520001 */ addiu $s2, $s2, 1 -.L80281948: -/* 7E27C8 80281948 86840002 */ lh $a0, 2($s4) -/* 7E27CC 8028194C 18800006 */ blez $a0, .L80281968 -/* 7E27D0 80281950 A6920004 */ sh $s2, 4($s4) -/* 7E27D4 80281954 0C00AB39 */ jal heap_malloc -/* 7E27D8 80281958 00042100 */ sll $a0, $a0, 4 -/* 7E27DC 8028195C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 7E27E0 80281960 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 7E27E4 80281964 AC620140 */ sw $v0, 0x140($v1) -.L80281968: -/* 7E27E8 80281968 8E930018 */ lw $s3, 0x18($s4) -/* 7E27EC 8028196C 8E620000 */ lw $v0, ($s3) -/* 7E27F0 80281970 8E950014 */ lw $s5, 0x14($s4) -/* 7E27F4 80281974 10400055 */ beqz $v0, .L80281ACC -/* 7E27F8 80281978 0000902D */ daddu $s2, $zero, $zero -/* 7E27FC 8028197C 3C1E8007 */ lui $fp, %hi(gGameStatusPtr) -/* 7E2800 80281980 27DE419C */ addiu $fp, $fp, %lo(gGameStatusPtr) -/* 7E2804 80281984 3C178028 */ lui $s7, 0x8028 -/* 7E2808 80281988 26F73F58 */ addiu $s7, $s7, 0x3f58 -/* 7E280C 8028198C 24160003 */ addiu $s6, $zero, 3 -/* 7E2810 80281990 26B10002 */ addiu $s1, $s5, 2 -.L80281994: -/* 7E2814 80281994 27A50028 */ addiu $a1, $sp, 0x28 -/* 7E2818 80281998 27A6002C */ addiu $a2, $sp, 0x2c -/* 7E281C 8028199C 27A70030 */ addiu $a3, $sp, 0x30 -/* 7E2820 802819A0 96A40000 */ lhu $a0, ($s5) -/* 7E2824 802819A4 27A20034 */ addiu $v0, $sp, 0x34 -/* 7E2828 802819A8 AFA20010 */ sw $v0, 0x10($sp) -/* 7E282C 802819AC 27A20038 */ addiu $v0, $sp, 0x38 -/* 7E2830 802819B0 AFA20014 */ sw $v0, 0x14($sp) -/* 7E2834 802819B4 27A2003C */ addiu $v0, $sp, 0x3c -/* 7E2838 802819B8 0C046C3B */ jal get_model_center_and_size -/* 7E283C 802819BC AFA20018 */ sw $v0, 0x18($sp) -/* 7E2840 802819C0 00128100 */ sll $s0, $s2, 4 -/* 7E2844 802819C4 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 7E2848 802819C8 8FC30000 */ lw $v1, ($fp) -/* 7E284C 802819CC 3C0140C0 */ lui $at, 0x40c0 -/* 7E2850 802819D0 44812000 */ mtc1 $at, $f4 -/* 7E2854 802819D4 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 7E2858 802819D8 8C620140 */ lw $v0, 0x140($v1) -/* 7E285C 802819DC 46041080 */ add.s $f2, $f2, $f4 -/* 7E2860 802819E0 02021021 */ addu $v0, $s0, $v0 -/* 7E2864 802819E4 E4400004 */ swc1 $f0, 4($v0) -/* 7E2868 802819E8 8C620140 */ lw $v0, 0x140($v1) -/* 7E286C 802819EC 02021021 */ addu $v0, $s0, $v0 -/* 7E2870 802819F0 E4420008 */ swc1 $f2, 8($v0) -/* 7E2874 802819F4 8C620140 */ lw $v0, 0x140($v1) -/* 7E2878 802819F8 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 7E287C 802819FC 02021021 */ addu $v0, $s0, $v0 -/* 7E2880 80281A00 E440000C */ swc1 $f0, 0xc($v0) -/* 7E2884 80281A04 96A40000 */ lhu $a0, ($s5) -/* 7E2888 80281A08 0C046C04 */ jal get_model_list_index_from_tree_index -/* 7E288C 80281A0C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 7E2890 80281A10 0C046B4C */ jal get_model_from_list_index -/* 7E2894 80281A14 0040202D */ daddu $a0, $v0, $zero -/* 7E2898 80281A18 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 7E289C 80281A1C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 7E28A0 80281A20 94430000 */ lhu $v1, ($v0) -/* 7E28A4 80281A24 44050000 */ mfc1 $a1, $f0 -/* 7E28A8 80281A28 44061000 */ mfc1 $a2, $f2 -/* 7E28AC 80281A2C C7A00030 */ lwc1 $f0, 0x30($sp) -/* 7E28B0 80281A30 34630004 */ ori $v1, $v1, 4 -/* 7E28B4 80281A34 A4430000 */ sh $v1, ($v0) -/* 7E28B8 80281A38 8E630000 */ lw $v1, ($s3) -/* 7E28BC 80281A3C 8E840024 */ lw $a0, 0x24($s4) -/* 7E28C0 80281A40 24020001 */ addiu $v0, $zero, 1 -/* 7E28C4 80281A44 AFA20010 */ sw $v0, 0x10($sp) -/* 7E28C8 80281A48 AFA00014 */ sw $zero, 0x14($sp) -/* 7E28CC 80281A4C 44070000 */ mfc1 $a3, $f0 -/* 7E28D0 80281A50 0C04C6A5 */ jal make_item_entity_nodelay -/* 7E28D4 80281A54 00642025 */ or $a0, $v1, $a0 -/* 7E28D8 80281A58 8FC40000 */ lw $a0, ($fp) -/* 7E28DC 80281A5C 8C830140 */ lw $v1, 0x140($a0) -/* 7E28E0 80281A60 26B50004 */ addiu $s5, $s5, 4 -/* 7E28E4 80281A64 02031821 */ addu $v1, $s0, $v1 -/* 7E28E8 80281A68 AC620000 */ sw $v0, ($v1) -/* 7E28EC 80281A6C 8C820140 */ lw $v0, 0x140($a0) -/* 7E28F0 80281A70 2673000C */ addiu $s3, $s3, 0xc -/* 7E28F4 80281A74 02028021 */ addu $s0, $s0, $v0 -/* 7E28F8 80281A78 8E040000 */ lw $a0, ($s0) -/* 7E28FC 80281A7C 0C04D052 */ jal set_item_entity_flags -/* 7E2900 80281A80 24054000 */ addiu $a1, $zero, 0x4000 -/* 7E2904 80281A84 02E0202D */ daddu $a0, $s7, $zero -/* 7E2908 80281A88 24050080 */ addiu $a1, $zero, 0x80 -/* 7E290C 80281A8C 96260000 */ lhu $a2, ($s1) -/* 7E2910 80281A90 0240382D */ daddu $a3, $s2, $zero -/* 7E2914 80281A94 AFA00010 */ sw $zero, 0x10($sp) -/* 7E2918 80281A98 0C0B10AA */ jal bind_trigger_1 -/* 7E291C 80281A9C AFB60014 */ sw $s6, 0x14($sp) -/* 7E2920 80281AA0 02E0202D */ daddu $a0, $s7, $zero -/* 7E2924 80281AA4 24050800 */ addiu $a1, $zero, 0x800 -/* 7E2928 80281AA8 0240382D */ daddu $a3, $s2, $zero -/* 7E292C 80281AAC 96260000 */ lhu $a2, ($s1) -/* 7E2930 80281AB0 26310004 */ addiu $s1, $s1, 4 -/* 7E2934 80281AB4 AFA00010 */ sw $zero, 0x10($sp) -/* 7E2938 80281AB8 0C0B10AA */ jal bind_trigger_1 -/* 7E293C 80281ABC AFB60014 */ sw $s6, 0x14($sp) -/* 7E2940 80281AC0 8E620000 */ lw $v0, ($s3) -/* 7E2944 80281AC4 1440FFB3 */ bnez $v0, .L80281994 -/* 7E2948 80281AC8 26520001 */ addiu $s2, $s2, 1 -.L80281ACC: -/* 7E294C 80281ACC 3C048008 */ lui $a0, 0x8008 -/* 7E2950 80281AD0 24840868 */ addiu $a0, $a0, 0x868 -/* 7E2954 80281AD4 0C050529 */ jal create_icon -/* 7E2958 80281AD8 2410FFFF */ addiu $s0, $zero, -1 -/* 7E295C 80281ADC 0040202D */ daddu $a0, $v0, $zero -/* 7E2960 80281AE0 24050080 */ addiu $a1, $zero, 0x80 -/* 7E2964 80281AE4 0C051280 */ jal set_icon_flags -/* 7E2968 80281AE8 AE840020 */ sw $a0, 0x20($s4) -/* 7E296C 80281AEC 8E840020 */ lw $a0, 0x20($s4) -/* 7E2970 80281AF0 0C05128B */ jal clear_icon_flags -/* 7E2974 80281AF4 34058000 */ ori $a1, $zero, 0x8000 -/* 7E2978 80281AF8 3C058028 */ lui $a1, %hi(draw_shop_items) -/* 7E297C 80281AFC 24A51524 */ addiu $a1, $a1, %lo(draw_shop_items) -/* 7E2980 80281B00 0C048C8F */ jal bind_dynamic_entity_7 -/* 7E2984 80281B04 0000202D */ daddu $a0, $zero, $zero -/* 7E2988 80281B08 0C048D8F */ jal get_dynamic_entity -/* 7E298C 80281B0C 0040202D */ daddu $a0, $v0, $zero -/* 7E2990 80281B10 2404000A */ addiu $a0, $zero, 0xa -/* 7E2994 80281B14 24050064 */ addiu $a1, $zero, 0x64 -/* 7E2998 80281B18 24060042 */ addiu $a2, $zero, 0x42 -/* 7E299C 80281B1C 24070078 */ addiu $a3, $zero, 0x78 -/* 7E29A0 80281B20 2402001C */ addiu $v0, $zero, 0x1c -/* 7E29A4 80281B24 AFA20010 */ sw $v0, 0x10($sp) -/* 7E29A8 80281B28 3C028028 */ lui $v0, 0x8028 -/* 7E29AC 80281B2C 24421434 */ addiu $v0, $v0, 0x1434 -/* 7E29B0 80281B30 AFA00014 */ sw $zero, 0x14($sp) -/* 7E29B4 80281B34 AFA20018 */ sw $v0, 0x18($sp) -/* 7E29B8 80281B38 AFA0001C */ sw $zero, 0x1c($sp) -/* 7E29BC 80281B3C 0C051F32 */ jal set_ui_panel_properties -/* 7E29C0 80281B40 AFB00020 */ sw $s0, 0x20($sp) -/* 7E29C4 80281B44 2404000B */ addiu $a0, $zero, 0xb -/* 7E29C8 80281B48 24050020 */ addiu $a1, $zero, 0x20 -/* 7E29CC 80281B4C 240600B8 */ addiu $a2, $zero, 0xb8 -/* 7E29D0 80281B50 24070100 */ addiu $a3, $zero, 0x100 -/* 7E29D4 80281B54 00A0102D */ daddu $v0, $a1, $zero -/* 7E29D8 80281B58 AFA20010 */ sw $v0, 0x10($sp) -/* 7E29DC 80281B5C 24020001 */ addiu $v0, $zero, 1 -/* 7E29E0 80281B60 AFA20014 */ sw $v0, 0x14($sp) -/* 7E29E4 80281B64 3C028028 */ lui $v0, 0x8028 -/* 7E29E8 80281B68 244214D0 */ addiu $v0, $v0, 0x14d0 -/* 7E29EC 80281B6C AFA20018 */ sw $v0, 0x18($sp) -/* 7E29F0 80281B70 AFA0001C */ sw $zero, 0x1c($sp) -/* 7E29F4 80281B74 0C051F32 */ jal set_ui_panel_properties -/* 7E29F8 80281B78 AFB00020 */ sw $s0, 0x20($sp) -/* 7E29FC 80281B7C 3C048015 */ lui $a0, 0x8015 -/* 7E2A00 80281B80 2484F150 */ addiu $a0, $a0, -0xeb0 -/* 7E2A04 80281B84 24030009 */ addiu $v1, $zero, 9 -/* 7E2A08 80281B88 AC830028 */ sw $v1, 0x28($a0) -/* 7E2A0C 80281B8C 24030003 */ addiu $v1, $zero, 3 -/* 7E2A10 80281B90 AC83002C */ sw $v1, 0x2c($a0) -/* 7E2A14 80281B94 AE800008 */ sw $zero, 8($s4) -/* 7E2A18 80281B98 AE80000C */ sw $zero, 0xc($s4) -/* 7E2A1C 80281B9C A6800000 */ sh $zero, ($s4) -/* 7E2A20 80281BA0 AE800010 */ sw $zero, 0x10($s4) -/* 7E2A24 80281BA4 8FBF0064 */ lw $ra, 0x64($sp) -/* 7E2A28 80281BA8 8FBE0060 */ lw $fp, 0x60($sp) -/* 7E2A2C 80281BAC 8FB7005C */ lw $s7, 0x5c($sp) -/* 7E2A30 80281BB0 8FB60058 */ lw $s6, 0x58($sp) -/* 7E2A34 80281BB4 8FB50054 */ lw $s5, 0x54($sp) -/* 7E2A38 80281BB8 8FB40050 */ lw $s4, 0x50($sp) -/* 7E2A3C 80281BBC 8FB3004C */ lw $s3, 0x4c($sp) -/* 7E2A40 80281BC0 8FB20048 */ lw $s2, 0x48($sp) -/* 7E2A44 80281BC4 8FB10044 */ lw $s1, 0x44($sp) -/* 7E2A48 80281BC8 8FB00040 */ lw $s0, 0x40($sp) -/* 7E2A4C 80281BCC 24020002 */ addiu $v0, $zero, 2 -/* 7E2A50 80281BD0 03E00008 */ jr $ra -/* 7E2A54 80281BD4 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s b/asm/nonmatchings/code_7e0e80/MakeShopOwner.s deleted file mode 100644 index f2774454e3..0000000000 --- a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel MakeShopOwner -/* 7E2A58 80281BD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E2A5C 80281BDC AFBF0014 */ sw $ra, 0x14($sp) -/* 7E2A60 80281BE0 AFB00010 */ sw $s0, 0x10($sp) -/* 7E2A64 80281BE4 8C82000C */ lw $v0, 0xc($a0) -/* 7E2A68 80281BE8 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 7E2A6C 80281BEC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 7E2A70 80281BF0 8C450000 */ lw $a1, ($v0) -/* 7E2A74 80281BF4 0C0B1EAF */ jal get_variable -/* 7E2A78 80281BF8 8C700144 */ lw $s0, 0x144($v1) -/* 7E2A7C 80281BFC AE020010 */ sw $v0, 0x10($s0) -/* 7E2A80 80281C00 8FBF0014 */ lw $ra, 0x14($sp) -/* 7E2A84 80281C04 8FB00010 */ lw $s0, 0x10($sp) -/* 7E2A88 80281C08 24020002 */ addiu $v0, $zero, 2 -/* 7E2A8C 80281C0C 03E00008 */ jr $ra -/* 7E2A90 80281C10 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7E2A94 80281C14 00000000 */ nop -/* 7E2A98 80281C18 00000000 */ nop -/* 7E2A9C 80281C1C 00000000 */ nop diff --git a/asm/nonmatchings/code_7e0e80/draw_shop_items.s b/asm/nonmatchings/code_7e0e80/draw_shop_items.s deleted file mode 100644 index 89553acca3..0000000000 --- a/asm/nonmatchings/code_7e0e80/draw_shop_items.s +++ /dev/null @@ -1,221 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel draw_shop_items -/* 7E23A4 80281524 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E23A8 80281528 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E23AC 8028152C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 7E23B0 80281530 AFBF005C */ sw $ra, 0x5c($sp) -/* 7E23B4 80281534 AFBE0058 */ sw $fp, 0x58($sp) -/* 7E23B8 80281538 AFB70054 */ sw $s7, 0x54($sp) -/* 7E23BC 8028153C AFB60050 */ sw $s6, 0x50($sp) -/* 7E23C0 80281540 AFB5004C */ sw $s5, 0x4c($sp) -/* 7E23C4 80281544 AFB40048 */ sw $s4, 0x48($sp) -/* 7E23C8 80281548 AFB30044 */ sw $s3, 0x44($sp) -/* 7E23CC 8028154C AFB20040 */ sw $s2, 0x40($sp) -/* 7E23D0 80281550 AFB1003C */ sw $s1, 0x3c($sp) -/* 7E23D4 80281554 AFB00038 */ sw $s0, 0x38($sp) -/* 7E23D8 80281558 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 7E23DC 8028155C F7B40060 */ sdc1 $f20, 0x60($sp) -/* 7E23E0 80281560 8C520144 */ lw $s2, 0x144($v0) -/* 7E23E4 80281564 96420000 */ lhu $v0, ($s2) -/* 7E23E8 80281568 30420001 */ andi $v0, $v0, 1 -/* 7E23EC 8028156C 10400005 */ beqz $v0, .L80281584 -/* 7E23F0 80281570 2404000A */ addiu $a0, $zero, 0xa -/* 7E23F4 80281574 3C108014 */ lui $s0, %hi(D_80147474) -/* 7E23F8 80281578 26107474 */ addiu $s0, $s0, %lo(D_80147474) -/* 7E23FC 8028157C 080A0563 */ j .L8028158C -/* 7E2400 80281580 00000000 */ nop -.L80281584: -/* 7E2404 80281584 3C108014 */ lui $s0, %hi(D_80147574) -/* 7E2408 80281588 26107574 */ addiu $s0, $s0, %lo(D_80147574) -.L8028158C: -/* 7E240C 8028158C 0C051F9F */ jal func_80147E7C -/* 7E2410 80281590 0200282D */ daddu $a1, $s0, $zero -/* 7E2414 80281594 2404000B */ addiu $a0, $zero, 0xb -/* 7E2418 80281598 0C051F9F */ jal func_80147E7C -/* 7E241C 8028159C 0200282D */ daddu $a1, $s0, $zero -/* 7E2420 802815A0 96420000 */ lhu $v0, ($s2) -/* 7E2424 802815A4 30420001 */ andi $v0, $v0, 1 -/* 7E2428 802815A8 10400096 */ beqz $v0, .L80281804 -/* 7E242C 802815AC 00000000 */ nop -/* 7E2430 802815B0 3C04800B */ lui $a0, %hi(gCameras) -/* 7E2434 802815B4 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 7E2438 802815B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E243C 802815BC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E2440 802815C0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 7E2444 802815C4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7E2448 802815C8 8C5E0140 */ lw $fp, 0x140($v0) -/* 7E244C 802815CC 00031080 */ sll $v0, $v1, 2 -/* 7E2450 802815D0 00431021 */ addu $v0, $v0, $v1 -/* 7E2454 802815D4 00021080 */ sll $v0, $v0, 2 -/* 7E2458 802815D8 00431023 */ subu $v0, $v0, $v1 -/* 7E245C 802815DC 000218C0 */ sll $v1, $v0, 3 -/* 7E2460 802815E0 00431021 */ addu $v0, $v0, $v1 -/* 7E2464 802815E4 000210C0 */ sll $v0, $v0, 3 -/* 7E2468 802815E8 0044A821 */ addu $s5, $v0, $a0 -/* 7E246C 802815EC 86420002 */ lh $v0, 2($s2) -/* 7E2470 802815F0 8E440018 */ lw $a0, 0x18($s2) -/* 7E2474 802815F4 18400083 */ blez $v0, .L80281804 -/* 7E2478 802815F8 0000B82D */ daddu $s7, $zero, $zero -/* 7E247C 802815FC 27D4000C */ addiu $s4, $fp, 0xc -/* 7E2480 80281600 24960004 */ addiu $s6, $a0, 4 -/* 7E2484 80281604 3C013F80 */ lui $at, 0x3f80 -/* 7E2488 80281608 4481B000 */ mtc1 $at, $f22 -/* 7E248C 8028160C 3C013FE0 */ lui $at, 0x3fe0 -/* 7E2490 80281610 4481A800 */ mtc1 $at, $f21 -/* 7E2494 80281614 4480A000 */ mtc1 $zero, $f20 -.L80281618: -/* 7E2498 80281618 26A400D4 */ addiu $a0, $s5, 0xd4 -/* 7E249C 8028161C C686FFF8 */ lwc1 $f6, -8($s4) -/* 7E24A0 80281620 C682FFFC */ lwc1 $f2, -4($s4) -/* 7E24A4 80281624 C6840000 */ lwc1 $f4, ($s4) -/* 7E24A8 80281628 3C0141F0 */ lui $at, 0x41f0 -/* 7E24AC 8028162C 44810000 */ mtc1 $at, $f0 -/* 7E24B0 80281630 27A20028 */ addiu $v0, $sp, 0x28 -/* 7E24B4 80281634 AFA20014 */ sw $v0, 0x14($sp) -/* 7E24B8 80281638 27A2002C */ addiu $v0, $sp, 0x2c -/* 7E24BC 8028163C AFA20018 */ sw $v0, 0x18($sp) -/* 7E24C0 80281640 27A20030 */ addiu $v0, $sp, 0x30 -/* 7E24C4 80281644 AFA2001C */ sw $v0, 0x1c($sp) -/* 7E24C8 80281648 46001080 */ add.s $f2, $f2, $f0 -/* 7E24CC 8028164C 44053000 */ mfc1 $a1, $f6 -/* 7E24D0 80281650 44072000 */ mfc1 $a3, $f4 -/* 7E24D4 80281654 44061000 */ mfc1 $a2, $f2 -/* 7E24D8 80281658 27A20034 */ addiu $v0, $sp, 0x34 -/* 7E24DC 8028165C E7B60010 */ swc1 $f22, 0x10($sp) -/* 7E24E0 80281660 0C00A588 */ jal transform_point -/* 7E24E4 80281664 AFA20020 */ sw $v0, 0x20($sp) -/* 7E24E8 80281668 C7A60034 */ lwc1 $f6, 0x34($sp) -/* 7E24EC 8028166C C7A00030 */ lwc1 $f0, 0x30($sp) -/* 7E24F0 80281670 4606B183 */ div.s $f6, $f22, $f6 -/* 7E24F4 80281674 46060002 */ mul.s $f0, $f0, $f6 -/* 7E24F8 80281678 00000000 */ nop -/* 7E24FC 8028167C 46160000 */ add.s $f0, $f0, $f22 -/* 7E2500 80281680 46000021 */ cvt.d.s $f0, $f0 -/* 7E2504 80281684 46340002 */ mul.d $f0, $f0, $f20 -/* 7E2508 80281688 00000000 */ nop -/* 7E250C 8028168C C7A20028 */ lwc1 $f2, 0x28($sp) -/* 7E2510 80281690 46061202 */ mul.s $f8, $f2, $f6 -/* 7E2514 80281694 00000000 */ nop -/* 7E2518 80281698 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 7E251C 8028169C 46003087 */ neg.s $f2, $f6 -/* 7E2520 802816A0 46022282 */ mul.s $f10, $f4, $f2 -/* 7E2524 802816A4 00000000 */ nop -/* 7E2528 802816A8 44801000 */ mtc1 $zero, $f2 -/* 7E252C 802816AC E7A60034 */ swc1 $f6, 0x34($sp) -/* 7E2530 802816B0 E7A80028 */ swc1 $f8, 0x28($sp) -/* 7E2534 802816B4 E7AA002C */ swc1 $f10, 0x2c($sp) -/* 7E2538 802816B8 46200020 */ cvt.s.d $f0, $f0 -/* 7E253C 802816BC 4600103C */ c.lt.s $f2, $f0 -/* 7E2540 802816C0 00000000 */ nop -/* 7E2544 802816C4 45000048 */ bc1f .L802817E8 -/* 7E2548 802816C8 E7A00030 */ swc1 $f0, 0x30($sp) -/* 7E254C 802816CC 4616003C */ c.lt.s $f0, $f22 -/* 7E2550 802816D0 00000000 */ nop -/* 7E2554 802816D4 45020045 */ bc1fl .L802817EC -/* 7E2558 802816D8 26F70001 */ addiu $s7, $s7, 1 -/* 7E255C 802816DC 86A2000A */ lh $v0, 0xa($s5) -/* 7E2560 802816E0 44820000 */ mtc1 $v0, $f0 -/* 7E2564 802816E4 00000000 */ nop -/* 7E2568 802816E8 46800020 */ cvt.s.w $f0, $f0 -/* 7E256C 802816EC 46004102 */ mul.s $f4, $f8, $f0 -/* 7E2570 802816F0 00000000 */ nop -/* 7E2574 802816F4 46002100 */ add.s $f4, $f4, $f0 -/* 7E2578 802816F8 46002121 */ cvt.d.s $f4, $f4 -/* 7E257C 802816FC 46342102 */ mul.d $f4, $f4, $f20 -/* 7E2580 80281700 00000000 */ nop -/* 7E2584 80281704 86A2000C */ lh $v0, 0xc($s5) -/* 7E2588 80281708 44820000 */ mtc1 $v0, $f0 -/* 7E258C 8028170C 00000000 */ nop -/* 7E2590 80281710 46800020 */ cvt.s.w $f0, $f0 -/* 7E2594 80281714 46005082 */ mul.s $f2, $f10, $f0 -/* 7E2598 80281718 00000000 */ nop -/* 7E259C 8028171C 46001080 */ add.s $f2, $f2, $f0 -/* 7E25A0 80281720 460010A1 */ cvt.d.s $f2, $f2 -/* 7E25A4 80281724 46341082 */ mul.d $f2, $f2, $f20 -/* 7E25A8 80281728 00000000 */ nop -/* 7E25AC 8028172C 86A2000E */ lh $v0, 0xe($s5) -/* 7E25B0 80281730 44820000 */ mtc1 $v0, $f0 -/* 7E25B4 80281734 00000000 */ nop -/* 7E25B8 80281738 46800021 */ cvt.d.w $f0, $f0 -/* 7E25BC 8028173C 86A20010 */ lh $v0, 0x10($s5) -/* 7E25C0 80281740 46202100 */ add.d $f4, $f4, $f0 -/* 7E25C4 80281744 44820000 */ mtc1 $v0, $f0 -/* 7E25C8 80281748 00000000 */ nop -/* 7E25CC 8028174C 46800021 */ cvt.d.w $f0, $f0 -/* 7E25D0 80281750 8EC20000 */ lw $v0, ($s6) -/* 7E25D4 80281754 46201080 */ add.d $f2, $f2, $f0 -/* 7E25D8 80281758 28420064 */ slti $v0, $v0, 0x64 -/* 7E25DC 8028175C 4620230D */ trunc.w.d $f12, $f4 -/* 7E25E0 80281760 44116000 */ mfc1 $s1, $f12 -/* 7E25E4 80281764 4620130D */ trunc.w.d $f12, $f2 -/* 7E25E8 80281768 44136000 */ mfc1 $s3, $f12 -/* 7E25EC 8028176C 10400002 */ beqz $v0, .L80281778 -/* 7E25F0 80281770 0000802D */ daddu $s0, $zero, $zero -/* 7E25F4 80281774 2410FFFC */ addiu $s0, $zero, -4 -.L80281778: -/* 7E25F8 80281778 0C04C3D6 */ jal get_item_entity -/* 7E25FC 8028177C 8FC40000 */ lw $a0, ($fp) -/* 7E2600 80281780 8C420000 */ lw $v0, ($v0) -/* 7E2604 80281784 30420040 */ andi $v0, $v0, 0x40 -/* 7E2608 80281788 14400009 */ bnez $v0, .L802817B0 -/* 7E260C 8028178C 02302821 */ addu $a1, $s1, $s0 -/* 7E2610 80281790 0260302D */ daddu $a2, $s3, $zero -/* 7E2614 80281794 240200FF */ addiu $v0, $zero, 0xff -/* 7E2618 80281798 AFA00010 */ sw $zero, 0x10($sp) -/* 7E261C 8028179C AFA20014 */ sw $v0, 0x14($sp) -/* 7E2620 802817A0 AFA00018 */ sw $zero, 0x18($sp) -/* 7E2624 802817A4 8EC40000 */ lw $a0, ($s6) -/* 7E2628 802817A8 0C049DA7 */ jal draw_number -/* 7E262C 802817AC 24070001 */ addiu $a3, $zero, 1 -.L802817B0: -/* 7E2630 802817B0 8E420008 */ lw $v0, 8($s2) -/* 7E2634 802817B4 56E2000D */ bnel $s7, $v0, .L802817EC -/* 7E2638 802817B8 26F70001 */ addiu $s7, $s7, 1 -/* 7E263C 802817BC 02302821 */ addu $a1, $s1, $s0 -/* 7E2640 802817C0 24A5FFFA */ addiu $a1, $a1, -6 -/* 7E2644 802817C4 8E440020 */ lw $a0, 0x20($s2) -/* 7E2648 802817C8 0C051261 */ jal set_icon_render_pos -/* 7E264C 802817CC 26660005 */ addiu $a2, $s3, 5 -/* 7E2650 802817D0 8E440020 */ lw $a0, 0x20($s2) -/* 7E2654 802817D4 3C053F33 */ lui $a1, 0x3f33 -/* 7E2658 802817D8 0C051308 */ jal func_80144C20 -/* 7E265C 802817DC 34A53333 */ ori $a1, $a1, 0x3333 -/* 7E2660 802817E0 0C0511EA */ jal draw_icon_0 -/* 7E2664 802817E4 8E440020 */ lw $a0, 0x20($s2) -.L802817E8: -/* 7E2668 802817E8 26F70001 */ addiu $s7, $s7, 1 -.L802817EC: -/* 7E266C 802817EC 26D6000C */ addiu $s6, $s6, 0xc -/* 7E2670 802817F0 26940010 */ addiu $s4, $s4, 0x10 -/* 7E2674 802817F4 86420002 */ lh $v0, 2($s2) -/* 7E2678 802817F8 02E2102A */ slt $v0, $s7, $v0 -/* 7E267C 802817FC 1440FF86 */ bnez $v0, .L80281618 -/* 7E2680 80281800 27DE0010 */ addiu $fp, $fp, 0x10 -.L80281804: -/* 7E2684 80281804 8E420358 */ lw $v0, 0x358($s2) -/* 7E2688 80281808 18400003 */ blez $v0, .L80281818 -/* 7E268C 8028180C 2442FFFF */ addiu $v0, $v0, -1 -/* 7E2690 80281810 080A060A */ j .L80281828 -/* 7E2694 80281814 AE420358 */ sw $v0, 0x358($s2) -.L80281818: -/* 7E2698 80281818 96420000 */ lhu $v0, ($s2) -/* 7E269C 8028181C 3042FFFE */ andi $v0, $v0, 0xfffe -/* 7E26A0 80281820 0C03A640 */ jal func_800E9900 -/* 7E26A4 80281824 A6420000 */ sh $v0, ($s2) -.L80281828: -/* 7E26A8 80281828 8FBF005C */ lw $ra, 0x5c($sp) -/* 7E26AC 8028182C 8FBE0058 */ lw $fp, 0x58($sp) -/* 7E26B0 80281830 8FB70054 */ lw $s7, 0x54($sp) -/* 7E26B4 80281834 8FB60050 */ lw $s6, 0x50($sp) -/* 7E26B8 80281838 8FB5004C */ lw $s5, 0x4c($sp) -/* 7E26BC 8028183C 8FB40048 */ lw $s4, 0x48($sp) -/* 7E26C0 80281840 8FB30044 */ lw $s3, 0x44($sp) -/* 7E26C4 80281844 8FB20040 */ lw $s2, 0x40($sp) -/* 7E26C8 80281848 8FB1003C */ lw $s1, 0x3c($sp) -/* 7E26CC 8028184C 8FB00038 */ lw $s0, 0x38($sp) -/* 7E26D0 80281850 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 7E26D4 80281854 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 7E26D8 80281858 03E00008 */ jr $ra -/* 7E26DC 8028185C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/code_7e0e80/func_80280000.s b/asm/nonmatchings/code_7e0e80/func_80280000.s deleted file mode 100644 index ce58438f1d..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280000.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280000 -/* 7E0E80 80280000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E0E84 80280004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E0E88 80280008 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E0E8C 8028000C AFBF0018 */ sw $ra, 0x18($sp) -/* 7E0E90 80280010 AFB10014 */ sw $s1, 0x14($sp) -/* 7E0E94 80280014 AFB00010 */ sw $s0, 0x10($sp) -/* 7E0E98 80280018 8C510144 */ lw $s1, 0x144($v0) -/* 7E0E9C 8028001C 24050001 */ addiu $a1, $zero, 1 -/* 7E0EA0 80280020 8E220010 */ lw $v0, 0x10($s1) -/* 7E0EA4 80280024 8C430018 */ lw $v1, 0x18($v0) -/* 7E0EA8 80280028 00041080 */ sll $v0, $a0, 2 -/* 7E0EAC 8028002C 3C048028 */ lui $a0, 0x8028 -/* 7E0EB0 80280030 24843E80 */ addiu $a0, $a0, 0x3e80 -/* 7E0EB4 80280034 00431021 */ addu $v0, $v0, $v1 -/* 7E0EB8 80280038 8C500000 */ lw $s0, ($v0) -/* 7E0EBC 8028003C 0C0B0CF8 */ jal start_script -/* 7E0EC0 80280040 0000302D */ daddu $a2, $zero, $zero -/* 7E0EC4 80280044 0040202D */ daddu $a0, $v0, $zero -/* 7E0EC8 80280048 AC900084 */ sw $s0, 0x84($a0) -/* 7E0ECC 8028004C 8E220010 */ lw $v0, 0x10($s1) -/* 7E0ED0 80280050 8C420000 */ lw $v0, ($v0) -/* 7E0ED4 80280054 AC820088 */ sw $v0, 0x88($a0) -/* 7E0ED8 80280058 8E220010 */ lw $v0, 0x10($s1) -/* 7E0EDC 8028005C 8C420008 */ lw $v0, 8($v0) -/* 7E0EE0 80280060 AC82008C */ sw $v0, 0x8c($a0) -/* 7E0EE4 80280064 8E230010 */ lw $v1, 0x10($s1) -/* 7E0EE8 80280068 8C820144 */ lw $v0, 0x144($a0) -/* 7E0EEC 8028006C 8C630004 */ lw $v1, 4($v1) -/* 7E0EF0 80280070 AC830090 */ sw $v1, 0x90($a0) -/* 7E0EF4 80280074 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E0EF8 80280078 8FB10014 */ lw $s1, 0x14($sp) -/* 7E0EFC 8028007C 8FB00010 */ lw $s0, 0x10($sp) -/* 7E0F00 80280080 03E00008 */ jr $ra -/* 7E0F04 80280084 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7e0e80/func_80280088.s b/asm/nonmatchings/code_7e0e80/func_80280088.s deleted file mode 100644 index 4a75caa116..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280088.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280088 -/* 7E0F08 80280088 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E0F0C 8028008C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E0F10 80280090 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E0F14 80280094 AFB20018 */ sw $s2, 0x18($sp) -/* 7E0F18 80280098 00C0902D */ daddu $s2, $a2, $zero -/* 7E0F1C 8028009C AFB10014 */ sw $s1, 0x14($sp) -/* 7E0F20 802800A0 00E0882D */ daddu $s1, $a3, $zero -/* 7E0F24 802800A4 AFBF0020 */ sw $ra, 0x20($sp) -/* 7E0F28 802800A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E0F2C 802800AC AFB00010 */ sw $s0, 0x10($sp) -/* 7E0F30 802800B0 8C500144 */ lw $s0, 0x144($v0) -/* 7E0F34 802800B4 00041080 */ sll $v0, $a0, 2 -/* 7E0F38 802800B8 8E030010 */ lw $v1, 0x10($s0) -/* 7E0F3C 802800BC 00A0202D */ daddu $a0, $a1, $zero -/* 7E0F40 802800C0 8C630018 */ lw $v1, 0x18($v1) -/* 7E0F44 802800C4 00431021 */ addu $v0, $v0, $v1 -/* 7E0F48 802800C8 8C530000 */ lw $s3, ($v0) -/* 7E0F4C 802800CC 0C0496CF */ jal set_message_string -/* 7E0F50 802800D0 0000282D */ daddu $a1, $zero, $zero -/* 7E0F54 802800D4 0240202D */ daddu $a0, $s2, $zero -/* 7E0F58 802800D8 0C0496FA */ jal set_message_value -/* 7E0F5C 802800DC 24050001 */ addiu $a1, $zero, 1 -/* 7E0F60 802800E0 1A200005 */ blez $s1, .L802800F8 -/* 7E0F64 802800E4 0220202D */ daddu $a0, $s1, $zero -/* 7E0F68 802800E8 0C0496FA */ jal set_message_value -/* 7E0F6C 802800EC 24050002 */ addiu $a1, $zero, 2 -/* 7E0F70 802800F0 080A0047 */ j .L8028011C -/* 7E0F74 802800F4 00000000 */ nop -.L802800F8: -/* 7E0F78 802800F8 3C048015 */ lui $a0, 0x8015 -/* 7E0F7C 802800FC 2484C290 */ addiu $a0, $a0, -0x3d70 -/* 7E0F80 80280100 24020001 */ addiu $v0, $zero, 1 -/* 7E0F84 80280104 16420003 */ bne $s2, $v0, .L80280114 -/* 7E0F88 80280108 00000000 */ nop -/* 7E0F8C 8028010C 3C048015 */ lui $a0, 0x8015 -/* 7E0F90 80280110 2484C294 */ addiu $a0, $a0, -0x3d6c -.L80280114: -/* 7E0F94 80280114 0C0496CF */ jal set_message_string -/* 7E0F98 80280118 24050002 */ addiu $a1, $zero, 2 -.L8028011C: -/* 7E0F9C 8028011C 3C048028 */ lui $a0, 0x8028 -/* 7E0FA0 80280120 24843E80 */ addiu $a0, $a0, 0x3e80 -/* 7E0FA4 80280124 24050001 */ addiu $a1, $zero, 1 -/* 7E0FA8 80280128 0C0B0CF8 */ jal start_script -/* 7E0FAC 8028012C 0000302D */ daddu $a2, $zero, $zero -/* 7E0FB0 80280130 0040202D */ daddu $a0, $v0, $zero -/* 7E0FB4 80280134 AC930084 */ sw $s3, 0x84($a0) -/* 7E0FB8 80280138 8E020010 */ lw $v0, 0x10($s0) -/* 7E0FBC 8028013C 8C420000 */ lw $v0, ($v0) -/* 7E0FC0 80280140 AC820088 */ sw $v0, 0x88($a0) -/* 7E0FC4 80280144 8E020010 */ lw $v0, 0x10($s0) -/* 7E0FC8 80280148 8C420008 */ lw $v0, 8($v0) -/* 7E0FCC 8028014C AC82008C */ sw $v0, 0x8c($a0) -/* 7E0FD0 80280150 8E030010 */ lw $v1, 0x10($s0) -/* 7E0FD4 80280154 8C820144 */ lw $v0, 0x144($a0) -/* 7E0FD8 80280158 8C630004 */ lw $v1, 4($v1) -/* 7E0FDC 8028015C AC830090 */ sw $v1, 0x90($a0) -/* 7E0FE0 80280160 8FBF0020 */ lw $ra, 0x20($sp) -/* 7E0FE4 80280164 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E0FE8 80280168 8FB20018 */ lw $s2, 0x18($sp) -/* 7E0FEC 8028016C 8FB10014 */ lw $s1, 0x14($sp) -/* 7E0FF0 80280170 8FB00010 */ lw $s0, 0x10($sp) -/* 7E0FF4 80280174 03E00008 */ jr $ra -/* 7E0FF8 80280178 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7e0e80/func_8028017C.s b/asm/nonmatchings/code_7e0e80/func_8028017C.s deleted file mode 100644 index 9095827655..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_8028017C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8028017C -/* 7E0FFC 8028017C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E1000 80280180 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E1004 80280184 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E1008 80280188 AFBF0018 */ sw $ra, 0x18($sp) -/* 7E100C 8028018C AFB10014 */ sw $s1, 0x14($sp) -/* 7E1010 80280190 AFB00010 */ sw $s0, 0x10($sp) -/* 7E1014 80280194 8C510144 */ lw $s1, 0x144($v0) -/* 7E1018 80280198 24050001 */ addiu $a1, $zero, 1 -/* 7E101C 8028019C 8E220010 */ lw $v0, 0x10($s1) -/* 7E1020 802801A0 8C430018 */ lw $v1, 0x18($v0) -/* 7E1024 802801A4 00041080 */ sll $v0, $a0, 2 -/* 7E1028 802801A8 3C048028 */ lui $a0, 0x8028 -/* 7E102C 802801AC 24843EB0 */ addiu $a0, $a0, 0x3eb0 -/* 7E1030 802801B0 00431021 */ addu $v0, $v0, $v1 -/* 7E1034 802801B4 8C500000 */ lw $s0, ($v0) -/* 7E1038 802801B8 0C0B0CF8 */ jal start_script -/* 7E103C 802801BC 0000302D */ daddu $a2, $zero, $zero -/* 7E1040 802801C0 0040202D */ daddu $a0, $v0, $zero -/* 7E1044 802801C4 AC900084 */ sw $s0, 0x84($a0) -/* 7E1048 802801C8 8E220010 */ lw $v0, 0x10($s1) -/* 7E104C 802801CC 8C420000 */ lw $v0, ($v0) -/* 7E1050 802801D0 AC820088 */ sw $v0, 0x88($a0) -/* 7E1054 802801D4 8E220010 */ lw $v0, 0x10($s1) -/* 7E1058 802801D8 8C420008 */ lw $v0, 8($v0) -/* 7E105C 802801DC AC82008C */ sw $v0, 0x8c($a0) -/* 7E1060 802801E0 8E230010 */ lw $v1, 0x10($s1) -/* 7E1064 802801E4 8C820144 */ lw $v0, 0x144($a0) -/* 7E1068 802801E8 8C630004 */ lw $v1, 4($v1) -/* 7E106C 802801EC AC830090 */ sw $v1, 0x90($a0) -/* 7E1070 802801F0 AC83007C */ sw $v1, 0x7c($a0) -/* 7E1074 802801F4 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E1078 802801F8 8FB10014 */ lw $s1, 0x14($sp) -/* 7E107C 802801FC 8FB00010 */ lw $s0, 0x10($sp) -/* 7E1080 80280200 03E00008 */ jr $ra -/* 7E1084 80280204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7e0e80/func_80280208.s b/asm/nonmatchings/code_7e0e80/func_80280208.s deleted file mode 100644 index 46bbd922c6..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280208.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280208 -/* 7E1088 80280208 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E108C 8028020C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E1090 80280210 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E1094 80280214 AFB00010 */ sw $s0, 0x10($sp) -/* 7E1098 80280218 00A0802D */ daddu $s0, $a1, $zero -/* 7E109C 8028021C AFBF001C */ sw $ra, 0x1c($sp) -/* 7E10A0 80280220 AFB20018 */ sw $s2, 0x18($sp) -/* 7E10A4 80280224 AFB10014 */ sw $s1, 0x14($sp) -/* 7E10A8 80280228 8C510144 */ lw $s1, 0x144($v0) -/* 7E10AC 8028022C 0000282D */ daddu $a1, $zero, $zero -/* 7E10B0 80280230 8E230010 */ lw $v1, 0x10($s1) -/* 7E10B4 80280234 00041080 */ sll $v0, $a0, 2 -/* 7E10B8 80280238 8C630018 */ lw $v1, 0x18($v1) -/* 7E10BC 8028023C 00431021 */ addu $v0, $v0, $v1 -/* 7E10C0 80280240 8C520000 */ lw $s2, ($v0) -/* 7E10C4 80280244 0C0496FA */ jal set_message_value -/* 7E10C8 80280248 0200202D */ daddu $a0, $s0, $zero -/* 7E10CC 8028024C 3C048015 */ lui $a0, 0x8015 -/* 7E10D0 80280250 2484C290 */ addiu $a0, $a0, -0x3d70 -/* 7E10D4 80280254 24020001 */ addiu $v0, $zero, 1 -/* 7E10D8 80280258 16020003 */ bne $s0, $v0, .L80280268 -/* 7E10DC 8028025C 00000000 */ nop -/* 7E10E0 80280260 3C048015 */ lui $a0, 0x8015 -/* 7E10E4 80280264 2484C294 */ addiu $a0, $a0, -0x3d6c -.L80280268: -/* 7E10E8 80280268 0C0496CF */ jal set_message_string -/* 7E10EC 8028026C 24050001 */ addiu $a1, $zero, 1 -/* 7E10F0 80280270 3C048028 */ lui $a0, 0x8028 -/* 7E10F4 80280274 24843EB0 */ addiu $a0, $a0, 0x3eb0 -/* 7E10F8 80280278 24050001 */ addiu $a1, $zero, 1 -/* 7E10FC 8028027C 0C0B0CF8 */ jal start_script -/* 7E1100 80280280 0000302D */ daddu $a2, $zero, $zero -/* 7E1104 80280284 0040202D */ daddu $a0, $v0, $zero -/* 7E1108 80280288 AC920084 */ sw $s2, 0x84($a0) -/* 7E110C 8028028C 8E220010 */ lw $v0, 0x10($s1) -/* 7E1110 80280290 8C420000 */ lw $v0, ($v0) -/* 7E1114 80280294 AC820088 */ sw $v0, 0x88($a0) -/* 7E1118 80280298 8E220010 */ lw $v0, 0x10($s1) -/* 7E111C 8028029C 8C420008 */ lw $v0, 8($v0) -/* 7E1120 802802A0 AC82008C */ sw $v0, 0x8c($a0) -/* 7E1124 802802A4 8E230010 */ lw $v1, 0x10($s1) -/* 7E1128 802802A8 8C820144 */ lw $v0, 0x144($a0) -/* 7E112C 802802AC 8C630004 */ lw $v1, 4($v1) -/* 7E1130 802802B0 AC830090 */ sw $v1, 0x90($a0) -/* 7E1134 802802B4 AC83007C */ sw $v1, 0x7c($a0) -/* 7E1138 802802B8 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E113C 802802BC 8FB20018 */ lw $s2, 0x18($sp) -/* 7E1140 802802C0 8FB10014 */ lw $s1, 0x14($sp) -/* 7E1144 802802C4 8FB00010 */ lw $s0, 0x10($sp) -/* 7E1148 802802C8 03E00008 */ jr $ra -/* 7E114C 802802CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7e0e80/func_802802D0.s b/asm/nonmatchings/code_7e0e80/func_802802D0.s deleted file mode 100644 index 906857ef51..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_802802D0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802802D0 -/* 7E1150 802802D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E1154 802802D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E1158 802802D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E115C 802802DC AFBF0018 */ sw $ra, 0x18($sp) -/* 7E1160 802802E0 AFB10014 */ sw $s1, 0x14($sp) -/* 7E1164 802802E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7E1168 802802E8 8C510144 */ lw $s1, 0x144($v0) -/* 7E116C 802802EC 24050001 */ addiu $a1, $zero, 1 -/* 7E1170 802802F0 8E220010 */ lw $v0, 0x10($s1) -/* 7E1174 802802F4 8C430018 */ lw $v1, 0x18($v0) -/* 7E1178 802802F8 00041080 */ sll $v0, $a0, 2 -/* 7E117C 802802FC 3C048028 */ lui $a0, 0x8028 -/* 7E1180 80280300 24843EE0 */ addiu $a0, $a0, 0x3ee0 -/* 7E1184 80280304 00431021 */ addu $v0, $v0, $v1 -/* 7E1188 80280308 8C500000 */ lw $s0, ($v0) -/* 7E118C 8028030C 0C0B0CF8 */ jal start_script -/* 7E1190 80280310 0000302D */ daddu $a2, $zero, $zero -/* 7E1194 80280314 0040202D */ daddu $a0, $v0, $zero -/* 7E1198 80280318 AC900084 */ sw $s0, 0x84($a0) -/* 7E119C 8028031C 8E220010 */ lw $v0, 0x10($s1) -/* 7E11A0 80280320 8C420000 */ lw $v0, ($v0) -/* 7E11A4 80280324 AC820088 */ sw $v0, 0x88($a0) -/* 7E11A8 80280328 8E220010 */ lw $v0, 0x10($s1) -/* 7E11AC 8028032C 8C420008 */ lw $v0, 8($v0) -/* 7E11B0 80280330 AC82008C */ sw $v0, 0x8c($a0) -/* 7E11B4 80280334 8E230010 */ lw $v1, 0x10($s1) -/* 7E11B8 80280338 8C820144 */ lw $v0, 0x144($a0) -/* 7E11BC 8028033C 8C630004 */ lw $v1, 4($v1) -/* 7E11C0 80280340 AC830090 */ sw $v1, 0x90($a0) -/* 7E11C4 80280344 AC83007C */ sw $v1, 0x7c($a0) -/* 7E11C8 80280348 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E11CC 8028034C 8FB10014 */ lw $s1, 0x14($sp) -/* 7E11D0 80280350 8FB00010 */ lw $s0, 0x10($sp) -/* 7E11D4 80280354 03E00008 */ jr $ra -/* 7E11D8 80280358 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7e0e80/func_8028035C.s b/asm/nonmatchings/code_7e0e80/func_8028035C.s deleted file mode 100644 index 148c98a96a..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_8028035C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8028035C -/* 7E11DC 8028035C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E11E0 80280360 3C048028 */ lui $a0, 0x8028 -/* 7E11E4 80280364 24843F2C */ addiu $a0, $a0, 0x3f2c -/* 7E11E8 80280368 24050001 */ addiu $a1, $zero, 1 -/* 7E11EC 8028036C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E11F0 80280370 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E11F4 80280374 AFBF0014 */ sw $ra, 0x14($sp) -/* 7E11F8 80280378 AFB00010 */ sw $s0, 0x10($sp) -/* 7E11FC 8028037C 8C500144 */ lw $s0, 0x144($v0) -/* 7E1200 80280380 0C0B0CF8 */ jal start_script -/* 7E1204 80280384 0000302D */ daddu $a2, $zero, $zero -/* 7E1208 80280388 8E030010 */ lw $v1, 0x10($s0) -/* 7E120C 8028038C 8C630000 */ lw $v1, ($v1) -/* 7E1210 80280390 0040202D */ daddu $a0, $v0, $zero -/* 7E1214 80280394 AC830084 */ sw $v1, 0x84($a0) -/* 7E1218 80280398 8E020010 */ lw $v0, 0x10($s0) -/* 7E121C 8028039C 8C420008 */ lw $v0, 8($v0) -/* 7E1220 802803A0 AC820088 */ sw $v0, 0x88($a0) -/* 7E1224 802803A4 8E030010 */ lw $v1, 0x10($s0) -/* 7E1228 802803A8 8C820144 */ lw $v0, 0x144($a0) -/* 7E122C 802803AC 8C630004 */ lw $v1, 4($v1) -/* 7E1230 802803B0 AC83008C */ sw $v1, 0x8c($a0) -/* 7E1234 802803B4 AC83007C */ sw $v1, 0x7c($a0) -/* 7E1238 802803B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 7E123C 802803BC 8FB00010 */ lw $s0, 0x10($sp) -/* 7E1240 802803C0 03E00008 */ jr $ra -/* 7E1244 802803C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7e0e80/func_802803C8.s b/asm/nonmatchings/code_7e0e80/func_802803C8.s deleted file mode 100644 index 64650b0886..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_802803C8.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802803C8 -/* 7E1248 802803C8 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* 7E124C 802803CC 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 7E1250 802803D0 AC80008C */ sw $zero, 0x8c($a0) -/* 7E1254 802803D4 80A300B4 */ lb $v1, 0xb4($a1) -/* 7E1258 802803D8 24020004 */ addiu $v0, $zero, 4 -/* 7E125C 802803DC 10620008 */ beq $v1, $v0, .L80280400 -/* 7E1260 802803E0 24020008 */ addiu $v0, $zero, 8 -/* 7E1264 802803E4 10620006 */ beq $v1, $v0, .L80280400 -/* 7E1268 802803E8 00000000 */ nop -/* 7E126C 802803EC 8CA20000 */ lw $v0, ($a1) -/* 7E1270 802803F0 30420100 */ andi $v0, $v0, 0x100 -/* 7E1274 802803F4 14400004 */ bnez $v0, .L80280408 -/* 7E1278 802803F8 24020001 */ addiu $v0, $zero, 1 -/* 7E127C 802803FC AC82008C */ sw $v0, 0x8c($a0) -.L80280400: -/* 7E1280 80280400 03E00008 */ jr $ra -/* 7E1284 80280404 24020002 */ addiu $v0, $zero, 2 -.L80280408: -/* 7E1288 80280408 03E00008 */ jr $ra -/* 7E128C 8028040C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_7e0e80/func_80280410.s b/asm/nonmatchings/code_7e0e80/func_80280410.s deleted file mode 100644 index 72a3308614..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280410.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280410 -/* 7E1290 80280410 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E1294 80280414 AFB20018 */ sw $s2, 0x18($sp) -/* 7E1298 80280418 3C128007 */ lui $s2, %hi(gGameStatusPtr) -/* 7E129C 8028041C 2652419C */ addiu $s2, $s2, %lo(gGameStatusPtr) -/* 7E12A0 80280420 AFBF001C */ sw $ra, 0x1c($sp) -/* 7E12A4 80280424 AFB10014 */ sw $s1, 0x14($sp) -/* 7E12A8 80280428 AFB00010 */ sw $s0, 0x10($sp) -/* 7E12AC 8028042C 8C82000C */ lw $v0, 0xc($a0) -/* 7E12B0 80280430 8E430000 */ lw $v1, ($s2) -/* 7E12B4 80280434 8C450000 */ lw $a1, ($v0) -/* 7E12B8 80280438 0C0B1EAF */ jal get_variable -/* 7E12BC 8028043C 8C700144 */ lw $s0, 0x144($v1) -/* 7E12C0 80280440 96030000 */ lhu $v1, ($s0) -/* 7E12C4 80280444 30630008 */ andi $v1, $v1, 8 -/* 7E12C8 80280448 14600022 */ bnez $v1, .L802804D4 -/* 7E12CC 8028044C 0040882D */ daddu $s1, $v0, $zero -/* 7E12D0 80280450 96020000 */ lhu $v0, ($s0) -/* 7E12D4 80280454 AE110008 */ sw $s1, 8($s0) -/* 7E12D8 80280458 34420001 */ ori $v0, $v0, 1 -/* 7E12DC 8028045C 0C03A63B */ jal func_800E98EC -/* 7E12E0 80280460 A6020000 */ sh $v0, ($s0) -/* 7E12E4 80280464 8E430000 */ lw $v1, ($s2) -/* 7E12E8 80280468 24020005 */ addiu $v0, $zero, 5 -/* 7E12EC 8028046C AE020358 */ sw $v0, 0x358($s0) -/* 7E12F0 80280470 8C620010 */ lw $v0, 0x10($v1) -/* 7E12F4 80280474 30428000 */ andi $v0, $v0, 0x8000 -/* 7E12F8 80280478 10400022 */ beqz $v0, .L80280504 -/* 7E12FC 8028047C 24020002 */ addiu $v0, $zero, 2 -/* 7E1300 80280480 0C03805E */ jal disable_player_input -/* 7E1304 80280484 00000000 */ nop -/* 7E1308 80280488 0C038045 */ jal disable_player_static_collisions -/* 7E130C 8028048C 00000000 */ nop -/* 7E1310 80280490 3C048028 */ lui $a0, 0x8028 -/* 7E1314 80280494 24844034 */ addiu $a0, $a0, 0x4034 -/* 7E1318 80280498 24050001 */ addiu $a1, $zero, 1 -/* 7E131C 8028049C 0C0B0CF8 */ jal start_script -/* 7E1320 802804A0 0000302D */ daddu $a2, $zero, $zero -/* 7E1324 802804A4 0040182D */ daddu $v1, $v0, $zero -/* 7E1328 802804A8 8C650144 */ lw $a1, 0x144($v1) -/* 7E132C 802804AC AC710084 */ sw $s1, 0x84($v1) -/* 7E1330 802804B0 96040000 */ lhu $a0, ($s0) -/* 7E1334 802804B4 0000102D */ daddu $v0, $zero, $zero -/* 7E1338 802804B8 3C018028 */ lui $at, 0x8028 -/* 7E133C 802804BC AC236520 */ sw $v1, 0x6520($at) -/* 7E1340 802804C0 34840008 */ ori $a0, $a0, 8 -/* 7E1344 802804C4 3C018028 */ lui $at, 0x8028 -/* 7E1348 802804C8 AC256524 */ sw $a1, 0x6524($at) -/* 7E134C 802804CC 080A0141 */ j .L80280504 -/* 7E1350 802804D0 A6040000 */ sh $a0, ($s0) -.L802804D4: -/* 7E1354 802804D4 3C048028 */ lui $a0, 0x8028 -/* 7E1358 802804D8 0C0B1059 */ jal does_script_exist -/* 7E135C 802804DC 8C846524 */ lw $a0, 0x6524($a0) -/* 7E1360 802804E0 54400008 */ bnel $v0, $zero, .L80280504 -/* 7E1364 802804E4 0000102D */ daddu $v0, $zero, $zero -/* 7E1368 802804E8 96020000 */ lhu $v0, ($s0) -/* 7E136C 802804EC 3042FFF7 */ andi $v0, $v0, 0xfff7 -/* 7E1370 802804F0 0C038050 */ jal enable_player_static_collisions -/* 7E1374 802804F4 A6020000 */ sh $v0, ($s0) -/* 7E1378 802804F8 0C038069 */ jal enable_player_input -/* 7E137C 802804FC 00000000 */ nop -/* 7E1380 80280500 24020002 */ addiu $v0, $zero, 2 -.L80280504: -/* 7E1384 80280504 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E1388 80280508 8FB20018 */ lw $s2, 0x18($sp) -/* 7E138C 8028050C 8FB10014 */ lw $s1, 0x14($sp) -/* 7E1390 80280510 8FB00010 */ lw $s0, 0x10($sp) -/* 7E1394 80280514 03E00008 */ jr $ra -/* 7E1398 80280518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7e0e80/func_8028051C.s b/asm/nonmatchings/code_7e0e80/func_8028051C.s deleted file mode 100644 index 404aecf0a1..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_8028051C.s +++ /dev/null @@ -1,297 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8028051C -/* 7E139C 8028051C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7E13A0 80280520 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E13A4 80280524 0080982D */ daddu $s3, $a0, $zero -/* 7E13A8 80280528 AFB00010 */ sw $s0, 0x10($sp) -/* 7E13AC 8028052C 00A0802D */ daddu $s0, $a1, $zero -/* 7E13B0 80280530 AFB60028 */ sw $s6, 0x28($sp) -/* 7E13B4 80280534 3C168011 */ lui $s6, %hi(gPlayerData) -/* 7E13B8 80280538 26D6F290 */ addiu $s6, $s6, %lo(gPlayerData) -/* 7E13BC 8028053C AFBF002C */ sw $ra, 0x2c($sp) -/* 7E13C0 80280540 AFB50024 */ sw $s5, 0x24($sp) -/* 7E13C4 80280544 AFB40020 */ sw $s4, 0x20($sp) -/* 7E13C8 80280548 AFB20018 */ sw $s2, 0x18($sp) -/* 7E13CC 8028054C AFB10014 */ sw $s1, 0x14($sp) -/* 7E13D0 80280550 8E750084 */ lw $s5, 0x84($s3) -/* 7E13D4 80280554 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 7E13D8 80280558 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 7E13DC 8028055C 00151040 */ sll $v0, $s5, 1 -/* 7E13E0 80280560 8C740144 */ lw $s4, 0x144($v1) -/* 7E13E4 80280564 00551021 */ addu $v0, $v0, $s5 -/* 7E13E8 80280568 8E830018 */ lw $v1, 0x18($s4) -/* 7E13EC 8028056C 00021080 */ sll $v0, $v0, 2 -/* 7E13F0 80280570 00629021 */ addu $s2, $v1, $v0 -/* 7E13F4 80280574 96820000 */ lhu $v0, ($s4) -/* 7E13F8 80280578 8E430000 */ lw $v1, ($s2) -/* 7E13FC 8028057C 3042FFFE */ andi $v0, $v0, 0xfffe -/* 7E1400 80280580 A6820000 */ sh $v0, ($s4) -/* 7E1404 80280584 3C028008 */ lui $v0, %hi(gItemTable) -/* 7E1408 80280588 244278E0 */ addiu $v0, $v0, %lo(gItemTable) -/* 7E140C 8028058C 00031940 */ sll $v1, $v1, 5 -/* 7E1410 80280590 0C03A640 */ jal func_800E9900 -/* 7E1414 80280594 00628821 */ addu $s1, $v1, $v0 -/* 7E1418 80280598 1200001B */ beqz $s0, .L80280608 -/* 7E141C 8028059C 00000000 */ nop -/* 7E1420 802805A0 96220018 */ lhu $v0, 0x18($s1) -/* 7E1424 802805A4 3C018028 */ lui $at, 0x8028 -/* 7E1428 802805A8 AC206530 */ sw $zero, 0x6530($at) -/* 7E142C 802805AC 3C018028 */ lui $at, 0x8028 -/* 7E1430 802805B0 AC206534 */ sw $zero, 0x6534($at) -/* 7E1434 802805B4 30420040 */ andi $v0, $v0, 0x40 -/* 7E1438 802805B8 10400008 */ beqz $v0, .L802805DC -/* 7E143C 802805BC 2407FFFF */ addiu $a3, $zero, -1 -/* 7E1440 802805C0 9223001A */ lbu $v1, 0x1a($s1) -/* 7E1444 802805C4 00031080 */ sll $v0, $v1, 2 -/* 7E1448 802805C8 00431021 */ addu $v0, $v0, $v1 -/* 7E144C 802805CC 00021080 */ sll $v0, $v0, 2 -/* 7E1450 802805D0 3C078009 */ lui $a3, 0x8009 -/* 7E1454 802805D4 00E23821 */ addu $a3, $a3, $v0 -/* 7E1458 802805D8 80E7F072 */ lb $a3, -0xf8e($a3) -.L802805DC: -/* 7E145C 802805DC 8E250000 */ lw $a1, ($s1) -/* 7E1460 802805E0 8E460004 */ lw $a2, 4($s2) -/* 7E1464 802805E4 0C0A0022 */ jal func_80280088 -/* 7E1468 802805E8 0000202D */ daddu $a0, $zero, $zero -/* 7E146C 802805EC AE620074 */ sw $v0, 0x74($s3) -/* 7E1470 802805F0 0C03A6D5 */ jal increment_status_menu_disabled -/* 7E1474 802805F4 AE600070 */ sw $zero, 0x70($s3) -/* 7E1478 802805F8 0C03A640 */ jal func_800E9900 -/* 7E147C 802805FC 00000000 */ nop -/* 7E1480 80280600 0C03A546 */ jal show_coin_counter -/* 7E1484 80280604 00000000 */ nop -.L80280608: -/* 7E1488 80280608 8E630070 */ lw $v1, 0x70($s3) -/* 7E148C 8028060C 24100005 */ addiu $s0, $zero, 5 -/* 7E1490 80280610 10700085 */ beq $v1, $s0, .L80280828 -/* 7E1494 80280614 28620006 */ slti $v0, $v1, 6 -/* 7E1498 80280618 1040000D */ beqz $v0, .L80280650 -/* 7E149C 8028061C 24020001 */ addiu $v0, $zero, 1 -/* 7E14A0 80280620 1062006D */ beq $v1, $v0, .L802807D8 -/* 7E14A4 80280624 28620002 */ slti $v0, $v1, 2 -/* 7E14A8 80280628 10400005 */ beqz $v0, .L80280640 -/* 7E14AC 8028062C 24020004 */ addiu $v0, $zero, 4 -/* 7E14B0 80280630 10600017 */ beqz $v1, .L80280690 -/* 7E14B4 80280634 0000102D */ daddu $v0, $zero, $zero -/* 7E14B8 80280638 080A024B */ j .L8028092C -/* 7E14BC 8028063C 00000000 */ nop -.L80280640: -/* 7E14C0 80280640 1062006F */ beq $v1, $v0, .L80280800 -/* 7E14C4 80280644 0000102D */ daddu $v0, $zero, $zero -/* 7E14C8 80280648 080A024B */ j .L8028092C -/* 7E14CC 8028064C 00000000 */ nop -.L80280650: -/* 7E14D0 80280650 2410000A */ addiu $s0, $zero, 0xa -/* 7E14D4 80280654 10700091 */ beq $v1, $s0, .L8028089C -/* 7E14D8 80280658 2862000B */ slti $v0, $v1, 0xb -/* 7E14DC 8028065C 10400005 */ beqz $v0, .L80280674 -/* 7E14E0 80280660 24020006 */ addiu $v0, $zero, 6 -/* 7E14E4 80280664 1062007F */ beq $v1, $v0, .L80280864 -/* 7E14E8 80280668 0000102D */ daddu $v0, $zero, $zero -/* 7E14EC 8028066C 080A024B */ j .L8028092C -/* 7E14F0 80280670 00000000 */ nop -.L80280674: -/* 7E14F4 80280674 2402000B */ addiu $v0, $zero, 0xb -/* 7E14F8 80280678 1062009D */ beq $v1, $v0, .L802808F0 -/* 7E14FC 8028067C 24020064 */ addiu $v0, $zero, 0x64 -/* 7E1500 80280680 10620012 */ beq $v1, $v0, .L802806CC -/* 7E1504 80280684 0000102D */ daddu $v0, $zero, $zero -/* 7E1508 80280688 080A024B */ j .L8028092C -/* 7E150C 8028068C 00000000 */ nop -.L80280690: -/* 7E1510 80280690 0C0B1059 */ jal does_script_exist -/* 7E1514 80280694 8E640074 */ lw $a0, 0x74($s3) -/* 7E1518 80280698 144000A4 */ bnez $v0, .L8028092C -/* 7E151C 8028069C 0000102D */ daddu $v0, $zero, $zero -/* 7E1520 802806A0 3C04001E */ lui $a0, 0x1e -/* 7E1524 802806A4 34840001 */ ori $a0, $a0, 1 -/* 7E1528 802806A8 26650078 */ addiu $a1, $s3, 0x78 -/* 7E152C 802806AC 24020064 */ addiu $v0, $zero, 0x64 -/* 7E1530 802806B0 AE620070 */ sw $v0, 0x70($s3) -/* 7E1534 802806B4 0C049640 */ jal load_string -/* 7E1538 802806B8 AE600078 */ sw $zero, 0x78($s3) -/* 7E153C 802806BC 3C018028 */ lui $at, 0x8028 -/* 7E1540 802806C0 AC226528 */ sw $v0, 0x6528($at) -/* 7E1544 802806C4 080A024B */ j .L8028092C -/* 7E1548 802806C8 0000102D */ daddu $v0, $zero, $zero -.L802806CC: -/* 7E154C 802806CC 8E700078 */ lw $s0, 0x78($s3) -/* 7E1550 802806D0 24020001 */ addiu $v0, $zero, 1 -/* 7E1554 802806D4 16020095 */ bne $s0, $v0, .L8028092C -/* 7E1558 802806D8 0000102D */ daddu $v0, $zero, $zero -/* 7E155C 802806DC 3C028028 */ lui $v0, 0x8028 -/* 7E1560 802806E0 8C426528 */ lw $v0, 0x6528($v0) -/* 7E1564 802806E4 904204E8 */ lbu $v0, 0x4e8($v0) -/* 7E1568 802806E8 14400035 */ bnez $v0, .L802807C0 -/* 7E156C 802806EC 00000000 */ nop -/* 7E1570 802806F0 86C2000C */ lh $v0, 0xc($s6) -/* 7E1574 802806F4 8E430004 */ lw $v1, 4($s2) -/* 7E1578 802806F8 0043102A */ slt $v0, $v0, $v1 -/* 7E157C 802806FC 10400006 */ beqz $v0, .L80280718 -/* 7E1580 80280700 00000000 */ nop -/* 7E1584 80280704 0C0A005F */ jal func_8028017C -/* 7E1588 80280708 24040001 */ addiu $a0, $zero, 1 -/* 7E158C 8028070C AE620074 */ sw $v0, 0x74($s3) -/* 7E1590 80280710 080A024A */ j .L80280928 -/* 7E1594 80280714 AE700070 */ sw $s0, 0x70($s3) -.L80280718: -/* 7E1598 80280718 8E420000 */ lw $v0, ($s2) -/* 7E159C 8028071C 2442FF20 */ addiu $v0, $v0, -0xe0 -/* 7E15A0 80280720 2C420075 */ sltiu $v0, $v0, 0x75 -/* 7E15A4 80280724 1440000C */ bnez $v0, .L80280758 -/* 7E15A8 80280728 00000000 */ nop -/* 7E15AC 8028072C 0C039D5D */ jal add_item -/* 7E15B0 80280730 0000202D */ daddu $a0, $zero, $zero -/* 7E15B4 80280734 2403FFFF */ addiu $v1, $zero, -1 -/* 7E15B8 80280738 14430007 */ bne $v0, $v1, .L80280758 -/* 7E15BC 8028073C 00000000 */ nop -/* 7E15C0 80280740 0C0A005F */ jal func_8028017C -/* 7E15C4 80280744 24040002 */ addiu $a0, $zero, 2 -/* 7E15C8 80280748 AE620074 */ sw $v0, 0x74($s3) -/* 7E15CC 8028074C 24020004 */ addiu $v0, $zero, 4 -/* 7E15D0 80280750 080A024A */ j .L80280928 -/* 7E15D4 80280754 AE620070 */ sw $v0, 0x70($s3) -.L80280758: -/* 7E15D8 80280758 96C2000C */ lhu $v0, 0xc($s6) -/* 7E15DC 8028075C 96430006 */ lhu $v1, 6($s2) -/* 7E15E0 80280760 00431023 */ subu $v0, $v0, $v1 -/* 7E15E4 80280764 A6C2000C */ sh $v0, 0xc($s6) -/* 7E15E8 80280768 8E440000 */ lw $a0, ($s2) -/* 7E15EC 8028076C 2482FF20 */ addiu $v0, $a0, -0xe0 -/* 7E15F0 80280770 2C420075 */ sltiu $v0, $v0, 0x75 -/* 7E15F4 80280774 1040000A */ beqz $v0, .L802807A0 -/* 7E15F8 80280778 00000000 */ nop -/* 7E15FC 8028077C 0C039DCF */ jal add_badge -/* 7E1600 80280780 00000000 */ nop -/* 7E1604 80280784 0000202D */ daddu $a0, $zero, $zero -/* 7E1608 80280788 3C05F840 */ lui $a1, 0xf840 -/* 7E160C 8028078C 34A55CF0 */ ori $a1, $a1, 0x5cf0 -/* 7E1610 80280790 0C0B2026 */ jal set_variable -/* 7E1614 80280794 24060001 */ addiu $a2, $zero, 1 -/* 7E1618 80280798 080A01EA */ j .L802807A8 -/* 7E161C 8028079C 00000000 */ nop -.L802807A0: -/* 7E1620 802807A0 0C039D5D */ jal add_item -/* 7E1624 802807A4 00000000 */ nop -.L802807A8: -/* 7E1628 802807A8 0C0A005F */ jal func_8028017C -/* 7E162C 802807AC 24040003 */ addiu $a0, $zero, 3 -/* 7E1630 802807B0 AE620074 */ sw $v0, 0x74($s3) -/* 7E1634 802807B4 24020005 */ addiu $v0, $zero, 5 -/* 7E1638 802807B8 080A024A */ j .L80280928 -/* 7E163C 802807BC AE620070 */ sw $v0, 0x70($s3) -.L802807C0: -/* 7E1640 802807C0 0C0A00B4 */ jal func_802802D0 -/* 7E1644 802807C4 24040016 */ addiu $a0, $zero, 0x16 -/* 7E1648 802807C8 AE620074 */ sw $v0, 0x74($s3) -/* 7E164C 802807CC 24020006 */ addiu $v0, $zero, 6 -/* 7E1650 802807D0 080A024A */ j .L80280928 -/* 7E1654 802807D4 AE620070 */ sw $v0, 0x70($s3) -.L802807D8: -/* 7E1658 802807D8 8E640074 */ lw $a0, 0x74($s3) -/* 7E165C 802807DC 0C0B1059 */ jal does_script_exist -/* 7E1660 802807E0 00000000 */ nop -/* 7E1664 802807E4 14400051 */ bnez $v0, .L8028092C -/* 7E1668 802807E8 0000102D */ daddu $v0, $zero, $zero -/* 7E166C 802807EC 8E430000 */ lw $v1, ($s2) -/* 7E1670 802807F0 3C018028 */ lui $at, 0x8028 -/* 7E1674 802807F4 AC206534 */ sw $zero, 0x6534($at) -/* 7E1678 802807F8 080A0214 */ j .L80280850 -/* 7E167C 802807FC 2402000A */ addiu $v0, $zero, 0xa -.L80280800: -/* 7E1680 80280800 8E640074 */ lw $a0, 0x74($s3) -/* 7E1684 80280804 0C0B1059 */ jal does_script_exist -/* 7E1688 80280808 00000000 */ nop -/* 7E168C 8028080C 14400047 */ bnez $v0, .L8028092C -/* 7E1690 80280810 0000102D */ daddu $v0, $zero, $zero -/* 7E1694 80280814 8E430000 */ lw $v1, ($s2) -/* 7E1698 80280818 3C018028 */ lui $at, 0x8028 -/* 7E169C 8028081C AC306534 */ sw $s0, 0x6534($at) -/* 7E16A0 80280820 080A0214 */ j .L80280850 -/* 7E16A4 80280824 2402000A */ addiu $v0, $zero, 0xa -.L80280828: -/* 7E16A8 80280828 8E640074 */ lw $a0, 0x74($s3) -/* 7E16AC 8028082C 0C0B1059 */ jal does_script_exist -/* 7E16B0 80280830 00000000 */ nop -/* 7E16B4 80280834 1440003D */ bnez $v0, .L8028092C -/* 7E16B8 80280838 0000102D */ daddu $v0, $zero, $zero -/* 7E16BC 8028083C 8E430000 */ lw $v1, ($s2) -/* 7E16C0 80280840 24020001 */ addiu $v0, $zero, 1 -/* 7E16C4 80280844 3C018028 */ lui $at, 0x8028 -/* 7E16C8 80280848 AC226534 */ sw $v0, 0x6534($at) -/* 7E16CC 8028084C 2402000A */ addiu $v0, $zero, 0xa -.L80280850: -/* 7E16D0 80280850 AE620070 */ sw $v0, 0x70($s3) -/* 7E16D4 80280854 3C018028 */ lui $at, 0x8028 -/* 7E16D8 80280858 AC236530 */ sw $v1, 0x6530($at) -/* 7E16DC 8028085C 080A024B */ j .L8028092C -/* 7E16E0 80280860 0000102D */ daddu $v0, $zero, $zero -.L80280864: -/* 7E16E4 80280864 8E640074 */ lw $a0, 0x74($s3) -/* 7E16E8 80280868 0C0B1059 */ jal does_script_exist -/* 7E16EC 8028086C 00000000 */ nop -/* 7E16F0 80280870 1440002E */ bnez $v0, .L8028092C -/* 7E16F4 80280874 0000102D */ daddu $v0, $zero, $zero -/* 7E16F8 80280878 8E430000 */ lw $v1, ($s2) -/* 7E16FC 8028087C 24020003 */ addiu $v0, $zero, 3 -/* 7E1700 80280880 3C018028 */ lui $at, 0x8028 -/* 7E1704 80280884 AC226534 */ sw $v0, 0x6534($at) -/* 7E1708 80280888 AE700070 */ sw $s0, 0x70($s3) -/* 7E170C 8028088C 3C018028 */ lui $at, 0x8028 -/* 7E1710 80280890 AC236530 */ sw $v1, 0x6530($at) -/* 7E1714 80280894 080A024B */ j .L8028092C -/* 7E1718 80280898 0000102D */ daddu $v0, $zero, $zero -.L8028089C: -/* 7E171C 8028089C 8E820010 */ lw $v0, 0x10($s4) -/* 7E1720 802808A0 3C108028 */ lui $s0, 0x8028 -/* 7E1724 802808A4 2610652C */ addiu $s0, $s0, 0x652c -/* 7E1728 802808A8 1040000E */ beqz $v0, .L802808E4 -/* 7E172C 802808AC AE000000 */ sw $zero, ($s0) -/* 7E1730 802808B0 8C44000C */ lw $a0, 0xc($v0) -/* 7E1734 802808B4 1080000B */ beqz $a0, .L802808E4 -/* 7E1738 802808B8 24050001 */ addiu $a1, $zero, 1 -/* 7E173C 802808BC 0C0B0CF8 */ jal start_script -/* 7E1740 802808C0 0000302D */ daddu $a2, $zero, $zero -/* 7E1744 802808C4 3C038028 */ lui $v1, 0x8028 -/* 7E1748 802808C8 8C636534 */ lw $v1, 0x6534($v1) -/* 7E174C 802808CC 3C048028 */ lui $a0, 0x8028 -/* 7E1750 802808D0 8C846530 */ lw $a0, 0x6530($a0) -/* 7E1754 802808D4 AE020000 */ sw $v0, ($s0) -/* 7E1758 802808D8 AC55008C */ sw $s5, 0x8c($v0) -/* 7E175C 802808DC AC430084 */ sw $v1, 0x84($v0) -/* 7E1760 802808E0 AC440088 */ sw $a0, 0x88($v0) -.L802808E4: -/* 7E1764 802808E4 2402000B */ addiu $v0, $zero, 0xb -/* 7E1768 802808E8 080A024A */ j .L80280928 -/* 7E176C 802808EC AE620070 */ sw $v0, 0x70($s3) -.L802808F0: -/* 7E1770 802808F0 3C028028 */ lui $v0, 0x8028 -/* 7E1774 802808F4 8C42652C */ lw $v0, 0x652c($v0) -/* 7E1778 802808F8 10400005 */ beqz $v0, .L80280910 -/* 7E177C 802808FC 00000000 */ nop -/* 7E1780 80280900 0C0B1059 */ jal does_script_exist -/* 7E1784 80280904 8C440144 */ lw $a0, 0x144($v0) -/* 7E1788 80280908 14400008 */ bnez $v0, .L8028092C -/* 7E178C 8028090C 0000102D */ daddu $v0, $zero, $zero -.L80280910: -/* 7E1790 80280910 0C03A6CC */ jal decrement_status_menu_disabled -/* 7E1794 80280914 00000000 */ nop -/* 7E1798 80280918 0C03A5B2 */ jal func_800E96C8 -/* 7E179C 8028091C 00000000 */ nop -/* 7E17A0 80280920 080A024B */ j .L8028092C -/* 7E17A4 80280924 24020001 */ addiu $v0, $zero, 1 -.L80280928: -/* 7E17A8 80280928 0000102D */ daddu $v0, $zero, $zero -.L8028092C: -/* 7E17AC 8028092C 8FBF002C */ lw $ra, 0x2c($sp) -/* 7E17B0 80280930 8FB60028 */ lw $s6, 0x28($sp) -/* 7E17B4 80280934 8FB50024 */ lw $s5, 0x24($sp) -/* 7E17B8 80280938 8FB40020 */ lw $s4, 0x20($sp) -/* 7E17BC 8028093C 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E17C0 80280940 8FB20018 */ lw $s2, 0x18($sp) -/* 7E17C4 80280944 8FB10014 */ lw $s1, 0x14($sp) -/* 7E17C8 80280948 8FB00010 */ lw $s0, 0x10($sp) -/* 7E17CC 8028094C 03E00008 */ jr $ra -/* 7E17D0 80280950 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_7e0e80/func_80280954.s b/asm/nonmatchings/code_7e0e80/func_80280954.s deleted file mode 100644 index 17da75e86e..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280954.s +++ /dev/null @@ -1,104 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280954 -/* 7E17D4 80280954 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E17D8 80280958 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E17DC 8028095C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 7E17E0 80280960 AFBF003C */ sw $ra, 0x3c($sp) -/* 7E17E4 80280964 AFBE0038 */ sw $fp, 0x38($sp) -/* 7E17E8 80280968 AFB70034 */ sw $s7, 0x34($sp) -/* 7E17EC 8028096C AFB60030 */ sw $s6, 0x30($sp) -/* 7E17F0 80280970 AFB5002C */ sw $s5, 0x2c($sp) -/* 7E17F4 80280974 AFB40028 */ sw $s4, 0x28($sp) -/* 7E17F8 80280978 AFB30024 */ sw $s3, 0x24($sp) -/* 7E17FC 8028097C AFB20020 */ sw $s2, 0x20($sp) -/* 7E1800 80280980 AFB1001C */ sw $s1, 0x1c($sp) -/* 7E1804 80280984 AFB00018 */ sw $s0, 0x18($sp) -/* 7E1808 80280988 8C420144 */ lw $v0, 0x144($v0) -/* 7E180C 8028098C 0080B82D */ daddu $s7, $a0, $zero -/* 7E1810 80280990 24420028 */ addiu $v0, $v0, 0x28 -/* 7E1814 80280994 12E00006 */ beqz $s7, .L802809B0 -/* 7E1818 80280998 AFA20010 */ sw $v0, 0x10($sp) -/* 7E181C 8028099C 24020001 */ addiu $v0, $zero, 1 -/* 7E1820 802809A0 12E20006 */ beq $s7, $v0, .L802809BC -/* 7E1824 802809A4 24150007 */ addiu $s5, $zero, 7 -/* 7E1828 802809A8 080A0271 */ j .L802809C4 -/* 7E182C 802809AC 24140020 */ addiu $s4, $zero, 0x20 -.L802809B0: -/* 7E1830 802809B0 24150005 */ addiu $s5, $zero, 5 -/* 7E1834 802809B4 080A0271 */ j .L802809C4 -/* 7E1838 802809B8 2414000A */ addiu $s4, $zero, 0xa -.L802809BC: -/* 7E183C 802809BC 24150006 */ addiu $s5, $zero, 6 -/* 7E1840 802809C0 2414000A */ addiu $s4, $zero, 0xa -.L802809C4: -/* 7E1844 802809C4 0000902D */ daddu $s2, $zero, $zero -/* 7E1848 802809C8 12800027 */ beqz $s4, .L80280A68 -/* 7E184C 802809CC 0240982D */ daddu $s3, $s2, $zero -/* 7E1850 802809D0 2AFE0002 */ slti $fp, $s7, 2 -/* 7E1854 802809D4 3C168008 */ lui $s6, %hi(gItemTable) -/* 7E1858 802809D8 26D678E0 */ addiu $s6, $s6, %lo(gItemTable) -/* 7E185C 802809DC 3C118011 */ lui $s1, %hi(gPlayerData) -/* 7E1860 802809E0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 7E1864 802809E4 8FB00010 */ lw $s0, 0x10($sp) -.L802809E8: -/* 7E1868 802809E8 13C00005 */ beqz $fp, .L80280A00 -/* 7E186C 802809EC 00000000 */ nop -/* 7E1870 802809F0 06E00003 */ bltz $s7, .L80280A00 -/* 7E1874 802809F4 00000000 */ nop -/* 7E1878 802809F8 080A0281 */ j .L80280A04 -/* 7E187C 802809FC 862401B4 */ lh $a0, 0x1b4($s1) -.L80280A00: -/* 7E1880 80280A00 862401C8 */ lh $a0, 0x1c8($s1) -.L80280A04: -/* 7E1884 80280A04 10800014 */ beqz $a0, .L80280A58 -/* 7E1888 80280A08 00041140 */ sll $v0, $a0, 5 -/* 7E188C 80280A0C 00561821 */ addu $v1, $v0, $s6 -/* 7E1890 80280A10 84620004 */ lh $v0, 4($v1) -/* 7E1894 80280A14 3C058009 */ lui $a1, 0x8009 -/* 7E1898 80280A18 24A5A680 */ addiu $a1, $a1, -0x5980 -/* 7E189C 80280A1C 000210C0 */ sll $v0, $v0, 3 -/* 7E18A0 80280A20 00451021 */ addu $v0, $v0, $a1 -/* 7E18A4 80280A24 8C420000 */ lw $v0, ($v0) -/* 7E18A8 80280A28 24050001 */ addiu $a1, $zero, 1 -/* 7E18AC 80280A2C AE120108 */ sw $s2, 0x108($s0) -/* 7E18B0 80280A30 AE05018C */ sw $a1, 0x18c($s0) -/* 7E18B4 80280A34 AE020000 */ sw $v0, ($s0) -/* 7E18B8 80280A38 8C620000 */ lw $v0, ($v1) -/* 7E18BC 80280A3C AE020084 */ sw $v0, 0x84($s0) -/* 7E18C0 80280A40 8C620014 */ lw $v0, 0x14($v1) -/* 7E18C4 80280A44 02659821 */ addu $s3, $s3, $a1 -/* 7E18C8 80280A48 0C0A02DE */ jal func_80280B78 -/* 7E18CC 80280A4C AE020294 */ sw $v0, 0x294($s0) -/* 7E18D0 80280A50 AE020210 */ sw $v0, 0x210($s0) -/* 7E18D4 80280A54 26100004 */ addiu $s0, $s0, 4 -.L80280A58: -/* 7E18D8 80280A58 26520001 */ addiu $s2, $s2, 1 -/* 7E18DC 80280A5C 0254102A */ slt $v0, $s2, $s4 -/* 7E18E0 80280A60 1440FFE1 */ bnez $v0, .L802809E8 -/* 7E18E4 80280A64 26310002 */ addiu $s1, $s1, 2 -.L80280A68: -/* 7E18E8 80280A68 8FA40010 */ lw $a0, 0x10($sp) -/* 7E18EC 80280A6C AC950318 */ sw $s5, 0x318($a0) -/* 7E18F0 80280A70 AC930324 */ sw $s3, 0x324($a0) -/* 7E18F4 80280A74 0C03D3F1 */ jal func_800F4FC4 -/* 7E18F8 80280A78 AC800328 */ sw $zero, 0x328($a0) -/* 7E18FC 80280A7C 0C03A625 */ jal func_800E9894 -/* 7E1900 80280A80 00000000 */ nop -/* 7E1904 80280A84 0C03A63B */ jal func_800E98EC -/* 7E1908 80280A88 00000000 */ nop -/* 7E190C 80280A8C 0C03A5E3 */ jal open_status_menu_short -/* 7E1910 80280A90 00000000 */ nop -/* 7E1914 80280A94 8FBF003C */ lw $ra, 0x3c($sp) -/* 7E1918 80280A98 8FBE0038 */ lw $fp, 0x38($sp) -/* 7E191C 80280A9C 8FB70034 */ lw $s7, 0x34($sp) -/* 7E1920 80280AA0 8FB60030 */ lw $s6, 0x30($sp) -/* 7E1924 80280AA4 8FB5002C */ lw $s5, 0x2c($sp) -/* 7E1928 80280AA8 8FB40028 */ lw $s4, 0x28($sp) -/* 7E192C 80280AAC 8FB30024 */ lw $s3, 0x24($sp) -/* 7E1930 80280AB0 8FB20020 */ lw $s2, 0x20($sp) -/* 7E1934 80280AB4 8FB1001C */ lw $s1, 0x1c($sp) -/* 7E1938 80280AB8 8FB00018 */ lw $s0, 0x18($sp) -/* 7E193C 80280ABC 03E00008 */ jr $ra -/* 7E1940 80280AC0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/code_7e0e80/func_80280AC4.s b/asm/nonmatchings/code_7e0e80/func_80280AC4.s deleted file mode 100644 index d2636a902e..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280AC4.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280AC4 -/* 7E1944 80280AC4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E1948 80280AC8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E194C 80280ACC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E1950 80280AD0 AFBF001C */ sw $ra, 0x1c($sp) -/* 7E1954 80280AD4 AFB20018 */ sw $s2, 0x18($sp) -/* 7E1958 80280AD8 AFB10014 */ sw $s1, 0x14($sp) -/* 7E195C 80280ADC AFB00010 */ sw $s0, 0x10($sp) -/* 7E1960 80280AE0 8C420144 */ lw $v0, 0x144($v0) -/* 7E1964 80280AE4 0080902D */ daddu $s2, $a0, $zero -/* 7E1968 80280AE8 84500354 */ lh $s0, 0x354($v0) -/* 7E196C 80280AEC 16000003 */ bnez $s0, .L80280AFC -/* 7E1970 80280AF0 24510028 */ addiu $s1, $v0, 0x28 -/* 7E1974 80280AF4 080A02CB */ j .L80280B2C -/* 7E1978 80280AF8 0000102D */ daddu $v0, $zero, $zero -.L80280AFC: -/* 7E197C 80280AFC 0C03C4EC */ jal func_800F13B0 -/* 7E1980 80280B00 00000000 */ nop -/* 7E1984 80280B04 240200FF */ addiu $v0, $zero, 0xff -/* 7E1988 80280B08 16020003 */ bne $s0, $v0, .L80280B18 -/* 7E198C 80280B0C 2602FFFF */ addiu $v0, $s0, -1 -/* 7E1990 80280B10 080A02C9 */ j .L80280B24 -/* 7E1994 80280B14 2402FFFF */ addiu $v0, $zero, -1 -.L80280B18: -/* 7E1998 80280B18 00021080 */ sll $v0, $v0, 2 -/* 7E199C 80280B1C 02221021 */ addu $v0, $s1, $v0 -/* 7E19A0 80280B20 8C420108 */ lw $v0, 0x108($v0) -.L80280B24: -/* 7E19A4 80280B24 AE420000 */ sw $v0, ($s2) -/* 7E19A8 80280B28 24020001 */ addiu $v0, $zero, 1 -.L80280B2C: -/* 7E19AC 80280B2C 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E19B0 80280B30 8FB20018 */ lw $s2, 0x18($sp) -/* 7E19B4 80280B34 8FB10014 */ lw $s1, 0x14($sp) -/* 7E19B8 80280B38 8FB00010 */ lw $s0, 0x10($sp) -/* 7E19BC 80280B3C 03E00008 */ jr $ra -/* 7E19C0 80280B40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_7e0e80/func_80280B44.s b/asm/nonmatchings/code_7e0e80/func_80280B44.s deleted file mode 100644 index 7f6e120ee0..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280B44.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280B44 -/* 7E19C4 80280B44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E19C8 80280B48 AFBF0010 */ sw $ra, 0x10($sp) -/* 7E19CC 80280B4C 0C03C54E */ jal func_800F1538 -/* 7E19D0 80280B50 00000000 */ nop -/* 7E19D4 80280B54 0C03A640 */ jal func_800E9900 -/* 7E19D8 80280B58 00000000 */ nop -/* 7E19DC 80280B5C 0C03A631 */ jal func_800E98C4 -/* 7E19E0 80280B60 00000000 */ nop -/* 7E19E4 80280B64 0C03A5EE */ jal func_800E97B8 -/* 7E19E8 80280B68 00000000 */ nop -/* 7E19EC 80280B6C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E19F0 80280B70 03E00008 */ jr $ra -/* 7E19F4 80280B74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_7e0e80/func_80280B78.s b/asm/nonmatchings/code_7e0e80/func_80280B78.s deleted file mode 100644 index 9f96c4c9fa..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280B78.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280B78 -/* 7E19F8 80280B78 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E19FC 80280B7C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E1A00 80280B80 8C420144 */ lw $v0, 0x144($v0) -/* 7E1A04 80280B84 84460004 */ lh $a2, 4($v0) -/* 7E1A08 80280B88 8C43001C */ lw $v1, 0x1c($v0) -/* 7E1A0C 80280B8C 18C0000A */ blez $a2, .L80280BB8 -/* 7E1A10 80280B90 0000282D */ daddu $a1, $zero, $zero -.L80280B94: -/* 7E1A14 80280B94 8C620000 */ lw $v0, ($v1) -/* 7E1A18 80280B98 14440004 */ bne $v0, $a0, .L80280BAC -/* 7E1A1C 80280B9C 24A50001 */ addiu $a1, $a1, 1 -/* 7E1A20 80280BA0 8C620004 */ lw $v0, 4($v1) -/* 7E1A24 80280BA4 03E00008 */ jr $ra -/* 7E1A28 80280BA8 00000000 */ nop -.L80280BAC: -/* 7E1A2C 80280BAC 00A6102A */ slt $v0, $a1, $a2 -/* 7E1A30 80280BB0 1440FFF8 */ bnez $v0, .L80280B94 -/* 7E1A34 80280BB4 2463000C */ addiu $v1, $v1, 0xc -.L80280BB8: -/* 7E1A38 80280BB8 00041140 */ sll $v0, $a0, 5 -/* 7E1A3C 80280BBC 3C018008 */ lui $at, 0x8008 -/* 7E1A40 80280BC0 00220821 */ addu $at, $at, $v0 -/* 7E1A44 80280BC4 842278EC */ lh $v0, 0x78ec($at) -/* 7E1A48 80280BC8 03E00008 */ jr $ra -/* 7E1A4C 80280BCC 00000000 */ nop diff --git a/asm/nonmatchings/code_7e0e80/func_80280BD0.s b/asm/nonmatchings/code_7e0e80/func_80280BD0.s deleted file mode 100644 index b4e4d7c2fd..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80280BD0.s +++ /dev/null @@ -1,604 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80280BD0 -/* 7E1A50 80280BD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E1A54 80280BD4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E1A58 80280BD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E1A5C 80280BDC AFB10014 */ sw $s1, 0x14($sp) -/* 7E1A60 80280BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 7E1A64 80280BE4 3C128011 */ lui $s2, %hi(gPlayerData) -/* 7E1A68 80280BE8 2652F290 */ addiu $s2, $s2, %lo(gPlayerData) -/* 7E1A6C 80280BEC AFBF0020 */ sw $ra, 0x20($sp) -/* 7E1A70 80280BF0 AFB3001C */ sw $s3, 0x1c($sp) -/* 7E1A74 80280BF4 AFB00010 */ sw $s0, 0x10($sp) -/* 7E1A78 80280BF8 8C500144 */ lw $s0, 0x144($v0) -/* 7E1A7C 80280BFC 10A00006 */ beqz $a1, .L80280C18 -/* 7E1A80 80280C00 0080882D */ daddu $s1, $a0, $zero -/* 7E1A84 80280C04 0C0A0000 */ jal func_80280000 -/* 7E1A88 80280C08 24040004 */ addiu $a0, $zero, 4 -/* 7E1A8C 80280C0C AE220074 */ sw $v0, 0x74($s1) -/* 7E1A90 80280C10 24020004 */ addiu $v0, $zero, 4 -/* 7E1A94 80280C14 AE220070 */ sw $v0, 0x70($s1) -.L80280C18: -/* 7E1A98 80280C18 8E230070 */ lw $v1, 0x70($s1) -/* 7E1A9C 80280C1C 24130020 */ addiu $s3, $zero, 0x20 -/* 7E1AA0 80280C20 10730117 */ beq $v1, $s3, .L80281080 -/* 7E1AA4 80280C24 28620021 */ slti $v0, $v1, 0x21 -/* 7E1AA8 80280C28 10400027 */ beqz $v0, .L80280CC8 -/* 7E1AAC 80280C2C 24020007 */ addiu $v0, $zero, 7 -/* 7E1AB0 80280C30 1062018C */ beq $v1, $v0, .L80281264 -/* 7E1AB4 80280C34 28620008 */ slti $v0, $v1, 8 -/* 7E1AB8 80280C38 10400011 */ beqz $v0, .L80280C80 -/* 7E1ABC 80280C3C 24020003 */ addiu $v0, $zero, 3 -/* 7E1AC0 80280C40 106200D9 */ beq $v1, $v0, .L80280FA8 -/* 7E1AC4 80280C44 28620004 */ slti $v0, $v1, 4 -/* 7E1AC8 80280C48 10400007 */ beqz $v0, .L80280C68 -/* 7E1ACC 80280C4C 24020004 */ addiu $v0, $zero, 4 -/* 7E1AD0 80280C50 106001DC */ beqz $v1, .L802813C4 -/* 7E1AD4 80280C54 24020002 */ addiu $v0, $zero, 2 -/* 7E1AD8 80280C58 106200AF */ beq $v1, $v0, .L80280F18 -/* 7E1ADC 80280C5C 0000102D */ daddu $v0, $zero, $zero -/* 7E1AE0 80280C60 080A0506 */ j .L80281418 -/* 7E1AE4 80280C64 00000000 */ nop -.L80280C68: -/* 7E1AE8 80280C68 1062003F */ beq $v1, $v0, .L80280D68 -/* 7E1AEC 80280C6C 24020005 */ addiu $v0, $zero, 5 -/* 7E1AF0 80280C70 1062012B */ beq $v1, $v0, .L80281120 -/* 7E1AF4 80280C74 0000102D */ daddu $v0, $zero, $zero -/* 7E1AF8 80280C78 080A0506 */ j .L80281418 -/* 7E1AFC 80280C7C 00000000 */ nop -.L80280C80: -/* 7E1B00 80280C80 2402000C */ addiu $v0, $zero, 0xc -/* 7E1B04 80280C84 10620108 */ beq $v1, $v0, .L802810A8 -/* 7E1B08 80280C88 2862000D */ slti $v0, $v1, 0xd -/* 7E1B0C 80280C8C 10400007 */ beqz $v0, .L80280CAC -/* 7E1B10 80280C90 24020009 */ addiu $v0, $zero, 9 -/* 7E1B14 80280C94 106201CB */ beq $v1, $v0, .L802813C4 -/* 7E1B18 80280C98 2402000A */ addiu $v0, $zero, 0xa -/* 7E1B1C 80280C9C 106201D1 */ beq $v1, $v0, .L802813E4 -/* 7E1B20 80280CA0 0000102D */ daddu $v0, $zero, $zero -/* 7E1B24 80280CA4 080A0506 */ j .L80281418 -/* 7E1B28 80280CA8 00000000 */ nop -.L80280CAC: -/* 7E1B2C 80280CAC 24020015 */ addiu $v0, $zero, 0x15 -/* 7E1B30 80280CB0 106200A0 */ beq $v1, $v0, .L80280F34 -/* 7E1B34 80280CB4 2402001F */ addiu $v0, $zero, 0x1f -/* 7E1B38 80280CB8 106200C5 */ beq $v1, $v0, .L80280FD0 -/* 7E1B3C 80280CBC 0000102D */ daddu $v0, $zero, $zero -/* 7E1B40 80280CC0 080A0506 */ j .L80281418 -/* 7E1B44 80280CC4 00000000 */ nop -.L80280CC8: -/* 7E1B48 80280CC8 24020047 */ addiu $v0, $zero, 0x47 -/* 7E1B4C 80280CCC 1062016F */ beq $v1, $v0, .L8028128C -/* 7E1B50 80280CD0 28620048 */ slti $v0, $v1, 0x48 -/* 7E1B54 80280CD4 10400012 */ beqz $v0, .L80280D20 -/* 7E1B58 80280CD8 24020033 */ addiu $v0, $zero, 0x33 -/* 7E1B5C 80280CDC 10620117 */ beq $v1, $v0, .L8028113C -/* 7E1B60 80280CE0 28620034 */ slti $v0, $v1, 0x34 -/* 7E1B64 80280CE4 10400007 */ beqz $v0, .L80280D04 -/* 7E1B68 80280CE8 24020029 */ addiu $v0, $zero, 0x29 -/* 7E1B6C 80280CEC 10620027 */ beq $v1, $v0, .L80280D8C -/* 7E1B70 80280CF0 2402002A */ addiu $v0, $zero, 0x2a -/* 7E1B74 80280CF4 106201B3 */ beq $v1, $v0, .L802813C4 -/* 7E1B78 80280CF8 0000102D */ daddu $v0, $zero, $zero -/* 7E1B7C 80280CFC 080A0506 */ j .L80281418 -/* 7E1B80 80280D00 00000000 */ nop -.L80280D04: -/* 7E1B84 80280D04 24020034 */ addiu $v0, $zero, 0x34 -/* 7E1B88 80280D08 10620133 */ beq $v1, $v0, .L802811D8 -/* 7E1B8C 80280D0C 24020035 */ addiu $v0, $zero, 0x35 -/* 7E1B90 80280D10 1062013B */ beq $v1, $v0, .L80281200 -/* 7E1B94 80280D14 0000102D */ daddu $v0, $zero, $zero -/* 7E1B98 80280D18 080A0506 */ j .L80281418 -/* 7E1B9C 80280D1C 00000000 */ nop -.L80280D20: -/* 7E1BA0 80280D20 240200C9 */ addiu $v0, $zero, 0xc9 -/* 7E1BA4 80280D24 10620072 */ beq $v1, $v0, .L80280EF0 -/* 7E1BA8 80280D28 286200CA */ slti $v0, $v1, 0xca -/* 7E1BAC 80280D2C 10400007 */ beqz $v0, .L80280D4C -/* 7E1BB0 80280D30 24020048 */ addiu $v0, $zero, 0x48 -/* 7E1BB4 80280D34 1062017E */ beq $v1, $v0, .L80281330 -/* 7E1BB8 80280D38 24020049 */ addiu $v0, $zero, 0x49 -/* 7E1BBC 80280D3C 1062018C */ beq $v1, $v0, .L80281370 -/* 7E1BC0 80280D40 0000102D */ daddu $v0, $zero, $zero -/* 7E1BC4 80280D44 080A0506 */ j .L80281418 -/* 7E1BC8 80280D48 00000000 */ nop -.L80280D4C: -/* 7E1BCC 80280D4C 240201F5 */ addiu $v0, $zero, 0x1f5 -/* 7E1BD0 80280D50 106200EA */ beq $v1, $v0, .L802810FC -/* 7E1BD4 80280D54 240202BD */ addiu $v0, $zero, 0x2bd -/* 7E1BD8 80280D58 10620138 */ beq $v1, $v0, .L8028123C -/* 7E1BDC 80280D5C 0000102D */ daddu $v0, $zero, $zero -/* 7E1BE0 80280D60 080A0506 */ j .L80281418 -/* 7E1BE4 80280D64 00000000 */ nop -.L80280D68: -/* 7E1BE8 80280D68 0C0B1059 */ jal does_script_exist -/* 7E1BEC 80280D6C 8E240074 */ lw $a0, 0x74($s1) -/* 7E1BF0 80280D70 144001A9 */ bnez $v0, .L80281418 -/* 7E1BF4 80280D74 0000102D */ daddu $v0, $zero, $zero -/* 7E1BF8 80280D78 3C04001E */ lui $a0, 0x1e -/* 7E1BFC 80280D7C 34840003 */ ori $a0, $a0, 3 -/* 7E1C00 80280D80 26250078 */ addiu $a1, $s1, 0x78 -/* 7E1C04 80280D84 080A04D5 */ j .L80281354 -/* 7E1C08 80280D88 24020029 */ addiu $v0, $zero, 0x29 -.L80280D8C: -/* 7E1C0C 80280D8C 8E240078 */ lw $a0, 0x78($s1) -/* 7E1C10 80280D90 24020001 */ addiu $v0, $zero, 1 -/* 7E1C14 80280D94 148201A0 */ bne $a0, $v0, .L80281418 -/* 7E1C18 80280D98 0000102D */ daddu $v0, $zero, $zero -/* 7E1C1C 80280D9C 3C028028 */ lui $v0, 0x8028 -/* 7E1C20 80280DA0 8C426538 */ lw $v0, 0x6538($v0) -/* 7E1C24 80280DA4 904304E8 */ lbu $v1, 0x4e8($v0) -/* 7E1C28 80280DA8 10640012 */ beq $v1, $a0, .L80280DF4 -/* 7E1C2C 80280DAC 28620002 */ slti $v0, $v1, 2 -/* 7E1C30 80280DB0 10400005 */ beqz $v0, .L80280DC8 -/* 7E1C34 80280DB4 24020002 */ addiu $v0, $zero, 2 -/* 7E1C38 80280DB8 10600009 */ beqz $v1, .L80280DE0 -/* 7E1C3C 80280DBC 00000000 */ nop -/* 7E1C40 80280DC0 080A03B6 */ j .L80280ED8 -/* 7E1C44 80280DC4 00000000 */ nop -.L80280DC8: -/* 7E1C48 80280DC8 10620018 */ beq $v1, $v0, .L80280E2C -/* 7E1C4C 80280DCC 24020003 */ addiu $v0, $zero, 3 -/* 7E1C50 80280DD0 1062002D */ beq $v1, $v0, .L80280E88 -/* 7E1C54 80280DD4 00000000 */ nop -/* 7E1C58 80280DD8 080A03B6 */ j .L80280ED8 -/* 7E1C5C 80280DDC 00000000 */ nop -.L80280DE0: -/* 7E1C60 80280DE0 0C0A005F */ jal func_8028017C -/* 7E1C64 80280DE4 24040005 */ addiu $a0, $zero, 5 -/* 7E1C68 80280DE8 AE220074 */ sw $v0, 0x74($s1) -/* 7E1C6C 80280DEC 080A0505 */ j .L80281414 -/* 7E1C70 80280DF0 AE200070 */ sw $zero, 0x70($s1) -.L80280DF4: -/* 7E1C74 80280DF4 0C039D7B */ jal get_item_count -/* 7E1C78 80280DF8 00000000 */ nop -/* 7E1C7C 80280DFC 14400005 */ bnez $v0, .L80280E14 -/* 7E1C80 80280E00 00000000 */ nop -/* 7E1C84 80280E04 0C0A005F */ jal func_8028017C -/* 7E1C88 80280E08 24040006 */ addiu $a0, $zero, 6 -/* 7E1C8C 80280E0C 080A04EE */ j .L802813B8 -/* 7E1C90 80280E10 AE220074 */ sw $v0, 0x74($s1) -.L80280E14: -/* 7E1C94 80280E14 0C0A005F */ jal func_8028017C -/* 7E1C98 80280E18 24040007 */ addiu $a0, $zero, 7 -/* 7E1C9C 80280E1C AE220074 */ sw $v0, 0x74($s1) -/* 7E1CA0 80280E20 240200C9 */ addiu $v0, $zero, 0xc9 -/* 7E1CA4 80280E24 080A0505 */ j .L80281414 -/* 7E1CA8 80280E28 AE220070 */ sw $v0, 0x70($s1) -.L80280E2C: -/* 7E1CAC 80280E2C 0C039D7B */ jal get_item_count -/* 7E1CB0 80280E30 00000000 */ nop -/* 7E1CB4 80280E34 14400005 */ bnez $v0, .L80280E4C -/* 7E1CB8 80280E38 00000000 */ nop -/* 7E1CBC 80280E3C 0C0A005F */ jal func_8028017C -/* 7E1CC0 80280E40 2404000C */ addiu $a0, $zero, 0xc -/* 7E1CC4 80280E44 080A04EE */ j .L802813B8 -/* 7E1CC8 80280E48 AE220074 */ sw $v0, 0x74($s1) -.L80280E4C: -/* 7E1CCC 80280E4C 0C039E12 */ jal get_stored_empty_count -/* 7E1CD0 80280E50 00000000 */ nop -/* 7E1CD4 80280E54 14400005 */ bnez $v0, .L80280E6C -/* 7E1CD8 80280E58 00000000 */ nop -/* 7E1CDC 80280E5C 0C0A005F */ jal func_8028017C -/* 7E1CE0 80280E60 2404000D */ addiu $a0, $zero, 0xd -/* 7E1CE4 80280E64 080A04EE */ j .L802813B8 -/* 7E1CE8 80280E68 AE220074 */ sw $v0, 0x74($s1) -.L80280E6C: -/* 7E1CEC 80280E6C 0C039E12 */ jal get_stored_empty_count -/* 7E1CF0 80280E70 00000000 */ nop -/* 7E1CF4 80280E74 2404000E */ addiu $a0, $zero, 0xe -/* 7E1CF8 80280E78 0C0A0082 */ jal func_80280208 -/* 7E1CFC 80280E7C 0040282D */ daddu $a1, $v0, $zero -/* 7E1D00 80280E80 080A048C */ j .L80281230 -/* 7E1D04 80280E84 AE220074 */ sw $v0, 0x74($s1) -.L80280E88: -/* 7E1D08 80280E88 0C039E05 */ jal get_stored_count -/* 7E1D0C 80280E8C 00000000 */ nop -/* 7E1D10 80280E90 14400005 */ bnez $v0, .L80280EA8 -/* 7E1D14 80280E94 00000000 */ nop -/* 7E1D18 80280E98 0C0A005F */ jal func_8028017C -/* 7E1D1C 80280E9C 24040011 */ addiu $a0, $zero, 0x11 -/* 7E1D20 80280EA0 080A04EE */ j .L802813B8 -/* 7E1D24 80280EA4 AE220074 */ sw $v0, 0x74($s1) -.L80280EA8: -/* 7E1D28 80280EA8 0C039D88 */ jal get_item_empty_count -/* 7E1D2C 80280EAC 00000000 */ nop -/* 7E1D30 80280EB0 14400005 */ bnez $v0, .L80280EC8 -/* 7E1D34 80280EB4 00000000 */ nop -/* 7E1D38 80280EB8 0C0A005F */ jal func_8028017C -/* 7E1D3C 80280EBC 24040012 */ addiu $a0, $zero, 0x12 -/* 7E1D40 80280EC0 080A04EE */ j .L802813B8 -/* 7E1D44 80280EC4 AE220074 */ sw $v0, 0x74($s1) -.L80280EC8: -/* 7E1D48 80280EC8 0C0A005F */ jal func_8028017C -/* 7E1D4C 80280ECC 24040013 */ addiu $a0, $zero, 0x13 -/* 7E1D50 80280ED0 080A04E8 */ j .L802813A0 -/* 7E1D54 80280ED4 AE220074 */ sw $v0, 0x74($s1) -.L80280ED8: -/* 7E1D58 80280ED8 0C0A00D7 */ jal func_8028035C -/* 7E1D5C 80280EDC 00000000 */ nop -/* 7E1D60 80280EE0 AE220074 */ sw $v0, 0x74($s1) -/* 7E1D64 80280EE4 2402002A */ addiu $v0, $zero, 0x2a -/* 7E1D68 80280EE8 080A0505 */ j .L80281414 -/* 7E1D6C 80280EEC AE220070 */ sw $v0, 0x70($s1) -.L80280EF0: -/* 7E1D70 80280EF0 8E240074 */ lw $a0, 0x74($s1) -/* 7E1D74 80280EF4 0C0B1059 */ jal does_script_exist -/* 7E1D78 80280EF8 00000000 */ nop -/* 7E1D7C 80280EFC 14400146 */ bnez $v0, .L80281418 -/* 7E1D80 80280F00 0000102D */ daddu $v0, $zero, $zero -/* 7E1D84 80280F04 0C0A0255 */ jal func_80280954 -/* 7E1D88 80280F08 0000202D */ daddu $a0, $zero, $zero -/* 7E1D8C 80280F0C 24020002 */ addiu $v0, $zero, 2 -/* 7E1D90 80280F10 080A0505 */ j .L80281414 -/* 7E1D94 80280F14 AE220070 */ sw $v0, 0x70($s1) -.L80280F18: -/* 7E1D98 80280F18 0C0A02B1 */ jal func_80280AC4 -/* 7E1D9C 80280F1C 2604000C */ addiu $a0, $s0, 0xc -/* 7E1DA0 80280F20 24030001 */ addiu $v1, $zero, 1 -/* 7E1DA4 80280F24 1443013C */ bne $v0, $v1, .L80281418 -/* 7E1DA8 80280F28 0000102D */ daddu $v0, $zero, $zero -/* 7E1DAC 80280F2C 080A049F */ j .L8028127C -/* 7E1DB0 80280F30 24020015 */ addiu $v0, $zero, 0x15 -.L80280F34: -/* 7E1DB4 80280F34 8E220074 */ lw $v0, 0x74($s1) -/* 7E1DB8 80280F38 1C4000D7 */ bgtz $v0, .L80281298 -/* 7E1DBC 80280F3C 2442FFFF */ addiu $v0, $v0, -1 -/* 7E1DC0 80280F40 0C0A02D1 */ jal func_80280B44 -/* 7E1DC4 80280F44 00000000 */ nop -/* 7E1DC8 80280F48 8E02000C */ lw $v0, 0xc($s0) -/* 7E1DCC 80280F4C 04400012 */ bltz $v0, .L80280F98 -/* 7E1DD0 80280F50 00021040 */ sll $v0, $v0, 1 -/* 7E1DD4 80280F54 00521021 */ addu $v0, $v0, $s2 -/* 7E1DD8 80280F58 844401B4 */ lh $a0, 0x1b4($v0) -/* 7E1DDC 80280F5C 3C028008 */ lui $v0, %hi(gItemTable) -/* 7E1DE0 80280F60 244278E0 */ addiu $v0, $v0, %lo(gItemTable) -/* 7E1DE4 80280F64 00048140 */ sll $s0, $a0, 5 -/* 7E1DE8 80280F68 0C0A02DE */ jal func_80280B78 -/* 7E1DEC 80280F6C 02028021 */ addu $s0, $s0, $v0 -/* 7E1DF0 80280F70 24040008 */ addiu $a0, $zero, 8 -/* 7E1DF4 80280F74 0040302D */ daddu $a2, $v0, $zero -/* 7E1DF8 80280F78 8E050000 */ lw $a1, ($s0) -/* 7E1DFC 80280F7C 0C0A0022 */ jal func_80280088 -/* 7E1E00 80280F80 2407FFFF */ addiu $a3, $zero, -1 -/* 7E1E04 80280F84 0C03A546 */ jal show_coin_counter -/* 7E1E08 80280F88 AE220074 */ sw $v0, 0x74($s1) -/* 7E1E0C 80280F8C 24020003 */ addiu $v0, $zero, 3 -/* 7E1E10 80280F90 080A0505 */ j .L80281414 -/* 7E1E14 80280F94 AE220070 */ sw $v0, 0x70($s1) -.L80280F98: -/* 7E1E18 80280F98 0C0A0000 */ jal func_80280000 -/* 7E1E1C 80280F9C 24040016 */ addiu $a0, $zero, 0x16 -/* 7E1E20 80280FA0 080A04EE */ j .L802813B8 -/* 7E1E24 80280FA4 AE220074 */ sw $v0, 0x74($s1) -.L80280FA8: -/* 7E1E28 80280FA8 8E240074 */ lw $a0, 0x74($s1) -/* 7E1E2C 80280FAC 0C0B1059 */ jal does_script_exist -/* 7E1E30 80280FB0 00000000 */ nop -/* 7E1E34 80280FB4 14400118 */ bnez $v0, .L80281418 -/* 7E1E38 80280FB8 0000102D */ daddu $v0, $zero, $zero -/* 7E1E3C 80280FBC 3C04001E */ lui $a0, 0x1e -/* 7E1E40 80280FC0 34840002 */ ori $a0, $a0, 2 -/* 7E1E44 80280FC4 26250078 */ addiu $a1, $s1, 0x78 -/* 7E1E48 80280FC8 080A04D5 */ j .L80281354 -/* 7E1E4C 80280FCC 2402001F */ addiu $v0, $zero, 0x1f -.L80280FD0: -/* 7E1E50 80280FD0 8E230078 */ lw $v1, 0x78($s1) -/* 7E1E54 80280FD4 24020001 */ addiu $v0, $zero, 1 -/* 7E1E58 80280FD8 1462010F */ bne $v1, $v0, .L80281418 -/* 7E1E5C 80280FDC 0000102D */ daddu $v0, $zero, $zero -/* 7E1E60 80280FE0 3C028028 */ lui $v0, 0x8028 -/* 7E1E64 80280FE4 8C426538 */ lw $v0, 0x6538($v0) -/* 7E1E68 80280FE8 904204E8 */ lbu $v0, 0x4e8($v0) -/* 7E1E6C 80280FEC 1440001D */ bnez $v0, .L80281064 -/* 7E1E70 80280FF0 00000000 */ nop -/* 7E1E74 80280FF4 8E02000C */ lw $v0, 0xc($s0) -/* 7E1E78 80280FF8 00021040 */ sll $v0, $v0, 1 -/* 7E1E7C 80280FFC 00521021 */ addu $v0, $v0, $s2 -/* 7E1E80 80281000 0C0A02DE */ jal func_80280B78 -/* 7E1E84 80281004 844401B4 */ lh $a0, 0x1b4($v0) -/* 7E1E88 80281008 0C03A830 */ jal add_coins -/* 7E1E8C 8028100C 0040202D */ daddu $a0, $v0, $zero -/* 7E1E90 80281010 8E02000C */ lw $v0, 0xc($s0) -/* 7E1E94 80281014 00021040 */ sll $v0, $v0, 1 -/* 7E1E98 80281018 00521021 */ addu $v0, $v0, $s2 -/* 7E1E9C 8028101C 0C039D7B */ jal get_item_count -/* 7E1EA0 80281020 A44001B4 */ sh $zero, 0x1b4($v0) -/* 7E1EA4 80281024 14400009 */ bnez $v0, .L8028104C -/* 7E1EA8 80281028 00000000 */ nop -/* 7E1EAC 8028102C 0C0A00B4 */ jal func_802802D0 -/* 7E1EB0 80281030 2404000B */ addiu $a0, $zero, 0xb -/* 7E1EB4 80281034 AE220074 */ sw $v0, 0x74($s1) -/* 7E1EB8 80281038 24020009 */ addiu $v0, $zero, 9 -/* 7E1EBC 8028103C 0C03A5A6 */ jal hide_coin_counter -/* 7E1EC0 80281040 AE220070 */ sw $v0, 0x70($s1) -/* 7E1EC4 80281044 080A0506 */ j .L80281418 -/* 7E1EC8 80281048 0000102D */ daddu $v0, $zero, $zero -.L8028104C: -/* 7E1ECC 8028104C 0C0A00B4 */ jal func_802802D0 -/* 7E1ED0 80281050 2404000A */ addiu $a0, $zero, 0xa -/* 7E1ED4 80281054 AE220074 */ sw $v0, 0x74($s1) -/* 7E1ED8 80281058 24020020 */ addiu $v0, $zero, 0x20 -/* 7E1EDC 8028105C 080A0505 */ j .L80281414 -/* 7E1EE0 80281060 AE220070 */ sw $v0, 0x70($s1) -.L80281064: -/* 7E1EE4 80281064 0C0A00B4 */ jal func_802802D0 -/* 7E1EE8 80281068 24040009 */ addiu $a0, $zero, 9 -/* 7E1EEC 8028106C AE220074 */ sw $v0, 0x74($s1) -/* 7E1EF0 80281070 0C03A5A6 */ jal hide_coin_counter -/* 7E1EF4 80281074 AE330070 */ sw $s3, 0x70($s1) -/* 7E1EF8 80281078 080A0506 */ j .L80281418 -/* 7E1EFC 8028107C 0000102D */ daddu $v0, $zero, $zero -.L80281080: -/* 7E1F00 80281080 8E240074 */ lw $a0, 0x74($s1) -/* 7E1F04 80281084 0C0B1059 */ jal does_script_exist -/* 7E1F08 80281088 00000000 */ nop -/* 7E1F0C 8028108C 144000E2 */ bnez $v0, .L80281418 -/* 7E1F10 80281090 0000102D */ daddu $v0, $zero, $zero -/* 7E1F14 80281094 3C04001E */ lui $a0, 0x1e -/* 7E1F18 80281098 34840004 */ ori $a0, $a0, 4 -/* 7E1F1C 8028109C 26250078 */ addiu $a1, $s1, 0x78 -/* 7E1F20 802810A0 080A04D5 */ j .L80281354 -/* 7E1F24 802810A4 2402000C */ addiu $v0, $zero, 0xc -.L802810A8: -/* 7E1F28 802810A8 8E230078 */ lw $v1, 0x78($s1) -/* 7E1F2C 802810AC 24020001 */ addiu $v0, $zero, 1 -/* 7E1F30 802810B0 146200D9 */ bne $v1, $v0, .L80281418 -/* 7E1F34 802810B4 0000102D */ daddu $v0, $zero, $zero -/* 7E1F38 802810B8 3C028028 */ lui $v0, 0x8028 -/* 7E1F3C 802810BC 8C426538 */ lw $v0, 0x6538($v0) -/* 7E1F40 802810C0 904204E8 */ lbu $v0, 0x4e8($v0) -/* 7E1F44 802810C4 14400009 */ bnez $v0, .L802810EC -/* 7E1F48 802810C8 00000000 */ nop -/* 7E1F4C 802810CC 0C0A00D7 */ jal func_8028035C -/* 7E1F50 802810D0 00000000 */ nop -/* 7E1F54 802810D4 AE220074 */ sw $v0, 0x74($s1) -/* 7E1F58 802810D8 240200C9 */ addiu $v0, $zero, 0xc9 -/* 7E1F5C 802810DC 0C03A5B2 */ jal func_800E96C8 -/* 7E1F60 802810E0 AE220070 */ sw $v0, 0x70($s1) -/* 7E1F64 802810E4 080A0506 */ j .L80281418 -/* 7E1F68 802810E8 0000102D */ daddu $v0, $zero, $zero -.L802810EC: -/* 7E1F6C 802810EC 0C03A5B2 */ jal func_800E96C8 -/* 7E1F70 802810F0 00000000 */ nop -/* 7E1F74 802810F4 080A04EB */ j .L802813AC -/* 7E1F78 802810F8 00000000 */ nop -.L802810FC: -/* 7E1F7C 802810FC 0C0B1059 */ jal does_script_exist -/* 7E1F80 80281100 8E240074 */ lw $a0, 0x74($s1) -/* 7E1F84 80281104 144000C4 */ bnez $v0, .L80281418 -/* 7E1F88 80281108 0000102D */ daddu $v0, $zero, $zero -/* 7E1F8C 8028110C 0C0A0255 */ jal func_80280954 -/* 7E1F90 80281110 24040001 */ addiu $a0, $zero, 1 -/* 7E1F94 80281114 24020005 */ addiu $v0, $zero, 5 -/* 7E1F98 80281118 080A0505 */ j .L80281414 -/* 7E1F9C 8028111C AE220070 */ sw $v0, 0x70($s1) -.L80281120: -/* 7E1FA0 80281120 0C0A02B1 */ jal func_80280AC4 -/* 7E1FA4 80281124 2604000C */ addiu $a0, $s0, 0xc -/* 7E1FA8 80281128 24030001 */ addiu $v1, $zero, 1 -/* 7E1FAC 8028112C 144300BA */ bne $v0, $v1, .L80281418 -/* 7E1FB0 80281130 0000102D */ daddu $v0, $zero, $zero -/* 7E1FB4 80281134 080A049F */ j .L8028127C -/* 7E1FB8 80281138 24020033 */ addiu $v0, $zero, 0x33 -.L8028113C: -/* 7E1FBC 8028113C 8E220074 */ lw $v0, 0x74($s1) -/* 7E1FC0 80281140 1C400055 */ bgtz $v0, .L80281298 -/* 7E1FC4 80281144 2442FFFF */ addiu $v0, $v0, -1 -/* 7E1FC8 80281148 0C0A02D1 */ jal func_80280B44 -/* 7E1FCC 8028114C 00000000 */ nop -/* 7E1FD0 80281150 8E02000C */ lw $v0, 0xc($s0) -/* 7E1FD4 80281154 0440001C */ bltz $v0, .L802811C8 -/* 7E1FD8 80281158 00021040 */ sll $v0, $v0, 1 -/* 7E1FDC 8028115C 00521021 */ addu $v0, $v0, $s2 -/* 7E1FE0 80281160 0C039DF1 */ jal store_item -/* 7E1FE4 80281164 844401B4 */ lh $a0, 0x1b4($v0) -/* 7E1FE8 80281168 04400005 */ bltz $v0, .L80281180 -/* 7E1FEC 8028116C 00000000 */ nop -/* 7E1FF0 80281170 8E02000C */ lw $v0, 0xc($s0) -/* 7E1FF4 80281174 00021040 */ sll $v0, $v0, 1 -/* 7E1FF8 80281178 00521021 */ addu $v0, $v0, $s2 -/* 7E1FFC 8028117C A44001B4 */ sh $zero, 0x1b4($v0) -.L80281180: -/* 7E2000 80281180 0C039D7B */ jal get_item_count -/* 7E2004 80281184 00000000 */ nop -/* 7E2008 80281188 10400005 */ beqz $v0, .L802811A0 -/* 7E200C 8028118C 00000000 */ nop -/* 7E2010 80281190 0C039E12 */ jal get_stored_empty_count -/* 7E2014 80281194 00000000 */ nop -/* 7E2018 80281198 14400005 */ bnez $v0, .L802811B0 -/* 7E201C 8028119C 00000000 */ nop -.L802811A0: -/* 7E2020 802811A0 0C0A0000 */ jal func_80280000 -/* 7E2024 802811A4 2404000F */ addiu $a0, $zero, 0xf -/* 7E2028 802811A8 080A04EE */ j .L802813B8 -/* 7E202C 802811AC AE220074 */ sw $v0, 0x74($s1) -.L802811B0: -/* 7E2030 802811B0 0C0A0000 */ jal func_80280000 -/* 7E2034 802811B4 24040010 */ addiu $a0, $zero, 0x10 -/* 7E2038 802811B8 AE220074 */ sw $v0, 0x74($s1) -/* 7E203C 802811BC 24020034 */ addiu $v0, $zero, 0x34 -/* 7E2040 802811C0 080A0505 */ j .L80281414 -/* 7E2044 802811C4 AE220070 */ sw $v0, 0x70($s1) -.L802811C8: -/* 7E2048 802811C8 0C0A0000 */ jal func_80280000 -/* 7E204C 802811CC 24040016 */ addiu $a0, $zero, 0x16 -/* 7E2050 802811D0 080A04EE */ j .L802813B8 -/* 7E2054 802811D4 AE220074 */ sw $v0, 0x74($s1) -.L802811D8: -/* 7E2058 802811D8 8E240074 */ lw $a0, 0x74($s1) -/* 7E205C 802811DC 0C0B1059 */ jal does_script_exist -/* 7E2060 802811E0 00000000 */ nop -/* 7E2064 802811E4 1440008C */ bnez $v0, .L80281418 -/* 7E2068 802811E8 0000102D */ daddu $v0, $zero, $zero -/* 7E206C 802811EC 3C04001E */ lui $a0, 0x1e -/* 7E2070 802811F0 34840005 */ ori $a0, $a0, 5 -/* 7E2074 802811F4 26250078 */ addiu $a1, $s1, 0x78 -/* 7E2078 802811F8 080A04D5 */ j .L80281354 -/* 7E207C 802811FC 24020035 */ addiu $v0, $zero, 0x35 -.L80281200: -/* 7E2080 80281200 8E230078 */ lw $v1, 0x78($s1) -/* 7E2084 80281204 24020001 */ addiu $v0, $zero, 1 -/* 7E2088 80281208 14620083 */ bne $v1, $v0, .L80281418 -/* 7E208C 8028120C 0000102D */ daddu $v0, $zero, $zero -/* 7E2090 80281210 3C028028 */ lui $v0, 0x8028 -/* 7E2094 80281214 8C426538 */ lw $v0, 0x6538($v0) -/* 7E2098 80281218 904204E8 */ lbu $v0, 0x4e8($v0) -/* 7E209C 8028121C 14400063 */ bnez $v0, .L802813AC -/* 7E20A0 80281220 00000000 */ nop -/* 7E20A4 80281224 0C0A00D7 */ jal func_8028035C -/* 7E20A8 80281228 00000000 */ nop -/* 7E20AC 8028122C AE220074 */ sw $v0, 0x74($s1) -.L80281230: -/* 7E20B0 80281230 240201F5 */ addiu $v0, $zero, 0x1f5 -/* 7E20B4 80281234 080A0505 */ j .L80281414 -/* 7E20B8 80281238 AE220070 */ sw $v0, 0x70($s1) -.L8028123C: -/* 7E20BC 8028123C 8E240074 */ lw $a0, 0x74($s1) -/* 7E20C0 80281240 0C0B1059 */ jal does_script_exist -/* 7E20C4 80281244 00000000 */ nop -/* 7E20C8 80281248 14400073 */ bnez $v0, .L80281418 -/* 7E20CC 8028124C 0000102D */ daddu $v0, $zero, $zero -/* 7E20D0 80281250 0C0A0255 */ jal func_80280954 -/* 7E20D4 80281254 24040002 */ addiu $a0, $zero, 2 -/* 7E20D8 80281258 24020007 */ addiu $v0, $zero, 7 -/* 7E20DC 8028125C 080A0505 */ j .L80281414 -/* 7E20E0 80281260 AE220070 */ sw $v0, 0x70($s1) -.L80281264: -/* 7E20E4 80281264 0C0A02B1 */ jal func_80280AC4 -/* 7E20E8 80281268 2604000C */ addiu $a0, $s0, 0xc -/* 7E20EC 8028126C 24030001 */ addiu $v1, $zero, 1 -/* 7E20F0 80281270 14430069 */ bne $v0, $v1, .L80281418 -/* 7E20F4 80281274 0000102D */ daddu $v0, $zero, $zero -/* 7E20F8 80281278 24020047 */ addiu $v0, $zero, 0x47 -.L8028127C: -/* 7E20FC 8028127C AE220070 */ sw $v0, 0x70($s1) -/* 7E2100 80281280 2402000F */ addiu $v0, $zero, 0xf -/* 7E2104 80281284 080A0505 */ j .L80281414 -/* 7E2108 80281288 AE220074 */ sw $v0, 0x74($s1) -.L8028128C: -/* 7E210C 8028128C 8E220074 */ lw $v0, 0x74($s1) -/* 7E2110 80281290 18400003 */ blez $v0, .L802812A0 -/* 7E2114 80281294 2442FFFF */ addiu $v0, $v0, -1 -.L80281298: -/* 7E2118 80281298 080A0505 */ j .L80281414 -/* 7E211C 8028129C AE220074 */ sw $v0, 0x74($s1) -.L802812A0: -/* 7E2120 802812A0 0C0A02D1 */ jal func_80280B44 -/* 7E2124 802812A4 00000000 */ nop -/* 7E2128 802812A8 8E02000C */ lw $v0, 0xc($s0) -/* 7E212C 802812AC 0440001C */ bltz $v0, .L80281320 -/* 7E2130 802812B0 00021040 */ sll $v0, $v0, 1 -/* 7E2134 802812B4 00521021 */ addu $v0, $v0, $s2 -/* 7E2138 802812B8 0C039D5D */ jal add_item -/* 7E213C 802812BC 844401C8 */ lh $a0, 0x1c8($v0) -/* 7E2140 802812C0 04400005 */ bltz $v0, .L802812D8 -/* 7E2144 802812C4 00000000 */ nop -/* 7E2148 802812C8 8E02000C */ lw $v0, 0xc($s0) -/* 7E214C 802812CC 00021040 */ sll $v0, $v0, 1 -/* 7E2150 802812D0 00521021 */ addu $v0, $v0, $s2 -/* 7E2154 802812D4 A44001C8 */ sh $zero, 0x1c8($v0) -.L802812D8: -/* 7E2158 802812D8 0C039D88 */ jal get_item_empty_count -/* 7E215C 802812DC 00000000 */ nop -/* 7E2160 802812E0 10400005 */ beqz $v0, .L802812F8 -/* 7E2164 802812E4 00000000 */ nop -/* 7E2168 802812E8 0C039E05 */ jal get_stored_count -/* 7E216C 802812EC 00000000 */ nop -/* 7E2170 802812F0 14400005 */ bnez $v0, .L80281308 -/* 7E2174 802812F4 00000000 */ nop -.L802812F8: -/* 7E2178 802812F8 0C0A0000 */ jal func_80280000 -/* 7E217C 802812FC 24040014 */ addiu $a0, $zero, 0x14 -/* 7E2180 80281300 080A04EE */ j .L802813B8 -/* 7E2184 80281304 AE220074 */ sw $v0, 0x74($s1) -.L80281308: -/* 7E2188 80281308 0C0A0000 */ jal func_80280000 -/* 7E218C 8028130C 24040015 */ addiu $a0, $zero, 0x15 -/* 7E2190 80281310 AE220074 */ sw $v0, 0x74($s1) -/* 7E2194 80281314 24020048 */ addiu $v0, $zero, 0x48 -/* 7E2198 80281318 080A0505 */ j .L80281414 -/* 7E219C 8028131C AE220070 */ sw $v0, 0x70($s1) -.L80281320: -/* 7E21A0 80281320 0C0A0000 */ jal func_80280000 -/* 7E21A4 80281324 24040016 */ addiu $a0, $zero, 0x16 -/* 7E21A8 80281328 080A04EE */ j .L802813B8 -/* 7E21AC 8028132C AE220074 */ sw $v0, 0x74($s1) -.L80281330: -/* 7E21B0 80281330 8E240074 */ lw $a0, 0x74($s1) -/* 7E21B4 80281334 0C0B1059 */ jal does_script_exist -/* 7E21B8 80281338 00000000 */ nop -/* 7E21BC 8028133C 14400036 */ bnez $v0, .L80281418 -/* 7E21C0 80281340 0000102D */ daddu $v0, $zero, $zero -/* 7E21C4 80281344 3C04001E */ lui $a0, 0x1e -/* 7E21C8 80281348 34840005 */ ori $a0, $a0, 5 -/* 7E21CC 8028134C 26250078 */ addiu $a1, $s1, 0x78 -/* 7E21D0 80281350 24020049 */ addiu $v0, $zero, 0x49 -.L80281354: -/* 7E21D4 80281354 AE220070 */ sw $v0, 0x70($s1) -/* 7E21D8 80281358 0C049640 */ jal load_string -/* 7E21DC 8028135C AE200078 */ sw $zero, 0x78($s1) -/* 7E21E0 80281360 3C018028 */ lui $at, 0x8028 -/* 7E21E4 80281364 AC226538 */ sw $v0, 0x6538($at) -/* 7E21E8 80281368 080A0506 */ j .L80281418 -/* 7E21EC 8028136C 0000102D */ daddu $v0, $zero, $zero -.L80281370: -/* 7E21F0 80281370 8E230078 */ lw $v1, 0x78($s1) -/* 7E21F4 80281374 24020001 */ addiu $v0, $zero, 1 -/* 7E21F8 80281378 14620027 */ bne $v1, $v0, .L80281418 -/* 7E21FC 8028137C 0000102D */ daddu $v0, $zero, $zero -/* 7E2200 80281380 3C028028 */ lui $v0, 0x8028 -/* 7E2204 80281384 8C426538 */ lw $v0, 0x6538($v0) -/* 7E2208 80281388 904204E8 */ lbu $v0, 0x4e8($v0) -/* 7E220C 8028138C 14400007 */ bnez $v0, .L802813AC -/* 7E2210 80281390 00000000 */ nop -/* 7E2214 80281394 0C0A00D7 */ jal func_8028035C -/* 7E2218 80281398 00000000 */ nop -/* 7E221C 8028139C AE220074 */ sw $v0, 0x74($s1) -.L802813A0: -/* 7E2220 802813A0 240202BD */ addiu $v0, $zero, 0x2bd -/* 7E2224 802813A4 080A0505 */ j .L80281414 -/* 7E2228 802813A8 AE220070 */ sw $v0, 0x70($s1) -.L802813AC: -/* 7E222C 802813AC 0C0A00B4 */ jal func_802802D0 -/* 7E2230 802813B0 24040016 */ addiu $a0, $zero, 0x16 -/* 7E2234 802813B4 AE220074 */ sw $v0, 0x74($s1) -.L802813B8: -/* 7E2238 802813B8 24020009 */ addiu $v0, $zero, 9 -/* 7E223C 802813BC 080A0505 */ j .L80281414 -/* 7E2240 802813C0 AE220070 */ sw $v0, 0x70($s1) -.L802813C4: -/* 7E2244 802813C4 8E240074 */ lw $a0, 0x74($s1) -/* 7E2248 802813C8 0C0B1059 */ jal does_script_exist -/* 7E224C 802813CC 00000000 */ nop -/* 7E2250 802813D0 14400011 */ bnez $v0, .L80281418 -/* 7E2254 802813D4 0000102D */ daddu $v0, $zero, $zero -/* 7E2258 802813D8 2402000A */ addiu $v0, $zero, 0xa -/* 7E225C 802813DC 080A0505 */ j .L80281414 -/* 7E2260 802813E0 AE220070 */ sw $v0, 0x70($s1) -.L802813E4: -/* 7E2264 802813E4 8E020010 */ lw $v0, 0x10($s0) -/* 7E2268 802813E8 10400006 */ beqz $v0, .L80281404 -/* 7E226C 802813EC 00000000 */ nop -/* 7E2270 802813F0 8C440014 */ lw $a0, 0x14($v0) -/* 7E2274 802813F4 10800003 */ beqz $a0, .L80281404 -/* 7E2278 802813F8 24050001 */ addiu $a1, $zero, 1 -/* 7E227C 802813FC 0C0B0CF8 */ jal start_script -/* 7E2280 80281400 0000302D */ daddu $a2, $zero, $zero -.L80281404: -/* 7E2284 80281404 0C03A5E3 */ jal open_status_menu_short -/* 7E2288 80281408 00000000 */ nop -/* 7E228C 8028140C 080A0506 */ j .L80281418 -/* 7E2290 80281410 24020001 */ addiu $v0, $zero, 1 -.L80281414: -/* 7E2294 80281414 0000102D */ daddu $v0, $zero, $zero -.L80281418: -/* 7E2298 80281418 8FBF0020 */ lw $ra, 0x20($sp) -/* 7E229C 8028141C 8FB3001C */ lw $s3, 0x1c($sp) -/* 7E22A0 80281420 8FB20018 */ lw $s2, 0x18($sp) -/* 7E22A4 80281424 8FB10014 */ lw $s1, 0x14($sp) -/* 7E22A8 80281428 8FB00010 */ lw $s0, 0x10($sp) -/* 7E22AC 8028142C 03E00008 */ jr $ra -/* 7E22B0 80281430 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7e0e80/func_80281434.s b/asm/nonmatchings/code_7e0e80/func_80281434.s deleted file mode 100644 index 5dcd366f21..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_80281434.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80281434 -/* 7E22B4 80281434 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E22B8 80281438 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E22BC 8028143C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7E22C0 80281440 AFBF0024 */ sw $ra, 0x24($sp) -/* 7E22C4 80281444 AFB20020 */ sw $s2, 0x20($sp) -/* 7E22C8 80281448 AFB1001C */ sw $s1, 0x1c($sp) -/* 7E22CC 8028144C AFB00018 */ sw $s0, 0x18($sp) -/* 7E22D0 80281450 8C440144 */ lw $a0, 0x144($v0) -/* 7E22D4 80281454 00A0882D */ daddu $s1, $a1, $zero -/* 7E22D8 80281458 8C830008 */ lw $v1, 8($a0) -/* 7E22DC 8028145C 00C0902D */ daddu $s2, $a2, $zero -/* 7E22E0 80281460 00031040 */ sll $v0, $v1, 1 -/* 7E22E4 80281464 00431021 */ addu $v0, $v0, $v1 -/* 7E22E8 80281468 8C830018 */ lw $v1, 0x18($a0) -/* 7E22EC 8028146C 00021080 */ sll $v0, $v0, 2 -/* 7E22F0 80281470 00621821 */ addu $v1, $v1, $v0 -/* 7E22F4 80281474 8C700000 */ lw $s0, ($v1) -/* 7E22F8 80281478 3C028008 */ lui $v0, %hi(gItemTable) -/* 7E22FC 8028147C 244278E0 */ addiu $v0, $v0, %lo(gItemTable) -/* 7E2300 80281480 00108140 */ sll $s0, $s0, 5 -/* 7E2304 80281484 02028021 */ addu $s0, $s0, $v0 -/* 7E2308 80281488 8E040000 */ lw $a0, ($s0) -/* 7E230C 8028148C 0C04991D */ jal get_string_width -/* 7E2310 80281490 0000282D */ daddu $a1, $zero, $zero -/* 7E2314 80281494 00021043 */ sra $v0, $v0, 1 -/* 7E2318 80281498 2442FFC4 */ addiu $v0, $v0, -0x3c -/* 7E231C 8028149C 02222823 */ subu $a1, $s1, $v0 -/* 7E2320 802814A0 26460006 */ addiu $a2, $s2, 6 -/* 7E2324 802814A4 AFA00010 */ sw $zero, 0x10($sp) -/* 7E2328 802814A8 AFA00014 */ sw $zero, 0x14($sp) -/* 7E232C 802814AC 8E040000 */ lw $a0, ($s0) -/* 7E2330 802814B0 0C04993B */ jal draw_string -/* 7E2334 802814B4 240700FF */ addiu $a3, $zero, 0xff -/* 7E2338 802814B8 8FBF0024 */ lw $ra, 0x24($sp) -/* 7E233C 802814BC 8FB20020 */ lw $s2, 0x20($sp) -/* 7E2340 802814C0 8FB1001C */ lw $s1, 0x1c($sp) -/* 7E2344 802814C4 8FB00018 */ lw $s0, 0x18($sp) -/* 7E2348 802814C8 03E00008 */ jr $ra -/* 7E234C 802814CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_7e0e80/func_802814D0.s b/asm/nonmatchings/code_7e0e80/func_802814D0.s deleted file mode 100644 index 663497bde0..0000000000 --- a/asm/nonmatchings/code_7e0e80/func_802814D0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802814D0 -/* 7E2350 802814D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7E2354 802814D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7E2358 802814D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E235C 802814DC AFBF0018 */ sw $ra, 0x18($sp) -/* 7E2360 802814E0 8C420144 */ lw $v0, 0x144($v0) -/* 7E2364 802814E4 24A50008 */ addiu $a1, $a1, 8 -/* 7E2368 802814E8 8C440008 */ lw $a0, 8($v0) -/* 7E236C 802814EC 8C430018 */ lw $v1, 0x18($v0) -/* 7E2370 802814F0 2402000A */ addiu $v0, $zero, 0xa -/* 7E2374 802814F4 AFA20010 */ sw $v0, 0x10($sp) -/* 7E2378 802814F8 AFA00014 */ sw $zero, 0x14($sp) -/* 7E237C 802814FC 00041040 */ sll $v0, $a0, 1 -/* 7E2380 80281500 00441021 */ addu $v0, $v0, $a0 -/* 7E2384 80281504 00021080 */ sll $v0, $v0, 2 -/* 7E2388 80281508 00621821 */ addu $v1, $v1, $v0 -/* 7E238C 8028150C 8C640008 */ lw $a0, 8($v1) -/* 7E2390 80281510 0C04993B */ jal draw_string -/* 7E2394 80281514 240700FF */ addiu $a3, $zero, 0xff -/* 7E2398 80281518 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E239C 8028151C 03E00008 */ jr $ra -/* 7E23A0 80281520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s deleted file mode 100644 index 954b3db869..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428C0_E07C20 -/* E07C20 802428C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07C24 802428C4 2404005B */ addiu $a0, $zero, 0x5b -/* E07C28 802428C8 2405FFFF */ addiu $a1, $zero, -1 -/* E07C2C 802428CC 24060001 */ addiu $a2, $zero, 1 -/* E07C30 802428D0 AFBF0010 */ sw $ra, 0x10($sp) -/* E07C34 802428D4 0C046E54 */ jal func_8011B950 -/* E07C38 802428D8 0000382D */ daddu $a3, $zero, $zero -/* E07C3C 802428DC 0000202D */ daddu $a0, $zero, $zero -/* E07C40 802428E0 0080282D */ daddu $a1, $a0, $zero -/* E07C44 802428E4 0080302D */ daddu $a2, $a0, $zero -/* E07C48 802428E8 0C046F97 */ jal set_background_color_blend -/* E07C4C 802428EC 240700FF */ addiu $a3, $zero, 0xff -/* E07C50 802428F0 8FBF0010 */ lw $ra, 0x10($sp) -/* E07C54 802428F4 24020002 */ addiu $v0, $zero, 2 -/* E07C58 802428F8 03E00008 */ jr $ra -/* E07C5C 802428FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s deleted file mode 100644 index f658cae9bb..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242900_E07C60.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242900_E07C60 -/* E07C60 80242900 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07C64 80242904 AFB00010 */ sw $s0, 0x10($sp) -/* E07C68 80242908 0080802D */ daddu $s0, $a0, $zero -/* E07C6C 8024290C 10A00003 */ beqz $a1, .L8024291C -/* E07C70 80242910 AFBF0014 */ sw $ra, 0x14($sp) -/* E07C74 80242914 240200FF */ addiu $v0, $zero, 0xff -/* E07C78 80242918 AE020074 */ sw $v0, 0x74($s0) -.L8024291C: -/* E07C7C 8024291C 8E020074 */ lw $v0, 0x74($s0) -/* E07C80 80242920 2442FFF6 */ addiu $v0, $v0, -0xa -/* E07C84 80242924 04410002 */ bgez $v0, .L80242930 -/* E07C88 80242928 AE020074 */ sw $v0, 0x74($s0) -/* E07C8C 8024292C AE000074 */ sw $zero, 0x74($s0) -.L80242930: -/* E07C90 80242930 0000202D */ daddu $a0, $zero, $zero -/* E07C94 80242934 0080282D */ daddu $a1, $a0, $zero -/* E07C98 80242938 92070077 */ lbu $a3, 0x77($s0) -/* E07C9C 8024293C 0C046F97 */ jal set_background_color_blend -/* E07CA0 80242940 0080302D */ daddu $a2, $a0, $zero -/* E07CA4 80242944 8E020074 */ lw $v0, 0x74($s0) -/* E07CA8 80242948 14400007 */ bnez $v0, .L80242968 -/* E07CAC 8024294C 0000102D */ daddu $v0, $zero, $zero -/* E07CB0 80242950 2404005B */ addiu $a0, $zero, 0x5b -/* E07CB4 80242954 2405FFFF */ addiu $a1, $zero, -1 -/* E07CB8 80242958 0000302D */ daddu $a2, $zero, $zero -/* E07CBC 8024295C 0C046E54 */ jal func_8011B950 -/* E07CC0 80242960 00C0382D */ daddu $a3, $a2, $zero -/* E07CC4 80242964 24020002 */ addiu $v0, $zero, 2 -.L80242968: -/* E07CC8 80242968 8FBF0014 */ lw $ra, 0x14($sp) -/* E07CCC 8024296C 8FB00010 */ lw $s0, 0x10($sp) -/* E07CD0 80242970 03E00008 */ jr $ra -/* E07CD4 80242974 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s deleted file mode 100644 index 125c322ce3..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242978_E07CD8.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242978_E07CD8 -/* E07CD8 80242978 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E07CDC 8024297C AFB20020 */ sw $s2, 0x20($sp) -/* E07CE0 80242980 AFBF0024 */ sw $ra, 0x24($sp) -/* E07CE4 80242984 AFB1001C */ sw $s1, 0x1c($sp) -/* E07CE8 80242988 AFB00018 */ sw $s0, 0x18($sp) -/* E07CEC 8024298C F7B40028 */ sdc1 $f20, 0x28($sp) -/* E07CF0 80242990 10A00006 */ beqz $a1, .L802429AC -/* E07CF4 80242994 0080902D */ daddu $s2, $a0, $zero -/* E07CF8 80242998 8E4400AC */ lw $a0, 0xac($s2) -/* E07CFC 8024299C 0C00EAD2 */ jal get_npc_safe -/* E07D00 802429A0 00000000 */ nop -/* E07D04 802429A4 AE420078 */ sw $v0, 0x78($s2) -/* E07D08 802429A8 AE400070 */ sw $zero, 0x70($s2) -.L802429AC: -/* E07D0C 802429AC 3C05444A */ lui $a1, 0x444a -/* E07D10 802429B0 34A58000 */ ori $a1, $a1, 0x8000 -/* E07D14 802429B4 8E510078 */ lw $s1, 0x78($s2) -/* E07D18 802429B8 4480A000 */ mtc1 $zero, $f20 -/* E07D1C 802429BC 2410002D */ addiu $s0, $zero, 0x2d -/* E07D20 802429C0 AFB00010 */ sw $s0, 0x10($sp) -/* E07D24 802429C4 8E470070 */ lw $a3, 0x70($s2) -/* E07D28 802429C8 4406A000 */ mfc1 $a2, $f20 -/* E07D2C 802429CC 0C00A8ED */ jal update_lerp -/* E07D30 802429D0 24040004 */ addiu $a0, $zero, 4 -/* E07D34 802429D4 4405A000 */ mfc1 $a1, $f20 -/* E07D38 802429D8 3C06437F */ lui $a2, 0x437f -/* E07D3C 802429DC E6200048 */ swc1 $f0, 0x48($s1) -/* E07D40 802429E0 AFB00010 */ sw $s0, 0x10($sp) -/* E07D44 802429E4 8E470070 */ lw $a3, 0x70($s2) -/* E07D48 802429E8 0C00A8ED */ jal update_lerp -/* E07D4C 802429EC 24040004 */ addiu $a0, $zero, 4 -/* E07D50 802429F0 3C014F00 */ lui $at, 0x4f00 -/* E07D54 802429F4 44811000 */ mtc1 $at, $f2 -/* E07D58 802429F8 00000000 */ nop -/* E07D5C 802429FC 4600103E */ c.le.s $f2, $f0 -/* E07D60 80242A00 00000000 */ nop -/* E07D64 80242A04 45010005 */ bc1t .L80242A1C -/* E07D68 80242A08 263100AC */ addiu $s1, $s1, 0xac -/* E07D6C 80242A0C 4600010D */ trunc.w.s $f4, $f0 -/* E07D70 80242A10 44032000 */ mfc1 $v1, $f4 -/* E07D74 80242A14 08090A8E */ j .L80242A38 -/* E07D78 80242A18 A2230000 */ sb $v1, ($s1) -.L80242A1C: -/* E07D7C 80242A1C 46020001 */ sub.s $f0, $f0, $f2 -/* E07D80 80242A20 3C028000 */ lui $v0, 0x8000 -/* E07D84 80242A24 4600010D */ trunc.w.s $f4, $f0 -/* E07D88 80242A28 44032000 */ mfc1 $v1, $f4 -/* E07D8C 80242A2C 00000000 */ nop -/* E07D90 80242A30 00621825 */ or $v1, $v1, $v0 -/* E07D94 80242A34 A2230000 */ sb $v1, ($s1) -.L80242A38: -/* E07D98 80242A38 8E430070 */ lw $v1, 0x70($s2) -/* E07D9C 80242A3C 24630001 */ addiu $v1, $v1, 1 -/* E07DA0 80242A40 2862002E */ slti $v0, $v1, 0x2e -/* E07DA4 80242A44 AE430070 */ sw $v1, 0x70($s2) -/* E07DA8 80242A48 8FBF0024 */ lw $ra, 0x24($sp) -/* E07DAC 80242A4C 8FB20020 */ lw $s2, 0x20($sp) -/* E07DB0 80242A50 8FB1001C */ lw $s1, 0x1c($sp) -/* E07DB4 80242A54 8FB00018 */ lw $s0, 0x18($sp) -/* E07DB8 80242A58 D7B40028 */ ldc1 $f20, 0x28($sp) -/* E07DBC 80242A5C 38420001 */ xori $v0, $v0, 1 -/* E07DC0 80242A60 03E00008 */ jr $ra -/* E07DC4 80242A64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s deleted file mode 100644 index 63b94e3d1c..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242A68_E07DC8.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A68_E07DC8 -/* E07DC8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E07DCC 80242A6C AFB10014 */ sw $s1, 0x14($sp) -/* E07DD0 80242A70 0080882D */ daddu $s1, $a0, $zero -/* E07DD4 80242A74 AFBF0018 */ sw $ra, 0x18($sp) -/* E07DD8 80242A78 AFB00010 */ sw $s0, 0x10($sp) -/* E07DDC 80242A7C 8E22000C */ lw $v0, 0xc($s1) -/* E07DE0 80242A80 00A0802D */ daddu $s0, $a1, $zero -/* E07DE4 80242A84 0C0B1EAF */ jal get_variable -/* E07DE8 80242A88 8C450000 */ lw $a1, ($v0) -/* E07DEC 80242A8C 1200000C */ beqz $s0, .L80242AC0 -/* E07DF0 80242A90 0220202D */ daddu $a0, $s1, $zero -/* E07DF4 80242A94 0C0B36B0 */ jal resolve_npc -/* E07DF8 80242A98 0040282D */ daddu $a1, $v0, $zero -/* E07DFC 80242A9C AE220074 */ sw $v0, 0x74($s1) -/* E07E00 80242AA0 C4420038 */ lwc1 $f2, 0x38($v0) -/* E07E04 80242AA4 3C014334 */ lui $at, 0x4334 -/* E07E08 80242AA8 44810000 */ mtc1 $at, $f0 -/* E07E0C 80242AAC 24020048 */ addiu $v0, $zero, 0x48 -/* E07E10 80242AB0 AE220070 */ sw $v0, 0x70($s1) -/* E07E14 80242AB4 4600110D */ trunc.w.s $f4, $f2 -/* E07E18 80242AB8 E6240078 */ swc1 $f4, 0x78($s1) -/* E07E1C 80242ABC E620007C */ swc1 $f0, 0x7c($s1) -.L80242AC0: -/* E07E20 80242AC0 C620007C */ lwc1 $f0, 0x7c($s1) -/* E07E24 80242AC4 3C0140A0 */ lui $at, 0x40a0 -/* E07E28 80242AC8 44816000 */ mtc1 $at, $f12 -/* E07E2C 80242ACC 8E300074 */ lw $s0, 0x74($s1) -/* E07E30 80242AD0 0C00A6C9 */ jal clamp_angle -/* E07E34 80242AD4 460C0301 */ sub.s $f12, $f0, $f12 -/* E07E38 80242AD8 46000306 */ mov.s $f12, $f0 -/* E07E3C 80242ADC 0C00A8D4 */ jal cos_deg -/* E07E40 80242AE0 E62C007C */ swc1 $f12, 0x7c($s1) -/* E07E44 80242AE4 3C0140C0 */ lui $at, 0x40c0 -/* E07E48 80242AE8 44811000 */ mtc1 $at, $f2 -/* E07E4C 80242AEC 00000000 */ nop -/* E07E50 80242AF0 46020002 */ mul.s $f0, $f0, $f2 -/* E07E54 80242AF4 00000000 */ nop -/* E07E58 80242AF8 C6020038 */ lwc1 $f2, 0x38($s0) -/* E07E5C 80242AFC 46001080 */ add.s $f2, $f2, $f0 -/* E07E60 80242B00 E6020038 */ swc1 $f2, 0x38($s0) -/* E07E64 80242B04 0C00A8BB */ jal sin_deg -/* E07E68 80242B08 C62C007C */ lwc1 $f12, 0x7c($s1) -/* E07E6C 80242B0C 3C014020 */ lui $at, 0x4020 -/* E07E70 80242B10 44811000 */ mtc1 $at, $f2 -/* E07E74 80242B14 00000000 */ nop -/* E07E78 80242B18 46020002 */ mul.s $f0, $f0, $f2 -/* E07E7C 80242B1C 00000000 */ nop -/* E07E80 80242B20 C6020040 */ lwc1 $f2, 0x40($s0) -/* E07E84 80242B24 46001080 */ add.s $f2, $f2, $f0 -/* E07E88 80242B28 3C014334 */ lui $at, 0x4334 -/* E07E8C 80242B2C 44816000 */ mtc1 $at, $f12 -/* E07E90 80242B30 E6020040 */ swc1 $f2, 0x40($s0) -/* E07E94 80242B34 C620007C */ lwc1 $f0, 0x7c($s1) -/* E07E98 80242B38 0C00A6C9 */ jal clamp_angle -/* E07E9C 80242B3C 46006301 */ sub.s $f12, $f12, $f0 -/* E07EA0 80242B40 E6000034 */ swc1 $f0, 0x34($s0) -/* E07EA4 80242B44 8E230070 */ lw $v1, 0x70($s1) -/* E07EA8 80242B48 2463FFFF */ addiu $v1, $v1, -1 -/* E07EAC 80242B4C AE230070 */ sw $v1, 0x70($s1) -/* E07EB0 80242B50 8FBF0018 */ lw $ra, 0x18($sp) -/* E07EB4 80242B54 8FB10014 */ lw $s1, 0x14($sp) -/* E07EB8 80242B58 8FB00010 */ lw $s0, 0x10($sp) -/* E07EBC 80242B5C 2C620001 */ sltiu $v0, $v1, 1 -/* E07EC0 80242B60 03E00008 */ jr $ra -/* E07EC4 80242B64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s deleted file mode 100644 index b6d654c039..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B68_E07EC8 -/* E07EC8 80242B68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E07ECC 80242B6C AFB10014 */ sw $s1, 0x14($sp) -/* E07ED0 80242B70 0080882D */ daddu $s1, $a0, $zero -/* E07ED4 80242B74 AFBF0018 */ sw $ra, 0x18($sp) -/* E07ED8 80242B78 AFB00010 */ sw $s0, 0x10($sp) -/* E07EDC 80242B7C 8E22000C */ lw $v0, 0xc($s1) -/* E07EE0 80242B80 00A0802D */ daddu $s0, $a1, $zero -/* E07EE4 80242B84 0C0B1EAF */ jal get_variable -/* E07EE8 80242B88 8C450000 */ lw $a1, ($v0) -/* E07EEC 80242B8C 1200000C */ beqz $s0, .L80242BC0 -/* E07EF0 80242B90 0220202D */ daddu $a0, $s1, $zero -/* E07EF4 80242B94 0C0B36B0 */ jal resolve_npc -/* E07EF8 80242B98 0040282D */ daddu $a1, $v0, $zero -/* E07EFC 80242B9C AE220074 */ sw $v0, 0x74($s1) -/* E07F00 80242BA0 C4420038 */ lwc1 $f2, 0x38($v0) -/* E07F04 80242BA4 3C014334 */ lui $at, 0x4334 -/* E07F08 80242BA8 44810000 */ mtc1 $at, $f0 -/* E07F0C 80242BAC 24020048 */ addiu $v0, $zero, 0x48 -/* E07F10 80242BB0 AE220070 */ sw $v0, 0x70($s1) -/* E07F14 80242BB4 4600110D */ trunc.w.s $f4, $f2 -/* E07F18 80242BB8 E6240078 */ swc1 $f4, 0x78($s1) -/* E07F1C 80242BBC E620007C */ swc1 $f0, 0x7c($s1) -.L80242BC0: -/* E07F20 80242BC0 C620007C */ lwc1 $f0, 0x7c($s1) -/* E07F24 80242BC4 3C0140A0 */ lui $at, 0x40a0 -/* E07F28 80242BC8 44816000 */ mtc1 $at, $f12 -/* E07F2C 80242BCC 8E300074 */ lw $s0, 0x74($s1) -/* E07F30 80242BD0 0C00A6C9 */ jal clamp_angle -/* E07F34 80242BD4 460C0300 */ add.s $f12, $f0, $f12 -/* E07F38 80242BD8 46000306 */ mov.s $f12, $f0 -/* E07F3C 80242BDC 0C00A8D4 */ jal cos_deg -/* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1) -/* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0 -/* E07F48 80242BE8 44811000 */ mtc1 $at, $f2 -/* E07F4C 80242BEC 00000000 */ nop -/* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2 -/* E07F54 80242BF4 00000000 */ nop -/* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0) -/* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0 -/* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0) -/* E07F64 80242C04 0C00A8BB */ jal sin_deg -/* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1) -/* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020 -/* E07F70 80242C10 44811000 */ mtc1 $at, $f2 -/* E07F74 80242C14 00000000 */ nop -/* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2 -/* E07F7C 80242C1C 00000000 */ nop -/* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0) -/* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0 -/* E07F88 80242C28 3C014334 */ lui $at, 0x4334 -/* E07F8C 80242C2C 44816000 */ mtc1 $at, $f12 -/* E07F90 80242C30 E6020040 */ swc1 $f2, 0x40($s0) -/* E07F94 80242C34 C620007C */ lwc1 $f0, 0x7c($s1) -/* E07F98 80242C38 0C00A6C9 */ jal clamp_angle -/* E07F9C 80242C3C 46006301 */ sub.s $f12, $f12, $f0 -/* E07FA0 80242C40 E6000034 */ swc1 $f0, 0x34($s0) -/* E07FA4 80242C44 8E230070 */ lw $v1, 0x70($s1) -/* E07FA8 80242C48 2463FFFF */ addiu $v1, $v1, -1 -/* E07FAC 80242C4C AE230070 */ sw $v1, 0x70($s1) -/* E07FB0 80242C50 8FBF0018 */ lw $ra, 0x18($sp) -/* E07FB4 80242C54 8FB10014 */ lw $s1, 0x14($sp) -/* E07FB8 80242C58 8FB00010 */ lw $s0, 0x10($sp) -/* E07FBC 80242C5C 2C620001 */ sltiu $v0, $v1, 1 -/* E07FC0 80242C60 03E00008 */ jr $ra -/* E07FC4 80242C64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s deleted file mode 100644 index cc8a7a58d1..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C68_E07FC8 -/* E07FC8 80242C68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07FCC 80242C6C AFBF0010 */ sw $ra, 0x10($sp) -/* E07FD0 80242C70 8C82000C */ lw $v0, 0xc($a0) -/* E07FD4 80242C74 0C0B1EAF */ jal get_variable -/* E07FD8 80242C78 8C450000 */ lw $a1, ($v0) -/* E07FDC 80242C7C 8FBF0010 */ lw $ra, 0x10($sp) -/* E07FE0 80242C80 3C018024 */ lui $at, 0x8024 -/* E07FE4 80242C84 AC225D34 */ sw $v0, 0x5d34($at) -/* E07FE8 80242C88 24020002 */ addiu $v0, $zero, 2 -/* E07FEC 80242C8C 03E00008 */ jr $ra -/* E07FF0 80242C90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s deleted file mode 100644 index b21718ceab..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C94_E07FF4 -/* E07FF4 80242C94 3C06FC12 */ lui $a2, 0xfc12 -/* E07FF8 80242C98 34C64624 */ ori $a2, $a2, 0x4624 -/* E07FFC 80242C9C 3C05FF8F */ lui $a1, 0xff8f -/* E08000 80242CA0 3C04800A */ lui $a0, 0x800a -/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, -0x5994 -/* E08008 80242CA8 8C820000 */ lw $v0, ($a0) -/* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff -/* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero -/* E08014 80242CB4 24420008 */ addiu $v0, $v0, 8 -/* E08018 80242CB8 AC820000 */ sw $v0, ($a0) -/* E0801C 80242CBC AC660000 */ sw $a2, ($v1) -/* E08020 80242CC0 AC650004 */ sw $a1, 4($v1) -/* E08024 80242CC4 24430008 */ addiu $v1, $v0, 8 -/* E08028 80242CC8 AC830000 */ sw $v1, ($a0) -/* E0802C 80242CCC 3C048024 */ lui $a0, 0x8024 -/* E08030 80242CD0 90845D37 */ lbu $a0, 0x5d37($a0) -/* E08034 80242CD4 3C03FA00 */ lui $v1, 0xfa00 -/* E08038 80242CD8 AC430000 */ sw $v1, ($v0) -/* E0803C 80242CDC 03E00008 */ jr $ra -/* E08040 80242CE0 AC440004 */ sw $a0, 4($v0) -/* E08044 80242CE4 00000000 */ nop -/* E08048 80242CE8 00000000 */ nop -/* E0804C 80242CEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 7793819346..047faa9710 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -88,9 +88,9 @@ glabel func_80242B04_BA7284 /* BA73C8 80242C48 2C62000F */ sltiu $v0, $v1, 0xf /* BA73CC 80242C4C 1040002C */ beqz $v0, .L80242D00 /* BA73D0 80242C50 00031080 */ sll $v0, $v1, 2 -/* BA73D4 80242C54 3C018024 */ lui $at, 0x8024 +/* BA73D4 80242C54 3C018024 */ lui $at, %hi(pause_stats_draw_contents) /* BA73D8 80242C58 00220821 */ addu $at, $at, $v0 -/* BA73DC 80242C5C 8C225980 */ lw $v0, 0x5980($at) +/* BA73DC 80242C5C 8C225980 */ lw $v0, %lo(pause_stats_draw_contents)($at) /* BA73E0 80242C60 00400008 */ jr $v0 /* BA73E4 80242C64 00000000 */ nop /* BA73E8 80242C68 0260202D */ daddu $a0, $s3, $zero