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_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_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_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_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_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_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_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_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_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_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/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/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 a976d26f12..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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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/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_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 deleted file mode 100644 index 77f053290b..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, 0x8008 -/* C3D310 80240290 00220821 */ addu $at, $at, $v0 -/* C3D314 80240294 942278F8 */ lhu $v0, 0x78f8($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_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 deleted file mode 100644 index c12eeb8986..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, 0x8008 -/* C4E180 80240290 00220821 */ addu $at, $at, $v0 -/* C4E184 80240294 942278F8 */ lhu $v0, 0x78f8($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 99c367974e..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, 0x8008 -/* C57180 80241240 00220821 */ addu $at, $at, $v0 -/* C57184 80241244 942278F8 */ lhu $v0, 0x78f8($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_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_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s index c5ce7fa7f1..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,15 +124,15 @@ 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 -/* 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_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 6d5b641387..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, 0x8008 -/* A3B740 80242260 00220821 */ addu $at, $at, $v0 -/* A3B744 80242264 942278F8 */ lhu $v0, 0x78f8($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 71f2fc41b1..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, 0x8008 -/* 986770 80240290 00220821 */ addu $at, $at, $v0 -/* 986774 80240294 942278F8 */ lhu $v0, 0x78f8($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_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_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 53b15ea335..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, 0x8008 -/* 918E40 80240290 00220821 */ addu $at, $at, $v0 -/* 918E44 80240294 942278F8 */ lhu $v0, 0x78f8($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 7329f118d5..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, 0x8008 -/* B44D50 802405E0 00220821 */ addu $at, $at, $v0 -/* B44D54 802405E4 942278F8 */ lhu $v0, 0x78f8($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_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 deleted file mode 100644 index 150d71f6ff..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, 0x8008 -/* AF1EF0 80240290 00220821 */ addu $at, $at, $v0 -/* AF1EF4 80240294 942278F8 */ lhu $v0, 0x78f8($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_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_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_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_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/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_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s deleted file mode 100644 index 8ca1886817..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, 0x8008 -/* 8D8760 80240290 00220821 */ addu $at, $at, $v0 -/* 8D8764 80240294 942278F8 */ lhu $v0, 0x78f8($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_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/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/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_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 deleted file mode 100644 index 8a45449717..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, 0x8008 -/* A59930 802405A0 00220821 */ addu $at, $at, $v0 -/* A59934 802405A4 942278F8 */ lhu $v0, 0x78f8($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_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_08/C71C10/func_802409F8_C71E78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s deleted file mode 100644 index 992f37f603..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, 0x8008 -/* C71EA0 80240A20 00220821 */ addu $at, $at, $v0 -/* C71EA4 80240A24 942278F8 */ lhu $v0, 0x78f8($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_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_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_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 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/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 fb6528e594..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, 0x8008 -/* BCEE80 80240290 00220821 */ addu $at, $at, $v0 -/* BCEE84 80240294 942278F8 */ lhu $v0, 0x78f8($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_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_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 deleted file mode 100644 index 4901d0a90a..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, 0x8008 -/* DB8410 80240B00 00220821 */ addu $at, $at, $v0 -/* DB8414 80240B04 942278F8 */ lhu $v0, 0x78f8($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_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 deleted file mode 100644 index e9c4ce0398..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, 0x8008 -/* DCD680 802409B0 00220821 */ addu $at, $at, $v0 -/* DCD684 802409B4 942278F8 */ lhu $v0, 0x78f8($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_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_13/DE36C0/func_80241498_DE3928.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s deleted file mode 100644 index 68d5a009a2..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, 0x8008 -/* DE3950 802414C0 00220821 */ addu $at, $at, $v0 -/* DE3954 802414C4 942278F8 */ lhu $v0, 0x78f8($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_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_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 8d12a9f9be..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, 0x8008 -/* D56D60 802411B0 00220821 */ addu $at, $at, $v0 -/* D56D64 802411B4 942278F8 */ lhu $v0, 0x78f8($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 aee5e60fe3..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, 0x8008 -/* D626B0 802411B0 00220821 */ addu $at, $at, $v0 -/* D626B4 802411B4 942278F8 */ lhu $v0, 0x78f8($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 d3c4603ad4..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, 0x8008 -/* D63EF0 802411E0 00220821 */ addu $at, $at, $v0 -/* D63EF4 802411E4 942278F8 */ lhu $v0, 0x78f8($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 e708da90fe..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, 0x8008 -/* D68EB0 802411B0 00220821 */ addu $at, $at, $v0 -/* D68EB4 802411B4 942278F8 */ lhu $v0, 0x78f8($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 451146e8f9..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, 0x8008 -/* D7ABD0 802411E0 00220821 */ addu $at, $at, $v0 -/* D7ABD4 802411E4 942278F8 */ lhu $v0, 0x78f8($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 16b5b1982b..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, 0x8008 -/* D7C480 802411E0 00220821 */ addu $at, $at, $v0 -/* D7C484 802411E4 942278F8 */ lhu $v0, 0x78f8($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 15efa22f53..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, 0x8008 -/* D8FE30 80242BE0 00220821 */ addu $at, $at, $v0 -/* D8FE34 80242BE4 942278F8 */ lhu $v0, 0x78f8($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 b0013735bd..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, 0x8008 -/* CF9A90 80241F20 00220821 */ addu $at, $at, $v0 -/* CF9A94 80241F24 942278F8 */ lhu $v0, 0x78f8($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 860e726e19..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, 0x8008 -/* D37A90 80240290 00220821 */ addu $at, $at, $v0 -/* D37A94 80240294 942278F8 */ lhu $v0, 0x78f8($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_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/86CA50/func_80240578_86CCB8.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s deleted file mode 100644 index 7138223922..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, 0x8008 -/* 86CCE0 802405A0 00220821 */ addu $at, $at, $v0 -/* 86CCE4 802405A4 942278F8 */ lhu $v0, 0x78f8($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_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_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s deleted file mode 100644 index 1cf2fe6e11..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, 0x8008 -/* 8756D0 80240910 00220821 */ addu $at, $at, $v0 -/* 8756D4 80240914 942278F8 */ lhu $v0, 0x78f8($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/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_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/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/code_7e0e80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/MakeShop.s rename to asm/nonmatchings/world/script_api/7E0E80/MakeShop.s diff --git a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/MakeShopOwner.s rename to asm/nonmatchings/world/script_api/7E0E80/MakeShopOwner.s diff --git a/asm/nonmatchings/code_7e0e80/draw_shop_items.s b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/draw_shop_items.s rename to asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280000.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280000.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280000.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280088.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280088.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280088.s diff --git a/asm/nonmatchings/code_7e0e80/func_8028017C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_8028017C.s rename to asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280208.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280208.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280208.s diff --git a/asm/nonmatchings/code_7e0e80/func_802802D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_802802D0.s rename to asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s diff --git a/asm/nonmatchings/code_7e0e80/func_8028035C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_8028035C.s rename to asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s diff --git a/asm/nonmatchings/code_7e0e80/func_802803C8.s b/asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_802803C8.s rename to asm/nonmatchings/world/script_api/7E0E80/func_802803C8.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280410.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280410.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280410.s diff --git a/asm/nonmatchings/code_7e0e80/func_8028051C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_8028051C.s rename to asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280954.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280954.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280954.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280AC4.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280AC4.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280AC4.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280B44.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280B44.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s diff --git a/asm/nonmatchings/code_7e0e80/func_80280B78.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s similarity index 90% rename from asm/nonmatchings/code_7e0e80/func_80280B78.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280B78.s index 9f96c4c9fa..52a7392921 100644 --- a/asm/nonmatchings/code_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/asm/nonmatchings/code_7e0e80/func_80280BD0.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80280BD0.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s diff --git a/asm/nonmatchings/code_7e0e80/func_80281434.s b/asm/nonmatchings/world/script_api/7E0E80/func_80281434.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_80281434.s rename to asm/nonmatchings/world/script_api/7E0E80/func_80281434.s diff --git a/asm/nonmatchings/code_7e0e80/func_802814D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s similarity index 100% rename from asm/nonmatchings/code_7e0e80/func_802814D0.s rename to asm/nonmatchings/world/script_api/7E0E80/func_802814D0.s diff --git a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s rename to asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s diff --git a/asm/nonmatchings/code_7E2AA0/func_802822A8.s b/asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_802822A8.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_802822A8.s diff --git a/asm/nonmatchings/code_7E2AA0/func_8028236C.s b/asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_8028236C.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_8028236C.s diff --git a/asm/nonmatchings/code_7E2AA0/func_802823B0.s b/asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_802823B0.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_802823B0.s diff --git a/asm/nonmatchings/code_7E2AA0/func_80282414.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_80282414.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_80282414.s 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/asm/nonmatchings/code_7E2AA0/func_80282634.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_80282634.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_80282634.s diff --git a/asm/nonmatchings/code_7E2AA0/func_80282700.s b/asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s similarity index 100% rename from asm/nonmatchings/code_7E2AA0/func_80282700.s rename to asm/nonmatchings/world/script_api/7E2AA0/func_80282700.s diff --git a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s similarity index 100% rename from asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s rename to asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s diff --git a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s similarity index 100% rename from asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s rename to asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s diff --git a/asm/nonmatchings/code_7E3700/GetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s similarity index 100% rename from asm/nonmatchings/code_7E3700/GetPushBlock.s rename to asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s diff --git a/asm/nonmatchings/code_7E3700/SetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s similarity index 100% rename from asm/nonmatchings/code_7E3700/SetPushBlock.s rename to asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s diff --git a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s similarity index 100% rename from asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s rename to asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s diff --git a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s similarity index 100% rename from asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s rename to asm/nonmatchings/world/script_api/7E3700/TeleportPartnerToPlayer.s diff --git a/asm/nonmatchings/code_7E3700/func_80282880.s b/asm/nonmatchings/world/script_api/7E3700/func_80282880.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80282880.s rename to asm/nonmatchings/world/script_api/7E3700/func_80282880.s diff --git a/asm/nonmatchings/code_7E3700/func_802828DC.s b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_802828DC.s rename to asm/nonmatchings/world/script_api/7E3700/func_802828DC.s diff --git a/asm/nonmatchings/code_7E3700/func_80282C40.s b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80282C40.s rename to asm/nonmatchings/world/script_api/7E3700/func_80282C40.s diff --git a/asm/nonmatchings/code_7E3700/func_80282E30.s b/asm/nonmatchings/world/script_api/7E3700/func_80282E30.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80282E30.s rename to asm/nonmatchings/world/script_api/7E3700/func_80282E30.s diff --git a/asm/nonmatchings/code_7E3700/func_80283080.s b/asm/nonmatchings/world/script_api/7E3700/func_80283080.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283080.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283080.s diff --git a/asm/nonmatchings/code_7E3700/func_80283174.s b/asm/nonmatchings/world/script_api/7E3700/func_80283174.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283174.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283174.s diff --git a/asm/nonmatchings/code_7E3700/func_80283240.s b/asm/nonmatchings/world/script_api/7E3700/func_80283240.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283240.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283240.s diff --git a/asm/nonmatchings/code_7E3700/func_80283810.s b/asm/nonmatchings/world/script_api/7E3700/func_80283810.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283810.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283810.s diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/world/script_api/7E3700/func_80283908.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283908.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283908.s diff --git a/asm/nonmatchings/code_7E3700/func_80283A50.s b/asm/nonmatchings/world/script_api/7E3700/func_80283A50.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283A50.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283A50.s diff --git a/asm/nonmatchings/code_7E3700/func_80283B88.s b/asm/nonmatchings/world/script_api/7E3700/func_80283B88.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283B88.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283B88.s diff --git a/asm/nonmatchings/code_7E3700/func_80283BB0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283BB0.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283BB0.s diff --git a/asm/nonmatchings/code_7E3700/func_80283BD0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283BD0.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283BD0.s diff --git a/asm/nonmatchings/code_7E3700/func_80283C34.s b/asm/nonmatchings/world/script_api/7E3700/func_80283C34.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283C34.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283C34.s diff --git a/asm/nonmatchings/code_7E3700/func_80283D00.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283D00.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283D00.s diff --git a/asm/nonmatchings/code_7E3700/func_80283D6C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283D6C.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s diff --git a/asm/nonmatchings/code_7E3700/func_80283DF0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283DF0.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s diff --git a/asm/nonmatchings/code_7E3700/func_80283E2C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s similarity index 100% rename from asm/nonmatchings/code_7E3700/func_80283E2C.s rename to asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s b/asm/nonmatchings/world/world/func_80058DD0.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s rename to asm/nonmatchings/world/world/func_80058DD0.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s b/asm/nonmatchings/world/world/func_80058E84.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s rename to asm/nonmatchings/world/world/func_80058E84.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s b/asm/nonmatchings/world/world/func_80058F88.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80058F88.s rename to asm/nonmatchings/world/world/func_80058F88.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s b/asm/nonmatchings/world/world/func_80059008.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059008.s rename to asm/nonmatchings/world/world/func_80059008.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s b/asm/nonmatchings/world/world/func_8005904C.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s rename to asm/nonmatchings/world/world/func_8005904C.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s b/asm/nonmatchings/world/world/func_80059310.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059310.s rename to asm/nonmatchings/world/world/func_80059310.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s b/asm/nonmatchings/world/world/func_800598A0.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s rename to asm/nonmatchings/world/world/func_800598A0.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s b/asm/nonmatchings/world/world/func_80059AB8.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s rename to asm/nonmatchings/world/world/func_80059AB8.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s b/asm/nonmatchings/world/world/func_80059BD4.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s rename to asm/nonmatchings/world/world/func_80059BD4.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s b/asm/nonmatchings/world/world/func_80059C88.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059C88.s rename to asm/nonmatchings/world/world/func_80059C88.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s b/asm/nonmatchings/world/world/func_80059C9C.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s rename to asm/nonmatchings/world/world/func_80059C9C.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s b/asm/nonmatchings/world/world/func_80059D50.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s rename to asm/nonmatchings/world/world/func_80059D50.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s b/asm/nonmatchings/world/world/func_80059F94.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s rename to asm/nonmatchings/world/world/func_80059F94.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s b/asm/nonmatchings/world/world/func_8005A2BC.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/func_8005A2BC.s rename to asm/nonmatchings/world/world/func_8005A2BC.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s b/asm/nonmatchings/world/world/get_asset_offset.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s rename to asm/nonmatchings/world/world/get_asset_offset.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s b/asm/nonmatchings/world/world/get_current_map_config.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s rename to asm/nonmatchings/world/world/get_current_map_config.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s b/asm/nonmatchings/world/world/get_current_map_header.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s rename to asm/nonmatchings/world/world/get_current_map_header.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/world/world/get_map_IDs_by_name.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s rename to asm/nonmatchings/world/world/get_map_IDs_by_name.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s b/asm/nonmatchings/world/world/load_asset_by_name.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s rename to asm/nonmatchings/world/world/load_asset_by_name.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s similarity index 88% rename from asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s rename to asm/nonmatchings/world/world/load_map_by_IDs.s index 34eb98d497..4561cc722a 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/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/asm/nonmatchings/code_341d0_len_20d0/play_effect.s b/asm/nonmatchings/world/world/play_effect.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/play_effect.s rename to asm/nonmatchings/world/world/play_effect.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s b/asm/nonmatchings/world/world/remove_all_effects.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s rename to asm/nonmatchings/world/world/remove_all_effects.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s b/asm/nonmatchings/world/world/remove_effect.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/remove_effect.s rename to asm/nonmatchings/world/world/remove_effect.s diff --git a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s b/asm/nonmatchings/world/world/render_effects.s similarity index 100% rename from asm/nonmatchings/code_341d0_len_20d0/render_effects.s rename to asm/nonmatchings/world/world/render_effects.s 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/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_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_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c index 733d47d9db..5ca2ded1f5 100644 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ b/src/world/area_kmr/kmr_00/8ABF90.c @@ -4,22 +4,69 @@ 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)); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240584_8AC514); + func_8006FEF0(3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405A8_8AC538); +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_802405CC_8AC55C); +ApiStatus func_802405A8_8AC538(ScriptInstance* script, s32 isInitialCall) { + func_80055590(0, 2000); + return ApiStatus_DONE2; +} + +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); -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; +} 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..0844ff9259 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), 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_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..30e9e15943 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -6,8 +6,37 @@ 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" +#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++)); + + 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 -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/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; +} 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; +} 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 } diff --git a/tools/n64splat b/tools/n64splat index 8f74e0bcce..79f47d6951 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 8f74e0bccec04e12c3dec27f64c257f61def594c +Subproject commit 79f47d69514c39d902b7b3aee41d713670d88934 diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 30190c2498..7d8ed28671 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; @@ -564,7 +564,9 @@ EnemyNpcDefeat = 0x8007809C; D_80078DB0 = 0x80078DB0; D_80078DB4 = 0x80078DB4; gEffectTable = 0x8007F214; +gItemTable = 0x800878E0; // size:0x2D80 gAreas = 0x800934F0; +gCurrentEncounter = 0x800B0F10; // size:0xB0 gBattleState = 0x800DC068; test_below_player = 0x800DDFD0; trace_below_player = 0x800DE54C;