diff --git a/Makefile b/Makefile index 326fe78c20..735667c976 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ submodules: split: rm -rf bin img - $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS rgba16 rgba32 ia4 ia8 ia16 i4 i8 ci4 ci8 + $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS img split-%: $(SPLAT) --modes ld $* @@ -132,12 +132,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0 # Compile C files $(BUILD_DIR)/%.c.o: %.c $(MDEPS) @mkdir -p $(shell dirname $@) - $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - + $(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) $< | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - # Compile C files (with DSL macros) $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) tools/compile_dsl_macros.py @mkdir -p $(shell dirname $@) - $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - + $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - # Assemble handwritten ASM $(BUILD_DIR)/%.s.o: %.s @@ -156,15 +156,12 @@ $(BUILD_DIR)/%.rgba32.png: %.png $(BUILD_DIR)/%.ci8.png: %.png @mkdir -p $(shell dirname $@) $(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS) -$(BUILD_DIR)/%.ci8palette.png: %.png - @mkdir -p $(shell dirname $@) - $(PYTHON) tools/convert_image.py ci8palette $< $@ $(IMG_FLAGS) $(BUILD_DIR)/%.ci4.png: %.png @mkdir -p $(shell dirname $@) $(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS) -$(BUILD_DIR)/%.ci4palette.png: %.png +$(BUILD_DIR)/%.palette.png: %.png @mkdir -p $(shell dirname $@) - $(PYTHON) tools/convert_image.py ci4palette $< $@ $(IMG_FLAGS) + $(PYTHON) tools/convert_image.py palette $< $@ $(IMG_FLAGS) $(BUILD_DIR)/%.ia4.png: %.png @mkdir -p $(shell dirname $@) $(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS) diff --git a/asm/boot.s b/asm/boot.s index e78799c793..ec8fe6588d 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -15,7 +15,7 @@ glabel func_A4000040 /* 50 A4000050 25080000 */ addiu $t0, $t0, 0 /* 54 A4000054 8D09000C */ lw $t1, 0xc($t0) /* 58 A4000058 152000ED */ bnez $t1, .LA4000410 -/* 5C A400005C 00000000 */ nop +/* 5C A400005C 00000000 */ nop /* 60 A4000060 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 64 A4000064 AFB30000 */ sw $s3, ($sp) /* 68 A4000068 AFB40004 */ sw $s4, 4($sp) @@ -32,20 +32,20 @@ glabel func_A4000040 /* 94 A4000094 AD090004 */ sw $t1, 4($t0) /* 98 A4000098 24112260 */ addiu $s1, $zero, 0x2260 .LA400009C: -/* 9C A400009C 00000000 */ nop +/* 9C A400009C 00000000 */ nop /* A0 A40000A0 2231FFFF */ addi $s1, $s1, -1 /* A4 A40000A4 1620FFFD */ bnez $s1, .LA400009C -/* A8 A40000A8 00000000 */ nop +/* A8 A40000A8 00000000 */ nop /* AC A40000AC AD000008 */ sw $zero, 8($t0) /* B0 A40000B0 34090014 */ ori $t1, $zero, 0x14 /* B4 A40000B4 AD09000C */ sw $t1, 0xc($t0) /* B8 A40000B8 AD000000 */ sw $zero, ($t0) /* BC A40000BC 24110004 */ addiu $s1, $zero, 4 .LA40000C0: -/* C0 A40000C0 00000000 */ nop +/* C0 A40000C0 00000000 */ nop /* C4 A40000C4 2231FFFF */ addi $s1, $s1, -1 /* C8 A40000C8 1620FFFD */ bnez $s1, .LA40000C0 -/* CC A40000CC 00000000 */ nop +/* CC A40000CC 00000000 */ nop /* D0 A40000D0 3409000E */ ori $t1, $zero, 0xe /* D4 A40000D4 AD090000 */ sw $t1, ($t0) /* D8 A40000D8 24110020 */ addiu $s1, $zero, 0x20 @@ -78,11 +78,11 @@ glabel func_A4000040 /* 140 A4000140 3C110101 */ lui $s1, 0x101 /* 144 A4000144 26310101 */ addiu $s1, $s1, 0x101 /* 148 A4000148 16110005 */ bne $s0, $s1, .LA4000160 -/* 14C A400014C 00000000 */ nop +/* 14C A400014C 00000000 */ nop /* 150 A4000150 24100200 */ addiu $s0, $zero, 0x200 /* 154 A4000154 35714000 */ ori $s1, $t3, 0x4000 /* 158 A4000158 10000003 */ b .LA4000168 -/* 15C A400015C 00000000 */ nop +/* 15C A400015C 00000000 */ nop .LA4000160: /* 160 A4000160 24100400 */ addiu $s0, $zero, 0x400 /* 164 A4000164 35718000 */ ori $s1, $t3, 0x8000 @@ -90,9 +90,9 @@ glabel func_A4000040 /* 168 A4000168 AE2E0004 */ sw $t6, 4($s1) /* 16C A400016C 25F5000C */ addiu $s5, $t7, 0xc /* 170 A4000170 0D0001DB */ jal func_A400076C -/* 174 A4000174 00000000 */ nop +/* 174 A4000174 00000000 */ nop /* 178 A4000178 10400038 */ beqz $v0, .LA400025C -/* 17C A400017C 00000000 */ nop +/* 17C A400017C 00000000 */ nop /* 180 A4000180 AFA20000 */ sw $v0, ($sp) /* 184 A4000184 24092000 */ addiu $t1, $zero, 0x2000 /* 188 A4000188 AD890000 */ sw $t1, ($t4) @@ -105,7 +105,7 @@ glabel func_A4000040 /* 1A4 A40001A4 AD890000 */ sw $t1, ($t4) /* 1A8 A40001A8 3C08B019 */ lui $t0, 0xb019 /* 1AC A40001AC 1568000C */ bne $t3, $t0, .LA40001E0 -/* 1B0 A40001B0 00000000 */ nop +/* 1B0 A40001B0 00000000 */ nop /* 1B4 A40001B4 3C080800 */ lui $t0, 0x800 /* 1B8 A40001B8 0308C020 */ add $t8, $t8, $t0 /* 1BC A40001BC 0330C820 */ add $t9, $t9, $s0 @@ -116,7 +116,7 @@ glabel func_A4000040 /* 1D0 A40001D0 00129040 */ sll $s2, $s2, 1 /* 1D4 A40001D4 22520001 */ addi $s2, $s2, 1 /* 1D8 A40001D8 10000003 */ b .LA40001E8 -/* 1DC A40001DC 00000000 */ nop +/* 1DC A40001DC 00000000 */ nop .LA40001E0: /* 1E0 A40001E0 3C080010 */ lui $t0, 0x10 /* 1E4 A40001E4 0288A020 */ add $s4, $s4, $t0 @@ -130,11 +130,11 @@ glabel func_A4000040 /* 200 A4000200 3129FFFF */ andi $t1, $t1, 0xffff /* 204 A4000204 24080500 */ addiu $t0, $zero, 0x500 /* 208 A4000208 15280009 */ bne $t1, $t0, .LA4000230 -/* 20C A400020C 00000000 */ nop +/* 20C A400020C 00000000 */ nop /* 210 A4000210 3C1B0100 */ lui $k1, 0x100 /* 214 A4000214 035BD024 */ and $k0, $k0, $k1 /* 218 A4000218 17400005 */ bnez $k0, .LA4000230 -/* 21C A400021C 00000000 */ nop +/* 21C A400021C 00000000 */ nop /* 220 A4000220 3C08101C */ lui $t0, 0x101c /* 224 A4000224 35080A04 */ ori $t0, $t0, 0xa04 /* 228 A4000228 ADE80018 */ sw $t0, 0x18($t7) @@ -151,7 +151,7 @@ glabel func_A4000040 /* 24C A400024C 25AD0001 */ addiu $t5, $t5, 1 /* 250 A4000250 2DA80008 */ sltiu $t0, $t5, 8 /* 254 A4000254 1500FFC4 */ bnez $t0, .LA4000168 -/* 258 A4000258 00000000 */ nop +/* 258 A4000258 00000000 */ nop .LA400025C: /* 25C A400025C 3C08C400 */ lui $t0, 0xc400 /* 260 A4000260 AD48000C */ sw $t0, 0xc($t2) @@ -163,14 +163,14 @@ glabel func_A4000040 /* 274 A4000274 8FA90004 */ lw $t1, 4($sp) /* 278 A4000278 3C08B009 */ lui $t0, 0xb009 /* 27C A400027C 15280016 */ bne $t1, $t0, .LA40002D8 -/* 280 A4000280 00000000 */ nop +/* 280 A4000280 00000000 */ nop /* 284 A4000284 AE380004 */ sw $t8, 4($s1) /* 288 A4000288 2735000C */ addiu $s5, $t9, 0xc /* 28C A400028C 8FA40000 */ lw $a0, ($sp) /* 290 A4000290 23BD0008 */ addi $sp, $sp, 8 /* 294 A4000294 24050001 */ addiu $a1, $zero, 1 /* 298 A4000298 0D00028D */ jal func_A4000A34 -/* 29C A400029C 00000000 */ nop +/* 29C A400029C 00000000 */ nop /* 2A0 A40002A0 8EC80000 */ lw $t0, ($s6) /* 2A4 A40002A4 3C080008 */ lui $t0, 8 /* 2A8 A40002A8 01164020 */ add $t0, $t0, $s6 @@ -192,7 +192,7 @@ glabel func_A4000040 /* 2E4 A40002E4 23BD0008 */ addi $sp, $sp, 8 /* 2E8 A40002E8 24050001 */ addiu $a1, $zero, 1 /* 2EC A40002EC 0D00028D */ jal func_A4000A34 -/* 2F0 A40002F0 00000000 */ nop +/* 2F0 A40002F0 00000000 */ nop /* 2F4 A40002F4 8CE80000 */ lw $t0, ($a3) /* 2F8 A40002F8 3C080008 */ lui $t0, 8 /* 2FC A40002FC 01074020 */ add $t0, $t0, $a3 @@ -223,7 +223,7 @@ glabel func_A4000040 /* 35C A400035C 24630001 */ addiu $v1, $v1, 1 /* 360 A4000360 006D402A */ slt $t0, $v1, $t5 /* 364 A4000364 1500FFC3 */ bnez $t0, .LA4000274 -/* 368 A4000368 00000000 */ nop +/* 368 A4000368 00000000 */ nop /* 36C A400036C 3C0AA470 */ lui $t2, 0xa470 /* 370 A4000370 001294C0 */ sll $s2, $s2, 0x13 /* 374 A4000374 3C090006 */ lui $t1, 6 @@ -266,7 +266,7 @@ glabel func_A4000040 /* 400 A4000400 1420FFFD */ bnez $at, .LA40003F8 /* 404 A4000404 25080010 */ addiu $t0, $t0, 0x10 /* 408 A4000408 10000013 */ b .LA4000458 -/* 40C A400040C 00000000 */ nop +/* 40C A400040C 00000000 */ nop .LA4000410: /* 410 A4000410 3C088000 */ lui $t0, 0x8000 /* 414 A4000414 25080000 */ addiu $t0, $t0, 0 @@ -315,7 +315,7 @@ glabel func_A4000040 /* 4B0 A40004B0 3C0C8000 */ lui $t4, 0x8000 /* 4B4 A40004B4 258C0000 */ addiu $t4, $t4, 0 /* 4B8 A40004B8 01800008 */ jr $t4 -/* 4BC A40004BC 00000000 */ nop +/* 4BC A40004BC 00000000 */ nop glabel func_A40004C0 /* 4C0 A40004C0 3C0BB000 */ lui $t3, 0xb000 @@ -343,23 +343,23 @@ glabel func_A40004C0 /* 514 A4000514 3C01A460 */ lui $at, 0xa460 /* 518 A4000518 AC2A000C */ sw $t2, 0xc($at) .LA400051C: -/* 51C A400051C 00000000 */ nop -/* 520 A4000520 00000000 */ nop -/* 524 A4000524 00000000 */ nop -/* 528 A4000528 00000000 */ nop -/* 52C A400052C 00000000 */ nop -/* 530 A4000530 00000000 */ nop -/* 534 A4000534 00000000 */ nop -/* 538 A4000538 00000000 */ nop -/* 53C A400053C 00000000 */ nop -/* 540 A4000540 00000000 */ nop -/* 544 A4000544 00000000 */ nop -/* 548 A4000548 00000000 */ nop +/* 51C A400051C 00000000 */ nop +/* 520 A4000520 00000000 */ nop +/* 524 A4000524 00000000 */ nop +/* 528 A4000528 00000000 */ nop +/* 52C A400052C 00000000 */ nop +/* 530 A4000530 00000000 */ nop +/* 534 A4000534 00000000 */ nop +/* 538 A4000538 00000000 */ nop +/* 53C A400053C 00000000 */ nop +/* 540 A4000540 00000000 */ nop +/* 544 A4000544 00000000 */ nop +/* 548 A4000548 00000000 */ nop /* 54C A400054C 3C0BA460 */ lui $t3, 0xa460 /* 550 A4000550 8D6B0010 */ lw $t3, 0x10($t3) /* 554 A4000554 316B0001 */ andi $t3, $t3, 1 /* 558 A4000558 1560FFF0 */ bnez $t3, .LA400051C -/* 55C A400055C 00000000 */ nop +/* 55C A400055C 00000000 */ nop /* 560 A4000560 3C0BB000 */ lui $t3, 0xb000 /* 564 A4000564 8D640008 */ lw $a0, 8($t3) /* 568 A4000568 3C010010 */ lui $at, 0x10 @@ -420,15 +420,15 @@ glabel func_A40004C0 /* 634 A4000634 3C0BB000 */ lui $t3, 0xb000 /* 638 A4000638 8D680010 */ lw $t0, 0x10($t3) /* 63C A400063C 14E80006 */ bne $a3, $t0, .LA4000658 -/* 640 A4000640 00000000 */ nop +/* 640 A4000640 00000000 */ nop /* 644 A4000644 8D680014 */ lw $t0, 0x14($t3) /* 648 A4000648 16080003 */ bne $s0, $t0, .LA4000658 -/* 64C A400064C 00000000 */ nop +/* 64C A400064C 00000000 */ nop /* 650 A4000650 04110003 */ bal .LA4000660 -/* 654 A4000654 00000000 */ nop +/* 654 A4000654 00000000 */ nop .LA4000658: /* 658 A4000658 0411FFFF */ bal .LA4000658 -/* 65C A400065C 00000000 */ nop +/* 65C A400065C 00000000 */ nop .LA4000660: /* 660 A4000660 3C09A408 */ lui $t1, 0xa408 /* 664 A4000664 8D290000 */ lw $t1, ($t1) @@ -500,8 +500,8 @@ glabel func_A40004C0 /* 758 A4000758 3C010010 */ lui $at, 0x10 /* 75C A400075C 01214823 */ subu $t1, $t1, $at /* 760 A4000760 01200008 */ jr $t1 -/* 764 A4000764 00000000 */ nop -/* 768 A4000768 00000000 */ nop +/* 764 A4000764 00000000 */ nop +/* 768 A4000768 00000000 */ nop glabel func_A400076C /* 76C A400076C 27BDFF60 */ addiu $sp, $sp, -0xa0 @@ -535,7 +535,7 @@ glabel func_A400076C /* 7DC A40007DC AFBF0064 */ sw $ra, 0x64($sp) .LA40007E0: /* 7E0 A40007E0 0D00021D */ jal func_A4000874 -/* 7E4 A40007E4 00000000 */ nop +/* 7E4 A40007E4 00000000 */ nop /* 7E8 A40007E8 26100001 */ addiu $s0, $s0, 1 /* 7EC A40007EC 2A090004 */ slti $t1, $s0, 4 /* 7F0 A40007F0 1520FFFB */ bnez $t1, .LA40007E0 @@ -591,7 +591,7 @@ glabel func_A4000874 /* 8AC A40008AC 00404825 */ or $t1, $v0, $zero /* 8B0 A40008B0 0000D012 */ mflo $k0 /* 8B4 A40008B4 017A5821 */ addu $t3, $t3, $k0 -/* 8B8 A40008B8 00000000 */ nop +/* 8B8 A40008B8 00000000 */ nop /* 8BC A40008BC 293A0050 */ slti $k0, $t1, 0x50 .LA40008C0: /* 8C0 A40008C0 1740FFF1 */ bnez $k0, .LA4000888 @@ -611,7 +611,7 @@ glabel func_A4000874 .LA40008F4: /* 8F4 A40008F4 27BD0020 */ addiu $sp, $sp, 0x20 /* 8F8 A40008F8 03E00008 */ jr $ra -/* 8FC A40008FC 00000000 */ nop +/* 8FC A40008FC 00000000 */ nop glabel func_A4000900 /* 900 A4000900 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -645,7 +645,7 @@ glabel func_A4000900 /* 964 A4000964 8FBF001C */ lw $ra, 0x1c($sp) /* 968 A4000968 27BD0028 */ addiu $sp, $sp, 0x28 /* 96C A400096C 03E00008 */ jr $ra -/* 970 A4000970 00000000 */ nop +/* 970 A4000970 00000000 */ nop glabel func_A4000974 /* 974 A4000974 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -701,7 +701,7 @@ glabel func_A4000974 /* A24 A4000A24 8FBF001C */ lw $ra, 0x1c($sp) /* A28 A4000A28 27BD0028 */ addiu $sp, $sp, 0x28 /* A2C A4000A2C 03E00008 */ jr $ra -/* A30 A4000A30 00000000 */ nop +/* A30 A4000A30 00000000 */ nop glabel func_A4000A34 /* A34 A4000A34 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -741,7 +741,7 @@ glabel func_A4000A34 /* AB4 A4000AB4 8FBF001C */ lw $ra, 0x1c($sp) /* AB8 A4000AB8 27BD0028 */ addiu $sp, $sp, 0x28 /* ABC A4000ABC 03E00008 */ jr $ra -/* AC0 A4000AC0 00000000 */ nop +/* AC0 A4000AC0 00000000 */ nop glabel func_A4000AC4 /* AC4 A4000AC4 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -782,8 +782,8 @@ glabel func_A4000AC4 /* B50 A4000B50 8FBF001C */ lw $ra, 0x1c($sp) /* B54 A4000B54 27BD0028 */ addiu $sp, $sp, 0x28 /* B58 A4000B58 03E00008 */ jr $ra -/* B5C A4000B5C 00000000 */ nop -/* B60 A4000B60 00000000 */ nop -/* B64 A4000B64 00000000 */ nop -/* B68 A4000B68 00000000 */ nop -/* B6C A4000B6C 00000000 */ nop +/* B5C A4000B5C 00000000 */ nop +/* B60 A4000B60 00000000 */ nop +/* B64 A4000B64 00000000 */ nop +/* B68 A4000B68 00000000 */ nop +/* B6C A4000B6C 00000000 */ nop diff --git a/asm/nonmatchings/code_102c80/func_802E1660.s b/asm/nonmatchings/code_102c80/func_802E1660.s index 194061e592..080da0f3c1 100644 --- a/asm/nonmatchings/code_102c80/func_802E1660.s +++ b/asm/nonmatchings/code_102c80/func_802E1660.s @@ -22,8 +22,8 @@ glabel func_802E1660 /* 102F24 802E16A4 822300B4 */ lb $v1, 0xb4($s1) /* 102F28 802E16A8 14620009 */ bne $v1, $v0, .L802E16D0 /* 102F2C 802E16AC 2402000D */ addiu $v0, $zero, 0xd -/* 102F30 802E16B0 3C028011 */ lui $v0, 0x8011 -/* 102F34 802E16B4 8042F291 */ lb $v0, -0xd6f($v0) +/* 102F30 802E16B0 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 102F34 802E16B4 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 102F38 802E16B8 0440001A */ bltz $v0, .L802E1724 /* 102F3C 802E16BC 00000000 */ nop /* 102F40 802E16C0 080B85C2 */ j .L802E1708 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s index a58bef3f9d..ac142e5bf1 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s @@ -97,8 +97,8 @@ glabel func_802E3BA4 /* 105570 802E3CF0 080B8F42 */ j .L802E3D08 /* 105574 802E3CF4 00000000 */ nop .L802E3CF8: -/* 105578 802E3CF8 3C028011 */ lui $v0, 0x8011 -/* 10557C 802E3CFC 8042F291 */ lb $v0, -0xd6f($v0) +/* 105578 802E3CF8 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 10557C 802E3CFC 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 105580 802E3D00 04430001 */ bgezl $v0, .L802E3D08 /* 105584 802E3D04 24100001 */ addiu $s0, $zero, 1 .L802E3D08: @@ -121,8 +121,8 @@ glabel func_802E3BA4 /* 1055C8 802E3D48 080B8F58 */ j .L802E3D60 /* 1055CC 802E3D4C 00000000 */ nop .L802E3D50: -/* 1055D0 802E3D50 3C028011 */ lui $v0, 0x8011 -/* 1055D4 802E3D54 8042F291 */ lb $v0, -0xd6f($v0) +/* 1055D0 802E3D50 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 1055D4 802E3D54 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 1055D8 802E3D58 5C400001 */ bgtzl $v0, .L802E3D60 /* 1055DC 802E3D5C 24100001 */ addiu $s0, $zero, 1 .L802E3D60: @@ -135,8 +135,8 @@ glabel func_802E3BA4 /* 1055F8 802E3D78 C6200050 */ lwc1 $f0, 0x50($s1) /* 1055FC 802E3D7C 080B8F6C */ j .L802E3DB0 /* 105600 802E3D80 24040150 */ addiu $a0, $zero, 0x150 -/* 105604 802E3D84 3C028011 */ lui $v0, 0x8011 -/* 105608 802E3D88 8042F291 */ lb $v0, -0xd6f($v0) +/* 105604 802E3D84 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 105608 802E3D88 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 10560C 802E3D8C 28420002 */ slti $v0, $v0, 2 /* 105610 802E3D90 14400015 */ bnez $v0, .L802E3DE8 /* 105614 802E3D94 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s index e87865cbe0..ba61951dcc 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802E3E9C -/* 10571C 802E3E9C 3C028011 */ lui $v0, 0x8011 -/* 105720 802E3EA0 8C42EFCC */ lw $v0, -0x1034($v0) +/* 10571C 802E3E9C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* 105720 802E3EA0 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) /* 105724 802E3EA4 9083000B */ lbu $v1, 0xb($a0) /* 105728 802E3EA8 30420001 */ andi $v0, $v0, 1 /* 10572C 802E3EAC 50400007 */ beql $v0, $zero, .L802E3ECC diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s index 77c53f1b52..cc83ebeea2 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802E54CC -/* 106D4C 802E54CC 3C028011 */ lui $v0, 0x8011 -/* 106D50 802E54D0 9042F2AC */ lbu $v0, -0xd54($v0) +/* 106D4C 802E54CC 3C028011 */ lui $v0, %hi(gPlayerData+0x1C) +/* 106D50 802E54D0 9042F2AC */ lbu $v0, %lo(gPlayerData+0x1C)($v0) /* 106D54 802E54D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106D58 802E54D8 AFB00010 */ sw $s0, 0x10($sp) /* 106D5C 802E54DC 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s index a3dc79dc42..b84b2c3964 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s @@ -34,16 +34,16 @@ glabel func_802E7AE4 /* 1093D8 802E7B58 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093DC 802E7B5C 080B9EE2 */ j .L802E7B88 /* 1093E0 802E7B60 00000000 */ nop -/* 1093E4 802E7B64 3C018011 */ lui $at, 0x8011 -/* 1093E8 802E7B68 A020F291 */ sb $zero, -0xd6f($at) +/* 1093E4 802E7B64 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 1093E8 802E7B68 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 1093EC 802E7B6C 080B9EE2 */ j .L802E7B88 /* 1093F0 802E7B70 00000000 */ nop /* 1093F4 802E7B74 080B9EE0 */ j .L802E7B80 /* 1093F8 802E7B78 24020001 */ addiu $v0, $zero, 1 /* 1093FC 802E7B7C 24020002 */ addiu $v0, $zero, 2 .L802E7B80: -/* 109400 802E7B80 3C018011 */ lui $at, 0x8011 -/* 109404 802E7B84 A022F291 */ sb $v0, -0xd6f($at) +/* 109400 802E7B80 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 109404 802E7B84 A022F291 */ sb $v0, %lo(gPlayerData+0x1)($at) .L802E7B88: /* 109408 802E7B88 8E020010 */ lw $v0, 0x10($s0) /* 10940C 802E7B8C 10400027 */ beqz $v0, .L802E7C2C diff --git a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s index 5f0ccdd553..16a96ab4e8 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s @@ -60,8 +60,8 @@ glabel pause_badges_draw_contents /* 13A91C 802475DC 00005810 */ mfhi $t3 /* 13A920 802475E0 24040004 */ addiu $a0, $zero, 4 /* 13A924 802475E4 8FA700C8 */ lw $a3, 0xc8($sp) -/* 13A928 802475E8 3C088011 */ lui $t0, 0x8011 -/* 13A92C 802475EC 8108F298 */ lb $t0, -0xd68($t0) +/* 13A928 802475E8 3C088011 */ lui $t0, %hi(gPlayerData+0x8) +/* 13A92C 802475EC 8108F298 */ lb $t0, %lo(gPlayerData+0x8)($t0) /* 13A930 802475F0 3C058027 */ lui $a1, 0x8027 /* 13A934 802475F4 24A5FC48 */ addiu $a1, $a1, -0x3b8 /* 13A938 802475F8 AFA00010 */ sw $zero, 0x10($sp) @@ -211,8 +211,8 @@ glabel pause_badges_draw_contents /* 13AB60 80247820 AFAA0094 */ sw $t2, 0x94($sp) .L80247824: /* 13AB64 80247824 8FAB0078 */ lw $t3, 0x78($sp) -/* 13AB68 80247828 3C128011 */ lui $s2, 0x8011 -/* 13AB6C 8024782C 2652F498 */ addiu $s2, $s2, -0xb68 +/* 13AB68 80247828 3C128011 */ lui $s2, %hi(gPlayerData+0x208) +/* 13AB6C 8024782C 2652F498 */ addiu $s2, $s2, %lo(gPlayerData+0x208) /* 13AB70 80247830 AFA00084 */ sw $zero, 0x84($sp) /* 13AB74 80247834 8D620004 */ lw $v0, 4($t3) /* 13AB78 80247838 24037FFF */ addiu $v1, $zero, 0x7fff @@ -1012,8 +1012,8 @@ glabel pause_badges_draw_contents /* 13B734 802483F4 24070001 */ addiu $a3, $zero, 1 /* 13B738 802483F8 241500FF */ addiu $s5, $zero, 0xff /* 13B73C 802483FC 8FAB00C4 */ lw $t3, 0xc4($sp) -/* 13B740 80248400 3C048011 */ lui $a0, 0x8011 -/* 13B744 80248404 8084F298 */ lb $a0, -0xd68($a0) +/* 13B740 80248400 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 13B744 80248404 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 13B748 80248408 24140003 */ addiu $s4, $zero, 3 /* 13B74C 8024840C AFB30010 */ sw $s3, 0x10($sp) /* 13B750 80248410 AFB50014 */ sw $s5, 0x14($sp) @@ -1023,8 +1023,8 @@ glabel pause_badges_draw_contents /* 13B760 80248420 0C0911FD */ jal pause_get_total_equipped_bp_cost /* 13B764 80248424 0000902D */ daddu $s2, $zero, $zero /* 13B768 80248428 3C056666 */ lui $a1, 0x6666 -/* 13B76C 8024842C 3C048011 */ lui $a0, 0x8011 -/* 13B770 80248430 8084F298 */ lb $a0, -0xd68($a0) +/* 13B76C 8024842C 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 13B770 80248430 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 13B774 80248434 34A56667 */ ori $a1, $a1, 0x6667 /* 13B778 80248438 2483FFFF */ addiu $v1, $a0, -1 /* 13B77C 8024843C 00650018 */ mult $v1, $a1 @@ -1068,8 +1068,8 @@ glabel pause_badges_draw_contents /* 13B810 802484D0 0060202D */ daddu $a0, $v1, $zero /* 13B814 802484D4 24630008 */ addiu $v1, $v1, 8 /* 13B818 802484D8 ACC30000 */ sw $v1, ($a2) -/* 13B81C 802484DC 3C108011 */ lui $s0, 0x8011 -/* 13B820 802484E0 8210F298 */ lb $s0, -0xd68($s0) +/* 13B81C 802484DC 3C108011 */ lui $s0, %hi(gPlayerData+0x8) +/* 13B820 802484E0 8210F298 */ lb $s0, %lo(gPlayerData+0x8)($s0) /* 13B824 802484E4 241E0064 */ addiu $fp, $zero, 0x64 /* 13B828 802484E8 AC820000 */ sw $v0, ($a0) /* 13B82C 802484EC 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s index e4973f8e35..d1916c5b06 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_badges_try_remove -/* 13A5F0 802472B0 3C068011 */ lui $a2, 0x8011 -/* 13A5F4 802472B4 24C6F498 */ addiu $a2, $a2, -0xb68 +/* 13A5F0 802472B0 3C068011 */ lui $a2, %hi(gPlayerData+0x208) +/* 13A5F4 802472B4 24C6F498 */ addiu $a2, $a2, %lo(gPlayerData+0x208) /* 13A5F8 802472B8 00C0182D */ daddu $v1, $a2, $zero /* 13A5FC 802472BC 00042400 */ sll $a0, $a0, 0x10 /* 13A600 802472C0 00042403 */ sra $a0, $a0, 0x10 diff --git a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s index e7d909e93b..27f6124019 100644 --- a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s @@ -44,8 +44,8 @@ glabel pause_stats_draw_contents /* 138D5C 80245A1C 0200302D */ daddu $a2, $s0, $zero /* 138D60 80245A20 24070001 */ addiu $a3, $zero, 1 /* 138D64 80245A24 8FA80084 */ lw $t0, 0x84($sp) -/* 138D68 80245A28 3C048011 */ lui $a0, 0x8011 -/* 138D6C 80245A2C 8484F29C */ lh $a0, -0xd64($a0) +/* 138D68 80245A28 3C048011 */ lui $a0, %hi(gPlayerData+0xC) +/* 138D6C 80245A2C 8484F29C */ lh $a0, %lo(gPlayerData+0xC)($a0) /* 138D70 80245A30 24120003 */ addiu $s2, $zero, 3 /* 138D74 80245A34 AFB20018 */ sw $s2, 0x18($sp) /* 138D78 80245A38 25140119 */ addiu $s4, $t0, 0x119 @@ -85,8 +85,8 @@ glabel pause_stats_draw_contents /* 138E00 80245AC0 0280282D */ daddu $a1, $s4, $zero /* 138E04 80245AC4 0200302D */ daddu $a2, $s0, $zero /* 138E08 80245AC8 24070001 */ addiu $a3, $zero, 1 -/* 138E0C 80245ACC 3C048011 */ lui $a0, 0x8011 -/* 138E10 80245AD0 8084F2A0 */ lb $a0, -0xd60($a0) +/* 138E0C 80245ACC 3C048011 */ lui $a0, %hi(gPlayerData+0x10) +/* 138E10 80245AD0 8084F2A0 */ lb $a0, %lo(gPlayerData+0x10)($a0) /* 138E14 80245AD4 2408000A */ addiu $t0, $zero, 0xa /* 138E18 80245AD8 AFA80010 */ sw $t0, 0x10($sp) /* 138E1C 80245ADC 240800FF */ addiu $t0, $zero, 0xff @@ -121,8 +121,8 @@ glabel pause_stats_draw_contents /* 138E90 80245B50 0280282D */ daddu $a1, $s4, $zero /* 138E94 80245B54 0200302D */ daddu $a2, $s0, $zero /* 138E98 80245B58 24070001 */ addiu $a3, $zero, 1 -/* 138E9C 80245B5C 3C048011 */ lui $a0, 0x8011 -/* 138EA0 80245B60 9084F29F */ lbu $a0, -0xd61($a0) +/* 138E9C 80245B5C 3C048011 */ lui $a0, %hi(gPlayerData+0xF) +/* 138EA0 80245B60 9084F29F */ lbu $a0, %lo(gPlayerData+0xF)($a0) /* 138EA4 80245B64 2408000A */ addiu $t0, $zero, 0xa /* 138EA8 80245B68 AFA80010 */ sw $t0, 0x10($sp) /* 138EAC 80245B6C 240800FF */ addiu $t0, $zero, 0xff @@ -165,8 +165,8 @@ glabel pause_stats_draw_contents /* 138F40 80245C00 AFA80014 */ sw $t0, 0x14($sp) /* 138F44 80245C04 0200302D */ daddu $a2, $s0, $zero /* 138F48 80245C08 8FA80084 */ lw $t0, 0x84($sp) -/* 138F4C 80245C0C 3C048011 */ lui $a0, 0x8011 -/* 138F50 80245C10 8084F292 */ lb $a0, -0xd6e($a0) +/* 138F4C 80245C0C 3C048011 */ lui $a0, %hi(gPlayerData+0x2) +/* 138F50 80245C10 8084F292 */ lb $a0, %lo(gPlayerData+0x2)($a0) /* 138F54 80245C14 24070001 */ addiu $a3, $zero, 1 /* 138F58 80245C18 AFA00010 */ sw $zero, 0x10($sp) /* 138F5C 80245C1C AFB20018 */ sw $s2, 0x18($sp) @@ -187,8 +187,8 @@ glabel pause_stats_draw_contents /* 138F98 80245C58 AFA80014 */ sw $t0, 0x14($sp) /* 138F9C 80245C5C 0200302D */ daddu $a2, $s0, $zero /* 138FA0 80245C60 8FA80084 */ lw $t0, 0x84($sp) -/* 138FA4 80245C64 3C048011 */ lui $a0, 0x8011 -/* 138FA8 80245C68 8084F293 */ lb $a0, -0xd6d($a0) +/* 138FA4 80245C64 3C048011 */ lui $a0, %hi(gPlayerData+0x3) +/* 138FA8 80245C68 8084F293 */ lb $a0, %lo(gPlayerData+0x3)($a0) /* 138FAC 80245C6C 24070001 */ addiu $a3, $zero, 1 /* 138FB0 80245C70 AFA00010 */ sw $zero, 0x10($sp) /* 138FB4 80245C74 AFB20018 */ sw $s2, 0x18($sp) @@ -221,8 +221,8 @@ glabel pause_stats_draw_contents /* 139020 80245CE0 0260282D */ daddu $a1, $s3, $zero /* 139024 80245CE4 0200302D */ daddu $a2, $s0, $zero /* 139028 80245CE8 24070001 */ addiu $a3, $zero, 1 -/* 13902C 80245CEC 3C048011 */ lui $a0, 0x8011 -/* 139030 80245CF0 8084F295 */ lb $a0, -0xd6b($a0) +/* 13902C 80245CEC 3C048011 */ lui $a0, %hi(gPlayerData+0x5) +/* 139030 80245CF0 8084F295 */ lb $a0, %lo(gPlayerData+0x5)($a0) /* 139034 80245CF4 240800FF */ addiu $t0, $zero, 0xff /* 139038 80245CF8 AFA00010 */ sw $zero, 0x10($sp) /* 13903C 80245CFC AFA80014 */ sw $t0, 0x14($sp) @@ -241,8 +241,8 @@ glabel pause_stats_draw_contents /* 139070 80245D30 02E0282D */ daddu $a1, $s7, $zero /* 139074 80245D34 0200302D */ daddu $a2, $s0, $zero /* 139078 80245D38 24070001 */ addiu $a3, $zero, 1 -/* 13907C 80245D3C 3C048011 */ lui $a0, 0x8011 -/* 139080 80245D40 8084F296 */ lb $a0, -0xd6a($a0) +/* 13907C 80245D3C 3C048011 */ lui $a0, %hi(gPlayerData+0x6) +/* 139080 80245D40 8084F296 */ lb $a0, %lo(gPlayerData+0x6)($a0) /* 139084 80245D44 240800FF */ addiu $t0, $zero, 0xff /* 139088 80245D48 AFA00010 */ sw $zero, 0x10($sp) /* 13908C 80245D4C AFA80014 */ sw $t0, 0x14($sp) @@ -272,8 +272,8 @@ glabel pause_stats_draw_contents /* 1390EC 80245DAC 0260282D */ daddu $a1, $s3, $zero /* 1390F0 80245DB0 0200302D */ daddu $a2, $s0, $zero /* 1390F4 80245DB4 24070001 */ addiu $a3, $zero, 1 -/* 1390F8 80245DB8 3C048011 */ lui $a0, 0x8011 -/* 1390FC 80245DBC 8084F298 */ lb $a0, -0xd68($a0) +/* 1390F8 80245DB8 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 1390FC 80245DBC 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 139100 80245DC0 240800FF */ addiu $t0, $zero, 0xff /* 139104 80245DC4 AFA00010 */ sw $zero, 0x10($sp) /* 139108 80245DC8 AFA80014 */ sw $t0, 0x14($sp) @@ -298,8 +298,8 @@ glabel pause_stats_draw_contents /* 139154 80245E14 0C04993B */ jal draw_string /* 139158 80245E18 AFA80014 */ sw $t0, 0x14($sp) /* 13915C 80245E1C 3C020149 */ lui $v0, 0x149 -/* 139160 80245E20 3C148011 */ lui $s4, 0x8011 -/* 139164 80245E24 8E94F54C */ lw $s4, -0xab4($s4) +/* 139160 80245E20 3C148011 */ lui $s4, %hi(gPlayerData+0x2BC) +/* 139164 80245E24 8E94F54C */ lw $s4, %lo(gPlayerData+0x2BC)($s4) /* 139168 80245E28 344296FF */ ori $v0, $v0, 0x96ff /* 13916C 80245E2C 0054102A */ slt $v0, $v0, $s4 /* 139170 80245E30 10400003 */ beqz $v0, .L80245E40 @@ -423,8 +423,8 @@ glabel pause_stats_draw_contents /* 139344 80246004 00442023 */ subu $a0, $v0, $a0 /* 139348 80246008 3C028011 */ lui $v0, %hi(gPlayerData) /* 13934C 8024600C 9042F290 */ lbu $v0, %lo(gPlayerData)($v0) -/* 139350 80246010 3C038011 */ lui $v1, 0x8011 -/* 139354 80246014 9063F291 */ lbu $v1, -0xd6f($v1) +/* 139350 80246010 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* 139354 80246014 9063F291 */ lbu $v1, %lo(gPlayerData+0x1)($v1) /* 139358 80246018 8FA80084 */ lw $t0, 0x84($sp) /* 13935C 8024601C 27C7000C */ addiu $a3, $fp, 0xc /* 139360 80246020 AFA00010 */ sw $zero, 0x10($sp) @@ -432,8 +432,8 @@ glabel pause_stats_draw_contents /* 139368 80246028 00029603 */ sra $s2, $v0, 0x18 /* 13936C 8024602C 00031E00 */ sll $v1, $v1, 0x18 /* 139370 80246030 00039E03 */ sra $s3, $v1, 0x18 -/* 139374 80246034 3C028011 */ lui $v0, 0x8011 -/* 139378 80246038 9042F299 */ lbu $v0, -0xd67($v0) +/* 139374 80246034 3C028011 */ lui $v0, %hi(gPlayerData+0x9) +/* 139378 80246038 9042F299 */ lbu $v0, %lo(gPlayerData+0x9)($v0) /* 13937C 8024603C 00021600 */ sll $v0, $v0, 0x18 /* 139380 80246040 0002A603 */ sra $s4, $v0, 0x18 /* 139384 80246044 0280102D */ daddu $v0, $s4, $zero diff --git a/asm/nonmatchings/code_182B30/func_80255FE0.s b/asm/nonmatchings/code_182B30/func_80255FE0.s index 8a6421b9ed..58297a1373 100644 --- a/asm/nonmatchings/code_182B30/func_80255FE0.s +++ b/asm/nonmatchings/code_182B30/func_80255FE0.s @@ -658,8 +658,8 @@ glabel func_80255FE0 .L802569B0: /* 185290 802569B0 1100000B */ beqz $t0, .L802569E0 /* 185294 802569B4 24020006 */ addiu $v0, $zero, 6 -/* 185298 802569B8 3C038011 */ lui $v1, 0x8011 -/* 18529C 802569BC 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 185298 802569B8 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 18529C 802569BC 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 1852A0 802569C0 14620007 */ bne $v1, $v0, .L802569E0 /* 1852A4 802569C4 00000000 */ nop /* 1852A8 802569C8 16000005 */ bnez $s0, .L802569E0 diff --git a/asm/nonmatchings/code_190B20/func_80263464.s b/asm/nonmatchings/code_190B20/func_80263464.s index 574798d6fd..521e4d14c4 100644 --- a/asm/nonmatchings/code_190B20/func_80263464.s +++ b/asm/nonmatchings/code_190B20/func_80263464.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80263464 -/* 191D44 80263464 3C028011 */ lui $v0, 0x8011 -/* 191D48 80263468 8042F292 */ lb $v0, -0xd6e($v0) +/* 191D44 80263464 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 191D48 80263468 8042F292 */ lb $v0, %lo(gPlayerData+0x2)($v0) /* 191D4C 8026346C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 191D50 80263470 1C40000D */ bgtz $v0, .L802634A8 /* 191D54 80263474 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s index f6181bec33..48e88bc850 100644 --- a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s +++ b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s @@ -56,8 +56,8 @@ glabel calc_enemy_damage_target /* 1A5DCC 802774EC 00000000 */ nop /* 1A5DD0 802774F0 16C00007 */ bnez $s6, .L80277510 /* 1A5DD4 802774F4 00000000 */ nop -/* 1A5DD8 802774F8 3C028011 */ lui $v0, 0x8011 -/* 1A5DDC 802774FC 9042F292 */ lbu $v0, -0xd6e($v0) +/* 1A5DD8 802774F8 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 1A5DDC 802774FC 9042F292 */ lbu $v0, %lo(gPlayerData+0x2)($v0) /* 1A5DE0 80277500 0809DD44 */ j .L80277510 /* 1A5DE4 80277504 A26201B8 */ sb $v0, 0x1b8($s3) .L80277508: @@ -513,8 +513,8 @@ glabel calc_enemy_damage_target /* 1A6458 80277B78 00501021 */ addu $v0, $v0, $s0 /* 1A645C 80277B7C A282007B */ sb $v0, 0x7b($s4) /* 1A6460 80277B80 926201B8 */ lbu $v0, 0x1b8($s3) -/* 1A6464 80277B84 3C018011 */ lui $at, 0x8011 -/* 1A6468 80277B88 A022F292 */ sb $v0, -0xd6e($at) +/* 1A6464 80277B84 3C018011 */ lui $at, %hi(gPlayerData+0x2) +/* 1A6468 80277B88 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) .L80277B8C: /* 1A646C 80277B8C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A6470 80277B90 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s index 7a5a543e63..b1957f3e01 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s @@ -759,8 +759,8 @@ glabel func_8003F7CC /* 1B6FC 800402FC 0000282D */ daddu $a1, $zero, $zero /* 1B700 80040300 0C052757 */ jal play_sound_at_position /* 1B704 80040304 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1B708 80040308 3C038011 */ lui $v1, 0x8011 -/* 1B70C 8004030C 9063F291 */ lbu $v1, -0xd6f($v1) +/* 1B708 80040308 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* 1B70C 8004030C 9063F291 */ lbu $v1, %lo(gPlayerData+0x1)($v1) /* 1B710 80040310 24020004 */ addiu $v0, $zero, 4 /* 1B714 80040314 A2620005 */ sb $v0, 5($s3) /* 1B718 80040318 0801015F */ j .L8004057C @@ -1030,8 +1030,8 @@ glabel func_8003F7CC /* 1BB14 80040714 1040000A */ beqz $v0, .L80040740 /* 1BB18 80040718 00000000 */ nop /* 1BB1C 8004071C 8E220018 */ lw $v0, 0x18($s1) -/* 1BB20 80040720 3C038011 */ lui $v1, 0x8011 -/* 1BB24 80040724 8063F299 */ lb $v1, -0xd67($v1) +/* 1BB20 80040720 3C038011 */ lui $v1, %hi(gPlayerData+0x9) +/* 1BB24 80040724 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BB28 80040728 84420028 */ lh $v0, 0x28($v0) /* 1BB2C 8004072C 0062182A */ slt $v1, $v1, $v0 /* 1BB30 80040730 14600003 */ bnez $v1, .L80040740 @@ -1126,8 +1126,8 @@ glabel func_8003F7CC /* 1BC80 80040880 5040001C */ beql $v0, $zero, .L800408F4 /* 1BC84 80040884 A2700004 */ sb $s0, 4($s3) /* 1BC88 80040888 8E220018 */ lw $v0, 0x18($s1) -/* 1BC8C 8004088C 3C038011 */ lui $v1, 0x8011 -/* 1BC90 80040890 8063F299 */ lb $v1, -0xd67($v1) +/* 1BC8C 8004088C 3C038011 */ lui $v1, %hi(gPlayerData+0x9) +/* 1BC90 80040890 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BC94 80040894 84420028 */ lh $v0, 0x28($v0) /* 1BC98 80040898 0062182A */ slt $v1, $v1, $v0 /* 1BC9C 8004089C 54600015 */ bnel $v1, $zero, .L800408F4 diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s index 7b4c785996..ae5a24ac34 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s +++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s @@ -245,10 +245,10 @@ glabel spawn_drops /* 23A10 80048610 4481D000 */ mtc1 $at, $f26 /* 23A14 80048614 3C0142C8 */ lui $at, 0x42c8 /* 23A18 80048618 4481E000 */ mtc1 $at, $f28 -/* 23A1C 8004861C 3C028011 */ lui $v0, 0x8011 -/* 23A20 80048620 8042F292 */ lb $v0, -0xd6e($v0) -/* 23A24 80048624 3C038011 */ lui $v1, 0x8011 -/* 23A28 80048628 8063F293 */ lb $v1, -0xd6d($v1) +/* 23A1C 8004861C 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 23A20 80048620 8042F292 */ lb $v0, %lo(gPlayerData+0x2)($v0) +/* 23A24 80048624 3C038011 */ lui $v1, %hi(gPlayerData+0x3) +/* 23A28 80048628 8063F293 */ lb $v1, %lo(gPlayerData+0x3)($v1) /* 23A2C 8004862C 24130002 */ addiu $s3, $zero, 2 /* 23A30 80048630 AFA00030 */ sw $zero, 0x30($sp) /* 23A34 80048634 44821000 */ mtc1 $v0, $f2 @@ -431,10 +431,10 @@ glabel spawn_drops /* 23CC0 800488C0 4481D000 */ mtc1 $at, $f26 /* 23CC4 800488C4 3C0142C8 */ lui $at, 0x42c8 /* 23CC8 800488C8 4481E000 */ mtc1 $at, $f28 -/* 23CCC 800488CC 3C028011 */ lui $v0, 0x8011 -/* 23CD0 800488D0 8042F295 */ lb $v0, -0xd6b($v0) -/* 23CD4 800488D4 3C038011 */ lui $v1, 0x8011 -/* 23CD8 800488D8 8063F296 */ lb $v1, -0xd6a($v1) +/* 23CCC 800488CC 3C028011 */ lui $v0, %hi(gPlayerData+0x5) +/* 23CD0 800488D0 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) +/* 23CD4 800488D4 3C038011 */ lui $v1, %hi(gPlayerData+0x6) +/* 23CD8 800488D8 8063F296 */ lb $v1, %lo(gPlayerData+0x6)($v1) /* 23CDC 800488DC 24130002 */ addiu $s3, $zero, 2 /* 23CE0 800488E0 AFA00030 */ sw $zero, 0x30($sp) /* 23CE4 800488E4 44821000 */ mtc1 $v0, $f2 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s index dfdcd1d7c9..5182d4911d 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s @@ -48,8 +48,8 @@ glabel func_800533D0 /* 2E874 80053474 AE22003C */ sw $v0, 0x3c($s1) /* 2E878 80053478 A62200BA */ sh $v0, 0xba($s1) .L8005347C: -/* 2E87C 8005347C 3C118008 */ lui $s1, 0x8008 -/* 2E880 80053480 26318DB0 */ addiu $s1, $s1, -0x7250 +/* 2E87C 8005347C 3C118008 */ lui $s1, %hi(D_80078DB0) +/* 2E880 80053480 26318DB0 */ addiu $s1, $s1, %lo(D_80078DB0) /* 2E884 80053484 8E220000 */ lw $v0, ($s1) /* 2E888 80053488 14400045 */ bnez $v0, .L800535A0 /* 2E88C 8005348C 00000000 */ nop diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s index 8c619d4066..ae25ec354e 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s @@ -6,8 +6,8 @@ glabel func_80055068 /* 3046C 8005506C AFB00010 */ sw $s0, 0x10($sp) /* 30470 80055070 0080802D */ daddu $s0, $a0, $zero /* 30474 80055074 3203000F */ andi $v1, $s0, 0xf -/* 30478 80055078 3C048008 */ lui $a0, 0x8008 -/* 3047C 8005507C 94848DB4 */ lhu $a0, -0x724c($a0) +/* 30478 80055078 3C048008 */ lui $a0, %hi(D_80078DB4) +/* 3047C 8005507C 94848DB4 */ lhu $a0, %lo(D_80078DB4)($a0) /* 30480 80055080 24020001 */ addiu $v0, $zero, 1 /* 30484 80055084 1482001E */ bne $a0, $v0, .L80055100 /* 30488 80055088 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s index 92b5a6d646..b3a1ba0c2b 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s @@ -4,8 +4,8 @@ glabel func_8005591C /* 30D1C 8005591C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30D20 80055920 AFB00030 */ sw $s0, 0x30($sp) -/* 30D24 80055924 3C108008 */ lui $s0, 0x8008 -/* 30D28 80055928 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30D24 80055924 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30D28 80055928 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30D2C 8005592C 24020001 */ addiu $v0, $zero, 1 /* 30D30 80055930 AFBF0034 */ sw $ra, 0x34($sp) /* 30D34 80055934 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s index 66ef33b09c..c30632e25b 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s @@ -4,8 +4,8 @@ glabel func_80055970 /* 30D70 80055970 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30D74 80055974 AFB00030 */ sw $s0, 0x30($sp) -/* 30D78 80055978 3C108008 */ lui $s0, 0x8008 -/* 30D7C 8005597C 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30D78 80055978 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30D7C 8005597C 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30D80 80055980 24020001 */ addiu $v0, $zero, 1 /* 30D84 80055984 AFBF0034 */ sw $ra, 0x34($sp) /* 30D88 80055988 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s index c80517b7e1..b5c7716d90 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s @@ -4,8 +4,8 @@ glabel func_80055A18 /* 30E18 80055A18 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30E1C 80055A1C AFB00030 */ sw $s0, 0x30($sp) -/* 30E20 80055A20 3C108008 */ lui $s0, 0x8008 -/* 30E24 80055A24 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30E20 80055A20 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30E24 80055A24 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30E28 80055A28 8FA30048 */ lw $v1, 0x48($sp) /* 30E2C 80055A2C 24020001 */ addiu $v0, $zero, 1 /* 30E30 80055A30 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s index b9c26e6092..33f13df2da 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s @@ -4,8 +4,8 @@ glabel func_80055A6C /* 30E6C 80055A6C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30E70 80055A70 AFB00030 */ sw $s0, 0x30($sp) -/* 30E74 80055A74 3C108008 */ lui $s0, 0x8008 -/* 30E78 80055A78 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30E74 80055A74 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30E78 80055A78 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30E7C 80055A7C 24020001 */ addiu $v0, $zero, 1 /* 30E80 80055A80 AFBF0034 */ sw $ra, 0x34($sp) /* 30E84 80055A84 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s index ba578d490a..1489541c05 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s @@ -4,8 +4,8 @@ glabel func_80055B28 /* 30F28 80055B28 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30F2C 80055B2C AFB00030 */ sw $s0, 0x30($sp) -/* 30F30 80055B30 3C108008 */ lui $s0, 0x8008 -/* 30F34 80055B34 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30F30 80055B30 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30F34 80055B34 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30F38 80055B38 24030001 */ addiu $v1, $zero, 1 /* 30F3C 80055B3C 240207D0 */ addiu $v0, $zero, 0x7d0 /* 30F40 80055B40 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s index 06dcf05b20..72e6bb7711 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s +++ b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s @@ -9,8 +9,8 @@ glabel get_map_IDs_by_name /* 36008 8005AC08 00A0B02D */ daddu $s6, $a1, $zero /* 3600C 8005AC0C AFB7002C */ sw $s7, 0x2c($sp) /* 36010 8005AC10 00C0B82D */ daddu $s7, $a2, $zero -/* 36014 8005AC14 3C028009 */ lui $v0, 0x8009 -/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, 0x34f0 +/* 36014 8005AC14 3C028009 */ lui $v0, %hi(gAreas) +/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 3601C 8005AC1C AFBF0030 */ sw $ra, 0x30($sp) /* 36020 8005AC20 AFB40020 */ sw $s4, 0x20($sp) /* 36024 8005AC24 AFB3001C */ sw $s3, 0x1c($sp) @@ -26,8 +26,8 @@ glabel get_map_IDs_by_name /* 36048 8005AC48 8C420000 */ lw $v0, ($v0) /* 3604C 8005AC4C 18400012 */ blez $v0, .L8005AC98 /* 36050 8005AC50 0000802D */ daddu $s0, $zero, $zero -/* 36054 8005AC54 3C028009 */ lui $v0, 0x8009 -/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, 0x34f0 +/* 36054 8005AC54 3C028009 */ lui $v0, %hi(gAreas) +/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 3605C 8005AC5C 02429821 */ addu $s3, $s2, $v0 /* 36060 8005AC60 0080882D */ daddu $s1, $a0, $zero .L8005AC64: @@ -50,8 +50,8 @@ glabel get_map_IDs_by_name /* 3609C 8005AC9C 3C048009 */ lui $a0, 0x8009 /* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2 /* 360A4 8005ACA4 8C8434F4 */ lw $a0, 0x34f4($a0) -/* 360A8 8005ACA8 3C028009 */ lui $v0, 0x8009 -/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, 0x34f0 +/* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas) +/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44 /* 360B4 8005ACB4 26940001 */ addiu $s4, $s4, 1 .L8005ACB8: diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s index 0268832392..34eb98d497 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s +++ b/asm/nonmatchings/code_341d0_len_20d0/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_map_script_lib -/* 35C6C 8005A86C 00000000 */ nop +/* 35C68 8005A868 0C0169B0 */ jal load_world_script_api +/* 35C6C 8005A86C 00000000 */ nop /* 35C70 8005A870 8E440008 */ lw $a0, 8($s2) /* 35C74 8005A874 10800004 */ beqz $a0, .L8005A888 -/* 35C78 8005A878 00000000 */ nop +/* 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_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s index 140cbadd07..3af1e3c00a 100644 --- a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s +++ b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel TeleportPartnerToPlayer -/* 7E46FC 8028387C 3C028011 */ lui $v0, 0x8011 -/* 7E4700 80283880 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 7E46FC 8028387C 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 7E4700 80283880 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 7E4704 80283884 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7E4708 80283888 AFB10014 */ sw $s1, 0x14($sp) /* 7E470C 8028388C 3C118011 */ lui $s1, %hi(gPlayerStatus) diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/code_7E3700/func_80283908.s index 6e6e927ccb..e00af2cf6e 100644 --- a/asm/nonmatchings/code_7E3700/func_80283908.s +++ b/asm/nonmatchings/code_7E3700/func_80283908.s @@ -38,8 +38,8 @@ glabel func_80283908 /* 7E480C 8028398C 00431021 */ addu $v0, $v0, $v1 /* 7E4810 80283990 000210C0 */ sll $v0, $v0, 3 /* 7E4814 80283994 E6000030 */ swc1 $f0, 0x30($s0) -/* 7E4818 80283998 3C038011 */ lui $v1, 0x8011 -/* 7E481C 8028399C 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 7E4818 80283998 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 7E481C 8028399C 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 7E4820 802839A0 10600022 */ beqz $v1, .L80283A2C /* 7E4824 802839A4 00449021 */ addu $s2, $v0, $a0 /* 7E4828 802839A8 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s index 1db095db11..1316ee7478 100644 --- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s @@ -40,16 +40,16 @@ glabel update_status_menu /* 815F0 800E8140 80420070 */ lb $v0, 0x70($v0) /* 815F4 800E8144 14400008 */ bnez $v0, .L800E8168 /* 815F8 800E8148 00000000 */ nop -/* 815FC 800E814C 3C038011 */ lui $v1, 0x8011 -/* 81600 800E8150 8463F29C */ lh $v1, -0xd64($v1) +/* 815FC 800E814C 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* 81600 800E8150 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81604 800E8154 86620040 */ lh $v0, 0x40($s3) /* 81608 800E8158 10620007 */ beq $v1, $v0, .L800E8178 /* 8160C 800E815C 00628023 */ subu $s0, $v1, $v0 /* 81610 800E8160 0C03A67D */ jal status_menu_start_blinking_coins /* 81614 800E8164 00000000 */ nop .L800E8168: -/* 81618 800E8168 3C038011 */ lui $v1, 0x8011 -/* 8161C 800E816C 8463F29C */ lh $v1, -0xd64($v1) +/* 81618 800E8168 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* 8161C 800E816C 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81620 800E8170 86620040 */ lh $v0, 0x40($s3) /* 81624 800E8174 00628023 */ subu $s0, $v1, $v0 .L800E8178: @@ -69,8 +69,8 @@ glabel update_status_menu /* 81654 800E81A4 00628023 */ subu $s0, $v1, $v0 /* 81658 800E81A8 96620040 */ lhu $v0, 0x40($s3) /* 8165C 800E81AC 8264003D */ lb $a0, 0x3d($s3) -/* 81660 800E81B0 3C038011 */ lui $v1, 0x8011 -/* 81664 800E81B4 8063F292 */ lb $v1, -0xd6e($v1) +/* 81660 800E81B0 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81664 800E81B4 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 81668 800E81B8 00501021 */ addu $v0, $v0, $s0 /* 8166C 800E81BC 1083000C */ beq $a0, $v1, .L800E81F0 /* 81670 800E81C0 A6620040 */ sh $v0, 0x40($s3) @@ -88,8 +88,8 @@ glabel update_status_menu /* 8169C 800E81EC A6620038 */ sh $v0, 0x38($s3) .L800E81F0: /* 816A0 800E81F0 8263003E */ lb $v1, 0x3e($s3) -/* 816A4 800E81F4 3C028011 */ lui $v0, 0x8011 -/* 816A8 800E81F8 8042F295 */ lb $v0, -0xd6b($v0) +/* 816A4 800E81F4 3C028011 */ lui $v0, %hi(gPlayerData+0x5) +/* 816A8 800E81F8 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) /* 816AC 800E81FC 1062000C */ beq $v1, $v0, .L800E8230 /* 816B0 800E8200 00000000 */ nop /* 816B4 800E8204 82620044 */ lb $v0, 0x44($s3) @@ -106,8 +106,8 @@ glabel update_status_menu /* 816DC 800E822C A6620038 */ sh $v0, 0x38($s3) .L800E8230: /* 816E0 800E8230 86630048 */ lh $v1, 0x48($s3) -/* 816E4 800E8234 3C028011 */ lui $v0, 0x8011 -/* 816E8 800E8238 8442F520 */ lh $v0, -0xae0($v0) +/* 816E4 800E8234 3C028011 */ lui $v0, %hi(gPlayerData+0x290) +/* 816E8 800E8238 8442F520 */ lh $v0, %lo(gPlayerData+0x290)($v0) /* 816EC 800E823C 1062000C */ beq $v1, $v0, .L800E8270 /* 816F0 800E8240 00000000 */ nop /* 816F4 800E8244 82620044 */ lb $v0, 0x44($s3) @@ -124,8 +124,8 @@ glabel update_status_menu /* 8171C 800E826C A6620038 */ sh $v0, 0x38($s3) .L800E8270: /* 81720 800E8270 8264003D */ lb $a0, 0x3d($s3) -/* 81724 800E8274 3C038011 */ lui $v1, 0x8011 -/* 81728 800E8278 8063F292 */ lb $v1, -0xd6e($v1) +/* 81724 800E8274 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81728 800E8278 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 8172C 800E827C 1083002E */ beq $a0, $v1, .L800E8338 /* 81730 800E8280 00000000 */ nop /* 81734 800E8284 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -139,8 +139,8 @@ glabel update_status_menu /* 81754 800E82A4 00000000 */ nop .L800E82A8: /* 81758 800E82A8 8262003D */ lb $v0, 0x3d($s3) -/* 8175C 800E82AC 3C038011 */ lui $v1, 0x8011 -/* 81760 800E82B0 8063F292 */ lb $v1, -0xd6e($v1) +/* 8175C 800E82AC 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81760 800E82B0 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 81764 800E82B4 0043102A */ slt $v0, $v0, $v1 /* 81768 800E82B8 10400018 */ beqz $v0, .L800E831C /* 8176C 800E82BC 9263003D */ lbu $v1, 0x3d($s3) @@ -178,8 +178,8 @@ glabel update_status_menu /* 817E4 800E8334 A262003D */ sb $v0, 0x3d($s3) .L800E8338: /* 817E8 800E8338 8264003E */ lb $a0, 0x3e($s3) -/* 817EC 800E833C 3C038011 */ lui $v1, 0x8011 -/* 817F0 800E8340 8063F295 */ lb $v1, -0xd6b($v1) +/* 817EC 800E833C 3C038011 */ lui $v1, %hi(gPlayerData+0x5) +/* 817F0 800E8340 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 817F4 800E8344 1083002E */ beq $a0, $v1, .L800E8400 /* 817F8 800E8348 00000000 */ nop /* 817FC 800E834C 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -193,8 +193,8 @@ glabel update_status_menu /* 8181C 800E836C 00000000 */ nop .L800E8370: /* 81820 800E8370 8262003E */ lb $v0, 0x3e($s3) -/* 81824 800E8374 3C038011 */ lui $v1, 0x8011 -/* 81828 800E8378 8063F295 */ lb $v1, -0xd6b($v1) +/* 81824 800E8374 3C038011 */ lui $v1, %hi(gPlayerData+0x5) +/* 81828 800E8378 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 8182C 800E837C 0043102A */ slt $v0, $v0, $v1 /* 81830 800E8380 10400018 */ beqz $v0, .L800E83E4 /* 81834 800E8384 9263003E */ lbu $v1, 0x3e($s3) @@ -232,8 +232,8 @@ glabel update_status_menu /* 818AC 800E83FC A262003E */ sb $v0, 0x3e($s3) .L800E8400: /* 818B0 800E8400 86620048 */ lh $v0, 0x48($s3) -/* 818B4 800E8404 3C048011 */ lui $a0, 0x8011 -/* 818B8 800E8408 8484F520 */ lh $a0, -0xae0($a0) +/* 818B4 800E8404 3C048011 */ lui $a0, %hi(gPlayerData+0x290) +/* 818B8 800E8408 8484F520 */ lh $a0, %lo(gPlayerData+0x290)($a0) /* 818BC 800E840C 96630048 */ lhu $v1, 0x48($s3) /* 818C0 800E8410 1044001A */ beq $v0, $a0, .L800E847C /* 818C4 800E8414 0044102A */ slt $v0, $v0, $a0 @@ -241,12 +241,12 @@ glabel update_status_menu /* 818CC 800E841C 2462000A */ addiu $v0, $v1, 0xa /* 818D0 800E8420 A6620048 */ sh $v0, 0x48($s3) /* 818D4 800E8424 00021400 */ sll $v0, $v0, 0x10 -/* 818D8 800E8428 3C038011 */ lui $v1, 0x8011 -/* 818DC 800E842C 8463F520 */ lh $v1, -0xae0($v1) +/* 818D8 800E8428 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 818DC 800E842C 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 818E0 800E8430 00021403 */ sra $v0, $v0, 0x10 /* 818E4 800E8434 0062182A */ slt $v1, $v1, $v0 -/* 818E8 800E8438 3C028011 */ lui $v0, 0x8011 -/* 818EC 800E843C 9442F520 */ lhu $v0, -0xae0($v0) +/* 818E8 800E8438 3C028011 */ lui $v0, %hi(gPlayerData+0x290) +/* 818EC 800E843C 9442F520 */ lhu $v0, %lo(gPlayerData+0x290)($v0) /* 818F0 800E8440 5460000E */ bnel $v1, $zero, .L800E847C /* 818F4 800E8444 A6620048 */ sh $v0, 0x48($s3) /* 818F8 800E8448 0803A11F */ j .L800E847C @@ -255,12 +255,12 @@ glabel update_status_menu /* 81900 800E8450 2462FFF6 */ addiu $v0, $v1, -0xa /* 81904 800E8454 A6620048 */ sh $v0, 0x48($s3) /* 81908 800E8458 00021400 */ sll $v0, $v0, 0x10 -/* 8190C 800E845C 3C038011 */ lui $v1, 0x8011 -/* 81910 800E8460 8463F520 */ lh $v1, -0xae0($v1) +/* 8190C 800E845C 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81910 800E8460 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81914 800E8464 00021403 */ sra $v0, $v0, 0x10 /* 81918 800E8468 0043102A */ slt $v0, $v0, $v1 -/* 8191C 800E846C 3C038011 */ lui $v1, 0x8011 -/* 81920 800E8470 9463F520 */ lhu $v1, -0xae0($v1) +/* 8191C 800E846C 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81920 800E8470 9463F520 */ lhu $v1, %lo(gPlayerData+0x290)($v1) /* 81924 800E8474 54400001 */ bnel $v0, $zero, .L800E847C /* 81928 800E8478 A6630048 */ sh $v1, 0x48($s3) .L800E847C: @@ -492,8 +492,8 @@ glabel update_status_menu /* 81C78 800E87C8 86650034 */ lh $a1, 0x34($s3) /* 81C7C 800E87CC 86660036 */ lh $a2, 0x36($s3) /* 81C80 800E87D0 8267003D */ lb $a3, 0x3d($s3) -/* 81C84 800E87D4 3C028011 */ lui $v0, 0x8011 -/* 81C88 800E87D8 8042F293 */ lb $v0, -0xd6d($v0) +/* 81C84 800E87D4 3C028011 */ lui $v0, %hi(gPlayerData+0x3) +/* 81C88 800E87D8 8042F293 */ lb $v0, %lo(gPlayerData+0x3)($v0) /* 81C8C 800E87DC 24A50030 */ addiu $a1, $a1, 0x30 /* 81C90 800E87E0 24C60008 */ addiu $a2, $a2, 8 /* 81C94 800E87E4 0C039F8D */ jal status_menu_draw_stat @@ -550,20 +550,20 @@ glabel update_status_menu /* 81D50 800E88A0 86650034 */ lh $a1, 0x34($s3) /* 81D54 800E88A4 86660036 */ lh $a2, 0x36($s3) /* 81D58 800E88A8 8267003E */ lb $a3, 0x3e($s3) -/* 81D5C 800E88AC 3C028011 */ lui $v0, 0x8011 -/* 81D60 800E88B0 8042F296 */ lb $v0, -0xd6a($v0) +/* 81D5C 800E88AC 3C028011 */ lui $v0, %hi(gPlayerData+0x6) +/* 81D60 800E88B0 8042F296 */ lb $v0, %lo(gPlayerData+0x6)($v0) /* 81D64 800E88B4 24A50088 */ addiu $a1, $a1, 0x88 /* 81D68 800E88B8 24C60008 */ addiu $a2, $a2, 8 /* 81D6C 800E88BC 0C039F8D */ jal status_menu_draw_stat /* 81D70 800E88C0 AFA20010 */ sw $v0, 0x10($sp) .L800E88C4: -/* 81D74 800E88C4 3C028011 */ lui $v0, 0x8011 -/* 81D78 800E88C8 8042F299 */ lb $v0, -0xd67($v0) +/* 81D74 800E88C4 3C028011 */ lui $v0, %hi(gPlayerData+0x9) +/* 81D78 800E88C8 8042F299 */ lb $v0, %lo(gPlayerData+0x9)($v0) /* 81D7C 800E88CC 2842001B */ slti $v0, $v0, 0x1b /* 81D80 800E88D0 14400003 */ bnez $v0, .L800E88E0 /* 81D84 800E88D4 00000000 */ nop -/* 81D88 800E88D8 3C018011 */ lui $at, 0x8011 -/* 81D8C 800E88DC A020F2A0 */ sb $zero, -0xd60($at) +/* 81D88 800E88D8 3C018011 */ lui $at, %hi(gPlayerData+0x10) +/* 81D8C 800E88DC A020F2A0 */ sb $zero, %lo(gPlayerData+0x10)($at) .L800E88E0: /* 81D90 800E88E0 82620052 */ lb $v0, 0x52($s3) /* 81D94 800E88E4 1040000B */ beqz $v0, .L800E8914 @@ -605,8 +605,8 @@ glabel update_status_menu /* 81E1C 800E896C 24020002 */ addiu $v0, $zero, 2 /* 81E20 800E8970 AFA20010 */ sw $v0, 0x10($sp) /* 81E24 800E8974 86660036 */ lh $a2, 0x36($s3) -/* 81E28 800E8978 3C078011 */ lui $a3, 0x8011 -/* 81E2C 800E897C 80E7F2A0 */ lb $a3, -0xd60($a3) +/* 81E28 800E8978 3C078011 */ lui $a3, %hi(gPlayerData+0x10) +/* 81E2C 800E897C 80E7F2A0 */ lb $a3, %lo(gPlayerData+0x10)($a3) /* 81E30 800E8980 24A500C8 */ addiu $a1, $a1, 0xc8 /* 81E34 800E8984 0C039F29 */ jal status_menu_draw_number /* 81E38 800E8988 24C60008 */ addiu $a2, $a2, 8 @@ -711,8 +711,8 @@ glabel update_status_menu /* 81FA0 800E8AF0 24020001 */ addiu $v0, $zero, 1 /* 81FA4 800E8AF4 1462002B */ bne $v1, $v0, .L800E8BA4 /* 81FA8 800E8AF8 00000000 */ nop -/* 81FAC 800E8AFC 3C038011 */ lui $v1, 0x8011 -/* 81FB0 800E8B00 8463F520 */ lh $v1, -0xae0($v1) +/* 81FAC 800E8AFC 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81FB0 800E8B00 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81FB4 800E8B04 04610002 */ bgez $v1, .L800E8B10 /* 81FB8 800E8B08 0060102D */ daddu $v0, $v1, $zero /* 81FBC 800E8B0C 246200FF */ addiu $v0, $v1, 0xff @@ -1064,8 +1064,8 @@ glabel update_status_menu /* 824C8 800E9018 3C16800F */ lui $s6, 0x800f /* 824CC 800E901C 26D67FE8 */ addiu $s6, $s6, 0x7fe8 /* 824D0 800E9020 8FA90050 */ lw $t1, 0x50($sp) -/* 824D4 800E9024 3C048011 */ lui $a0, 0x8011 -/* 824D8 800E9028 8084F51E */ lb $a0, -0xae2($a0) +/* 824D4 800E9024 3C048011 */ lui $a0, %hi(gPlayerData+0x28E) +/* 824D8 800E9028 8084F51E */ lb $a0, %lo(gPlayerData+0x28E)($a0) /* 824DC 800E902C 00091080 */ sll $v0, $t1, 2 /* 824E0 800E9030 00491021 */ addu $v0, $v0, $t1 /* 824E4 800E9034 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s index 6441e053df..ffe2fa71ae 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s @@ -8,8 +8,8 @@ glabel partner_reset_data /* 84930 800EB480 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) /* 84934 800EB484 0220202D */ daddu $a0, $s1, $zero /* 84938 800EB488 AFB00010 */ sw $s0, 0x10($sp) -/* 8493C 800EB48C 3C108011 */ lui $s0, 0x8011 -/* 84940 800EB490 8210F2A2 */ lb $s0, -0xd5e($s0) +/* 8493C 800EB48C 3C108011 */ lui $s0, %hi(gPlayerData+0x12) +/* 84940 800EB490 8210F2A2 */ lb $s0, %lo(gPlayerData+0x12)($s0) /* 84944 800EB494 AFBF0018 */ sw $ra, 0x18($sp) /* 84948 800EB498 0C00A580 */ jal mem_clear /* 8494C 800EB49C 24050360 */ addiu $a1, $zero, 0x360 diff --git a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s index c341840e85..4ce96bddbf 100644 --- a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s +++ b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s @@ -16,9 +16,9 @@ glabel use_consumable /* 838DC 800EA42C 00111040 */ sll $v0, $s1, 1 /* 838E0 800EA430 3C018011 */ lui $at, %hi(D_8010CD20) /* 838E4 800EA434 AC31CD20 */ sw $s1, %lo(D_8010CD20)($at) -/* 838E8 800EA438 3C118011 */ lui $s1, 0x8011 +/* 838E8 800EA438 3C118011 */ lui $s1, %hi(gPlayerData+0x1B4) /* 838EC 800EA43C 02228821 */ addu $s1, $s1, $v0 -/* 838F0 800EA440 8631F444 */ lh $s1, -0xbbc($s1) +/* 838F0 800EA440 8631F444 */ lh $s1, %lo(gPlayerData+0x1B4)($s1) /* 838F4 800EA444 0C00A5CF */ jal dma_copy /* 838F8 800EA448 00000000 */ nop /* 838FC 800EA44C 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_FBE10/ShowEmote.s b/asm/nonmatchings/code_FBE10/ShowEmote.s index 1d1d874dae..d78e090254 100644 --- a/asm/nonmatchings/code_FBE10/ShowEmote.s +++ b/asm/nonmatchings/code_FBE10/ShowEmote.s @@ -66,8 +66,8 @@ glabel ShowEmote /* FC344 802D7994 080B5E9E */ j .L802D7A78 /* FC348 802D7998 4600B106 */ mov.s $f4, $f22 .L802D799C: -/* FC34C 802D799C 3C028011 */ lui $v0, 0x8011 -/* FC350 802D79A0 9442F078 */ lhu $v0, -0xf88($v0) +/* FC34C 802D799C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) +/* FC350 802D79A0 9442F078 */ lhu $v0, %lo(gPlayerStatus+0xB0)($v0) /* FC354 802D79A4 34A55556 */ ori $a1, $a1, 0x5556 /* FC358 802D79A8 00021400 */ sll $v0, $v0, 0x10 /* FC35C 802D79AC 00022403 */ sra $a0, $v0, 0x10 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s index c9dbd5c772..644c582471 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s @@ -4,8 +4,8 @@ glabel func_8014A548 /* E0C48 8014A548 27BDFFC8 */ addiu $sp, $sp, -0x38 /* E0C4C 8014A54C AFB1001C */ sw $s1, 0x1c($sp) -/* E0C50 8014A550 3C118016 */ lui $s1, 0x8016 -/* E0C54 8014A554 26319AF0 */ addiu $s1, $s1, -0x6510 +/* E0C50 8014A550 3C118016 */ lui $s1, %hi(gMusicPlayers) +/* E0C54 8014A554 26319AF0 */ addiu $s1, $s1, %lo(gMusicPlayers) /* E0C58 8014A558 AFB20020 */ sw $s2, 0x20($sp) /* E0C5C 8014A55C 0000902D */ daddu $s2, $zero, $zero /* E0C60 8014A560 AFB30024 */ sw $s3, 0x24($sp) @@ -27,7 +27,7 @@ glabel func_8014A548 /* E0C9C 8014A59C 00220821 */ addu $at, $at, $v0 /* E0CA0 8014A5A0 8C221290 */ lw $v0, 0x1290($at) /* E0CA4 8014A5A4 00400008 */ jr $v0 -/* E0CA8 8014A5A8 00000000 */ nop +/* E0CA8 8014A5A8 00000000 */ nop /* E0CAC 8014A5AC 96230000 */ lhu $v1, ($s1) /* E0CB0 8014A5B0 30620001 */ andi $v0, $v1, 1 /* E0CB4 8014A5B4 1040001D */ beqz $v0, .L8014A62C @@ -37,24 +37,24 @@ glabel func_8014A548 /* E0CC4 8014A5C4 1040000B */ beqz $v0, .L8014A5F4 /* E0CC8 8014A5C8 30620004 */ andi $v0, $v1, 4 /* E0CCC 8014A5CC 14400005 */ bnez $v0, .L8014A5E4 -/* E0CD0 8014A5D0 00000000 */ nop +/* E0CD0 8014A5D0 00000000 */ nop /* E0CD4 8014A5D4 0C015671 */ jal func_800559C4 /* E0CD8 8014A5D8 8E040016 */ lw $a0, 0x16($s0) /* E0CDC 8014A5DC 08052987 */ j .L8014A61C -/* E0CE0 8014A5E0 00000000 */ nop +/* E0CE0 8014A5E0 00000000 */ nop .L8014A5E4: /* E0CE4 8014A5E4 0C0156BC */ jal func_80055AF0 /* E0CE8 8014A5E8 8E040016 */ lw $a0, 0x16($s0) /* E0CEC 8014A5EC 08052987 */ j .L8014A61C -/* E0CF0 8014A5F0 00000000 */ nop +/* E0CF0 8014A5F0 00000000 */ nop .L8014A5F4: /* E0CF4 8014A5F4 14400006 */ bnez $v0, .L8014A610 -/* E0CF8 8014A5F8 00000000 */ nop +/* E0CF8 8014A5F8 00000000 */ nop /* E0CFC 8014A5FC 8E040016 */ lw $a0, 0x16($s0) /* E0D00 8014A600 0C0156AF */ jal func_80055ABC /* E0D04 8014A604 0000302D */ daddu $a2, $zero, $zero /* E0D08 8014A608 08052987 */ j .L8014A61C -/* E0D0C 8014A60C 00000000 */ nop +/* E0D0C 8014A60C 00000000 */ nop .L8014A610: /* E0D10 8014A610 8E040016 */ lw $a0, 0x16($s0) /* E0D14 8014A614 0C0156EE */ jal func_80055BB8 @@ -82,7 +82,7 @@ glabel func_8014A548 /* E0D5C 8014A65C A6220000 */ sh $v0, ($s1) /* E0D60 8014A660 8E040016 */ lw $a0, 0x16($s0) /* E0D64 8014A664 0C01567F */ jal func_800559FC -/* E0D68 8014A668 00000000 */ nop +/* E0D68 8014A668 00000000 */ nop /* E0D6C 8014A66C 5440004D */ bnel $v0, $zero, .L8014A7A4 /* E0D70 8014A670 26520001 */ addiu $s2, $s2, 1 /* E0D74 8014A674 96220000 */ lhu $v0, ($s1) @@ -100,7 +100,7 @@ glabel func_8014A548 /* E0DA4 8014A6A4 30620010 */ andi $v0, $v1, 0x10 /* E0DA8 8014A6A8 8E04000E */ lw $a0, 0xe($s0) /* E0DAC 8014A6AC 04810003 */ bgez $a0, .L8014A6BC -/* E0DB0 8014A6B0 00000000 */ nop +/* E0DB0 8014A6B0 00000000 */ nop /* E0DB4 8014A6B4 080529E8 */ j .L8014A7A0 /* E0DB8 8014A6B8 A6000000 */ sh $zero, ($s0) .L8014A6BC: @@ -113,7 +113,7 @@ glabel func_8014A548 /* E0DD4 8014A6D4 96220000 */ lhu $v0, ($s1) /* E0DD8 8014A6D8 30420020 */ andi $v0, $v0, 0x20 /* E0DDC 8014A6DC 1040000C */ beqz $v0, .L8014A710 -/* E0DE0 8014A6E0 00000000 */ nop +/* E0DE0 8014A6E0 00000000 */ nop /* E0DE4 8014A6E4 8602000C */ lh $v0, 0xc($s0) /* E0DE8 8014A6E8 8607000A */ lh $a3, 0xa($s0) /* E0DEC 8014A6EC AFA20010 */ sw $v0, 0x10($sp) @@ -126,10 +126,10 @@ glabel func_8014A548 /* E0E08 8014A708 080529C8 */ j .L8014A720 /* E0E0C 8014A70C A6220000 */ sh $v0, ($s1) .L8014A710: -/* E0E10 8014A710 3C048016 */ lui $a0, 0x8016 -/* E0E14 8014A714 84849AE0 */ lh $a0, -0x6520($a0) +/* E0E10 8014A710 3C048016 */ lui $a0, %hi(gMusicUnkVolume) +/* E0E14 8014A714 84849AE0 */ lh $a0, %lo(gMusicUnkVolume)($a0) /* E0E18 8014A718 0C052B21 */ jal transition_music_volume_to -/* E0E1C 8014A71C 00000000 */ nop +/* E0E1C 8014A71C 00000000 */ nop .L8014A720: /* E0E20 8014A720 8E040016 */ lw $a0, 0x16($s0) /* E0E24 8014A724 0C01565C */ jal func_80055970 @@ -143,7 +143,7 @@ glabel func_8014A548 /* E0E44 8014A744 A6000000 */ sh $zero, ($s0) .L8014A748: /* E0E48 8014A748 10400005 */ beqz $v0, .L8014A760 -/* E0E4C 8014A74C 00000000 */ nop +/* E0E4C 8014A74C 00000000 */ nop /* E0E50 8014A750 A6000000 */ sh $zero, ($s0) /* E0E54 8014A754 96220000 */ lhu $v0, ($s1) /* E0E58 8014A758 080529E7 */ j .L8014A79C @@ -151,7 +151,7 @@ glabel func_8014A548 .L8014A760: /* E0E60 8014A760 8E04002A */ lw $a0, 0x2a($s0) /* E0E64 8014A764 0C0156CA */ jal func_80055B28 -/* E0E68 8014A768 00000000 */ nop +/* E0E68 8014A768 00000000 */ nop /* E0E6C 8014A76C 5440000D */ bnel $v0, $zero, .L8014A7A4 /* E0E70 8014A770 26520001 */ addiu $s2, $s2, 1 /* E0E74 8014A774 8E020022 */ lw $v0, 0x22($s0) @@ -174,7 +174,7 @@ glabel func_8014A548 /* E0EAC 8014A7AC 1440FF75 */ bnez $v0, .L8014A584 /* E0EB0 8014A7B0 26310030 */ addiu $s1, $s1, 0x30 /* E0EB4 8014A7B4 0C052B25 */ jal func_8014AC94 -/* E0EB8 8014A7B8 00000000 */ nop +/* E0EB8 8014A7B8 00000000 */ nop /* E0EBC 8014A7BC 8FBF0030 */ lw $ra, 0x30($sp) /* E0EC0 8014A7C0 8FB5002C */ lw $s5, 0x2c($sp) /* E0EC4 8014A7C4 8FB40028 */ lw $s4, 0x28($sp) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s index f1b97ef67a..1ce886b843 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s @@ -25,8 +25,8 @@ glabel func_8014AC94 /* E13E0 8014ACE0 54400001 */ bnel $v0, $zero, .L8014ACE8 /* E13E4 8014ACE4 0060202D */ daddu $a0, $v1, $zero .L8014ACE8: -/* E13E8 8014ACE8 3C058016 */ lui $a1, 0x8016 -/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, -0x651a +/* E13E8 8014ACE8 3C058016 */ lui $a1, %hi(gMusicCurrentVolume) +/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, %lo(gMusicCurrentVolume) /* E13F0 8014ACF0 00041400 */ sll $v0, $a0, 0x10 /* E13F4 8014ACF4 00022403 */ sra $a0, $v0, 0x10 /* E13F8 8014ACF8 84A20000 */ lh $v0, ($a1) @@ -38,10 +38,10 @@ glabel func_8014AC94 /* E1410 8014AD10 2462FFFF */ addiu $v0, $v1, -1 .L8014AD14: /* E1414 8014AD14 A4A20000 */ sh $v0, ($a1) -/* E1418 8014AD18 3C048016 */ lui $a0, 0x8016 -/* E141C 8014AD1C 84849AE6 */ lh $a0, -0x651a($a0) +/* E1418 8014AD18 3C048016 */ lui $a0, %hi(gMusicCurrentVolume) +/* E141C 8014AD1C 84849AE6 */ lh $a0, %lo(gMusicCurrentVolume)($a0) /* E1420 8014AD20 0C015869 */ jal func_800561A4 -/* E1424 8014AD24 00000000 */ nop +/* E1424 8014AD24 00000000 */ nop /* E1428 8014AD28 24020003 */ addiu $v0, $zero, 3 /* E142C 8014AD2C 3C018015 */ lui $at, 0x8015 /* E1430 8014AD30 A422F738 */ sh $v0, -0x8c8($at) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s index 065caa040d..843f7eb11e 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s @@ -4,8 +4,8 @@ glabel func_8014AD40 /* E1440 8014AD40 27BDFFE0 */ addiu $sp, $sp, -0x20 /* E1444 8014AD44 AFB00010 */ sw $s0, 0x10($sp) -/* E1448 8014AD48 3C108016 */ lui $s0, 0x8016 -/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, -0x6510 +/* E1448 8014AD48 3C108016 */ lui $s0, %hi(gMusicPlayers) +/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, %lo(gMusicPlayers) /* E1450 8014AD50 AFB10014 */ sw $s1, 0x14($sp) /* E1454 8014AD54 0000882D */ daddu $s1, $zero, $zero /* E1458 8014AD58 AFBF0018 */ sw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s index 138ee65425..3b03167cb0 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s @@ -7,8 +7,8 @@ glabel func_8014ADA4 /* E14AC 8014ADAC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* E14B0 8014ADB0 AFBF0018 */ sw $ra, 0x18($sp) /* E14B4 8014ADB4 80420071 */ lb $v0, 0x71($v0) -/* E14B8 8014ADB8 3C068016 */ lui $a2, 0x8016 -/* E14BC 8014ADBC 24C69AF0 */ addiu $a2, $a2, -0x6510 +/* E14B8 8014ADB8 3C068016 */ lui $a2, %hi(gMusicPlayers) +/* E14BC 8014ADBC 24C69AF0 */ addiu $a2, $a2, %lo(gMusicPlayers) /* E14C0 8014ADC0 1440000A */ bnez $v0, .L8014ADEC /* E14C4 8014ADC4 24030008 */ addiu $v1, $zero, 8 /* E14C8 8014ADC8 94C20000 */ lhu $v0, ($a2) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s index 7b9f6bc0ed..80ead6d3be 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s @@ -8,8 +8,8 @@ glabel func_8014ADF8 /* E1504 8014AE04 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E1508 8014AE08 AFBF0018 */ sw $ra, 0x18($sp) /* E150C 8014AE0C 80420071 */ lb $v0, 0x71($v0) -/* E1510 8014AE10 3C078016 */ lui $a3, 0x8016 -/* E1514 8014AE14 24E79AF0 */ addiu $a3, $a3, -0x6510 +/* E1510 8014AE10 3C078016 */ lui $a3, %hi(gMusicPlayers) +/* E1514 8014AE14 24E79AF0 */ addiu $a3, $a3, %lo(gMusicPlayers) /* E1518 8014AE18 14400011 */ bnez $v0, .L8014AE60 /* E151C 8014AE1C 00A0482D */ daddu $t1, $a1, $zero /* E1520 8014AE20 8CE40010 */ lw $a0, 0x10($a3) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s index 9030224ef6..d0cb92e4bb 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s @@ -7,8 +7,8 @@ glabel func_8014AE6C /* E1574 8014AE74 27BDFFE0 */ addiu $sp, $sp, -0x20 /* E1578 8014AE78 AFBF0018 */ sw $ra, 0x18($sp) /* E157C 8014AE7C 80420071 */ lb $v0, 0x71($v0) -/* E1580 8014AE80 3C068016 */ lui $a2, 0x8016 -/* E1584 8014AE84 24C69AF0 */ addiu $a2, $a2, -0x6510 +/* E1580 8014AE80 3C068016 */ lui $a2, %hi(gMusicPlayers) +/* E1584 8014AE84 24C69AF0 */ addiu $a2, $a2, %lo(gMusicPlayers) /* E1588 8014AE88 14400018 */ bnez $v0, .L8014AEEC /* E158C 8014AE8C 3C020002 */ lui $v0, 2 /* E1590 8014AE90 3C04800A */ lui $a0, %hi(D_8009A650) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s index ed3cbbc650..066759add0 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s @@ -8,8 +8,8 @@ glabel func_8014AEF8 /* E1604 8014AF04 AFBF001C */ sw $ra, 0x1c($sp) /* E1608 8014AF08 AFB00018 */ sw $s0, 0x18($sp) /* E160C 8014AF0C 80420071 */ lb $v0, 0x71($v0) -/* E1610 8014AF10 3C108016 */ lui $s0, 0x8016 -/* E1614 8014AF14 26109AF0 */ addiu $s0, $s0, -0x6510 +/* E1610 8014AF10 3C108016 */ lui $s0, %hi(gMusicPlayers) +/* E1614 8014AF14 26109AF0 */ addiu $s0, $s0, %lo(gMusicPlayers) /* E1618 8014AF18 14400018 */ bnez $v0, .L8014AF7C /* E161C 8014AF1C 3C030002 */ lui $v1, 2 /* E1620 8014AF20 3C02800A */ lui $v0, %hi(D_8009A650) diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s index 9b1cfbade8..d7331898fe 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 @@ -106,8 +106,8 @@ glabel func_80033BC0 /* F150 80033D50 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* F154 80033D54 0C03AC80 */ jal func_800EB200 /* F158 80033D58 80440012 */ lb $a0, 0x12($v0) -/* F15C 80033D5C 0C0169B0 */ jal load_map_script_lib -/* F160 80033D60 00000000 */ nop +/* F15C 80033D5C 0C0169B0 */ jal load_world_script_api +/* 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 dedf270b12..75b1db7e46 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 -/* 10204 80034E04 0C0169B0 */ jal load_map_script_lib -/* 10208 80034E08 00000000 */ nop +/* 10200 80034E00 00000000 */ nop +/* 10204 80034E04 0C0169B0 */ jal load_world_script_api +/* 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/code_fa4c0_len_3bf0/func_802D5EE0.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s index e4ce3a143a..552becea95 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s @@ -7,8 +7,8 @@ glabel func_802D5EE0 /* FA898 802D5EE8 8C82000C */ lw $v0, 0xc($a0) /* FA89C 802D5EEC 0C0B1EAF */ jal get_variable /* FA8A0 802D5EF0 8C450000 */ lw $a1, ($v0) -/* FA8A4 802D5EF4 3C048016 */ lui $a0, 0x8016 -/* FA8A8 802D5EF8 24849AF0 */ addiu $a0, $a0, -0x6510 +/* FA8A4 802D5EF4 3C048016 */ lui $a0, %hi(gMusicPlayers) +/* FA8A8 802D5EF8 24849AF0 */ addiu $a0, $a0, %lo(gMusicPlayers) /* FA8AC 802D5EFC 00021840 */ sll $v1, $v0, 1 /* FA8B0 802D5F00 00621821 */ addu $v1, $v1, $v0 /* FA8B4 802D5F04 00031900 */ sll $v1, $v1, 4 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s index 9c04bc7950..6a5639e28f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s @@ -12,8 +12,8 @@ glabel func_802424F0_C38A20 /* C38A3C 8024250C AFB50024 */ sw $s5, 0x24($sp) /* C38A40 80242510 0200A82D */ daddu $s5, $s0, $zero /* C38A44 80242514 AFB10014 */ sw $s1, 0x14($sp) -/* C38A48 80242518 3C118011 */ lui $s1, 0x8011 -/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C38A48 80242518 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C38A50 80242520 AFBF0028 */ sw $ra, 0x28($sp) /* C38A54 80242524 AFB20018 */ sw $s2, 0x18($sp) /* C38A58 80242528 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s index 431c983a4e..474b20ce22 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80242818_C38D48 -/* C38D48 80242818 3C028011 */ lui $v0, 0x8011 -/* C38D4C 8024281C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C38D48 80242818 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C38D4C 8024281C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C38D50 80242820 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C38D54 80242824 AFBF0010 */ sw $ra, 0x10($sp) /* C38D58 80242828 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s new file mode 100644 index 0000000000..954b3db869 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s @@ -0,0 +1,20 @@ +.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/E07C20/func_80242900_E07C60.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s new file mode 100644 index 0000000000..f658cae9bb --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s @@ -0,0 +1,37 @@ +.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/E07C20/func_80242978_E07CD8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s new file mode 100644 index 0000000000..125c322ce3 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s @@ -0,0 +1,67 @@ +.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/E07C20/func_80242A68_E07DC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s new file mode 100644 index 0000000000..63b94e3d1c --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s @@ -0,0 +1,69 @@ +.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/E07C20/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s new file mode 100644 index 0000000000..b6d654c039 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s @@ -0,0 +1,69 @@ +.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/E07C20/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s new file mode 100644 index 0000000000..cc8a7a58d1 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s @@ -0,0 +1,15 @@ +.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/E07C20/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s new file mode 100644 index 0000000000..b21718ceab --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s @@ -0,0 +1,27 @@ +.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_flo/flo_08/CAED40/func_80240120_CAEE60.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s index d258a5b4c0..fda576323c 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s @@ -12,8 +12,8 @@ glabel func_80240120_CAEE60 /* CAEE7C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* CAEE80 80240140 0200A82D */ daddu $s5, $s0, $zero /* CAEE84 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* CAEE88 80240148 3C118011 */ lui $s1, 0x8011 -/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* CAEE88 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* CAEE90 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* CAEE94 80240154 AFB20018 */ sw $s2, 0x18($sp) /* CAEE98 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s index 78f957404c..a19c129a53 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_CAF188 -/* CAF188 80240448 3C028011 */ lui $v0, 0x8011 -/* CAF18C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CAF188 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CAF18C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CAF190 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CAF194 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* CAF198 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s index 316b599ad3..6f5aee6437 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s @@ -3,8 +3,8 @@ glabel func_802403D4_CCB6E4 /* CCB6E4 802403D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB6E8 802403D8 3C028011 */ lui $v0, 0x8011 -/* CCB6EC 802403DC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CCB6E8 802403D8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CCB6EC 802403DC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CCB6F0 802403E0 0080182D */ daddu $v1, $a0, $zero /* CCB6F4 802403E4 1040000C */ beqz $v0, .L80240418 /* CCB6F8 802403E8 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s index 49186a69c3..6543d3568a 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s @@ -12,8 +12,8 @@ glabel func_80240200_CD2030 /* CD204C 8024021C AFB50024 */ sw $s5, 0x24($sp) /* CD2050 80240220 0200A82D */ daddu $s5, $s0, $zero /* CD2054 80240224 AFB10014 */ sw $s1, 0x14($sp) -/* CD2058 80240228 3C118011 */ lui $s1, 0x8011 -/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, -0xd68 +/* CD2058 80240228 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* CD2060 80240230 AFBF0028 */ sw $ra, 0x28($sp) /* CD2064 80240234 AFB20018 */ sw $s2, 0x18($sp) /* CD2068 80240238 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s index aca75a6bbd..8c9e36a0d3 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240528_CD2358 -/* CD2358 80240528 3C028011 */ lui $v0, 0x8011 -/* CD235C 8024052C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CD2358 80240528 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CD235C 8024052C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CD2360 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CD2364 80240534 AFBF0010 */ sw $ra, 0x10($sp) /* CD2368 80240538 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s index 8a35eb943d..231a5b2a96 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s @@ -8,8 +8,8 @@ glabel func_802407C0_A0C4B0 /* A0C4BC 802407CC 0C0B1EAF */ jal get_variable /* A0C4C0 802407D0 8C450000 */ lw $a1, ($v0) /* A0C4C4 802407D4 8FBF0010 */ lw $ra, 0x10($sp) -/* A0C4C8 802407D8 3C018011 */ lui $at, 0x8011 -/* A0C4CC 802407DC A022F2A2 */ sb $v0, -0xd5e($at) +/* A0C4C8 802407D8 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* A0C4CC 802407DC A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* A0C4D0 802407E0 24020002 */ addiu $v0, $zero, 2 /* A0C4D4 802407E4 03E00008 */ jr $ra /* A0C4D8 802407E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s index 33ee37042b..a48de861df 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s @@ -3,7 +3,7 @@ glabel func_80240908_A0C5F8 /* A0C5F8 80240908 24020001 */ addiu $v0, $zero, 1 -/* A0C5FC 8024090C 3C018011 */ lui $at, 0x8011 -/* A0C600 80240910 A022F29A */ sb $v0, -0xd66($at) +/* A0C5FC 8024090C 3C018011 */ lui $at, %hi(gPlayerData+0xA) +/* A0C600 80240910 A022F29A */ sb $v0, %lo(gPlayerData+0xA)($at) /* A0C604 80240914 03E00008 */ jr $ra /* A0C608 80240918 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s index 08a17c7972..20cbc0e829 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s @@ -5,8 +5,8 @@ glabel func_80240A68_A39F48 /* A39F48 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A39F4C 80240A6C AFBF0010 */ sw $ra, 0x10($sp) /* A39F50 80240A70 8C82000C */ lw $v0, 0xc($a0) -/* A39F54 80240A74 3C068011 */ lui $a2, 0x8011 -/* A39F58 80240A78 90C6F29F */ lbu $a2, -0xd61($a2) +/* A39F54 80240A74 3C068011 */ lui $a2, %hi(gPlayerData+0xF) +/* A39F58 80240A78 90C6F29F */ lbu $a2, %lo(gPlayerData+0xF)($a2) /* A39F5C 80240A7C 0C0B2026 */ jal set_variable /* A39F60 80240A80 8C450000 */ lw $a1, ($v0) /* A39F64 80240A84 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s index deb496c038..0a3e0f9ec6 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s @@ -11,8 +11,8 @@ glabel func_802417EC_A3ACCC /* A3ACE4 80241804 8E050000 */ lw $a1, ($s0) /* A3ACE8 80241808 0C0B1EAF */ jal get_variable /* A3ACEC 8024180C 26100004 */ addiu $s0, $s0, 4 -/* A3ACF0 80241810 3C038011 */ lui $v1, 0x8011 -/* A3ACF4 80241814 8463F29C */ lh $v1, -0xd64($v1) +/* A3ACF0 80241810 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* A3ACF4 80241814 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* A3ACF8 80241818 3C018024 */ lui $at, 0x8024 /* A3ACFC 8024181C 00220821 */ addu $at, $at, $v0 /* A3AD00 80241820 902247D0 */ lbu $v0, 0x47d0($at) diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s index 71cf0b78e9..3405093595 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80240BEC_A4032C -/* A4032C 80240BEC 3C018011 */ lui $at, 0x8011 -/* A40330 80240BF0 A020F2A2 */ sb $zero, -0xd5e($at) +/* A4032C 80240BEC 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* A40330 80240BF0 A020F2A2 */ sb $zero, %lo(gPlayerData+0x12)($at) /* A40334 80240BF4 03E00008 */ jr $ra /* A40338 80240BF8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s index 0918131edf..d25a33d76e 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s @@ -12,8 +12,8 @@ glabel func_80240120_988C80 /* 988C9C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* 988CA0 80240140 0200A82D */ daddu $s5, $s0, $zero /* 988CA4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* 988CA8 80240148 3C118011 */ lui $s1, 0x8011 -/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 988CA8 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 988CB0 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* 988CB4 80240154 AFB20018 */ sw $s2, 0x18($sp) /* 988CB8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s index 62065d9373..09a3bfe846 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_988FA8 -/* 988FA8 80240448 3C028011 */ lui $v0, 0x8011 -/* 988FAC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 988FA8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 988FAC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 988FB0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 988FB4 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* 988FB8 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s index 8021cc8534..02b81e54e7 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s @@ -3,8 +3,8 @@ glabel func_80240D38_989898 /* 989898 80240D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98989C 80240D3C 3C028011 */ lui $v0, 0x8011 -/* 9898A0 80240D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* 98989C 80240D3C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 9898A0 80240D40 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 9898A4 80240D44 3C018024 */ lui $at, 0x8024 /* 9898A8 80240D48 D4201EA0 */ ldc1 $f0, 0x1ea0($at) /* 9898AC 80240D4C 2406FFFF */ addiu $a2, $zero, -1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s index 0cc6c4b83c..3e46faef59 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s @@ -3,8 +3,8 @@ glabel func_802402BC_918E6C /* 918E6C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E70 802402C0 3C028011 */ lui $v0, 0x8011 -/* 918E74 802402C4 8442EFE0 */ lh $v0, -0x1020($v0) +/* 918E70 802402C0 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 918E74 802402C4 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 918E78 802402C8 3C014069 */ lui $at, 0x4069 /* 918E7C 802402CC 44810800 */ mtc1 $at, $f1 /* 918E80 802402D0 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s index 330f487e77..81b2d5b654 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s @@ -3,8 +3,8 @@ glabel func_80240000_91B8E0 /* 91B8E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91B8E4 80240004 3C028011 */ lui $v0, 0x8011 -/* 91B8E8 80240008 8442EFE0 */ lh $v0, -0x1020($v0) +/* 91B8E4 80240004 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 91B8E8 80240008 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 91B8EC 8024000C 3C01C059 */ lui $at, 0xc059 /* 91B8F0 80240010 44810800 */ mtc1 $at, $f1 /* 91B8F4 80240014 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s index 8bd8afd955..f2b96dfb38 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s @@ -12,8 +12,8 @@ glabel func_80240410_91E980 /* 91E99C 8024042C AFB50024 */ sw $s5, 0x24($sp) /* 91E9A0 80240430 0200A82D */ daddu $s5, $s0, $zero /* 91E9A4 80240434 AFB10014 */ sw $s1, 0x14($sp) -/* 91E9A8 80240438 3C118011 */ lui $s1, 0x8011 -/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 91E9A8 80240438 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 91E9B0 80240440 AFBF0028 */ sw $ra, 0x28($sp) /* 91E9B4 80240444 AFB20018 */ sw $s2, 0x18($sp) /* 91E9B8 80240448 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s index 4077c47e03..51476c406b 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240738_91ECA8 -/* 91ECA8 80240738 3C028011 */ lui $v0, 0x8011 -/* 91ECAC 8024073C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 91ECA8 80240738 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 91ECAC 8024073C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 91ECB0 80240740 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 91ECB4 80240744 AFBF0010 */ sw $ra, 0x10($sp) /* 91ECB8 80240748 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s index d1c7f51216..e4c639c610 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s @@ -12,8 +12,8 @@ glabel func_80240780_B5EA30 /* B5EA4C 8024079C AFB50024 */ sw $s5, 0x24($sp) /* B5EA50 802407A0 0200A82D */ daddu $s5, $s0, $zero /* B5EA54 802407A4 AFB10014 */ sw $s1, 0x14($sp) -/* B5EA58 802407A8 3C118011 */ lui $s1, 0x8011 -/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, -0xd68 +/* B5EA58 802407A8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* B5EA60 802407B0 AFBF0028 */ sw $ra, 0x28($sp) /* B5EA64 802407B4 AFB20018 */ sw $s2, 0x18($sp) /* B5EA68 802407B8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s index 5ad0aa5525..a92c7dc2dd 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AA8_B5ED58 -/* B5ED58 80240AA8 3C028011 */ lui $v0, 0x8011 -/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* B5ED58 80240AA8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* B5ED60 80240AB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5ED64 80240AB4 AFBF0010 */ sw $ra, 0x10($sp) /* B5ED68 80240AB8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s index 3a055bd399..a3d711160f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s @@ -11,8 +11,8 @@ glabel func_80240034_ACAB54 /* ACAB6C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACAB70 80240050 44021000 */ mfc1 $v0, $f2 /* ACAB74 80240054 00000000 */ nop -/* ACAB78 80240058 3C018011 */ lui $at, 0x8011 -/* ACAB7C 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* ACAB78 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* ACAB7C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACAB80 80240060 24020002 */ addiu $v0, $zero, 2 /* ACAB84 80240064 03E00008 */ jr $ra /* ACAB88 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s index 9d39c1729e..a1a360bf0d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s @@ -5,8 +5,8 @@ glabel func_80240F18_ACBA38 /* ACBA38 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACBA3C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) /* ACBA40 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACBA44 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACBA48 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACBA44 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ACBA48 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ACBA4C 80240F2C 0C0B2026 */ jal set_variable /* ACBA50 80240F30 8C450000 */ lw $a1, ($v0) /* ACBA54 80240F34 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s index e47bcd0f46..e1c1fc0aec 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s @@ -11,8 +11,8 @@ glabel func_80240034_ACE174 /* ACE18C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACE190 80240050 44021000 */ mfc1 $v0, $f2 /* ACE194 80240054 00000000 */ nop -/* ACE198 80240058 3C018011 */ lui $at, 0x8011 -/* ACE19C 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* ACE198 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* ACE19C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACE1A0 80240060 24020002 */ addiu $v0, $zero, 2 /* ACE1A4 80240064 03E00008 */ jr $ra /* ACE1A8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s index 175d6c8e95..2efc6d90e5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s @@ -5,8 +5,8 @@ glabel func_80240F18_ACF058 /* ACF058 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACF05C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) /* ACF060 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACF064 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACF068 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACF064 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ACF068 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ACF06C 80240F2C 0C0B2026 */ jal set_variable /* ACF070 80240F30 8C450000 */ lw $a1, ($v0) /* ACF074 80240F34 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s index 11f07f8482..bef78bbf6a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s @@ -11,8 +11,8 @@ glabel func_80240034_AD40C4 /* AD40DC 8024004C 4600008D */ trunc.w.s $f2, $f0 /* AD40E0 80240050 44021000 */ mfc1 $v0, $f2 /* AD40E4 80240054 00000000 */ nop -/* AD40E8 80240058 3C018011 */ lui $at, 0x8011 -/* AD40EC 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* AD40E8 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AD40EC 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AD40F0 80240060 24020002 */ addiu $v0, $zero, 2 /* AD40F4 80240064 03E00008 */ jr $ra /* AD40F8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s index cb509ba3dc..bd512fcc47 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s @@ -5,8 +5,8 @@ glabel func_802406E8_AD4778 /* AD4778 802406E8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AD477C 802406EC AFBF0010 */ sw $ra, 0x10($sp) /* AD4780 802406F0 8C82000C */ lw $v0, 0xc($a0) -/* AD4784 802406F4 3C068011 */ lui $a2, 0x8011 -/* AD4788 802406F8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AD4784 802406F4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AD4788 802406F8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AD478C 802406FC 0C0B2026 */ jal set_variable /* AD4790 80240700 8C450000 */ lw $a1, ($v0) /* AD4794 80240704 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s index bb07a690db..92d6421284 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s @@ -8,7 +8,7 @@ glabel func_8024035C_ADB1FC /* ADB208 80240368 306300FE */ andi $v1, $v1, 0xfe /* ADB20C 8024036C A043007E */ sb $v1, 0x7e($v0) /* ADB210 80240370 90820087 */ lbu $v0, 0x87($a0) -/* ADB214 80240374 3C018011 */ lui $at, 0x8011 -/* ADB218 80240378 A022F2A2 */ sb $v0, -0xd5e($at) +/* ADB214 80240374 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* ADB218 80240378 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* ADB21C 8024037C 03E00008 */ jr $ra /* ADB220 80240380 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s index 864f81aff4..808e385b3b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s @@ -5,8 +5,8 @@ glabel func_802403A0_ADB240 /* ADB240 802403A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ADB244 802403A4 AFBF0010 */ sw $ra, 0x10($sp) /* ADB248 802403A8 8C82000C */ lw $v0, 0xc($a0) -/* ADB24C 802403AC 3C068011 */ lui $a2, 0x8011 -/* ADB250 802403B0 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ADB24C 802403AC 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ADB250 802403B0 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ADB254 802403B4 0C0B2026 */ jal set_variable /* ADB258 802403B8 8C450000 */ lw $a1, ($v0) /* ADB25C 802403BC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s index 83eeebf918..a10ef85d26 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s @@ -8,8 +8,8 @@ glabel func_8024030C_AE589C /* AE58A8 80240318 306300FE */ andi $v1, $v1, 0xfe /* AE58AC 8024031C A043007E */ sb $v1, 0x7e($v0) /* AE58B0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AE58B4 80240324 3C018011 */ lui $at, 0x8011 -/* AE58B8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) +/* AE58B4 80240324 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AE58B8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AE58BC 8024032C 03E00008 */ jr $ra /* AE58C0 80240330 24020002 */ addiu $v0, $zero, 2 /* AE58C4 80240334 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s index 026a624c18..820eae1f4a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s @@ -8,7 +8,7 @@ glabel func_80240000_AED410 /* AED41C 8024000C 306300FE */ andi $v1, $v1, 0xfe /* AED420 80240010 A043007E */ sb $v1, 0x7e($v0) /* AED424 80240014 90820087 */ lbu $v0, 0x87($a0) -/* AED428 80240018 3C018011 */ lui $at, 0x8011 -/* AED42C 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* AED428 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AED42C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AED430 80240020 03E00008 */ jr $ra /* AED434 80240024 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s index 7b606c7ce4..95c3f3ba12 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s @@ -11,8 +11,8 @@ glabel func_80240028_AED438 /* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 /* AED454 80240044 44021000 */ mfc1 $v0, $f2 /* AED458 80240048 00000000 */ nop -/* AED45C 8024004C 3C018011 */ lui $at, 0x8011 -/* AED460 80240050 A022EFD5 */ sb $v0, -0x102b($at) +/* AED45C 8024004C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AED460 80240050 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AED464 80240054 24020002 */ addiu $v0, $zero, 2 /* AED468 80240058 03E00008 */ jr $ra /* AED46C 8024005C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s index 2a22d7bf22..dcb61015b5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s @@ -5,8 +5,8 @@ glabel func_80240EC8_AEE2D8 /* AEE2D8 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AEE2DC 80240ECC AFBF0010 */ sw $ra, 0x10($sp) /* AEE2E0 80240ED0 8C82000C */ lw $v0, 0xc($a0) -/* AEE2E4 80240ED4 3C068011 */ lui $a2, 0x8011 -/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AEE2E4 80240ED4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AEE2EC 80240EDC 0C0B2026 */ jal set_variable /* AEE2F0 80240EE0 8C450000 */ lw $a1, ($v0) /* AEE2F4 80240EE4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s index a5f8b01d5f..440e2f628a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s @@ -8,8 +8,8 @@ glabel func_8024030C_AF2FAC /* AF2FB8 80240318 306300FE */ andi $v1, $v1, 0xfe /* AF2FBC 8024031C A043007E */ sb $v1, 0x7e($v0) /* AF2FC0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AF2FC4 80240324 3C018011 */ lui $at, 0x8011 -/* AF2FC8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) +/* AF2FC4 80240324 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AF2FC8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AF2FCC 8024032C 03E00008 */ jr $ra /* AF2FD0 80240330 24020002 */ addiu $v0, $zero, 2 /* AF2FD4 80240334 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s index 52f74b189e..12097d8f4f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s @@ -12,8 +12,8 @@ glabel func_80240730_AF33D0 /* AF33EC 8024074C 4600008D */ trunc.w.s $f2, $f0 /* AF33F0 80240750 44021000 */ mfc1 $v0, $f2 /* AF33F4 80240754 00000000 */ nop -/* AF33F8 80240758 3C018011 */ lui $at, 0x8011 -/* AF33FC 8024075C A022F08C */ sb $v0, -0xf74($at) +/* AF33F8 80240758 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) +/* AF33FC 8024075C A022F08C */ sb $v0, %lo(gPlayerStatus+0xC4)($at) /* AF3400 80240760 A0620080 */ sb $v0, 0x80($v1) /* AF3404 80240764 8FBF0010 */ lw $ra, 0x10($sp) /* AF3408 80240768 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s index 0256e6abbd..43ea5d1890 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s @@ -10,8 +10,8 @@ glabel func_80240C10_AF8560 /* AF8574 80240C24 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* AF8578 80240C28 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* AF857C 80240C2C 0040182D */ daddu $v1, $v0, $zero -/* AF8580 80240C30 3C018011 */ lui $at, 0x8011 -/* AF8584 80240C34 A023F08C */ sb $v1, -0xf74($at) +/* AF8580 80240C30 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) +/* AF8584 80240C34 A023F08C */ sb $v1, %lo(gPlayerStatus+0xC4)($at) /* AF8588 80240C38 A0830080 */ sb $v1, 0x80($a0) /* AF858C 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) /* AF8590 80240C40 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s index 139246b4ac..e2880bba27 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s @@ -5,8 +5,8 @@ glabel func_802405BC_AFE0FC /* AFE0FC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AFE100 802405C0 AFBF0010 */ sw $ra, 0x10($sp) /* AFE104 802405C4 8C82000C */ lw $v0, 0xc($a0) -/* AFE108 802405C8 3C068011 */ lui $a2, 0x8011 -/* AFE10C 802405CC 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AFE108 802405C8 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AFE10C 802405CC 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AFE110 802405D0 0C0B2026 */ jal set_variable /* AFE114 802405D4 8C450000 */ lw $a1, ($v0) /* AFE118 802405D8 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s index 37e564b43e..556262f71c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s @@ -8,7 +8,7 @@ glabel func_80240020_B028A0 /* B028AC 8024002C 306300FE */ andi $v1, $v1, 0xfe /* B028B0 80240030 A043007E */ sb $v1, 0x7e($v0) /* B028B4 80240034 90820087 */ lbu $v0, 0x87($a0) -/* B028B8 80240038 3C018011 */ lui $at, 0x8011 -/* B028BC 8024003C A022F2A2 */ sb $v0, -0xd5e($at) +/* B028B8 80240038 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B028BC 8024003C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B028C0 80240040 03E00008 */ jr $ra /* B028C4 80240044 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s index d6223aa13a..888e49bad5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s @@ -11,8 +11,8 @@ glabel func_80240048_B028C8 /* B028E0 80240060 4600008D */ trunc.w.s $f2, $f0 /* B028E4 80240064 44021000 */ mfc1 $v0, $f2 /* B028E8 80240068 00000000 */ nop -/* B028EC 8024006C 3C018011 */ lui $at, 0x8011 -/* B028F0 80240070 A022EFD5 */ sb $v0, -0x102b($at) +/* B028EC 8024006C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* B028F0 80240070 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* B028F4 80240074 24020002 */ addiu $v0, $zero, 2 /* B028F8 80240078 03E00008 */ jr $ra /* B028FC 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s index 3669829815..d829944e67 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s @@ -5,8 +5,8 @@ glabel func_80240758_B02FD8 /* B02FD8 80240758 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B02FDC 8024075C AFBF0010 */ sw $ra, 0x10($sp) /* B02FE0 80240760 8C82000C */ lw $v0, 0xc($a0) -/* B02FE4 80240764 3C068011 */ lui $a2, 0x8011 -/* B02FE8 80240768 80C6EFD4 */ lb $a2, -0x102c($a2) +/* B02FE4 80240764 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* B02FE8 80240768 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* B02FEC 8024076C 0C0B2026 */ jal set_variable /* B02FF0 80240770 8C450000 */ lw $a1, ($v0) /* B02FF4 80240774 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s index 8245428187..76b334fb4d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s +++ b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s @@ -8,8 +8,8 @@ glabel func_80240000_B13120 /* B1312C 8024000C 306300FE */ andi $v1, $v1, 0xfe /* B13130 80240010 A043007E */ sb $v1, 0x7e($v0) /* B13134 80240014 90820087 */ lbu $v0, 0x87($a0) -/* B13138 80240018 3C018011 */ lui $at, 0x8011 -/* B1313C 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* B13138 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B1313C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B13140 80240020 03E00008 */ jr $ra /* B13144 80240024 24020002 */ addiu $v0, $zero, 2 /* B13148 80240028 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s index eb90b313f0..a398faff3c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s @@ -8,8 +8,8 @@ glabel func_80240000_B150B0 /* B150BC 8024000C 306300FE */ andi $v1, $v1, 0xfe /* B150C0 80240010 A043007E */ sb $v1, 0x7e($v0) /* B150C4 80240014 90820087 */ lbu $v0, 0x87($a0) -/* B150C8 80240018 3C018011 */ lui $at, 0x8011 -/* B150CC 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* B150C8 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B150CC 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B150D0 80240020 03E00008 */ jr $ra /* B150D4 80240024 24020002 */ addiu $v0, $zero, 2 /* B150D8 80240028 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s index 28e2cc6a96..421fff4889 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s @@ -4,8 +4,8 @@ glabel func_80242788_8B27F8 /* 8B27F8 80242788 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8B27FC 8024278C AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2800 80242790 3C018011 */ lui $at, 0x8011 -/* 8B2804 80242794 A020F2CC */ sb $zero, -0xd34($at) +/* 8B2800 80242790 3C018011 */ lui $at, %hi(gPlayerData+0x3C) +/* 8B2804 80242794 A020F2CC */ sb $zero, %lo(gPlayerData+0x3C)($at) /* 8B2808 80242798 0C03ACA9 */ jal func_800EB2A4 /* 8B280C 8024279C 0000202D */ daddu $a0, $zero, $zero /* 8B2810 802427A0 8FBF0010 */ lw $ra, 0x10($sp) 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 index 8096c27b8f..03e5caf0ac 100644 --- 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 @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80240434_8CAD34 -/* 8CAD34 80240434 3C018011 */ lui $at, 0x8011 -/* 8CAD38 80240438 A020F291 */ sb $zero, -0xd6f($at) +/* 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_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 49b7180b4b..c3b167fe1c 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -51,8 +51,8 @@ glabel func_802406C8_8EC4E8 /* 8EC590 80240770 2402FFFF */ addiu $v0, $zero, -1 /* 8EC594 80240774 1602001F */ bne $s0, $v0, .L802407F4 /* 8EC598 80240778 0000202D */ daddu $a0, $zero, $zero -/* 8EC59C 8024077C 3C028011 */ lui $v0, 0x8011 -/* 8EC5A0 80240780 9442F552 */ lhu $v0, -0xaae($v0) +/* 8EC59C 8024077C 3C028011 */ lui $v0, %hi(gPlayerData+0x2C2) +/* 8EC5A0 80240780 9442F552 */ lhu $v0, %lo(gPlayerData+0x2C2)($v0) /* 8EC5A4 80240784 10400021 */ beqz $v0, .L8024080C /* 8EC5A8 80240788 00000000 */ nop /* 8EC5AC 8024078C 08090203 */ j .L8024080C diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s index e3900f6019..6a65e7a67c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s @@ -32,8 +32,8 @@ glabel func_8024037C_A54CCC /* A54D34 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* A54D38 802403E8 E440001C */ swc1 $f0, 0x1c($v0) .L802403EC: -/* A54D3C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A54D40 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A54D3C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A54D40 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A54D44 802403F4 1040000D */ beqz $v0, .L8024042C /* A54D48 802403F8 00000000 */ nop /* A54D4C 802403FC 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s index 986383060d..286ddccde5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s @@ -32,8 +32,8 @@ glabel func_8024037C_A5629C /* A56304 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* A56308 802403E8 E440001C */ swc1 $f0, 0x1c($v0) .L802403EC: -/* A5630C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A56310 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A5630C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A56310 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A56314 802403F4 1040000D */ beqz $v0, .L8024042C /* A56318 802403F8 00000000 */ nop /* A5631C 802403FC 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s index 58774ad020..4060728c1e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s @@ -46,8 +46,8 @@ glabel func_8024073C_A57BEC /* A57C8C 802407DC 46800020 */ cvt.s.w $f0, $f0 /* A57C90 802407E0 E4A0001C */ swc1 $f0, 0x1c($a1) .L802407E4: -/* A57C94 802407E4 3C028011 */ lui $v0, 0x8011 -/* A57C98 802407E8 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A57C94 802407E4 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A57C98 802407E8 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A57C9C 802407EC 1040000D */ beqz $v0, .L80240824 /* A57CA0 802407F0 00000000 */ nop /* A57CA4 802407F4 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s index fe9c426885..5648433c0f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240000_A927C0 -/* A927C0 80240000 3C028011 */ lui $v0, 0x8011 -/* A927C4 80240004 8442F29C */ lh $v0, -0xd64($v0) +/* A927C0 80240000 3C028011 */ lui $v0, %hi(gPlayerData+0xC) +/* A927C4 80240004 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) /* A927C8 80240008 18400003 */ blez $v0, .L80240018 /* A927CC 8024000C 24020001 */ addiu $v0, $zero, 1 /* A927D0 80240010 08090007 */ j .L8024001C diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s index 80c68ebcfc..22b6850ea0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s @@ -42,8 +42,8 @@ glabel func_802403DC_C5AB1C /* C5ABAC 8024046C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C5ABB0 80240470 E440001C */ swc1 $f0, 0x1c($v0) .L80240474: -/* C5ABB4 80240474 3C028011 */ lui $v0, 0x8011 -/* C5ABB8 80240478 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C5ABB4 80240474 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C5ABB8 80240478 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C5ABBC 8024047C 1040000E */ beqz $v0, .L802404B8 /* C5ABC0 80240480 00000000 */ nop /* C5ABC4 80240484 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s index a16bbd1a0c..4107d94080 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s @@ -3,8 +3,8 @@ glabel func_80242D38_C63A48 /* C63A48 80242D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63A4C 80242D3C 3C028011 */ lui $v0, 0x8011 -/* C63A50 80242D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* C63A4C 80242D3C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* C63A50 80242D40 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* C63A54 80242D44 3C014089 */ lui $at, 0x4089 /* C63A58 80242D48 44810800 */ mtc1 $at, $f1 /* C63A5C 80242D4C 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s index ae3cc022c2..91f5ce6c99 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s @@ -12,8 +12,8 @@ glabel func_80240430_C68560 /* C6857C 8024044C AFB50024 */ sw $s5, 0x24($sp) /* C68580 80240450 0200A82D */ daddu $s5, $s0, $zero /* C68584 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C68588 80240458 3C118011 */ lui $s1, 0x8011 -/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C68588 80240458 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C68590 80240460 AFBF0028 */ sw $ra, 0x28($sp) /* C68594 80240464 AFB20018 */ sw $s2, 0x18($sp) /* C68598 80240468 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s index 72cceee892..bfe0eaa7e8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240758_C68888 -/* C68888 80240758 3C028011 */ lui $v0, 0x8011 -/* C6888C 8024075C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C68888 80240758 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C6888C 8024075C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C68890 80240760 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C68894 80240764 AFBF0010 */ sw $ra, 0x10($sp) /* C68898 80240768 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s index 4dc454419d..595e9bc7eb 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s @@ -12,8 +12,8 @@ glabel func_80240120_C76E00 /* C76E1C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* C76E20 80240140 0200A82D */ daddu $s5, $s0, $zero /* C76E24 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* C76E28 80240148 3C118011 */ lui $s1, 0x8011 -/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C76E28 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C76E30 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* C76E34 80240154 AFB20018 */ sw $s2, 0x18($sp) /* C76E38 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s index 0508dc7eed..82da4bb2f8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_C77128 -/* C77128 80240448 3C028011 */ lui $v0, 0x8011 -/* C7712C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C77128 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C7712C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C77130 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C77134 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* C77138 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s index 5fc4cae48e..83315e428b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s @@ -42,8 +42,8 @@ glabel func_80240310_C804B0 /* C80540 802403A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C80544 802403A4 E440001C */ swc1 $f0, 0x1c($v0) .L802403A8: -/* C80548 802403A8 3C028011 */ lui $v0, 0x8011 -/* C8054C 802403AC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C80548 802403A8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C8054C 802403AC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C80550 802403B0 1040000E */ beqz $v0, .L802403EC /* C80554 802403B4 00000000 */ nop /* C80558 802403B8 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s index 34b66ddccc..f5db5f7529 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s @@ -5,8 +5,8 @@ glabel func_80242224_7ECF34 /* 7ECF34 80242224 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7ECF38 80242228 24020001 */ addiu $v0, $zero, 1 /* 7ECF3C 8024222C AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECF40 80242230 3C018011 */ lui $at, 0x8011 -/* 7ECF44 80242234 A022F292 */ sb $v0, -0xd6e($at) +/* 7ECF40 80242230 3C018011 */ lui $at, %hi(gPlayerData+0x2) +/* 7ECF44 80242234 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) /* 7ECF48 80242238 0C03A6DB */ jal sync_status_menu /* 7ECF4C 8024223C 00000000 */ nop /* 7ECF50 80242240 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s index 9fe30cc31d..9ab507f9fd 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s @@ -4,8 +4,8 @@ glabel func_802416CC_E13E2C /* E13E2C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E13E30 802416D0 3C05FE36 */ lui $a1, 0xfe36 -/* E13E34 802416D4 3C068011 */ lui $a2, 0x8011 -/* E13E38 802416D8 84C6F29C */ lh $a2, -0xd64($a2) +/* E13E34 802416D4 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* E13E38 802416D8 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E13E3C 802416DC AFBF0010 */ sw $ra, 0x10($sp) /* E13E40 802416E0 0C0B2026 */ jal set_variable /* E13E44 802416E4 34A53C8A */ ori $a1, $a1, 0x3c8a diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s index 11f9e63790..9ec8c4b87f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s @@ -4,8 +4,8 @@ glabel func_80242314_E18094 /* E18094 80242314 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E18098 80242318 3C05FE36 */ lui $a1, 0xfe36 -/* E1809C 8024231C 3C068011 */ lui $a2, 0x8011 -/* E180A0 80242320 84C6F29C */ lh $a2, -0xd64($a2) +/* E1809C 8024231C 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* E180A0 80242320 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E180A4 80242324 AFBF0010 */ sw $ra, 0x10($sp) /* E180A8 80242328 0C0B2026 */ jal set_variable /* E180AC 8024232C 34A53C8A */ ori $a1, $a1, 0x3c8a diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s index f53c31221c..edc2d8a84b 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241F08_9F6948 -/* 9F6948 80241F08 3C028011 */ lui $v0, 0x8011 -/* 9F694C 80241F0C 8442F29C */ lh $v0, -0xd64($v0) +/* 9F6948 80241F08 3C028011 */ lui $v0, %hi(gPlayerData+0xC) +/* 9F694C 80241F0C 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) /* 9F6950 80241F10 28420064 */ slti $v0, $v0, 0x64 /* 9F6954 80241F14 14400003 */ bnez $v0, .L80241F24 /* 9F6958 80241F18 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s index bdd6db4f0b..8395e83a4f 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s @@ -12,8 +12,8 @@ glabel func_802408B0_DDD0E0 /* DDD0FC 802408CC AFB50024 */ sw $s5, 0x24($sp) /* DDD100 802408D0 0200A82D */ daddu $s5, $s0, $zero /* DDD104 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* DDD108 802408D8 3C118011 */ lui $s1, 0x8011 -/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, -0xd68 +/* DDD108 802408D8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* DDD110 802408E0 AFBF0028 */ sw $ra, 0x28($sp) /* DDD114 802408E4 AFB20018 */ sw $s2, 0x18($sp) /* DDD118 802408E8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s index 9f71ad3c2a..fcf58055c1 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240BD8_DDD408 -/* DDD408 80240BD8 3C028011 */ lui $v0, 0x8011 -/* DDD40C 80240BDC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* DDD408 80240BD8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* DDD40C 80240BDC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* DDD410 80240BE0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DDD414 80240BE4 AFBF0010 */ sw $ra, 0x10($sp) /* DDD418 80240BE8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s index c5260c8342..661b45cb0c 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s @@ -11,8 +11,8 @@ glabel func_80240020_AB2190 /* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 /* AB21AC 8024003C 44021000 */ mfc1 $v0, $f2 /* AB21B0 80240040 00000000 */ nop -/* AB21B4 80240044 3C018011 */ lui $at, 0x8011 -/* AB21B8 80240048 A022EFD5 */ sb $v0, -0x102b($at) +/* AB21B4 80240044 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AB21B8 80240048 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AB21BC 8024004C 24020002 */ addiu $v0, $zero, 2 /* AB21C0 80240050 03E00008 */ jr $ra /* AB21C4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s index ffdeabcd3f..e2a05b2af3 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s @@ -5,8 +5,8 @@ glabel func_80240120_AB2290 /* AB2290 80240120 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AB2294 80240124 AFBF0010 */ sw $ra, 0x10($sp) /* AB2298 80240128 8C82000C */ lw $v0, 0xc($a0) -/* AB229C 8024012C 3C068011 */ lui $a2, 0x8011 -/* AB22A0 80240130 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AB229C 8024012C 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AB22A0 80240130 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AB22A4 80240134 0C0B2026 */ jal set_variable /* AB22A8 80240138 8C450000 */ lw $a1, ($v0) /* AB22AC 8024013C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s index 992bb5f768..1ca8e08a15 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s @@ -12,8 +12,8 @@ glabel func_80240120_D2FDA0 /* D2FDBC 8024013C AFB50024 */ sw $s5, 0x24($sp) /* D2FDC0 80240140 0200A82D */ daddu $s5, $s0, $zero /* D2FDC4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* D2FDC8 80240148 3C118011 */ lui $s1, 0x8011 -/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* D2FDC8 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* D2FDD0 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* D2FDD4 80240154 AFB20018 */ sw $s2, 0x18($sp) /* D2FDD8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s index 0847937065..4b92b691f8 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_D300C8 -/* D300C8 80240448 3C028011 */ lui $v0, 0x8011 -/* D300CC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* D300C8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* D300CC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* D300D0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D300D4 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* D300D8 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s index dfcc790296..f8c1b51d98 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s @@ -12,8 +12,8 @@ glabel func_802401A0_954160 /* 95417C 802401BC AFB50024 */ sw $s5, 0x24($sp) /* 954180 802401C0 0200A82D */ daddu $s5, $s0, $zero /* 954184 802401C4 AFB10014 */ sw $s1, 0x14($sp) -/* 954188 802401C8 3C118011 */ lui $s1, 0x8011 -/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 954188 802401C8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 954190 802401D0 AFBF0028 */ sw $ra, 0x28($sp) /* 954194 802401D4 AFB20018 */ sw $s2, 0x18($sp) /* 954198 802401D8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s index 8bf79961fa..44ffb326cc 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802404C8_954488 -/* 954488 802404C8 3C028011 */ lui $v0, 0x8011 -/* 95448C 802404CC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 954488 802404C8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 95448C 802404CC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 954490 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 954494 802404D4 AFBF0010 */ sw $ra, 0x10($sp) /* 954498 802404D8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s index f012d08dc5..0456b51d0e 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s @@ -12,8 +12,8 @@ glabel func_80240400_879FE0 /* 879FFC 8024041C AFB50024 */ sw $s5, 0x24($sp) /* 87A000 80240420 0200A82D */ daddu $s5, $s0, $zero /* 87A004 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* 87A008 80240428 3C118011 */ lui $s1, 0x8011 -/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 87A008 80240428 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 87A010 80240430 AFBF0028 */ sw $ra, 0x28($sp) /* 87A014 80240434 AFB20018 */ sw $s2, 0x18($sp) /* 87A018 80240438 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s index 882caca4b4..31dd9f6013 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240728_87A308 -/* 87A308 80240728 3C028011 */ lui $v0, 0x8011 -/* 87A30C 8024072C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 87A308 80240728 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 87A30C 8024072C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 87A310 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 87A314 80240734 AFBF0010 */ sw $ra, 0x10($sp) /* 87A318 80240738 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s index baf65714b0..4316a071b1 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s @@ -12,8 +12,8 @@ glabel func_802407A0_886B60 /* 886B7C 802407BC AFB50024 */ sw $s5, 0x24($sp) /* 886B80 802407C0 0200A82D */ daddu $s5, $s0, $zero /* 886B84 802407C4 AFB10014 */ sw $s1, 0x14($sp) -/* 886B88 802407C8 3C118011 */ lui $s1, 0x8011 -/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 886B88 802407C8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 886B90 802407D0 AFBF0028 */ sw $ra, 0x28($sp) /* 886B94 802407D4 AFB20018 */ sw $s2, 0x18($sp) /* 886B98 802407D8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s index ccdcc41a3c..848ec6f9a2 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AC8_886E88 -/* 886E88 80240AC8 3C028011 */ lui $v0, 0x8011 -/* 886E8C 80240ACC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 886E88 80240AC8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 886E8C 80240ACC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 886E90 80240AD0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 886E94 80240AD4 AFBF0010 */ sw $ra, 0x10($sp) /* 886E98 80240AD8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s index f175cb7772..3b5c3812b5 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s @@ -12,8 +12,8 @@ glabel func_80240D3C_88990C /* 889928 80240D58 AFB50024 */ sw $s5, 0x24($sp) /* 88992C 80240D5C 0200A82D */ daddu $s5, $s0, $zero /* 889930 80240D60 AFB10014 */ sw $s1, 0x14($sp) -/* 889934 80240D64 3C118011 */ lui $s1, 0x8011 -/* 889938 80240D68 2631F298 */ addiu $s1, $s1, -0xd68 +/* 889934 80240D64 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 889938 80240D68 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 88993C 80240D6C AFBF0028 */ sw $ra, 0x28($sp) /* 889940 80240D70 AFB20018 */ sw $s2, 0x18($sp) /* 889944 80240D74 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s index 0a9d47f416..1d3b0c3706 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241064_889C34 -/* 889C34 80241064 3C028011 */ lui $v0, 0x8011 -/* 889C38 80241068 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 889C34 80241064 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 889C38 80241068 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 889C3C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 889C40 80241070 AFBF0010 */ sw $ra, 0x10($sp) /* 889C44 80241074 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s index 6af3cd00aa..71b84ffbed 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AD0_890670 -/* 890670 80240AD0 3C068011 */ lui $a2, 0x8011 -/* 890674 80240AD4 84C6F29C */ lh $a2, -0xd64($a2) +/* 890670 80240AD0 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* 890674 80240AD4 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* 890678 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 89067C 80240ADC AFBF0010 */ sw $ra, 0x10($sp) /* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s index 809235df88..c35cdb854f 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s @@ -12,8 +12,8 @@ glabel func_80240150_892B70 /* 892B8C 8024016C AFB50024 */ sw $s5, 0x24($sp) /* 892B90 80240170 0200A82D */ daddu $s5, $s0, $zero /* 892B94 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* 892B98 80240178 3C118011 */ lui $s1, 0x8011 -/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 892B98 80240178 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 892BA0 80240180 AFBF0028 */ sw $ra, 0x28($sp) /* 892BA4 80240184 AFB20018 */ sw $s2, 0x18($sp) /* 892BA8 80240188 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s index fc1c5daadf..fa7adf807c 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240478_892E98 -/* 892E98 80240478 3C028011 */ lui $v0, 0x8011 -/* 892E9C 8024047C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 892E98 80240478 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 892E9C 8024047C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 892EA0 80240480 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 892EA4 80240484 AFBF0010 */ sw $ra, 0x10($sp) /* 892EA8 80240488 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s index b4830cf40d..9d6fab67d9 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s @@ -12,8 +12,8 @@ glabel func_80240710_897CF0 /* 897D0C 8024072C AFB50024 */ sw $s5, 0x24($sp) /* 897D10 80240730 0200A82D */ daddu $s5, $s0, $zero /* 897D14 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* 897D18 80240738 3C118011 */ lui $s1, 0x8011 -/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 897D18 80240738 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 897D20 80240740 AFBF0028 */ sw $ra, 0x28($sp) /* 897D24 80240744 AFB20018 */ sw $s2, 0x18($sp) /* 897D28 80240748 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s index b70f6286fe..5e8d297207 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240A38_898018 -/* 898018 80240A38 3C028011 */ lui $v0, 0x8011 -/* 89801C 80240A3C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 898018 80240A38 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 89801C 80240A3C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 898020 80240A40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 898024 80240A44 AFBF0010 */ sw $ra, 0x10($sp) /* 898028 80240A48 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s index fe2a36ff96..9107c8a9ef 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -23,8 +23,8 @@ glabel func_80240508_9AEC08 /* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 /* 9AEC54 80240554 0C0B210B */ jal get_float_variable /* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero -/* 9AEC5C 8024055C 3C028011 */ lui $v0, 0x8011 -/* 9AEC60 80240560 8442F078 */ lh $v0, -0xf88($v0) +/* 9AEC5C 8024055C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) +/* 9AEC60 80240560 8442F078 */ lh $v0, %lo(gPlayerStatus+0xB0)($v0) /* 9AEC64 80240564 3C018024 */ lui $at, 0x8024 /* 9AEC68 80240568 D4223078 */ ldc1 $f2, 0x3078($at) /* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s index 2ec406ce53..b9206ebf5f 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240820_9C3130 -/* 9C3130 80240820 3C038011 */ lui $v1, 0x8011 -/* 9C3134 80240824 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 9C3130 80240820 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 9C3134 80240824 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 /* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C /* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) diff --git a/include/functions.h b/include/functions.h index e4afc452a8..545f4ec24e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -9,6 +9,7 @@ void osCleanupThread(void); s32 heap_malloc(s32 size); HeapNode* _heap_create(void* addr, s32 size); +void dma_copy(void* romStart, void* romEnd, void* vramDest); s32 get_global_byte(s32 index); s32 get_global_flag(s32 index); diff --git a/include/map.h b/include/map.h index b06d236645..17c78e59ac 100644 --- a/include/map.h +++ b/include/map.h @@ -33,6 +33,8 @@ typedef struct MapConfig { } tattle; } MapConfig; // size = 0x40 +typedef s32 MapInit(void); + #define MAP_ID_MAX_LEN 7 ///< "xxx_yyy" excluding null terminator. typedef struct Map { /* 0x00 */ char* id; ///< @see MAP_ID_MAX_LEN @@ -41,10 +43,10 @@ typedef struct Map { /* 0x0C */ void* dmaEnd; /* 0x10 */ void* dmaDest; /* 0x14 */ char* bgName; - /* 0x18 */ s32(*init)(void); ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading. - /* 0x1C */ s16 flags1; - /* 0x1E */ s8 flags2; - /* 0x1F */ s8 flags3; + /* 0x18 */ MapInit* init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading. + /* 0x1C */ s16 unk_1C; // Unused? + /* 0x1E */ s8 songVariation; ///< 0 or 1. @see get_song_variation_override_for_cur_map + /* 0x1F */ s8 flags; } Map; // size = 0x20 typedef struct Area { @@ -246,9 +248,9 @@ typedef struct { Enemy* get_enemy(NpcId npcId); /// Zero-terminated. -extern Area gAreas[]; +Area gAreas[29]; -/// Lists the songs that are forced to use the variation determined by `map.flags2 & 1`. +/// Lists the songs that are forced to use the variation determined by `map.songVariation & 1`. /// @see get_song_variation_override_for_cur_map extern SongID gSongsUsingVariationFlag[6]; diff --git a/include/variables.h b/include/variables.h index a803133bfc..17539ff3f0 100644 --- a/include/variables.h +++ b/include/variables.h @@ -160,10 +160,6 @@ extern s32 D_8009A5D8; extern u8 D_800779B0; extern u8 D_800A0963; -extern s32 mapScriptLibStart; -extern s32 mapScriptLibEnd; -extern s32 mapScriptLibVram; - // Scripts extern Bytecode* SCRIPT_NpcDefeat; extern Bytecode* ShakeCam1; diff --git a/requirements.txt b/requirements.txt index 450238e89e..779222e276 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ capstone PyYAML lark-parser +python-ranges pypng diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c deleted file mode 100644 index 2cf1492877..0000000000 --- a/src/code_341d0_len_20d0.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4); - -void func_80059C80(void) { -} - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C); - -void func_80059D48(void) { -} - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect); - -void load_map_script_lib(void) { - dma_copy(&mapScriptLibStart, &mapScriptLibEnd, &mapScriptLibVram); -} - -INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name); - -INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize); - -INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index b38715016e..5a96a65017 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -53,7 +53,7 @@ void copy_matrix(Matrix4f* src, Matrix4f* dest) { bcopy(src, dest, sizeof(Matrix4f)); } -INCLUDE_ASM(s32, "code_42e0_len_1f60", dma_copy); +INCLUDE_ASM(void, "code_42e0_len_1f60", dma_copy, void* romStart, void* romEnd, void* vramDest); INCLUDE_ASM(s32, "code_42e0_len_1f60", func_800297D4); diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index 4cf4fdfe38..e82a8caaa3 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -4,7 +4,7 @@ void transition_music_volume_to(s16 volume); /// If the given song ID is present in gSongsUsingVariationFlag, returns the current -/// map's `flags2 & 1` value. Otherwise, returns -1. +/// map's `songVariation & 1` value. Otherwise, returns -1. /// /// @see gSongsUsingVariationFlag /// @returns -1: no override; 0: override to variation 0; 1 override to variation 1 @@ -17,7 +17,7 @@ s32 get_song_variation_override_for_cur_map(SongID songID) { if (allowed[i] == songID) { Map* map = &areas[GAME_STATUS->areaID].maps[GAME_STATUS->mapID]; - return map->flags2 & 1; + return map->songVariation & 1; } } diff --git a/src/world/area_end/end_01/E05390.c b/src/world/area_end/end_01/E05390.c index 94107c3521..a2979d96c7 100644 --- a/src/world/area_end/end_01/E05390.c +++ b/src/world/area_end/end_01/E05390.c @@ -47,17 +47,3 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427E8_E07B48); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242840_E07BA0); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_8024289C_E07BFC); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802428C0_E07C20); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242900_E07C60); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242978_E07CD8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242A68_E07DC8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242B68_E07EC8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C68_E07FC8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C94_E07FF4); diff --git a/src/world/area_end/end_01/E07C20.c b/src/world/area_end/end_01/E07C20.c new file mode 100644 index 0000000000..8b2f6350ad --- /dev/null +++ b/src/world/area_end/end_01/E07C20.c @@ -0,0 +1,15 @@ +#include "end_01.h" + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_802428C0_E07C20); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242900_E07C60); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242978_E07CD8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242A68_E07DC8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242B68_E07EC8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C68_E07FC8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C94_E07FF4); diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h index 406b7f4299..573ea67911 100644 --- a/src/world/area_kmr/kmr_12/kmr_12.h +++ b/src/world/area_kmr/kmr_12/kmr_12.h @@ -8,6 +8,8 @@ #define GetGoomba M(GetGoomba) ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall); +MapConfig M(config); + Script M(Main); Script M(PlayMusic); Script M(MakeEntities); diff --git a/src/code_7e0e80.c b/src/world/script_api/7E0E80.c similarity index 100% rename from src/code_7e0e80.c rename to src/world/script_api/7E0E80.c diff --git a/src/code_7E2AA0.c b/src/world/script_api/7E2AA0.c similarity index 100% rename from src/code_7E2AA0.c rename to src/world/script_api/7E2AA0.c diff --git a/src/code_7E3700.c b/src/world/script_api/7E3700.c similarity index 100% rename from src/code_7E3700.c rename to src/world/script_api/7E3700.c diff --git a/src/world/world.c b/src/world/world.c new file mode 100644 index 0000000000..378d91329e --- /dev/null +++ b/src/world/world.c @@ -0,0 +1,661 @@ +#include "common.h" +#include "ld_addrs.h" +#include "map.h" + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4); + +void func_80059C80(void) { +} + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C); + +void func_80059D48(void) { +} + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect); + +void load_world_script_api(void) { + dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM); +} + +// TODO +static const s32 rodata_73DA0[] = { + 0x82C882B5, 0x00000000, 0x82A982AD, 0x82B982A2, + 0x00000000, 0x82B982C1, 0x82AB82E5, 0x82A40000, + 0x82DE82C9, 0x82E182DE, 0x82C982E1, 0x00000000, + 0x82D082C6, 0x82E882DA, 0x82AF0000, 0x83748340, + 0x83438369, 0x838B837B, 0x83808377, 0x83430000, + 0x83748340, 0x83438369, 0x838B834E, 0x838A8357, + 0x83430000, 0X82C282A4, 0x82B682E5, 0x82A40000, + + // These string literals belong to load_map_by_IDs + 0x25735F73, 0x68617065, 0x00000000, // "%_shape" + 0x25735F68, 0x69740000, // "%s_hit" + 0x25735F74, 0x65780000, // "%s_tex" +}; + +INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name); + +INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize); + +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset); + +#define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), area##_maps, "area_" #area, jp_name } + +#define MAP(map) \ + .id = #map, \ + .config = &map##_config, \ + .dmaStart = &code_##map##_ROM_START, \ + .dmaEnd = &code_##map##_ROM_END, \ + .dmaDest = &code_##map##_VRAM \ + +// Should be removed once the data section containing .init and .config of all maps have been disassembled +#define MAP_UNSPLIT(map, configVRAM) \ + .id = #map, \ + .config = (MapConfig*)(configVRAM), \ + .dmaStart = &code_##map##_ROM_START, \ + .dmaEnd = &code_##map##_ROM_END, \ + .dmaDest = &code_##map##_VRAM \ + +/// Toad Town +static Map mac_maps[] = { + { MAP_UNSPLIT(machi, 0x802407A0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mac_00, 0x80243BE0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mac_01, 0x80246730), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mac_02, 0x80243580), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mac_03, 0x802428B0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(mac_05, 0x802441A0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mac_06, 0x802416A0), .bgName = "nok_bg" }, +}; + +/// Toad Town Tunnels +static Map tik_maps[] = { + { MAP_UNSPLIT(tik_01, 0x80240AE0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_02, 0x802409B0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_03, 0x80240B00), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_04, 0x80240CB0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_05, 0x80240A90), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_06, 0x802409A0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_07, 0x80242920), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_08, 0x80240B10), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_09, 0x802412D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_10, 0x802413D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_12, 0x80242260), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_14, 0x80240980), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_15, 0x80240B30), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_17, 0x80241380), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_18, 0x802406D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_19, 0x80241340), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_20, 0x80241170), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_21, 0x80240990), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_22, 0x802409D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_23, 0x80241160), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(tik_24, 0x80240ED0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(tik_25, 0x802407D0), .songVariation = 1, .flags = 2 }, +}; + +/// Inside the Whale +static Map kgr_maps[] = { + { MAP_UNSPLIT(kgr_01, 0x80240540), .flags = 1 }, + { MAP_UNSPLIT(kgr_02, 0x80240790), .flags = 1 }, +}; + +/// Goomba Region +MapConfig kmr_12_config; +static Map kmr_maps[] = { + { MAP_UNSPLIT(kmr_00, 0x80240D80), .bgName = "kmr_bg", .flags = 1 }, + { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_03, 0x80240680), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_04, 0x80240520), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_05, 0x802417A0), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_06, 0x80241DC0), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_07, 0x80240B70), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_09, 0x80241550), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_10, 0x80240640), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_11, 0x80241180), .bgName = "kmr_bg" }, + { MAP(kmr_12), .bgName = "kmr_bg" }, + { MAP_UNSPLIT(kmr_20, 0x80242C00), .bgName = "kmr_bg" }, // Mario's House + { MAP_UNSPLIT(kmr_21, 0x802402F0), .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kmr_22, 0x80240DA0), .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kmr_23, 0x80241150), .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kmr_24, 0x80240120), .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kmr_30, 0x802404F0) }, +}; + +/// Mt. Rugged +static Map iwa_maps[] = { + { MAP_UNSPLIT(iwa_00, 0x80240310), .bgName = "iwa_bg" }, + { MAP_UNSPLIT(iwa_01, 0x80243320), .bgName = "iwa_bg" }, + { MAP_UNSPLIT(iwa_02, 0x80241140), .bgName = "iwa_bg" }, + { MAP_UNSPLIT(iwa_03, 0x80241360), .bgName = "iwa_bg" }, + { MAP_UNSPLIT(iwa_04, 0x80241100), .bgName = "iwa_bg" }, + { MAP_UNSPLIT(iwa_10, 0x80241810), .bgName = "iwa_bg" }, + { MAP_UNSPLIT(iwa_11, 0x80240330), .bgName = "iwa_bg" }, +}; + +/// Dry Dry Outpost +static Map dro_maps[] = { + { MAP_UNSPLIT(dro_01, 0x80243B70), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(dro_02, 0x80243AB0), .bgName = "sbk_bg" }, +}; + +/// Dry Dry Desert +static Map sbk_maps[] = { + { MAP_UNSPLIT(sbk_00, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_01, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_02, 0x80240C80), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_03, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_04, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_05, 0x802400B0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_06, 0x802403C0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_10, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_11, 0x802401A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_12, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_13, 0x802401A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_14, 0x80240090), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_15, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_16, 0x802402C0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_20, 0x80240180), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_21, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_22, 0x802401A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_23, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_24, 0x802403D0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_25, 0x802403C0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_26, 0x802403E0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_30, 0x80241870), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_31, 0x80240180), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_32, 0x802401B0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_33, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_34, 0x80240A20), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_35, 0x802403C0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_36, 0x802402C0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_40, 0x80240180), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_41, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_42, 0x80240180), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_43, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_44, 0x802401A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_45, 0x80240090), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_46, 0x802403E0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_50, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_51, 0x802401A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_52, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_53, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_54, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_55, 0x802402E0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_56, 0x80241040), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_60, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_61, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_62, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_63, 0x802400A0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_64, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_65, 0x80240080), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_66, 0x802403C0), .bgName = "sbk_bg" }, + { MAP_UNSPLIT(sbk_99, 0x80240020), .bgName = "sbk_bg" }, +}; + +/// Dry Dry Ruins +static Map isk_maps[] = { + { MAP_UNSPLIT(isk_01, 0x80240020), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_02, 0x80240140), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_03, 0x80240030), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_04, 0x80240AD0), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_05, 0x80241ED0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_06, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_07, 0x80240130), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_08, 0x80240930), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_09, 0x80240340), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_10, 0x80240DE0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_11, 0x802401A0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_12, 0x80240040), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_13, 0x80242080), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_14, 0x80241D70), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_16, 0x80240B20), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_18, 0x80240910), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(isk_19, 0x80240020), .songVariation = 1, .flags = 2 }, +}; + +/// Koopa Bros. Fortress +static Map trd_maps[] = { + { MAP_UNSPLIT(trd_00, 0x80240690), .bgName = "nok_bg" }, + { MAP_UNSPLIT(trd_01, 0x80241700), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_02, 0x80241AA0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_03, 0x80240A40), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_04, 0x80243900), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_05, 0x802407B0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_06, 0x80240D60), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_07, 0x80242910), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_08, 0x80240A30), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(trd_09, 0x80240200), .bgName = "nok_bg" }, + { MAP_UNSPLIT(trd_10, 0x80240870), .songVariation = 1, .flags = 3 }, +}; + +/// Koopa Region +static Map nok_maps[] = { + { MAP_UNSPLIT(nok_01, 0x80242B90), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_02, 0x802445F0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_03, 0x80240E40), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_04, 0x80240F40), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_11, 0x80241F70), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_12, 0x80242100), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_13, 0x802414C0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_14, 0x80242440), .bgName = "nok_bg" }, + { MAP_UNSPLIT(nok_15, 0x802427D0), .bgName = "nok_bg" }, +}; + +/// Star Region +static Map hos_maps[] = { + { MAP_UNSPLIT(hos_00, 0x80240D50), .bgName = "nok_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(hos_01, 0x80240E40), .bgName = "hos_bg" }, + { MAP_UNSPLIT(hos_02, 0x80242B90), .bgName = "hos_bg" }, + { MAP_UNSPLIT(hos_03, 0x802435F0), .bgName = "hos_bg" }, + { MAP_UNSPLIT(hos_04, 0x80240EE0), .bgName = "hos_bg" }, + { MAP_UNSPLIT(hos_05, 0x80245910), .bgName = "hos_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(hos_06, 0x80242570), .bgName = "hos_bg" }, + { MAP_UNSPLIT(hos_10, 0x80240CE0), .bgName = "hos_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(hos_20, 0x80240390), .bgName = "hos_bg" }, +}; + +/// Bowser's Castle +static Map kpa_maps[] = { + { MAP_UNSPLIT(kpa_01, 0x80240A70), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_03, 0x80241EE0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_04, 0x80240190), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_08, 0x802414C0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_09, 0x80241310), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_10, 0x80240360), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_11, 0x80240B40), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_12, 0x802404A0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_13, 0x802404A0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_17, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_32, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_33, 0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_40, 0x80240040), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_41, 0x80240040), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_50, 0x80241A40), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_51, 0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_52, 0x80241360), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_53, 0x80240190), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_60, 0x80240450), .bgName = "kpa_bg" }, + { MAP_UNSPLIT(kpa_61, 0x80242360), .bgName = "kpa_bg" }, + { MAP_UNSPLIT(kpa_62, 0x80240430), .bgName = "kpa_bg" }, + { MAP_UNSPLIT(kpa_63, 0x802401B0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_70, 0x80240B10), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_90, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_91, 0x80241920), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_113, 0x80240AD0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kpa_115, 0x802413F0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_116, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_117, 0x80240010), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(kpa_118, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_119, 0x80240010), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(kpa_121, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kpa_130, 0x80240760), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_133, 0x802404B0), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kpa_134, 0x80240740), .songVariation = 1, .flags = 3 }, +}; + +/// Peach's Castle Grounds +static Map osr_maps[] = { + { MAP_UNSPLIT(osr_00, 0x802407E0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(osr_01, 0x80240B00), .bgName = "nok_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(osr_02, 0x80240170), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(osr_03, 0x802403F0), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(osr_04, 0x802400D0), .bgName = "nok_bg", .init = (MapInit*)0x80240000 }, +}; + +/// Peach's Castle +/// @bug There are two entries for kkj_26; the latter is unreachable. +static Map kkj_maps[] = { + { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .songVariation = 1, .flags = 3, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kkj_01, 0x80240F10), .bgName = "nok_bg", .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .flags = 2 }, + { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .flags = 3, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kkj_10, 0x80241120), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kkj_11, 0x80241160), .songVariation = 1, .flags = 3 }, + { MAP_UNSPLIT(kkj_12, 0x802408D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .flags = 3, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kkj_15, 0x80240640) }, + { MAP_UNSPLIT(kkj_16, 0x80241090), .flags = 0x1 }, + { MAP_UNSPLIT(kkj_17, 0x802405B0) }, + { MAP_UNSPLIT(kkj_18, 0x80240830), .bgName = "kpa_bg" }, + { MAP_UNSPLIT(kkj_19, 0x80240D20) }, + { MAP_UNSPLIT(kkj_20, 0x80240600) }, + { MAP_UNSPLIT(kkj_21, 0x80240010), .flags = 0x1 }, + { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(kkj_26, 0x80240070), .bgName = "kpa_bg" }, + { MAP_UNSPLIT(kkj_26, 0x80240070), .flags = 0x2 }, + { MAP_UNSPLIT(kkj_27, 0x802404C0), .flags = 0x1 }, + { MAP_UNSPLIT(kkj_28, 0x80240010), .flags = 0x1 }, + { MAP_UNSPLIT(kkj_29, 0x80240080), .flags = 0x1 }, +}; + +/// Jade Jungle +static Map jan_maps[] = { + { MAP_UNSPLIT(jan_00, 0x80241BD0), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_01, 0x802413F0), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_02, 0x80242940), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_03, 0x802432D0), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_04, 0x80241140), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_05, 0x80242710), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_06, 0x80242620), .bgName = "jan_bg" }, + { MAP_UNSPLIT(jan_07, 0x80241230), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_08, 0x80242460), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_09, 0x80241960), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_10, 0x80241750), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_11, 0x80240810), .bgName = "jan_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(jan_12, 0x80241280), .bgName = "jan_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(jan_13, 0x802405F0), .bgName = "jan_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(jan_14, 0x80241300), .bgName = "jan_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(jan_15, 0x80240320), .bgName = "jan_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(jan_16, 0x80240590), .bgName = "jan_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(jan_17, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(jan_18, 0x80240020), .bgName = "yos_bg" }, + { MAP_UNSPLIT(jan_19, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(jan_22, 0x802419A0), .bgName = "jan_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(jan_23, 0x80240010), .bgName = "yos_bg" }, +}; + +/// Forever Forest +static Map mim_maps[] = { + { MAP_UNSPLIT(mim_01, 0x80241EF0), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_02, 0x80241220), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_03, 0x80240570), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_04, 0x80241170), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_05, 0x80241A60), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_06, 0x80242D70), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_07, 0x802410D0), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_08, 0x80242F80), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_09, 0x80240F00), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_10, 0x802401B0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(mim_11, 0x80240C20), .bgName = "obk_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(mim_12, 0x80240600), .bgName = "arn_bg", .songVariation = 1, .flags = 2 }, +}; + +/// Boo's Mansion +static Map obk_maps[] = { + { MAP_UNSPLIT(obk_01, 0x802411B0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(obk_02, 0x802402E0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_03, 0x80241020), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_04, 0x80240E90), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_05, 0x802409F0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_06, 0x80240020), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_07, 0x80241BA0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_08, 0x802417B0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(obk_09, 0x80240460), .songVariation = 1, .flags = 2 }, +}; + +/// Gusty Gulch +static Map arn_maps[] = { + { MAP_UNSPLIT(arn_02, 0x80241000), .bgName = "arn_bg" }, + { MAP_UNSPLIT(arn_03, 0x80241740), .bgName = "arn_bg" }, + { MAP_UNSPLIT(arn_04, 0x80243390), .bgName = "arn_bg" }, + { MAP_UNSPLIT(arn_05, 0x80241320), .bgName = "arn_bg" }, + { MAP_UNSPLIT(arn_07, 0x80241ED0), .bgName = "arn_bg" }, + { MAP_UNSPLIT(arn_08, 0x802402C0), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(arn_09, 0x80240060), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(arn_10, 0x80240020), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(arn_11, 0x80240010), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(arn_12, 0x80240020), .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(arn_13, 0x80240020), .songVariation = 1, .flags = 1 }, +}; + +/// Tubba Blubba's Castle +static Map dgb_maps[] = { + { MAP_UNSPLIT(dgb_00, 0x802400D0), .bgName = "arn_bg", .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(dgb_01, 0x80243460), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_02, 0x80241470), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_03, 0x80242830), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_04, 0x80243130), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_05, 0x802414A0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_06, 0x802402E0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_07, 0x80241450), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_08, 0x80243CB0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_09, 0x80243840), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_10, 0x80240210), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_11, 0x80240090), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_12, 0x802402D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_13, 0x80240010), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_14, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_15, 0x802418A0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_16, 0x80241440), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_17, 0x80240020), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(dgb_18, 0x80241280), .songVariation = 1, .flags = 2 }, +}; + +/// Mt. Lavalava +static Map kzn_maps[] = { + { MAP_UNSPLIT(kzn_01, 0x80240330), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_02, 0x80242850), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_03, 0x802430E0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_04, 0x80241770), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_05, 0x80240330), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_06, 0x80240AA0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_07, 0x80242320), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_08, 0x80244130), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_09, 0x80243A40), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_10, 0x802406F0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_11, 0x80242680), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_17, 0x802430C0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_18, 0x802403F0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_19, 0x80241D70), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_20, 0x80240AE0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_22, 0x802403A0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(kzn_23, 0x80240630), .bgName = "yos_bg", .songVariation = 1, .flags = 2 }, +}; + +/// Flower Fields +static Map flo_maps[] = { + { MAP_UNSPLIT(flo_00, 0x80241490), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_03, 0x80240660), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_07, 0x80240760), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_08, 0x80241F00), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_09, 0x80241840), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_10, 0x802414A0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_11, 0x802403A0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_12, 0x80240710), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_13, 0x80243690), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_14, 0x802423B0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_15, 0x80240020), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_16, 0x80242990), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_17, 0x80243240), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_18, 0x802407F0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_19, 0x80240980), .bgName = "sra_bg" }, + { MAP_UNSPLIT(flo_21, 0x80240D00), .bgName = "sra_bg" }, + { MAP_UNSPLIT(flo_22, 0x802402A0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_23, 0x80240CF0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_24, 0x802405C0), .bgName = "fla_bg" }, + { MAP_UNSPLIT(flo_25, 0x802422F0), .bgName = "fla_bg" }, +}; + +/// Shiver Region +static Map sam_maps[] = { + { MAP_UNSPLIT(sam_01, 0x80241F70), .bgName = "yki_bg" }, + { MAP_UNSPLIT(sam_02, 0x80241C00), .bgName = "yki_bg" }, + { MAP_UNSPLIT(sam_03, 0x80240940), .bgName = "yki_bg" }, + { MAP_UNSPLIT(sam_04, 0x80240740), .bgName = "yki_bg" }, + { MAP_UNSPLIT(sam_05, 0x80241D60), .bgName = "sam_bg" }, + { MAP_UNSPLIT(sam_06, 0x80242630), .bgName = "sam_bg" }, + { MAP_UNSPLIT(sam_07, 0x80242020), .bgName = "yki_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(sam_08, 0x802417D0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(sam_09, 0x80240420), .bgName = "yki_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(sam_10, 0x80240CE0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 }, + { MAP_UNSPLIT(sam_11, 0x802421A0), .bgName = "yki_bg" }, + { MAP_UNSPLIT(sam_12, 0x802403B0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 }, +}; + +/// Crystal Palace +static Map pra_maps[] = { + { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_06, 0x80240F60), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(pra_40, 0x80240F40), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 }, +}; + +/// Shy Guy's Toy Box +static Map omo_maps[] = { + { MAP_UNSPLIT(omo_01, 0x80240C40), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_02, 0x80242BD0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_03, 0x80240900), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_04, 0x80241F30), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_05, 0x80242440), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_06, 0x80240B80), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_07, 0x80243310), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_08, 0x80240E10), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_09, 0x80243700), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_10, 0x802408B0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_11, 0x802414F0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_12, 0x802404D0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_13, 0x80241510), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_14, 0x802405E0), .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_15, 0x80240810), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_16, 0x80240620), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, + { MAP_UNSPLIT(omo_17, 0x80243770), .bgName = "omo_bg", .songVariation = 1, .flags = 2 }, +}; + +/// Debug +static Map tst_maps[] = { + { MAP_UNSPLIT(tst_01, 0x802400B0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_02, 0x802400B0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_03, 0x802400B0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_04, 0x80240740), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_10, 0x80240040), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_11, 0x80240780), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_12, 0x80240010), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_13, 0x802403D0), .bgName = "nok_bg" }, + { MAP_UNSPLIT(tst_20, 0x80240010), .bgName = "nok_bg" }, +}; + +/// Credits +static Map end_maps[] = { + { MAP_UNSPLIT(end_00, 0x80242B50), .init = (MapInit*)0x80240000 }, + { MAP_UNSPLIT(end_01, 0x80243000), .init = (MapInit*)0x80240000 }, +}; + +/// Toad Town Playroom +static Map mgm_maps[] = { + { MAP_UNSPLIT(mgm_00, 0x80241810) }, + { MAP_UNSPLIT(mgm_01, 0x802417C0) }, + { MAP_UNSPLIT(mgm_02, 0x80242410) }, + { MAP_UNSPLIT(mgm_03, 0x80240010) }, +}; + +/// Game Over +static Map gv_maps[] = { + { MAP_UNSPLIT(gv_01, 0x802407D0) }, +}; + +Area gAreas[] = { + AREA(kmr, "クリむら"), // kuri mura [kuribou village, Goomba Village] + AREA(mac, "まち"), // machi [town, Toad Town] + AREA(tik, "まちのちか"), // machi no chika [under the town, Toad Town Tunnels] + AREA(kgr, "くじらのなか"), // kujira no naka [inside the whale] + AREA(kkj, "きのこ城"), // kinoko shiro [mushroom castle, Princess Peach's Castle] + AREA(hos, "星ふる丘"), // hoshi furu oka [star fall hill, Shooting Star Summit] + AREA(nok, "ノコノコむら"), // nokonoko mura [nokonoko village, Koopa Village] + AREA(trd, "とりで"), // toride [fortress, Koopa Bros. Fortress] + AREA(iwa, "岩山"), // iwayama [rock mountain, Mt. Rugged] + AREA(dro, "カラカラタウン"), // karakara taun [dried up town, Dry Dry Outpost] + AREA(sbk, "カラカラ砂漠"), // karakara sabaku [dried up desert, Dry Dry Desert] + AREA(isk, "カラカラいせき"), // karakara iseki [dried up ruins, Dry Dry Ruins] + AREA(mim, "迷いの森"), // mayoi no mori [lost forest, Forever Forest] + AREA(obk, "テレサハウス"), // teresa hausu [teresa house, Boo's Mansion] + AREA(arn, "あれの"), // areno [wasteland, Gusty Gulch] + AREA(dgb, "ドガボンの城"), // dogabon no shiro [dogabon's castle, Tubba Blubba's Castle] + AREA(omo, "ヘイホーのおもちゃばこ"), // heiho no omochabako [heiho's toy box, Shy Guy's Toy Box] + AREA(jan, "ジャングル"), // janguru [jungle, Jade Jungle] + AREA(kzn, "火山"), // kazan [volcano, Mt. Lavalava] + AREA(flo, "フラワーランド"), // furawaa rando [flower land, Flower Fields] + AREA(sam, "さむいさむい村"), // samui samui mura [cold cold village, Shiver City] + AREA(pra, "パラレルきゅうでん"), // parareru kyuuden [parallel palace, Crystal Palace] + AREA(kpa, "クッパ城"), // kuppa shiro [koopa's castle, Bowser's Castle] + AREA(osr, "きのこ城そと"), // kinoko shiro soto [outside mushroom castle, Outside Peach's Castle] + AREA(end, "エンディング"), // endingu [Ending] + AREA(mgm, "ミニゲーム"), // minige-mu [Minigames] + AREA(gv, "ゲームオーバー"), // ge-mu o-ba- [Game Over] + AREA(tst, "テストマップ"), // tesuto mappu [Test map] + 0, 0, 0, 0, +}; diff --git a/tools/convert_image.py b/tools/convert_image.py index afc92d94bc..d9fc14a4d7 100755 --- a/tools/convert_image.py +++ b/tools/convert_image.py @@ -84,7 +84,7 @@ class Converter(): for a, b in iter_in_groups(row, 2): byte = (a << 4) | b f.write(byte.to_bytes(1, byteorder="big")) - elif self.mode == "ci8palette" or self.mode == "ci4palette": + elif self.mode == "palette": img.preamble(True) palette = img.palette(alpha="force") diff --git a/tools/n64splat b/tools/n64splat index e7a811adf8..42c5f587eb 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit e7a811adf8e9cc5505c0992d0e73e9589c6ccd2e +Subproject commit 42c5f587eb8b2bc669f2710c93ff10c46ae48dc3 diff --git a/tools/sort_symbol_addrs.py b/tools/sort_symbol_addrs.py new file mode 100644 index 0000000000..0e4ed32e8b --- /dev/null +++ b/tools/sort_symbol_addrs.py @@ -0,0 +1,26 @@ +#!/usr/bin/python3 + +from collections import OrderedDict +import os +import sys + +script_dir = os.path.dirname(os.path.realpath(__file__)) + +syms = {} + +file_path = os.path.join(script_dir, "symbol_addrs.txt") + +with open(file_path) as f: + symbol_lines = f.readlines() + +for line in symbol_lines: + addr_text = line.split(" = ")[1][:10] + addr = int(addr_text, 0) + if addr in syms: + print("Duplicate address: " + addr_text) + sys.exit(55) + syms[addr] = line + +with open(file_path, newline="\n", mode="w") as f: + for addr in sorted(syms): + f.write(syms[addr]) diff --git a/tools/splat.yaml b/tools/splat.yaml index 58f2b70121..202fb55e81 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -58,7 +58,7 @@ segments: - [0x2d9a0, "c", "code_2d9a0_len_890"] - [0x2e230, "c", "code_2e230_len_2190"] - [0x303c0, "c", "code_303c0_len_3e10"] - - [0x341d0, "c", "code_341d0_len_20d0"] + - [0x341d0, "c", "world/world"] - [0x362a0, "c", "code_362a0_len_2f70"] - [0x39210, "c", "code_39210_len_aa0"] - [0x39cb0, "c", "os/code_39cb0_len_100"] @@ -197,7 +197,11 @@ segments: - [0x4a360, "c", "os/code_4a360_len_930"] - [0x4ac90, "c", "os/code_4ac90_len_3910"] - [0x4E5A0, "bin"] - - [0x6E8F0, "bin", "world/area_table"] + - [0x52D50, "bin"] + - [0x6B450, ".data", "world/world"] + - [0x6EAC0, "bin"] # has scripts + - [0x73DA0, ".rodata", "world/world"] + - [0x74EA0, "bin"] - type: code start: 0x759B0 vram: 0x800DC500 @@ -212,13 +216,13 @@ segments: - [0x8a860, "c", "code_8a860_len_3f30"] - [0x8e790, "c", "code_8e790_len_2850"] - [0x90fe0, "bin"] - - [0x93CD0, ci4, ui/hammer, 32, 32] - - [0x93ED0, ci4palette, ui/hammer] - - [0x93EF0, ci4palette, ui/hammer.disabled] + - [0x93CD0, ci4, ui/hammer, 32, 32] + - [0x93ED0, palette, ui/hammer] + - [0x93EF0, palette, ui/hammer.disabled] - [0x93FF0, bin] - - [0x9D658, rgba32, ui/stat_heart, 16, 16] + - [0x9D658, rgba32, ui/stat_heart, 16, 16] - [0x9DA58, bin] - - [0x9DA60, rgba32, ui/stat_flower, 16, 16] + - [0x9DA60, rgba32, ui/stat_flower, 16, 16] - [0x9DE60, bin] - type: code start: 0xA5DD0 @@ -277,15 +281,15 @@ segments: - [0x1086a0, "c", "code_1086a0_len_fc0"] - [0x109660, "c", "code_109660_len_1270"] - [0x10A8D0, "c", "code_10A8D0"] - - [0x10A9F0, i4, shadow/square, 16, 16] - - [0x10AA70, i4, shadow/circle, 16, 16] + - [0x10A9F0, i4, shadow/square, 16, 16] + - [0x10AA70, i4, shadow/circle, 16, 16] - [0x10AAF0, bin] - - [0x10AB70, i4, shadow/10AB70, 32, 32] - - [0x10AD70, i4, shadow/10AD70, 32, 32] + - [0x10AB70, i4, shadow/10AB70, 32, 32] + - [0x10AD70, i4, shadow/10AD70, 32, 32] - [0x10AF70, bin] # TODO - - [0x1164B8, ci8, peach_letter, 150, 105] + - [0x1164B8, ci8, peach_letter, 150, 105] - [0x11A23E, bin] - - [0x11A240, ci8palette, peach_letter] + - [0x11A240, palette, peach_letter] - [0x11A440, bin] - [0x131340, bin] - type: code @@ -299,26 +303,26 @@ segments: - [0x1421C0, "c"] - [0x1422A0, "bin"] - [0x1443F0, ci8, pause/world_map, 320, 320] - - [0x15D3F0, ci8palette, pause/world_map] + - [0x15D3F0, palette, pause/world_map] - [0x15D5F0, ci4, pause/spirits_bg, 128, 110] - - [0x15F170, ci4palette, pause/spirits_bg] + - [0x15F170, palette, pause/spirits_bg] - [0x15F270, bin] - [0x15F970, ci4, pause/banner_hp, 64, 16] - - [0x15FB70, ci4palette, pause/banner_hp] + - [0x15FB70, palette, pause/banner_hp] - [0x15FD70, ci4, pause/banner_fp, 64, 16] - - [0x15FF70, ci4palette, pause/banner_fp] + - [0x15FF70, palette, pause/banner_fp] - [0x160170, ci4, pause/banner_bp, 64, 16] - - [0x160370, ci4palette, pause/banner_bp] + - [0x160370, palette, pause/banner_bp] - [0x160570, ci4, pause/banner_boots, 48, 16] - - [0x1606F0, ci4palette, pause/banner_boots] + - [0x1606F0, palette, pause/banner_boots] - [0x1608F0, ci4, pause/banner_hammer, 48, 16] - - [0x160A70, ci4palette, pause/banner_hammer] + - [0x160A70, palette, pause/banner_hammer] - [0x160C70, ci4, pause/banner_star_energy, 48, 16] - - [0x160DF0, ci4palette, pause/banner_star_energy] + - [0x160DF0, palette, pause/banner_star_energy] - [0x160FF0, ci4, pause/available, 64, 16] - - [0x1611F0, ci4palette, pause/available] + - [0x1611F0, palette, pause/available] - [0x1613F0, ci4, pause/prompt_check_abilities, 128, 16] - - [0x1617F0, ci4palette, pause/prompt_check_abilities] + - [0x1617F0, palette, pause/prompt_check_abilities] - [0x1619F0, bin] - type: code start: 0x163400 @@ -353,20 +357,20 @@ segments: - [0x1AF230, "c"] - [0x1AF2D0, "bin"] - [0x1CC310, "bin"] # icon images and palettes, vram unknown - - [0x1FE1B0, rgba16, title/logo_n64, 128, 112] - - [0x2051B0, rgba16, title/logo_is, 256, 122] - - [0x2131B0, rgba16, title/logo_nintendo, 256, 48] - - [0x2191B0, ci8, title/bg_1, 264, 162] - - [0x2238C0, ci8palette, title/bg_1] - - [0x223AC0, ci8, title/bg_2, 264, 162] - - [0x22E1D0, ci8palette, title/bg_2] - - [0x22E3D0, ci8, title/bg_3, 264, 162] - - [0x238AE0, ci8palette, title/bg_3] - - [0x238CE0, ci8, title/bg_4, 264, 162] - - [0x2433F0, ci8palette, title/bg_4] - - [0x2435F0, ia8, title/tape, 128, 128] - - [0x2475F0, ci8, title/bowser_silhouette, 128, 128] - - [0x24B5F0, ci8palette, title/bowser_silhouette] + - [0x1FE1B0, rgba16, title/logo_n64, 128, 112] + - [0x2051B0, rgba16, title/logo_is, 256, 122] + - [0x2131B0, rgba16, title/logo_nintendo, 256, 48] + - [0x2191B0, ci8, title/bg_1, 264, 162] + - [0x2238C0, palette, title/bg_1] + - [0x223AC0, ci8, title/bg_2, 264, 162] + - [0x22E1D0, palette, title/bg_2] + - [0x22E3D0, ci8, title/bg_3, 264, 162] + - [0x238AE0, palette, title/bg_3] + - [0x238CE0, ci8, title/bg_4, 264, 162] + - [0x2433F0, palette, title/bg_4] + - [0x2435F0, ia8, title/tape, 128, 128] + - [0x2475F0, ci8, title/bowser_silhouette, 128, 128] + - [0x24B5F0, palette, title/bowser_silhouette] - [0x24B7F0, bin] - type: code start: 0x3169F0 @@ -884,11 +888,13 @@ segments: files: - [0x415D90, "c"] - [0x4200C0, "bin"] # todo split this further - - type: code + - name: world/script_api/ + ld_name: world_script_api + type: code start: 0x7E0E80 vram: 0x80280000 files: - - [0x7e0e80, "c", "code_7e0e80"] + - [0x7e0e80, "c"] - [0x7E2AA0, "c"] - [0x7E3700, "c"] - [0x7e4d00, "bin"] @@ -4944,7 +4950,7 @@ segments: - [0xC047F0, "bin"] - [0xC20C70, "bin"] # rodata - [0xC20CF8, "bin"] # rodata - - [0xC20F40, "bin"] # rodata + - [0xC20F40, "bin"] - name: world/area_dgb/dgb_02/ type: code overlay: True @@ -6500,6 +6506,7 @@ segments: - [0xE05360, "c"] - [0xE05370, "c"] - [0xE05390, "c"] + - [0xE07C20, "c"] - [0xE08050, "c"] - [0xE08350, "bin"] - [0xE08470, "bin"] @@ -6564,7 +6571,7 @@ segments: files: - [0xE1E460, "c"] - [0xE1EC20, "bin"] - - [0xE20110, "bin"] + - [0xE20110, "bin"] - type: code overlay: True start: 0xE20EB0 diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 3db8a5f395..30190c2498 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -1,1909 +1,1909 @@ -ActorExists;0x8026DE5C -ActorSpeak;0x80252F30 -AddActorDecoration;0x8026EE88 -AddActorPos;0x8026B92C -AddActorVar;0x8026C0D4 -AddBadge;0x802D6FF8 -AddBattleCamOffsetZ;0x8024EA98 -AddBattleCamZoom;0x8024ECAC -AddCoin;0x802D7278 -AddGoalPos;0x8026A748 -AddItem;0x802D6A98 -AddKeyItem;0x802D68C8 -AddPartDispOffset;0x8026BD88 -AddPartMovementVar;0x8026C2E8 -AddStarPieces;0x802D72F0 -AddStarPoints;0x802D72B4 -AddVectorPolar;0x802D4B14 -AdjustCam;0x802CC660 -AfflictActor;0x8027D67C -ApplyShrinkFromOwner;0x80254198 -AssignAreaFlag;0x80111FF8 -AssignBlockFlag;0x8011206C -AssignCrateFlag;0x80112170 -AssignFlag;0x801120B8 -AssignPanelFlag;0x80112114 -AssignScript;0x80111FB0 -AwaitPlayerApproach;0x802D48AC -AwaitPlayerLeave;0x802D4A5C -BattleCamTargetActor;0x8024EB24 -BindHandleEvent;0x80278C20 -BindIdle;0x80278A94 -BindNextTurn;0x80278C94 -BindNpcAI;0x80044A78 -BindNpcAux;0x80044EB8 -BindNpcDefeat;0x800451DC -BindNpcHit;0x80045140 -BindNpcIdle;0x80044BAC -BindNpcInteract;0x800450A4 -BindTakeTurn;0x80278930 -BoostAttack;0x8026FCD4 -BoostDefense;0x80270174 -BringPartnerOut;0x802CF5B8 -BtlBringPartnerOut;0x80280B6C -BtlPutPartnerAway;0x80280A34 -CancelMessage;0x802D0C20 -CancelMessageAndBlock;0x802D0C48 -CancelablePlayerRunToGoal;0x80273EFC -ChangeModelAnimation;0x802CCF6C -CheckActionState;0x802831DC -CheckButtonDown;0x8026E108 -CheckButtonHeld;0x8026E0D0 -CheckButtonPress;0x8026E098 -ChooseNextTarget;0x8026E414 -ClampAngleFloat;0x802D5AB4 -ClampAngleInt;0x802D5A58 -ClearAmbientSounds;0x802D60E8 -ClearDefeatedEnemies;0x80045640 -ClearPartnerMoveHistory;0x802CF370 -ClearStatusEffects;0x8027DDA0 -CloneModel;0x802C8F28 -CloseActionCommandInfo;0x80269410 -CloseChoice;0x802D0BF8 -CloseMessage;0x802D0A98 -ContinueSpeech;0x802D02E8 -CopyBuffs;0x80271160 -CopyStatusEffects;0x8027DCBC -CountFortressKeys;0x802D6C4C -CountPlayerTargets;0x8026A14C -CreateNpc;0x802CDBA4 -CreatePartShadow;0x8026F52C -CreatePushBlockGrid;0x802832E0 -DeleteNpc;0x802CDC1C -DeletePartner;0x802807A8 -DeleteTrigger;0x802C6824 -DemoJoystickRadial;0x802D9B64 -DemoJoystickXY;0x802D9C10 -DemoPressButton;0x802D9AC0 -DemoReleaseButton;0x802D9AF8 -DemoSetButtons;0x802D9B34 -DidActionSucceed;0x80276EB4 -Disable8bitMario;0x802D2B88 -DisablePartner;0x802D1F38 -DisablePartnerAI;0x802CF4E8 -DisablePartnerBlur;0x802456D8 -DisablePlayerInput;0x802D0E28 -DisablePlayerPhysics;0x802D0DE4 -DisablePulseStone;0x802D2AA8 -DispatchDamageEvent;0x8027D1BC -DispatchDamagePlayerEvent;0x8027491C -DispatchEvent;0x8027D264 -DoAirLift;0x8029C37C -DoBasicAI;0x8004A47C -DoBlowAway;0x8029C4A8 -DoBurnHit;0x8029A0D0 -DoDeath;0x8029AEC0 -DoDizzyAttack;0x8028907C -DoDizzyHit;0x802945FC -DoFreezeHit;0x8029466C -DoImmune;0x8029AC70 -DoJumpBack;0x8029BD70 -DoNormalHit;0x80299044 -DoNpcDefeat;0x8004462C -DoParalyzeHit;0x80294618 -DoPoisonHit;0x80294634 -DoRecover;0x8029BFA0 -DoReturnHome;0x8029BEB8 -DoScareAway;0x8029B22C -DoShinkHit;0x802946B8 -DoShockHit;0x8029A6FC -DoSleepHit;0x802945E0 -DoSpinSmashHit;0x8029B998 -DoStopHit;0x80294650 -DropItemEntity;0x802D6DC0 -DropItemEntityB;0x802D6EC0 -DropStarPoints;0x8027C8A4 -ElectrifyActor;0x8027095C -EnableActorBlur;0x8027D57C -EnableActorGlow;0x8027DBA4 -EnableGroup;0x802C9B98 -EnableIdleScript;0x80278B4C -EnableModel;0x802C9288 -EnableNpcAI;0x80044CF0 -EnableNpcAux;0x80044FF0 -EnableNpcBlur;0x802CF2EC -EnableNpcShadow;0x802CF268 -EnablePartner;0x802D1EFC -EnablePartnerAI;0x802CF52C -EnablePartnerBlur;0x802456B8 -EnablePlayerBlur;0x80274978 -EnableSpriteShading;0x802D9A3C -EnableStatusMenu;0x802D5998 -EnableTexPanning;0x802C9208 -EndActorSpeech;0x802532D0 -EndSpeech;0x802D02CC -EnemyCreateTargetList;0x8026E310 -EnemyDamageTarget;0x8027CCB4 -EnemyFollowupAfflictTarget;0x8027CED4 -EnemyTestTarget;0x8027CFB8 -EnterDoubleDoor;0x80285E74 -EnterSavePoint;0x80285CB0 -EnterSingleDoor;0x80285DD4 -EnterWalk;0x80285960 -EnterWalkShort;0x80285A60 -ExitDoubleDoor;0x80285E4C -ExitSingleDoor;0x80285DAC -ExitWalk;0x80285CF4 -FXRecoverFP;0x80261C68 -FXRecoverHP;0x80261BA8 -FadeBackgroundToBlack;0x8003EF00 -FadeInMusic;0x802D5DF4 -FadeOutMusic;0x802D5CE0 -FallPartTo;0x8027A854 -FallToGoal;0x80279BEC -FindItem;0x802D6B18 -FindKeyItem;0x802D6A14 -FlyPartTo;0x8027BF38 -FlyToGoal;0x8027B624 -ForceCloseMessageBox;0x802513F0 -ForceHomePos;0x8026A1EC -ForceNextTarget;0x80298BF0 -FreezeBattleCam;0x8024ED78 -FullyRestoreHPandFP;0x802D1EC0 -FullyRestoreSP;0x802D1EE0 -GetActionSuccess;0x80269294 -GetActionSuccessCopy;0x802694F8 -GetActorAttackBoost;0x8026FC04 -GetActorDefenseBoost;0x8026FC6C -GetActorFlags;0x8026CF20 -GetActorHP;0x8027C6A0 -GetActorLevel;0x8027FD48 -GetActorPos;0x8026AAA8 -GetActorRotation;0x8026C56C -GetActorScale;0x8026CA84 -GetActorSize;0x8027D8E0 -GetActorVar;0x8026BFB4 -GetActorYaw;0x8026B3C8 -GetAngleBetweenNPCs;0x802D4708 -GetAngleToNPC;0x802D47B4 -GetAngleToPlayer;0x802D4830 -GetAnimation;0x8026B238 -GetBattleFlags;0x8026CD10 -GetBattleFlags2;0x8026CDA0 -GetBattleOutcome;0x8004457C -GetBattlePhase;0x80269E28 -GetBattleState;0x8026E140 -GetBattleVar;0x8026F694 -GetBlockResult;0x8026957C -GetCamDistance;0x802CC084 -GetCamLookAtObjVector;0x8003F398 -GetCamPitch;0x802CBFF4 -GetCamPosA;0x802CC0F4 -GetCamPosB;0x802CC184 -GetCamPosC;0x802CC214 -GetCamPosition;0x802CC2A4 -GetCamType;0x802CBF64 -GetColliderCenter;0x802CA0AC -GetCurrentActorType;0x8027DAD4 -GetCurrentPartner;0x802D2B0C -GetCurrentPartnerID;0x802CFC74 -GetDamageIntensity;0x80280840 -GetDemoState;0x802D9A90 -GetDist2D;0x802D5770 -GetDistanceToGoal;0x8026E9FC -GetEncounterState;0x8027D7C4 -GetEnemyMaxHP;0x8027C748 -GetEntryID;0x802CA460 -GetGoalPos;0x8026A820 -GetGridIndexFromPos;0x802836B8 -GetHomePos;0x8026AD74 -GetIdleGoal;0x8026A8EC -GetIndexFromHome;0x8026A0D4 -GetIndexFromPos;0x8026A05C -GetItemPower;0x802D732C -GetLastDamage;0x8027DB3C -GetLastElement;0x80269E54 -GetLastEvent;0x8027C4E0 -GetLoadType;0x802CA4C0 -GetMapID;0x802CA490 -GetMenuSelection;0x802733C4 -GetModelCenter;0x802C8F80 -GetModelIndex;0x802C8E8C -GetNextPathPos;0x802D5524 -GetNpcAnimation;0x802CE160 -GetNpcPointer;0x802CDC58 -GetNpcPos;0x802CF0F4 -GetNpcVar;0x800453BC -GetNpcYaw;0x802CEA10 -GetOriginalActorType;0x8027DA68 -GetOwnerEncounterTrigger;0x80044600 -GetOwnerID;0x8026DE00 -GetOwnerTarget;0x8026E8AC -GetPartDispOffset;0x8026BAE8 -GetPartEventFlags;0x8026D488 -GetPartFlags;0x8026D218 -GetPartMovementVar;0x8026C170 -GetPartOffset;0x8026AB74 -GetPartPos;0x8026AC88 -GetPartRotation;0x8026C828 -GetPartScale;0x8026CC34 -GetPartTarget;0x8026A9B8 -GetPartTargetFlags;0x8026D2AC -GetPartYaw;0x8026B4C0 -GetPartnerPos;0x802CF438 -GetPlayerActionState;0x802D1DD0 -GetAttackerActorID;0x8026E974 -GetPlayerAnimation;0x802D1E94 -GetPlayerHP;0x80274234 -GetPlayerPos;0x802D1DFC -GetPlayerTargetYaw;0x802D1D28 -GetPushBlock;0x802835C0 -GetSelfAnimationFromTable;0x80045734 -GetSelfNpcID;0x80045614 -GetSelfVar;0x800452C0 -GetStatusFlags;0x8026F230 -GetTargetListLength;0x8026E864 -GetValueByRef;0x802D593C -GotoMap;0x802CA400 -GotoMapByID;0x802CA440 -GotoMapSpecial;0x802CA420 -HPBarToCurrent;0x8026D7A8 -HPBarToHome;0x8026D664 -HasKeyItem;0x802D699C -HasMerleeCasts;0x8003F3F4 -HasMerleeCastsLeft;0x802619C8 -HealActor;0x80270CA4 -HidePlayerShadow;0x802D0DA0 -IdleFlyToGoal;0x8027BBB8 -IdleJumpToGoal;0x8027910C -IdleRunToGoal;0x8027A264 -IncrementPlayerFP;0x80261D60 -IncrementPlayerHP;0x80261D28 -InitTargetIterator;0x8026E354 -InterpNpcYaw;0x802CEB04 -InterpPlayerYaw;0x802D193C -IsMessageBoxDisplayed;0x80251384 -IsPlayerWithin;0x802D4964 -ItemAfflictEnemy;0x80252924 -ItemCheckHit;0x80252D40 -ItemDamageEnemy;0x80252728 -JumpPartTo;0x8027A4E4 -JumpToGoal;0x80278D08 -JumpWithBounce;0x80279728 -LandJump;0x80279AD4 -LoadActionCommand;0x802681C0 -LoadBattleDmaData;0x80253624 -LoadBattleSection;0x80269DE4 -LoadDemoBattle;0x80044264 -LoadFreeItemScript;0x8026801C -LoadItemScript;0x80267ED0 -LoadModelAnimation;0x802CCCEC -LoadMoveScript;0x80268130 -LoadPath;0x802D5430 -LoadSettings;0x802CB9F8 -LoadStarPowerScript;0x80280950 -MakeDoorAdvanced;0x80281CAC -MakeEntity;0x80111D38 -MakeItemEntity;0x802D6CC0 -MakeLerp;0x802D45B0 -MakeNpcs;0x80044298 -MakeOwnerTargetIndex;0x8027FBB8 -MakeShop;0x80281860 -MakeShopOwner;0x80281BD8 -MakeStatusField;0x80253B94 -MarioEnterStage;0x80284A40 -MerleeAttackBonus;0x80288400 -MerleeDefenseBonus;0x8028870C -MerleeExpBonus;0x80288A58 -MerleeRunOut;0x80288398 -ModifyActorDecoration;0x8026EFF0 -ModifyColliderFlags;0x802C9DCC -MoveBattleCamOver;0x8024EC08 -MultiplyByActorScale;0x80253FDC -MultiplyVec2ByActorScale;0x80254048 -MultiplyVec3ByActorScale;0x802540DC -NOP_npc_callback;0x80038470 -NOP_state;0x80112B90 -NpcFaceNpc;0x802CEE80 -NpcFacePlayer;0x802CECC8 -NpcFlyTo;0x802CE6FC -NpcJump0;0x802CE6C4 -NpcJump1;0x802CE6E0 -NpcMoveTo;0x802CE22C -OnDefeatEnemy;0x8003F580 -OnFleeBattleDrops;0x8003F6E8 -OverrideBattleDmaDest;0x802535F8 -PanToTarget;0x802CB79C -ParentColliderToModel;0x802CA114 -PartnerAfflictEnemy;0x80280004 -PartnerCanUseAbility;0x802CFCA0 -PartnerDamageEnemy;0x8027FDB4 -PartnerIsFlying;0x802CFCE8 -PartnerPowerBounceEnemy;0x80280270 -PartnerTestEnemy;0x802804D0 -PauseTakeTurn;0x802789A4 -PeachEnterStage;0x80284D04 -PlayAmbientSounds;0x802D611C -PlayDrinkFX;0x80287948 -PlayEatFX;0x802878D0 -PlayEffect;0x802D829C -PlayLoopingSoundAtActor;0x80253974 -PlayModelAnimation;0x802CCE6C -PlaySound;0x802D6150 -PlaySoundAt;0x802D61DC -PlaySoundAtActor;0x8025385C -PlaySoundAtCollider;0x802CA614 -PlaySoundAtF;0x802D636C -PlaySoundAtModel;0x802CA558 -PlaySoundAtNpc;0x802D01AC -PlaySoundAtPart;0x802538D0 -PlaySoundAtPlayer;0x802D2CD8 -PlayerCreateTargetList;0x8026E2CC -PlayerDamageEnemy;0x80274260 -PlayerFaceNpc;0x802D1B04 -PlayerFallToGoal;0x80273894 -PlayerFirstStrike;0x802851FC -PlayerHappy;0x80288D64 -PlayerJump;0x802D18E8 -PlayerJump1;0x802D1904 -PlayerJump2;0x802D1920 -PlayerLandJump;0x80273B04 -PlayerMoveTo;0x802D1134 -PlayerPowerBounceEnemy;0x802744A0 -PlayerRunToGoal;0x80273C64 -PlayerTestEnemy;0x802746F0 -PutPartnerAway;0x802CF988 -RandInt;0x802D46B0 -RegainAbility;0x80289110 -RemoveActor;0x8027C7B0 -RemoveActorDecoration;0x8026EF4C -RemoveBadge;0x802D7050 -RemoveEffect;0x802D7AE4 -RemoveEncounter;0x80044478 -RemoveFortressKeys;0x802D6C94 -RemoveItem;0x802D6B9C -RemoveItemAt;0x802D688C -RemoveItemEntity;0x802D6FCC -RemoveKeyItemAt;0x802D6858 -RemoveNpc;0x80044340 -RemovePartShadow;0x8026F59C -RemovePlayerBuffs;0x8026F44C -ResetActorSounds;0x8026F838 -ResetAllActorSounds;0x8026F6EC -ResetCam;0x802CC8C8 -ResetFromLava;0x802C9ED8 -RestartNpcAI;0x80044C2C -RestartNpcAux;0x80044F38 -ResumeTakeTurn;0x80278A1C -RotateGroup;0x802C98D8 -RotateModel;0x802C8C64 -RunAwayFail;0x80287078 -RunAwayReset;0x80287128 -RunAwayStart;0x802868BC -RunPartTo;0x8027ACAC -RunToGoal;0x80279E64 -ScaleGroup;0x802C9A1C -ScaleModel;0x802C8D88 -SetActionSuccess;0x802692C0 -SetActorDispOffset;0x8026BA04 -SetActorFlagBits;0x8026CE8C -SetActorFlags;0x8026CE30 -SetActorIdleJumpGravity;0x8026B5D8 -SetActorIdleSpeed;0x8026B6D0 -SetActorJumpGravity;0x8026B55C -SetActorPos;0x8026AE40 -SetActorRotation;0x8026C3AC -SetActorRotationOffset;0x8026C4AC -SetActorScale;0x8026C904 -SetActorScaleModifier;0x8026C9C4 -SetActorSize;0x8027D810 -SetActorSounds;0x8026F740 -SetActorSpeed;0x8026B654 -SetActorType;0x8026FB20 -SetActorVar;0x8026C044 -SetActorYaw;0x8026B358 -SetAnimation;0x8026B1B0 -SetAnimationRate;0x8026B2D0 -SetBattleCamOffsetZ;0x8024EA58 -SetBattleCamTarget;0x8024E90C -SetBattleCamYaw;0x8024EAE4 -SetBattleCamZoom;0x8024EC6C -SetBattleFlagBits;0x8026CD3C -SetBattleFlagBits2;0x8026CDCC -SetBattleInputButtons;0x8026E068 -SetBattleInputMask;0x8026E050 -SetBattleMusic;0x80044A38 -SetBattleVar;0x8026F638 -SetCamBGColor;0x802CAD98 -SetCamDistance;0x802CBBE4 -SetCamEnabled;0x802CA6C0 -SetCamFlag80;0x802CA774 -SetCamLeadPlayer;0x802CB680 -SetCamPerspective;0x802CA828 -SetCamPitch;0x802CBB48 -SetCamPosA;0x802CBC58 -SetCamPosB;0x802CBCF4 -SetCamPosC;0x802CBD90 -SetCamProperties;0x802CC3EC -SetCamSpeed;0x802CBEF0 -SetCamTarget;0x802CAF2C -SetCamType;0x802CBAB4 -SetCamViewport;0x802CAB18 -SetDefenseTable;0x8027CA74 -SetEncounterStatusFlags;0x80044180 -SetEnemyFlagBits;0x80045688 -SetEnemyHP;0x8027C5C8 -SetEnemyTargetOffset;0x8026B0A0 -SetForegroundModelsVisible;0x80253AEC -SetGameMode;0x802D5A28 -SetGoalPos;0x8026A510 -SetGoalToFirstTarget;0x8026A49C -SetGoalToHome;0x80269EC4 -SetGoalToIndex;0x80269F94 -SetGoalToTarget;0x8026A3A8 -SetGroupEnabled;0x802C9308 -SetHomePos;0x8026A2D0 -SetIdleAnimations;0x8027CB7C -SetIdleGoal;0x8026A62C -SetIdleGoalToHome;0x80269F2C -SetItemFlags;0x802D7194 -SetItemPos;0x802D70D0 -SetJumpAnimations;0x8026B88C -SetMessageBoxDuration;0x80251408 -SetMessageImages;0x802D0C70 -SetMessageString;0x802D0CEC -SetMessageValue;0x802D0D44 -SetModelFlag10;0x802C907C -SetModelFlags;0x802C9518 -SetMusicTrack;0x802D5D4C -SetNpcAnimation;0x802CE0F4 -SetNpcAnimationSpeed;0x802CE1C0 -SetNpcAux;0x80044DA4 -SetNpcCollisionSize;0x802CDF8C -SetNpcEffect;0x802D0118 -SetNpcFlagBits;0x802CF060 -SetNpcJumpscale;0x802CE088 -SetNpcPos;0x802CDCB0 -SetNpcRotation;0x802CDDB0 -SetNpcScale;0x802CDED4 -SetNpcSpeed;0x802CE01C -SetNpcVar;0x80045320 -SetNpcYaw;0x802CEA84 -SetOwnerID;0x8026DE28 -SetOwnerTarget;0x8026E3A8 -SetPanTarget;0x802CBE2C -SetPartAlpha;0x8026F470 -SetPartDispOffset;0x8026BC38 -SetPartEventBits;0x8026D3C8 -SetPartEventFlags;0x8026D340 -SetPartFlagBits;0x8026D010 -SetPartFlags;0x8026CF88 -SetPartGoalToTarget;0x8026A404 -SetPartJumpGravity;0x8026B74C -SetPartMoveSpeed;0x8026B7EC -SetPartMovementVar;0x8026C22C -SetPartPos;0x8026AF18 -SetPartRotation;0x8026C634 -SetPartRotationOffset;0x8026C740 -SetPartScale;0x8026CB4C -SetPartSize;0x8027D970 -SetPartSounds;0x8026FA00 -SetPartTargetFlagBits;0x8026D158 -SetPartTargetFlags;0x8026D0D0 -SetPartYaw;0x8026B438 -SetPlayerActionState;0x802D10D8 -SetPlayerAnimation;0x802D1084 -SetPlayerAnimationSpeed;0x802D1104 -SetPlayerCollisionSize;0x802D0FB0 -SetPlayerFlagBits;0x802D1D60 -SetPlayerJumpscale;0x802D1054 -SetPlayerPos;0x802D0EF0 -SetPlayerSpeed;0x802D1024 -SetPushBlock;0x8028347C -SetPushBlockFallEffect;0x802837AC -SetRenderMode;0x802CA4F4 -SetSelfEnemyFlagBits;0x80045524 -SetSelfEnemyFlags;0x8004550C -SetSelfRotation;0x8004545C -SetSelfVar;0x8004525C -SetSpriteShading;0x802D9700 -SetStatusTable;0x8027CB08 -SetTargetActor;0x8027C548 -SetTargetOffset;0x8027D380 -SetTexPanOffset;0x802C9364 -SetTexPanner;0x802C9000 -SetValueByRef;0x802D58E0 -SetZoneEnabled;0x802CA254 -ShakeCam;0x802CB2A8 -ShakeCam1;0x802D9CB0 -ShakeCamX;0x802D9CE8 -ShowBattleChoice;0x80253538 -ShowChoice;0x802D0B6C -ShowCoinCounter;0x800E96F8 -ShowEmote;0x802D78A0 -ShowGotItem;0x802D73A4 -ShowMessageAtScreenPos;0x802D0894 -ShowMessageAtWorldPos;0x802D095C -ShowMessageBox;0x802512B4 -ShowShockEffect;0x8026FBB0 -ShowSleepBubble;0x802D8028 -ShowStatusMenu;0x802D59DC -ShowVariableMessageBox;0x8025130C -SpeakToNpc;0x802D0304 -SpeakToPlayer;0x802D02B0 -StartBattle;0x80044840 -StartBattleWith;0x80044860 -StartBossBattle;0x8004489C -StartDefend;0x802852B8 -StartRumble;0x80254218 -StartRumbleWithParams;0x80267D9C -StopLoopingSoundAtActor;0x80253A18 -StopSound;0x802D62B8 -SummonEnemy;0x8026DB64 -SwitchMessage;0x802D0AFC -TeleportPartnerToPlayer;0x8028387C -TranslateGroup;0x802C97B4 -TranslateModel;0x802C8B60 -UnfadeBackgroundFromBlack;0x8003EF98 -UpdateColliderTransform;0x802CA188 -UpdateLerp;0x802D462C -UseCamPreset;0x8024E61C -UseDoorSounds;0x802D6314 -UseEntryHeading;0x802D1F70 -UseExitHeading;0x802D216C -UseIdleAnimation;0x8026F0EC -UseLifeShroom;0x802879C0 -UseMystery;0x80293E40 -UseSettingsFrom;0x802CB860 -VanishActor;0x80270614 -WaitForBuffDone;0x8027114C -WaitForCam;0x802CC354 -WaitForMessageBoxDone;0x802513CC -WasStatusInflicted;0x8027DC68 -YieldTurn;0x8027D7F0 -_Genld;0x8006C0B4 -_Ldtob;0x8006BBD0 -_Ldunscale;0x8006C01C -_Litob;0x8006B980 -_Printf;0x80064AA0 -_Putfld;0x80065020 -_add_hit_vert_to_buffer;0x8005B9A0 -_bound_script_trigger_handler;0x802C667C -_create_npc;0x80038598 -_draw_message_box;0x8012CC08 -_get_hit_vert_index_from_buffer;0x8005B9F4 -_heap_create;0x80029030 -_heap_free;0x8002921C -_heap_malloc;0x8002906C -_heap_malloc_tail;0x80029164 -_heap_realloc;0x800292C4 -_load_model_textures;0x80115B44 -_load_string;0x8012591C -_npc_jump_to;0x802CE434 -_play_sound;0x80149AB8 -_remove_part_decoration;0x8025D03C -_set_game_mode;0x80112CA8 -_set_music_track;0x8014A7E0 -_show_message;0x802D0320 -_spr_sign_extend_12bit;0x802DD0DC -_spr_sign_extend_16bit;0x802DD0FC -_update_message;0x80123898 -_wrap_trig_lookup_value;0x8002A034 -activate_defend_command;0x80260B04 -add_SP;0x800EA1F4 -add_actor_decoration;0x80267190 -add_badge;0x800E773C -add_cam_zoom;0x8024E5B4 -add_coins;0x800EA0C0 -add_fortress_keys;0x800EA398 -add_item;0x800E7574 -add_part_decoration;0x80267114 -add_star_pieces;0x800EA170 -add_star_points;0x800EA128 -add_vec2D_polar;0x80029F9C -add_xz_vec3f;0x80264128 -add_xz_vec3f_copy1;0x802641C0 -add_xz_vec3f_copy2;0x80264258 -ai;0x8006AD64 -alAudioFrame;0x800565C0 -alHeapAlloc;0x80057F90 -alLink;0x8004B3EC -alUnlink;0x8004B40C -al_CopyFileTableEntry;0x8005447C -al_CopyWords;0x80054F74 -al_DmaCopy;0x80054E00 -al_LoadBKHeaders;0x80054FC0 -al_LoadBank;0x800547C8 -al_LoadINIT;0x800542BC -al_LoadPER;0x800544F8 -al_LoadPRG;0x800545B4 -allocate_hit_tables;0x8005AEA0 -appedGfx_npc_blur;0x8003AE38 -appendGfx_item_entity;0x801321A4 -appendGfx_model;0x80113090 -appendGfx_model_group;0x80117C94 -appendGfx_npc;0x80039FD0 -appendGfx_player;0x800E12F4 -appendGfx_player_spin;0x800E1704 -atan2;0x80029C80 -battle_heap_create;0x8002ACA0 -bcmp;0x8006B870 -bcopy;0x80064650 -begin_battle;0x80241218 -begin_state_battle;0x800338D0 -begin_state_init;0x80033540 -begin_state_intro;0x80036650 -begin_state_logos;0x80033E70 -begin_state_pause_menu;0x80034940 -begin_state_title_screen;0x80036DF0 -begin_state_world;0x80035D30 -bind_dynamic_entity_3;0x80123158 -bind_dynamic_entity_7;0x8012323C -bind_dynamic_entity_B;0x80123320 -bind_enemy_ai;0x8003E94C -bind_enemy_aux;0x8003E9B4 -bind_enemy_interact;0x8003EA1C -bind_npc_ai;0x8003EA84 -bind_npc_aux;0x8003EB50 -bind_npc_interact;0x8003EC1C -boot_idle;0x8005E90C -boot_main;0x80025F70 -!bzero;0x80064970 -calc_enemy_damage_target;0x8027742C -calc_enemy_test_target;0x802771F8 -calc_item_check_hit;0x802515D0 -calc_item_damage_enemy;0x802516E8 -calc_partner_damage_enemy;0x8027E328 -calc_partner_test_enemy;0x8027DF7C -calc_player_damage_enemy;0x80271944 -calc_player_test_enemy;0x80271754 -calculate_model_sizes;0x8011612C -cam_target_actor;0x8024E43C -can_pause;0x800E69DC -can_switch_to_player;0x802A5818 -cancel_message;0x80125B08 -check_block_input;0x80268ECC -check_input_hammer;0x800E60E0 -check_input_jump;0x800E6160 -check_input_midair_jump;0x800E4FCC -check_input_open_menus;0x800E6CE4 -check_input_spin;0x800E6268 -check_input_status_menu;0x800E728C -check_input_use_partner;0x800DFA00 -clamp_angle;0x80029B24 -clamp_printer_coords;0x80125AB8 -clear_area_flag;0x8014554C -clear_area_flags;0x80145390 -clear_character_set;0x80123660 -clear_dynamic_entity_list;0x801230B8 -clear_encounter_status;0x8003E400 -clear_entity_data;0x80110CB8 -clear_global_flag;0x801453E0 -clear_icon_flags;0x80144A2C -clear_item_entity_data;0x80130FF0 -clear_item_entity_flags;0x80134188 -clear_model_data;0x80115D44 -clear_npcs;0x800384BC -clear_partner_move_history;0x800EF45C -clear_player_data;0x800E73A0 -clear_player_status;0x800DFC50 -clear_printers;0x80123674 -clear_saved_variables;0x80145320 -clear_script_flags;0x802C4880 -clear_script_list;0x802C31DC -clear_trigger_data;0x80145680 -clear_virtual_models;0x80120BB0 -clone_model;0x8011B6F0 -close_action_command_instruction_popup;0x8024FB0C -close_message;0x80125C70 -coin_counter_draw_content;0x800E92D8 -collision_check_above;0x800DE7E4 -collision_check_player_intersecting_world;0x800E4308 -collision_heap_create;0x8002AD74 -collision_heap_free;0x8002ADF4 -collision_heap_malloc;0x8002ADB0 -collision_main_above;0x800E27E0 -collision_main_lateral;0x800E363C -contPakFileDelete;0x8005F864 -contPakFileNum;0x8005F8D0 -contPakFileOpen;0x8005F7B0 -contPakFileReadWrite;0x8005F770 -contPakFileState;0x8005F8A4 -contPakFree;0x8005F748 -contPakOpen;0x8005F6F8 -contPakRepairId;0x8005F8FC -contQuery;0x80060870 -contReadData;0x80060738 -contReadNW;0x800607B4 -contRetrace;0x8006065C -contRmbCheckMesg;0x8005FD10 -contRmbForceStopEndMesg;0x8005FE54 -contRmbForceStopMesg;0x8005FE0C -contRmbStartMesg;0x8005FD58 -contRmbStopMesg;0x8005FDE4 -copy_matrix;0x80029720 -corrupted;0x8006D1D8 -corrupted_init;0x8006D080 -cos_deg;0x8002A350 -cos_rad;0x8002A1D0 -cosine;0x800293D4 -coss;0x80061F00 -count_power_plus;0x80263B10 -count_targets;0x80269660 -crash_create_monitor;0x8002C8B0 -crash_delay_msec;0x8002BF40 -crash_monitor_thread;0x8002C81C -crash_print_fpr;0x8002C2B8 -crash_printf_string;0x8002C208 -crash_show_handler;0x8002C3B0 -create_actor;0x802653A4 -create_basic_npc;0x80038844 -create_cameras_a;0x8002DEF4 -create_cameras_b;0x8002E038 -create_entity;0x801118C4 -create_entity_shadow;0x801121CC -create_icon;0x801414A4 -create_npcs;0x800436B0 -create_part_shadow;0x8026731C -create_partner_npc;0x80038880 -create_popup;0x8024EF68 -create_shadow_callback;0x802E0D90 -create_shadow_from_data;0x80111BD8 -create_shadow_type;0x80112260 -create_standard_npc;0x80038864 -create_target_list;0x80262240 -create_trigger;0x8014576C -decode_yay0;0x8006EDF0 -decrement_status_menu_disabled;0x800E9B30 -deduct_current_move_fp;0x80263BC8 -default_trigger_function_handler;0x80145670 -delete_actor;0x80240BBC -delete_entity;0x801106D0 -delete_entity_and_unload_data;0x80110790 -delete_player_actor;0x80240D68 -delete_trigger;0x80145BF4 -disable_actor_blur;0x8025455C -disable_entity_fog;0x80123000 -disable_npc_blur;0x8003ADAC -disable_npc_shadow;0x8003ABFC -disable_partner_blur;0x80254668 -disable_player_blur;0x80254914 -disable_player_input;0x800E0178 -disable_player_shadow;0x800E00E4 -disable_player_static_collisions;0x800E0114 -disable_world_fog;0x8011BB64 -dispatch_damage_event_actor;0x802786D4 -dispatch_damage_event_actor_0;0x802788F8 -dispatch_damage_event_actor_1;0x80278914 -dispatch_damage_event_partner;0x8027F9CC -dispatch_damage_event_partner_0;0x8027FB80 -dispatch_damage_event_partner_1;0x8027FB9C -dispatch_damage_event_player;0x802731BC -dispatch_damage_event_player_0;0x8027337C -dispatch_damage_event_player_1;0x802733A8 -dispatch_event_actor;0x80277160 -dispatch_event_general;0x80276F8C -dispatch_event_partner;0x8027DE80 -dispatch_event_partner_continue_turn;0x8027DF0C -dispatch_event_player;0x80271658 -dispatch_event_player_continue_turn;0x802716E4 -dist2D;0x80029ED4 -dist3D;0x80029F2C -dma_copy;0x8002973C -dma_load_string;0x80125804 -do_camera_type_0;0x8002F850 -do_camera_type_1;0x8002F290 -do_camera_type_2;0x8002ECF8 -do_camera_type_3;0x80031494 -do_camera_type_4;0x8002E910 -do_camera_type_5;0x80030000 -do_camera_type_6;0x8002F990 -do_camera_type_unused;0x8002FCE0 -do_lateral_collision;0x800DEC04 -does_script_exist;0x802C4164 -does_script_exist_by_ref;0x802C41A4 -dp;0x8006AE0C -draw_battle_wheel;0x802A1C54 -draw_box;0x800F52E0 -draw_coin_sparkles;0x80130B0C -draw_digit;0x801274C0 -draw_enemy_health_bars;0x8023FFA0 -draw_icon_0;0x801447A8 -draw_icon_1;0x801447C4 -draw_icon_2;0x801447E0 -draw_item_entities;0x80132C80 -draw_main_battle_ui;0x8023EA7C -draw_number;0x8012769C -draw_shop_items;0x80281524 -draw_status_ui;0x800E973C -draw_string;0x801264EC -enable_actor_blur;0x802542CC -enable_entity_fog;0x80122FEC -enable_npc_blur;0x8003AD24 -enable_npc_shadow;0x8003ABA0 -enable_partner_ai;0x800EF328 -enable_partner_blur;0x80254644 -enable_partner_flying;0x800ED310 -enable_partner_walking;0x800EB8A8 -enable_player_blur;0x802546D4 -enable_player_input;0x800E01A4 -enable_player_shadow;0x800E00B0 -enable_player_static_collisions;0x800E0140 -enable_world_fog;0x8011BB50 -end_battle;0x80244A50 -enemy_create_target_list;0x80263048 -enforce_hpfp_limits;0x800E786C -entity_get_collision_flags;0x801108B8 -entity_init_BlueSwitch;0x802E2380 -entity_init_Chest;0x802E7D84 -entity_init_Hammer1Block_normal;0x802E3E00 -entity_init_Hammer23Block_normal;0x802E36E4 -entity_init_HammerBlock_small;0x802E3E30 -entity_init_HugeBlueSwitch;0x802E2408 -entry_point;0x80025C00 -exec_ShakeCam1;0x802CB56C -exec_ShakeCamX;0x802CB5C8 -find_item;0x800E7644 -find_script_labels;0x802C3148 -fio_calc_file_checksum;0x8002B0D0 -fio_calc_header_checksum;0x8002AF40 -fio_deserialize_state;0x8002B490 -fio_erase_flash;0x8002BA1C -fio_erase_game;0x8002B42C -fio_fetch_saved_file_info;0x8002B154 -fio_init_flash;0x8002B84C -fio_load_game;0x8002B2D0 -fio_read_flash;0x8002B868 -fio_save_game;0x8002B374 -fio_serialize_state;0x8002B630 -fio_validate_file_checksum;0x8002B0F8 -fio_validate_header_checksums;0x8002AF70 -fio_write_flash;0x8002B948 -fixed_var_to_float;0x802C4920 -float_to_fixed_var;0x802C496C -free_icon;0x801448F4 -free_npc;0x800389CC -free_npc_by_index;0x800388A0 -fx_emote;0x8006FE90 -fx_sleep_bubble;0x800707F0 -fx_sweat;0x80070790 -fx_walk_large;0x8006FAD0 -fx_walk_normal;0x8006FB30 -general_heap_create;0x8002AC00 -general_heap_free;0x8002AC78 -general_heap_malloc;0x8002AC28 -general_heap_malloc_tail;0x8002AC50 -get_actor;0x80269D6C -get_actor_part;0x8026445C -get_area_byte;0x80145650 -get_area_flag;0x801455F0 -get_asset_offset;0x8005ADD0 -get_background_color_blend;0x8011BE80 -get_cam_viewport;0x8002E4E8 -get_char_width;0x80125DF4 -get_clamped_angle_diff;0x80029C28 -get_coin_drop_amount;0x80048D50 -get_collider_center;0x8005BE10 -get_collider_type_by_id;0x8005BDA8 -get_current_map_config;0x8005ABD8 -get_current_map_header;0x8005ABE8 -get_current_partner_id;0x800E5088 -get_default_variation_for_song;0x8014A430 -get_defeated;0x8003EDF0 -get_defense;0x802662BC -get_dpad_input_radial;0x8023E000 -get_dynamic_entity;0x8012363C -get_enemy;0x8003ECE8 -get_enemy_safe;0x8003ED68 -get_entity_by_index;0x801105E8 -get_entity_fog_color;0x8012307C -get_entity_fog_distance;0x80123060 -get_entity_list;0x80110620 -get_entity_type;0x801106A4 -get_float_variable;0x802C842C -get_fortress_key_count;0x800EA3E4 -get_game_mode;0x80033528 -get_global_byte;0x80145538 -get_global_flag;0x801454BC -get_global_timespace;0x802C420C -get_icon_render_pos;0x801449AC -get_item_count;0x800E75EC -get_item_empty_count;0x800E7620 -get_item_entity;0x80130F58 -get_map_IDs_by_name;0x8005ABF8 -get_menu_icon;0x801448D4 -get_menu_icon_script;0x801448B0 -get_model_center_and_size;0x8011B0EC -get_model_from_list_index;0x8011AD30 -get_model_list_index_from_tree_index;0x8011B010 -get_model_property;0x80115B0C -get_nearest_home_index;0x80269698 -get_npc_by_index;0x80038ADC -get_npc_pos;0x8005DE10 -get_npc_safe;0x8003AB48 -get_npc_unsafe;0x8003AAEC -get_player_data;0x800E7564 -get_player_normal_pitch;0x80029E50 -get_player_normal_yaw;0x80029E20 -get_screen_coords;0x8002E538 -get_script_by_id;0x802C47A8 -get_script_by_index;0x802C4790 -get_shadow_by_index;0x80110604 -get_shadow_list;0x8011064C -get_spirits_rescued;0x8002AE40 -get_stored_count;0x800E7814 -get_stored_empty_count;0x800E7848 -get_string_properties;0x80125F68 -get_string_width;0x80126474 -get_trigger_by_id;0x80145CD0 -get_variable;0x802C7ABC -get_variable_index;0x802C7DA8 -get_variable_index_alt;0x802C7F20 -get_world_fog_color;0x8011BBD8 -get_world_fog_distance;0x8011BBB4 -gfxPreNMI_Callback;0x8002670C -!gfxRetrace_Callback;0x8002605C -gfx_draw_frame;0x80026B08 -goto_map;0x802CA304 -gravity_use_fall_parms;0x800E306C -gravity_use_jump_parms;0x800E2FD0 -guFrustum;0x80062060 -guFrustumF;0x80061F30 -guLookAt;0x80062530 -guLookAtF;0x800621B0 -guLookAtHilite;0x80063244 -guLookAtHiliteF;0x800628C0 -guLookAtReflect;0x80063898 -guLookAtReflectF;0x80063320 -guMtxCat;0x80067960 -guMtxCatF;0x80067600 -guMtxF2L;0x80067500 -guMtxIdent;0x80067440 -guMtxIdentF;0x800674A0 -guMtxL2F;0x80067580 -guMtxXFMF;0x80067A70 -guMtxXFML;0x800679E0 -guNormalize;0x8006CBC0 -guOrtho;0x80063A40 -guOrthoF;0x80063910 -guPerspective;0x80063D40 -guPerspectiveF;0x80063B90 -guPosition;0x800640E8 -guPositionF;0x80063F10 -guRotate;0x80067C80 -guRotateAngles;0x80064458 -guRotateAnglesF;0x800642D0 -guRotateF;0x80067B20 -guScale;0x80067700 -guScaleF;0x800677C0 -guTranslate;0x80067820 -guTranslateF;0x80067900 -has_full_fp;0x800EA37C -has_full_hp;0x800EA360 -heap_free;0x8002AD2C -heap_malloc;0x8002ACE4 -heroes_is_ability_active;0x802672AC -hide_coin_counter;0x800E9698 -hide_foreground_models;0x80267CB4 -hide_foreground_models_unsafe;0x80267BDC -icon_set_opacity;0x80144EB0 -icon_set_tint;0x80144EFC -increment_max_SP;0x800EA1B4 -increment_status_menu_disabled;0x800E9B54 -inflict_partner_ko;0x80266254 -inflict_status;0x80265F40 -inflict_status_set_duration;0x80266CF0 -init_demo_data;0x80038080 -init_dynamic_entity_list;0x80123114 -init_got_item;0x80131B00 -init_item_entity_list;0x801310CC -init_menu_icon_list;0x80141300 -init_model_data;0x80115FE8 -init_npc_list;0x8003852C -init_script_list;0x802C32EC -init_trigger_list;0x80145728 -init_virtual_models;0x80120C58 -initialize_battle;0x8023E130 -initialize_collision;0x8005AF94 -initialize_curtains;0x8002BA40 -initialize_next_camera;0x8002E16C -initialize_printer;0x801256A4 -initialize_status_menu;0x800E7934 -input_to_move_vector;0x800E2304 -int_to_string;0x800294C4 -integrate_gravity;0x800E3448 -intro_logos_fade_in;0x800337F8 -intro_logos_fade_out;0x80033830 -intro_logos_set_fade_alpha;0x800337D0 -intro_logos_set_fade_color;0x800337E0 -intro_logos_update_fade;0x80033874 -is_ability_active;0x800E9D48 -is_actor_hp_bar_visible;0x80253C20 -is_actortype_hpbar_visible;0x80253C9C -is_current_partner_flying;0x800EA5A4 -!is_entity_data_loaded;0x8011115C -is_entity_fog_enabled;0x80123050 -is_partner_ability_active;0x800EA0B8 -is_player_action_state;0x80110BB0 -is_point_within_region;0x80048FD4 -is_popup_displayed;0x8024FAB4 -is_status_menu_visible;0x800E9910 -is_trigger_bound;0x80145C6C -is_world_fog_enabled;0x8011BBA4 -kill_all_scripts;0x802C4114 -kill_encounter;0x8003E730 -kill_enemy;0x8003E7AC -kill_script;0x802C3F3C -kill_script_by_ID;0x802C40AC -ldiv;0x8006D620 -length2D;0x80028FF0 -lldiv;0x8006D6A4 -load_area_specific_entity_data;0x80110C14 -load_asset_by_name;0x8005ACE8 -load_battle;0x80072C90 -load_collision;0x8005B058 -load_data_for_models;0x8011AD48 -load_demo_battle;0x80072E14 -load_engine_data;0x80026DDC -load_font;0x80123734 -load_font_data;0x80123708 -load_hit_asset;0x8005AFC0 -load_hit_data;0x8005B23C -load_map_bg;0x80145D70 -load_map_by_IDs;0x8005A6F4 -load_map_script_lib;0x8005A6C0 -load_message_to_buffer;0x8012588C -load_message_to_printer;0x80125A68 -load_model_textures;0x80115C24 -load_model_transforms;0x8011ADC8 -load_partner_actor;0x80264B74 -load_player_actor;0x802644A4 -load_simple_entity_data;0x801112A4 -load_split_entity_data;0x80111408 -load_sprite;0x802DEB0C -load_stage_collision;0x8005B1A0 -load_string;0x80125900 -load_tattle_flags;0x80253E78 -load_tile_header;0x80114D6C -load_virtual_model;0x80120CE0 -lookup_defense;0x80265E44 -lookup_status_chance;0x80265E98 -lookup_status_duration_mod;0x80265EEC -make_disguise_npc;0x800E657C -make_item_entity;0x801313F4 -make_item_entity_delayed;0x80131AC8 -make_item_entity_nodelay;0x80131A94 -make_npcs;0x8003E678 -mem_clear;0x80029600 -memcpy;0x80064A74 -memset;0x8006EDB0 -modify_collider_family_flags;0x802C9CE8 -move_cam_over;0x8024E4D8 -move_player;0x800E2778 -mtx_ident_mirror_y;0x80038478 -mtx_mirror_y;0x80254288 -next_demo_scene;0x800380F4 -npc_do_other_npc_collision;0x8003900C -npc_do_player_collision;0x800392D8 -npc_do_world_collision;0x80038AFC -npc_move_heading;0x8003AA54 -nuAuCleanDMABuffers;0x8004B268 -!nuAuDmaCallBack;0x8004B074 -nuAuDmaNew;0x8004B224 -nuBoot;0x8005E8B0 -nuContDataClose;0x8006060C -nuContDataGet;0x8005F650 -nuContDataLock;0x800608C0 -nuContDataOpen;0x80060634 -nuContDataUnLock;0x800608F0 -nuContInit;0x8005F610 -nuContMgrInit;0x80060510 -nuContMgrRemove;0x800605E8 -nuContPakMgrInit;0x8005F6B0 -nuContPakMgrRemove;0x8005F6D4 -nuContQueryRead;0x80060920 -nuContRmbCheck;0x8005FEF0 -nuContRmbForceStop;0x800600A0 -nuContRmbForceStopEnd;0x800600C0 -nuContRmbMgrInit;0x8005FC8C -nuContRmbMgrRemove;0x8005FCEC -nuContRmbModeSet;0x8005FF90 -nuContRmbStart;0x8005FE90 -nuGfxDisplayOff;0x8005F400 -nuGfxDisplayOn;0x8005F430 -nuGfxFuncSet;0x8005F250 -nuGfxInitEX2;0x8005F560 -nuGfxPreNMIFuncSet;0x8005F290 -nuGfxRetraceWait;0x80060370 -nuGfxSetCfb;0x8005F2F0 -nuGfxSwapCfb;0x80060350 -nuGfxSwapCfbFuncSet;0x80060310 -nuGfxTaskAllEndWait;0x8005F2D0 -nuGfxTaskMgr;0x8002CA40 -!nuGfxTaskMgrInit;0x8002CB38 -nuGfxTaskStart;0x8002CCC4 -nuGfxThread;0x80060248 -nuGfxThreadStart;0x800601F0 -nuPiInit;0x8005F450 -nuPiReadRom;0x8005F490 -nuPiReadRomOverlay;0x800600E0 -!nuScAddClient;0x8005EE30 -nuScCreateScheduler;0x8005E9B0 -!nuScEventBroadcast;0x8005F0C0 -nuScEventHandler;0x8005EFA8 -nuScExecuteAudio;0x8005EBE0 -!nuScExecuteGraphics;0x8005ED14 -nuScGetAudioMQ;0x8005EF84 -nuScGetFrameRate;0x8005EF9C -nuScGetGfxMQ;0x8005EF78 -nuScRemoveClient;0x8005EEBC -nuScResetClientMesgType;0x8005EF38 -nuScSetFrameBufferNum;0x8005EF90 -nuScWaitTaskReady;0x8005F120 -nuSiCallBackAdd;0x800603F0 -nuSiCallBackRemove;0x80060490 -nuSiMgrInit;0x8002CE30 -nuSiMgrRestart;0x8002CFAC -nuSiMgrStop;0x8002CF8C -nuSiMgrThread;0x8002CFD0 -nuSiSendMesg;0x8002CF28 -open_status_menu_long;0x800E9760 -open_status_menu_short;0x800E978C -osAfterPreNMI;0x8006A630 -osAiDeviceBusy;0x8006B850 -osAiGetLength;0x80061540 -osAiGetStatus;0x80061550 -osAiSetFrequency;0x80061560 -osAiSetNextBuffer;0x80061680 -osCartRomInit;0x80060F10 -osCheckId;0x80069DD4 -osCheckPackId;0x80069AA4 -osContAddressCrc;0x8006C860 -osContDataCrc;0x8006C8CC -osContGetInitData;0x80061D1C -osContGetQuery;0x80061980 -osContGetReadData;0x80061A28 -osContInit;0x80061B80 -osContRamRead;0x8006A1D0 -osContRamWrite;0x8006A3C0 -osContStartQuery;0x80061900 -osContStartReadData;0x800619A0 -osCreateMesgQueue;0x80065580 -osCreatePiManager;0x800609E0 -osCreateThread;0x80065E60 -osCreateViManager;0x80066A70 -osDequeueThread;0x80066200 -osDestroyThread;0x8006C950 -osDevMgrMain;0x80061090 -__osDisableInt;0x8006B360 -osDispatchThreadSave;0x8006B1F4 -osEPiLinkHandle;0x80060EC0 -osEPiRawReadIo;0x8006B570 -osEPiRawStartDma;0x80060B70 -osEPiRawWriteIo;0x8006B6E0 -osEPiReadIo;0x80060DC0 -osEPiStartDma;0x80060E20 -osEPiWriteIo;0x80060D60 -osExceptionPreamble;0x8006AA00 -osFlashAllErase;0x8006F308 -osFlashClearStatus;0x8006F29C -osFlashInit;0x8006EF68 -osFlashReadArray;0x8006F75C -osFlashReadId;0x8006F184 -osFlashReadStatus;0x8006F0B8 -osFlashSectorErase;0x8006F424 -osFlashWriteArray;0x8006F61C -osFlashWriteBuffer;0x8006F550 -osGetActiveQueue;0x80066290 -osGetCause;0x8006C660 -osGetCount;0x80065A00 -osGetId;0x80069C08 -osGetSR;0x8006C670 -osGetThreadPri;0x80065F30 -osGetTime;0x800662A0 -osIdCheckSum;0x80069774 -osInitialize;0x8006A708 -osInsertTimer;0x80066690 -osInvalDCache;0x80061720 -osInvalICache;0x800617D0 -osJamMesg;0x800655B0 -osMapTLB;0x800667A0 -osMapTLBRdb;0x8006CA30 -__osMotorAccess;0x80067E00 -osMotorInit;0x80067F44 -contRmbControl;0x8005F920 -osPackReadData;0x80061AC4 -osPackRequestData;0x80061DD0 -osPfsAllocateFile;0x80068190 -osPfsCheckRamArea;0x80069388 -osPfsChecker;0x8006CC20 -osPfsDeclearPage;0x8006849C -osPfsDeleteFile;0x800685C0 -osPfsFileState;0x80068C20 -osPfsFindFile;0x80068DC0 -osPfsFreeBlocks;0x80068F80 -osPfsGetInitData;0x8006D560 -osPfsGetOneChannelData;0x80069644 -osPfsGetStatus;0x800694C0 -osPfsInitPak;0x80069190 -osPfsIsPlug;0x8006D340 -osPfsNumFiles;0x80069090 -osPfsRWInode;0x80069E8C -osPfsReadWriteFile;0x800687E0 -osPfsReleasePages;0x8006876C -osPfsRepairId;0x80069460 -osPfsRequestData;0x8006D4BC -osPfsRequestOneChannel;0x800695B0 -osPfsSelectBank;0x800696D0 -osPiCreateAccessQueue;0x80061450 -osPiGetAccess;0x800614A4 -osPiGetCmdQueue;0x8006B550 -osPiRawStartDma;0x8006B480 -osPiRelAccess;0x80061510 -osProbeTLB;0x80066860 -osRecvMesg;0x800656F0 -osRepairPackId;0x800697B8 -osResetGlobalIntMask;0x8006B430 -__osRestoreInt;0x8006B3D0 -osSendMesg;0x80065820 -osSetCompare;0x8006C680 -osSetEventMesg;0x80065950 -osSetFpcCsr;0x8006C690 -osSetGlobalIntMask;0x8006B3F0 -osSetIntMask;0x80060940 -osSetSR;0x8006C6A0 -osSetThreadPri;0x80065F50 -osSetTime;0x80066330 -osSetTimer;0x80066350 -osSetTimerIntr;0x80066610 -osSetWatchLo;0x8006C6B0 -osSiCreateAccessQueue;0x80065D70 -osSiDeviceBusy;0x8006D7E0 -osSiGetAccess;0x80065DC4 -osSiRawReadIo;0x8006C7C0 -osSiRawStartDma;0x80065CC0 -osSiRawWriteIo;0x8006C810 -osSiRelAccess;0x80065E30 -osSpDeviceBusy;0x8006C6C0 -osSpGetStatus;0x8006C6E0 -osSpRawStartDma;0x8006C730 -osSpSetPc;0x8006C700 -osSpSetStatus;0x8006C6F0 -osSpTaskLoad;0x80065A10 -osSpTaskStartGo;0x80065C1C -osSpTaskYield;0x80065C50 -osSpTaskYielded;0x80065C70 -osStartThread;0x80066020 -osStopThread;0x80066140 -osSumcalc;0x80069740 -osTimerInterrupt;0x800664D4 -osTimerServicesInit;0x80066480 -osUnmapTLB;0x80066920 -osUnmapTLBAll;0x80066960 -osViBlack;0x80067380 -osViGetCurrentContext;0x8006CBA0 -osViGetCurrentFramebuffer;0x800669B0 -osViGetCurrentMode;0x80066A30 -osViGetNextFramebuffer;0x800669F0 -osViInit;0x8006CA90 -osViRepeatLine;0x800673E0 -osViSetEvent;0x80066DB0 -osViSetMode;0x80066E10 -osViSetSpecialFeatures;0x80066E60 -osViSetYScale;0x80066FD0 -osViSwapBuffer;0x80067020 -osViSwapContext;0x80067070 -osVirtualToPhysical;0x80061E90 -osWritebackDCache;0x80061850 -osWritebackDCacheAll;0x800618D0 -osYieldThread;0x80066240 -parent_collider_to_model;0x8005B780 -partner_can_use_ability;0x800EB42C -partner_get_ride_script;0x800EB638 -partner_handle_after_battle;0x800EB6C4 -partner_handle_before_battle;0x800EB658 -partner_initialize_data;0x800EB580 -partner_kill_ability_script;0x800EB7CC -partner_player_can_pause;0x800EB3E0 -partner_reset_data;0x800EB474 -partner_resume_ability_script;0x800EB860 -partner_suspend_ability_script;0x800EB818 -partner_test_enemy_collision;0x800EB5E4 -partner_use_ability;0x800EB314 -pause_badges_cleanup;0x80249758 -pause_badges_comparator;0x80246FE0 -pause_badges_count_all;0x80247054 -pause_badges_count_equipped;0x802470B0 -pause_badges_draw_bp_orbs;0x80247458 -pause_badges_draw_contents;0x80247508 -pause_badges_get_column;0x802471D8 -pause_badges_get_pos_x;0x8024710C -pause_badges_get_pos_y;0x80247168 -pause_badges_get_row;0x80247220 -pause_badges_handle_input;0x802490A8 -pause_badges_init;0x80248FC0 -pause_badges_is_visible;0x80247270 -pause_badges_load_badges;0x80248D8C -pause_badges_scroll_offset_x;0x802472A8 -pause_badges_scroll_offset_y;0x80247298 -pause_badges_try_equip;0x80247338 -pause_badges_try_remove;0x802472B0 -pause_badges_update;0x8024961C -pause_cleanup;0x80244708;0x135EE0 -pause_draw_menu_label;0x8024EE94 -pause_draw_rect;0x80244858 -pause_get_menu_string;0x8024EE80 -pause_get_total_equipped_bp_cost;0x802447F4 -pause_handle_input;0x80244424 -pause_init;0x80244060 -pause_interp_cursor;0x80242E6C -pause_interp_text_scroll;0x80243418 -pause_interp_vertical_scroll;0x8024346C -pause_items_cleanup;0x8024AD90 -pause_items_comparator;0x802497B0 -pause_items_draw_contents;0x80249970 -pause_items_get_column;0x80249898 -pause_items_get_pos_x;0x802497D0 -pause_items_get_pos_y;0x80249828 -pause_items_get_row;0x802498E0 -pause_items_handle_input;0x8024A7D8 -pause_items_init;0x8024A714 -pause_items_is_visible;0x80249930 -pause_items_load_items;0x8024A4DC -pause_items_scroll_offset_x;0x80249968 -pause_items_scroll_offset_y;0x80249958 -pause_items_update;0x8024AC54 -pause_map_cleanup;0x8024EE2C -pause_map_draw_border_arrows;0x8024DA28 -pause_map_draw_contents;0x8024DB1C -pause_map_draw_title;0x8024E54C -pause_map_handle_input;0x8024E878 -pause_map_init;0x8024E604 -pause_map_update;0x8024ECB0 -pause_partners_cleanup;0x8024C984 -pause_partners_draw_contents;0x8024AEF8 -pause_partners_draw_movelist;0x8024BD38 -pause_partners_draw_movelist_flower;0x8024C0A0 -pause_partners_draw_movelist_title;0x8024C048 -pause_partners_draw_title;0x8024BBAC -pause_partners_handle_input;0x8024C338 -pause_partners_init;0x8024C0E0 -pause_partners_load_portrait;0x8024ADE0 -pause_partners_update;0x8024C7A4 -pause_set_cursor_opacity;0x80242BA0;0x135EE0 -pause_sort_item_list;0x80244A4C -pause_spirits_cleanup;0x8024D8D8 -pause_spirits_draw_contents;0x8024CA00 -pause_spirits_draw_title;0x8024D294 -pause_spirits_handle_input;0x8024D44C -pause_spirits_init;0x8024D360 -pause_spirits_update;0x8024D800 -pause_stats_cleanup;0x80246F94 -pause_stats_draw_contents;0x80245980 -pause_stats_handle_input;0x80246B74 -pause_stats_init;0x80246AC8 -pause_tabs_cleanup;0x80245930 -pause_tabs_draw_badges;0x80244CC0 -pause_tabs_draw_invis;0x80244B90 -pause_tabs_draw_items;0x80244DE8 -pause_tabs_draw_map;0x80245160 -pause_tabs_draw_party;0x80244F10 -pause_tabs_draw_spirits;0x80245038 -pause_tabs_draw_stats;0x80244B98 -pause_tabs_handle_input;0x80245354 -pause_tabs_init;0x80245288 -pause_tabs_update;0x802455BC -pause_textbox_draw_contents;0x80243570 -pause_tutorial_draw_contents;0x802437F4 -pause_tutorial_input;0x802442A0 -pause_update_cursor;0x802434DC;0x135EE0 -phys_player_land;0x800E3278 -play_ambient_sounds;0x80147368 -play_effect;0x8005A564 -play_hit_sound;0x80277004 -play_model_animation;0x80120148 -play_movement_dust_effects;0x802642F0 -play_sound;0x80149CB4 -play_sound_at_npc;0x80149D08 -play_sound_at_player;0x80149CD8 -play_sound_at_position;0x80149D5C -player_create_target_list;0x8026302C -player_enter_blue_pipe;0x802E8CCC -player_jump;0x802D14E0 -poll_rumble;0x80028EE0 -proutSprintf;0x80065548 -push_entity_matrix;0x802E8E4C -queue_render_task;0x8011D910 -rand_int;0x800299FC -read_background_size;0x80145E28 -recover_fp;0x800EA264 -recover_hp;0x800EA2CC -remove_actor_decoration;0x80267234 -remove_all_effects;0x8005A4E0 -remove_consumable;0x800EA47C -remove_effect;0x8005A450 -remove_item_entity_by_index;0x801339FC -remove_item_entity_by_reference;0x80133930 -remove_part_decoration;0x80267218 -remove_part_shadow;0x802673A0 -create_part_shadow_by_ref;0x802673E4 -remove_player_buffs;0x80267454 -render_curtains;0x8002BA80 -render_dynamic_entities;0x80123470 -render_effects;0x80059EF4 -render_entities;0x8010FEB4 -render_frame;0x8002D73C -render_item_entities;0x80132E54 -render_menu_icon;0x80142BFC -render_menu_icons;0x801436B4 -render_messages;0x80124204 -render_models;0x80116B90 -render_npcs;0x8003A7F0 -render_player;0x800E1138 -render_player_model;0x800E1168 -render_shadows;0x801100CC -render_sprite;0x802DDC40 -render_ui;0x80112F58 -reset_actor_blur;0x802545AC -reset_all_actor_sounds;0x80267A9C -reset_partner_blur;0x8025468C -reset_status_menu;0x800E9BB0 -resolve_npc;0x802CDAC0 -restart_script;0x802C3D04 -resume_all_group;0x802C4648 -resume_all_script;0x802C448C -resume_group_others;0x802C471C -resume_group_script;0x802C437C -resume_group_script_index;0x802C4570 -round;0x80029AC4 -save_game_at_player_position;0x802E11A0 -save_ground_pos;0x800E54E0 -save_tattle_flags;0x80253D10 -set_action_state;0x800E5DA4 -set_actor_current_position;0x80269C24 -set_actor_home_position;0x80269D20 -set_actor_yaw;0x80263F68 -set_anim_timescale;0x802DD88C -set_animation;0x80263CFC -set_animation_rate;0x80263EB8 -set_area_byte;0x80145638 -set_area_flag;0x801455A0 -set_aux_pan_u;0x8011BC4C -set_aux_pan_v;0x8011BC64 -set_background_color_blend;0x8011BE5C -set_background_size;0x80145E70 -set_cam_target_pos;0x8024E520 -set_cam_viewport;0x8002E314 -set_cam_zoffset;0x8024E5E0 -set_cam_zoom;0x8024E594 -set_curtain_draw_callback;0x8002BF04 -set_curtain_fade;0x8002BF24 -set_curtain_fade_goal;0x8002BF14 -set_curtain_scale;0x8002BEEC -set_curtain_scale_goal;0x8002BEDC -set_defeated;0x8003EE40 -set_entity_fog_color;0x80123028 -set_entity_fog_dist;0x80123010 -set_float_variable;0x802C8640 -set_game_mode;0x800334F0 -set_global_byte;0x80145520 -set_global_flag;0x80145450 -set_global_timespace;0x802C4200 -set_goal_pos_to_part;0x80269754 -set_icon_flags;0x80144A00 -set_icon_render_pos;0x80144984 -set_item_entity_flags;0x80134148 -set_item_entity_position;0x8013420C -set_main_pan_u;0x8011BC1C -set_main_pan_v;0x8011BC34 -set_map_transition_effect;0x801382A0 -set_max_SP;0x800EA1D8 -set_menu_icon_script;0x801447FC -set_message_images;0x80125B2C -set_message_string;0x80125B3C -set_message_value;0x80125BE8 -set_music_track;0x8014A918 -set_npc_animation;0x802CDB0C -set_npc_shadow_scale;0x80112900 -set_npc_yaw;0x8003B340 -set_part_absolute_position;0x80269C70 -set_part_goal_to_actor_part;0x802699D8 -set_part_yaw;0x80263F9C -set_peach_shadow_scale;0x801129D4 -set_popup_duration;0x8024FAC4 -set_script_flags;0x802C47E8 -set_script_group;0x802C4218 -set_script_priority;0x802C41D8 -set_script_timescale;0x802C41E0 -set_standard_shadow_scale;0x8011285C -set_tex_panner;0x8011BC14 -set_ui_panel_properties;0x80147CC8 -set_variable;0x802C8098 -set_world_fog_color;0x8011BB88 -set_world_fog_dist;0x8011BB74 -set_zone_enabled;0x802CA1B8 -setup_demo_player;0x80072D2C -setup_item_popup;0x800E6C44 -setup_partner_popup;0x800E6B78 -setup_path_data;0x802D4DAC -show_battle_message;0x8024F960 -show_coin_counter;0x800E9518 -show_damage_popup;0x802665AC -show_first_strike_message;0x80041C5C -show_foreground_models;0x80267D28 -show_foreground_models_unsafe;0x80267C48 -show_message_popup;0x80250EA4 -show_variable_battle_message;0x8024FA04 -si;0x8006AD90 -si_execute_next_command;0x802C7404 -si_find_label;0x802C8890 -!si_goto_end_case;0x802C89E4 -si_goto_end_loop;0x802C8AE4 -si_goto_next_case;0x802C8A60 -si_handle_AND;0x802C6270 -si_handle_AND_const;0x802C62D4 -si_handle_OR;0x802C632C -si_handle_OR_const;0x802C6390 -si_handle_add;0x802C5804 -si_handle_addF;0x802C5A84 -si_handle_allocate_array;0x802C6214 -si_handle_bind;0x802C6714 -si_handle_bind_lock;0x802C6B54 -si_handle_break_case;0x802C56D4 -si_handle_break_loop;0x802C4B0C -si_handle_call;0x802C63E8 -si_handle_case_AND;0x802C549C -si_handle_case_default;0x802C5444 -si_handle_case_equal;0x802C5030 -si_handle_case_equal_AND;0x802C55B8 -si_handle_case_equal_OR;0x802C5518 -si_handle_case_greater;0x802C5268 -si_handle_case_greater_equal;0x802C52F8 -si_handle_case_less;0x802C5148 -si_handle_case_less_equal;0x802C51D8 -si_handle_case_not_equal;0x802C50BC -si_handle_case_range;0x802C5388 -si_handle_child_thread;0x802C6D6C -si_handle_divide;0x802C5934 -si_handle_divideF;0x802C5BC0 -si_handle_does_script_exist;0x802C6A78 -si_handle_else;0x802C4F40 -si_handle_end_case_group;0x802C565C -si_handle_end_child_thread;0x802C6DF4 -si_handle_end_if;0x802C4F6C -si_handle_end_loop;0x802C4A48 -si_handle_end_switch;0x802C5718 -si_handle_end_thread;0x802C6D4C -si_handle_exec1;0x802C646C -si_handle_exec2;0x802C6524 -si_handle_exec_wait;0x802C65FC -si_handle_get_1_float;0x802C5EB4 -si_handle_get_1_word;0x802C5C90 -si_handle_get_2_float;0x802C5F0C -si_handle_get_2_word;0x802C5CC4 -si_handle_get_3_float;0x802C5F9C -si_handle_get_3_word;0x802C5D2C -si_handle_get_4_float;0x802C605C -si_handle_get_4_word;0x802C5DB4 -si_handle_get_Nth_float;0x802C614C -si_handle_get_Nth_word;0x802C5E5C -si_handle_goto;0x802C49C0 -si_handle_if_AND;0x802C4E90 -si_handle_if_equal;0x802C4C40 -si_handle_if_greater;0x802C4D64 -si_handle_if_greater_equal;0x802C4E2C -si_handle_if_less;0x802C4D00 -si_handle_if_less_equal;0x802C4DC8 -si_handle_if_not_AND;0x802C4EE8 -si_handle_if_not_equal;0x802C4CA0 -si_handle_jump;0x802C6640 -si_handle_kill;0x802C6870 -si_handle_label;0x802C49B8 -si_handle_loop;0x802C4A00 -si_handle_mod;0x802C59BC -si_handle_multiply;0x802C58CC -si_handle_multiplyF;0x802C5B54 -si_handle_print_debug_var;0x802C6E1C -si_handle_resume;0x802C6A4C -si_handle_resume_all;0x802C697C -si_handle_resume_others;0x802C69E4 -si_handle_return;0x802C4998 -si_handle_set_array;0x802C61AC -si_handle_set_const;0x802C5790 -si_handle_set_flag_array;0x802C61E0 -si_handle_set_float;0x802C57B8 -si_handle_set_float_buffer_ptr;0x802C5C5C -si_handle_set_group;0x802C6914 -si_handle_set_int_buffer_ptr;0x802C5C28 -si_handle_set_priority;0x802C689C -si_handle_set_timescale;0x802C68D8 -si_handle_set_var;0x802C5744 -si_handle_subtract;0x802C5868 -si_handle_subtractF;0x802C5AEC -si_handle_suspend;0x802C6A20 -si_handle_suspend_all;0x802C6950 -si_handle_suspend_others;0x802C69A8 -si_handle_switch;0x802C4F74 -si_handle_switch_const;0x802C4FE4 -si_handle_thread;0x802C6C78 -si_handle_unbind;0x802C6850 -si_handle_wait;0x802C4B5C -si_handle_wait_seconds;0x802C4BB8 -si_skip_else;0x802C8978 -si_skip_if;0x802C88FC -si_standard_trigger_executor;0x802C6AD0 -sign;0x800294B0 -signF;0x80029A7C -sin_cos_deg;0x8002A234 -sin_cos_rad;0x8002A0B4 -sin_deg;0x8002A2EC -sin_rad;0x8002A16C -sins;0x800645F0 -sort_items;0x800E76CC -sort_scripts;0x802C3000 -spawn_drops;0x80048280 -spr_appendMDL_component;0x802DC8F4 -spr_draw_component;0x802DCEDC -spr_transform_point;0x802DCD00 -sprintf;0x800654F0 -sqrtf;0x80061EF0 -start_battle;0x800446B4 -start_bounce_a;0x800E6034 -start_bounce_b;0x800E608C -start_child_script;0x802C37C8 -start_falling;0x800E5FD0 -start_rumble;0x80028F08 -start_rumble_type;0x80267DF4 -start_script;0x802C33E0 -start_script_in_group;0x802C35D0 -status_menu_draw_number;0x800E7CA4 -status_menu_draw_stat;0x800E7E34 -status_menu_start_blinking_coins;0x800E99F4 -status_menu_start_blinking_fp;0x800E998C -status_menu_start_blinking_hp;0x800E9920 -status_menu_start_blinking_sp;0x800E9A60 -status_menu_start_blinking_sp_bars;0x800E9AB8 -status_menu_start_blinking_starpoints;0x800E9AE4 -status_menu_stop_blinking_coins;0x800E9A38 -status_menu_stop_blinking_fp;0x800E99D0 -status_menu_stop_blinking_hp;0x800E9964 -status_menu_stop_blinking_sp;0x800E9A94 -status_menu_stop_blinking_starpoints;0x800E9B0C -step_battle;0x800338E4 -step_current_game_mode;0x80112E78 -step_game_loop;0x80026740 -step_init_state;0x80033568 -step_intro;0x80036854 -step_logos;0x800340A4 -step_pause_menu;0x8003497C -step_title_screen;0x800370B4 -step_world;0x80035D54 -stop_sound;0x80149C6C -store_item;0x800E77C4 -strchr;0x80064A10 -strcmp;0x8006ED70 -strcpy;0x8006ED40 -strlen;0x80064A50 -stub_dynamic_entity_delegate;0x801230B0 -subtract_fortress_keys;0x800EA3B8 -subtract_hp;0x800EA334 -suspend_all_group;0x802C45E8 -suspend_all_script;0x802C4420 -suspend_group_others;0x802C46A8 -suspend_group_script;0x802C42D8 -suspend_group_script_index;0x802C44F8 -switch_order;0x80243918 -switch_to_partner;0x80242F00 -switch_to_player;0x80242AC8 -sync_status_menu;0x800E9B6C -test_below_player;0x800DDFD0 -test_down_ray_triangle;0x8005C49C -test_item_player_collision;0x80133B0C -test_player_entity_aabb;0x80110AAC -test_player_lateral;0x800DF460 -test_ray_colliders;0x8005CCD0 -test_ray_entities;0x8005D448 -test_ray_triangle_general;0x8005BE84 -test_ray_zone_aabb;0x80030458 -test_ray_zones;0x8005D124 -test_up_ray_collider;0x8005D2DC -test_up_ray_triangle;0x8005C7A4 -trace_above_player;0x800DEA08 -trace_below_player;0x800DE54C -transform_point;0x80029620 -try_inflict_status;0x80266B78 -unfreeze_cam;0x8024E600 -update_actor_shadow;0x802559BC -update_actor_shadows;0x8023E404 -update_battle_state;0x8023E438 -update_cameras;0x8002D400 -update_coin_counter;0x800E93DC -update_collider_transform;0x8005BA24 -update_component;0x802DD11C -update_curtains;0x8002BA78 -update_dynamic_entities;0x80123404 -update_end_player_turn;0x80242BB0 -update_enemy_action;0x80247570 -update_enemy_change_turn;0x802472AC -update_enemy_shadows;0x80255F5C -update_entities;0x8010F6D0 -update_entity_inverse_rotation_matrix;0x801104A4 -update_entity_transform_matrix;0x8011022C -update_fall_state;0x800E2D18 -update_hero_shadows;0x80255FAC -update_heroes_start_turn;0x80242024 -update_input;0x80028874 -update_item_entities;0x80131EEC -update_item_entity_collectable;0x80134250 -update_item_entity_static;0x80135658 -update_item_entity_temp;0x801356DC -update_lerp;0x8002A3B4 -update_lerp_battle;0x8027B0DC -update_locomotion_state;0x800E5F68 -update_menu_icons;0x80141610 -update_messages;0x801237D8 -update_npc_blur;0x8003ADF8 -update_npcs;0x80039930 -update_partner_action;0x80246B34 -update_partner_menu;0x802A81C8 -update_player;0x800DF740 -update_player_action;0x80245AD0 -update_player_actor_shadow;0x80257BAC -update_player_change_turn;0x80246450 -update_player_input;0x800E1F90 -update_player_menu;0x802A5988 -update_player_move_history;0x800ED4B8 -update_player_shadow;0x800E1BC4 -update_run_away;0x80244F00 -update_scripts;0x802C3D74 -update_shadow_transform_matrix;0x80110374 -update_shadows;0x8010FA98 -update_starpoints_display;0x802403BC -update_status_menu;0x800E80B4 -update_swap_partner;0x802456F8 -update_targeting_enemies;0x802AA688 -update_triggers;0x80145860 -use_cam_preset;0x8024CF34 -use_consumable;0x800EA400 -viMgrMain;0x80066C10 -ActorAddMovePos;0x80280880 -PlayerScriptDispatcher;0x80284EBC -PeachScriptDispatcher;0x80285010 -ExecutePlayerAction;0x8028505C -ExecutePeachAction;0x80285174 -HandleEvent_Player;0x802852D4 -SetForegroundModelsVisibleUnsafe;0x80253AA8 -JumpToGoalSimple2;0x80279420 -LandJumpPart;0x8027AB5C -_advance_rng;0x80029900 -fio_has_valid_backup;0x8002AFD8 -fio_flush_backups;0x8002B04C -COPY_set_defeated;0x8003E2E0 -GetCamLookAtObjVector;0x8003F398 -draw_submenu_title;0x800F4648 -AssignScript;0x80111FB0 -draw_menu_icon;0x80144298 -bind_trigger;0x802C4220 -bind_trigger_1;0x802C42A8 -draw_anim_models;0x802CCB18 -SetAnimModelPosition;0x802CCFE4 -GetAnimModelPosition;0x802CD090 -AddAnimModelPosition;0x802CD12C -SetAnimModelRotation;0x802CD1F0 -SetAnimModelScale;0x802CD29C -NpcSetHomePosToCurrent;0x802CF3BC -!func_8002D160;0x8002D160 -!func_8002C890;0x8002C890 -func_802A91F8;0x802A91F8 -func_802A9208;0x802A9208 -func_802A9228;0x802A9228 -func_802A9234;0x802A9234 -func_802A9254;0x802A9254 -func_802A9278;0x802A9278 -func_802A928C;0x802A928C -func_802A9294;0x802A9294 -func_802A9298;0x802A9298 -func_802A92A0;0x802A92A0 -func_802A92D4;0x802A92D4 -func_802A92DC;0x802A92DC -func_802A92F0;0x802A92F0 -func_802A9310;0x802A9310 -func_802A936C;0x802A936C -func_802A9378;0x802A9378 -func_802A948C;0x802A948C -func_802A94A4;0x802A94A4 -func_802A94D8;0x802A94D8 -func_802A9544;0x802A9544 -func_802A955C;0x802A955C -func_802A9590;0x802A9590 -func_802A959C;0x802A959C -func_802A9634;0x802A9634 -func_802A963C;0x802A963C -func_802A9664;0x802A9664 -func_802A96B8;0x802A96B8 -func_802A96DC;0x802A96DC -func_802A96EC;0x802A96EC -func_802A96F4;0x802A96F4 -func_802A9708;0x802A9708 -func_802A9718;0x802A9718 -func_802A9720;0x802A9720 -func_802A973C;0x802A973C -func_802A9744;0x802A9744 -func_802A9764;0x802A9764 -func_802A97AC;0x802A97AC -func_802A97BC;0x802A97BC -func_802A97CC;0x802A97CC -func_802A97F8;0x802A97F8 -func_802A97FC;0x802A97FC -func_802A9810;0x802A9810 -func_802A981C;0x802A981C -func_802A9834;0x802A9834 -func_802A984C;0x802A984C -func_802A9894;0x802A9894 -func_802A9898;0x802A9898 -func_802A98B0;0x802A98B0 -func_802A98D0;0x802A98D0 -func_802A98DC;0x802A98DC -func_802A98E0;0x802A98E0 -func_802A9914;0x802A9914 -func_802A992C;0x802A992C -func_802A9990;0x802A9990 -func_802A99D4;0x802A99D4 -func_802A9A30;0x802A9A30 -func_802A9A54;0x802A9A54 -func_802AA014;0x802AA014 -func_802AA0D8;0x802AA0D8 -func_802AB330;0x802AB330 -func_802AB338;0x802AB338 -func_802B71D4;0x802B71D4 -func_802B71E8;0x802B71E8 -func_802BD7DC;0x802BD7DC -func_802BE070;0x802BE070 -!func_8006AA34;0x8006AA34 -SetTattleString;0x80045A58 -!osEnqueueAndYield;0x8006B06C -!osPopThread;0x8006B1BC -!osDispatchThread;0x8006B1D4 -!osEnqueueThread;0x8006B174 -!send_mesg;0x8006AF7C -!handle_CPU;0x8006B038 -gPauseMenuStrings;0x8026F778 -gEffectTable;0x8007F214 -gMoveScriptTable;0x80293E80 -gStaticScriptCounter;0x802D9CA0 -D_80156954;0x80156954 -D_802D9CA4;0x802D9CA4 -gCollisionStatus;0x8015A550 -gGlobalTimeSpace;0x802D9CA8 -gBattleState;0x800DC068 -gBattleDmaDest;0x80284000 -gDialogueState;0x8029FA60 -gSpeakingActorPrintCtx;0x8029FA60 -gSpeakingActorPrintIsDone;0x8029FA68 -gSpeakingActorTalkAnim;0x8029FA6C -gSpeakingActorIdleAnim;0x8029FA70 -gSpeakingActor;0x8029FA74 -gSpeakingActorPart;0x8029FA78 -EnterWalk;0x80285960 -EnemyNpcHit;0x80077F70 -EnemyNpcDefeat;0x8007809C -D_80078DB0;0x80078DB0 -D_80078DB4;0x80078DB4 -gMusicPlayers;0x80159AF0 -gMusicUnkVolume;0x80159AE0 -gMusicUnkVolume2;0x80159AE4 -gMusicTargetVolume;0x80159AE2 -gMusicCurrentVolume;0x80159AE6 -gAreas;0x800934F0 -gSongArray;0x8014F720 -D_802D9D50;0x802D9D50 +entry_point = 0x80025C00; +boot_main = 0x80025F70; +gfxRetrace_Callback = 0x8002605C; // ! +gfxPreNMI_Callback = 0x8002670C; +step_game_loop = 0x80026740; +gfx_draw_frame = 0x80026B08; +load_engine_data = 0x80026DDC; +update_input = 0x80028874; +poll_rumble = 0x80028EE0; +start_rumble = 0x80028F08; +length2D = 0x80028FF0; +_heap_create = 0x80029030; +_heap_malloc = 0x8002906C; +_heap_malloc_tail = 0x80029164; +_heap_free = 0x8002921C; +_heap_realloc = 0x800292C4; +cosine = 0x800293D4; +sign = 0x800294B0; +int_to_string = 0x800294C4; +mem_clear = 0x80029600; +transform_point = 0x80029620; +copy_matrix = 0x80029720; +dma_copy = 0x8002973C; +_advance_rng = 0x80029900; +rand_int = 0x800299FC; +signF = 0x80029A7C; +round = 0x80029AC4; +clamp_angle = 0x80029B24; +get_clamped_angle_diff = 0x80029C28; +atan2 = 0x80029C80; +get_player_normal_yaw = 0x80029E20; +get_player_normal_pitch = 0x80029E50; +dist2D = 0x80029ED4; +dist3D = 0x80029F2C; +add_vec2D_polar = 0x80029F9C; +_wrap_trig_lookup_value = 0x8002A034; +sin_cos_rad = 0x8002A0B4; +sin_rad = 0x8002A16C; +cos_rad = 0x8002A1D0; +sin_cos_deg = 0x8002A234; +sin_deg = 0x8002A2EC; +cos_deg = 0x8002A350; +update_lerp = 0x8002A3B4; +general_heap_create = 0x8002AC00; +general_heap_malloc = 0x8002AC28; +general_heap_malloc_tail = 0x8002AC50; +general_heap_free = 0x8002AC78; +battle_heap_create = 0x8002ACA0; +heap_malloc = 0x8002ACE4; +heap_free = 0x8002AD2C; +collision_heap_create = 0x8002AD74; +collision_heap_malloc = 0x8002ADB0; +collision_heap_free = 0x8002ADF4; +get_spirits_rescued = 0x8002AE40; +fio_calc_header_checksum = 0x8002AF40; +fio_validate_header_checksums = 0x8002AF70; +fio_has_valid_backup = 0x8002AFD8; +fio_flush_backups = 0x8002B04C; +fio_calc_file_checksum = 0x8002B0D0; +fio_validate_file_checksum = 0x8002B0F8; +fio_fetch_saved_file_info = 0x8002B154; +fio_load_game = 0x8002B2D0; +fio_save_game = 0x8002B374; +fio_erase_game = 0x8002B42C; +fio_deserialize_state = 0x8002B490; +fio_serialize_state = 0x8002B630; +fio_init_flash = 0x8002B84C; +fio_read_flash = 0x8002B868; +fio_write_flash = 0x8002B948; +fio_erase_flash = 0x8002BA1C; +initialize_curtains = 0x8002BA40; +update_curtains = 0x8002BA78; +render_curtains = 0x8002BA80; +set_curtain_scale_goal = 0x8002BEDC; +set_curtain_scale = 0x8002BEEC; +set_curtain_draw_callback = 0x8002BF04; +set_curtain_fade_goal = 0x8002BF14; +set_curtain_fade = 0x8002BF24; +crash_delay_msec = 0x8002BF40; +crash_printf_string = 0x8002C208; +crash_print_fpr = 0x8002C2B8; +crash_show_handler = 0x8002C3B0; +crash_monitor_thread = 0x8002C81C; +func_8002C890 = 0x8002C890; // ! +crash_create_monitor = 0x8002C8B0; +nuGfxTaskMgr = 0x8002CA40; +nuGfxTaskMgrInit = 0x8002CB38; // ! +nuGfxTaskStart = 0x8002CCC4; +nuSiMgrInit = 0x8002CE30; +nuSiSendMesg = 0x8002CF28; +nuSiMgrStop = 0x8002CF8C; +nuSiMgrRestart = 0x8002CFAC; +nuSiMgrThread = 0x8002CFD0; +func_8002D160 = 0x8002D160; // ! +update_cameras = 0x8002D400; +render_frame = 0x8002D73C; +create_cameras_a = 0x8002DEF4; +create_cameras_b = 0x8002E038; +initialize_next_camera = 0x8002E16C; +set_cam_viewport = 0x8002E314; +get_cam_viewport = 0x8002E4E8; +get_screen_coords = 0x8002E538; +do_camera_type_4 = 0x8002E910; +do_camera_type_2 = 0x8002ECF8; +do_camera_type_1 = 0x8002F290; +do_camera_type_0 = 0x8002F850; +do_camera_type_6 = 0x8002F990; +do_camera_type_unused = 0x8002FCE0; +do_camera_type_5 = 0x80030000; +test_ray_zone_aabb = 0x80030458; +do_camera_type_3 = 0x80031494; +set_game_mode = 0x800334F0; +get_game_mode = 0x80033528; +begin_state_init = 0x80033540; +step_init_state = 0x80033568; +intro_logos_set_fade_alpha = 0x800337D0; +intro_logos_set_fade_color = 0x800337E0; +intro_logos_fade_in = 0x800337F8; +intro_logos_fade_out = 0x80033830; +intro_logos_update_fade = 0x80033874; +begin_state_battle = 0x800338D0; +step_battle = 0x800338E4; +begin_state_logos = 0x80033E70; +step_logos = 0x800340A4; +begin_state_pause_menu = 0x80034940; +step_pause_menu = 0x8003497C; +begin_state_world = 0x80035D30; +step_world = 0x80035D54; +begin_state_intro = 0x80036650; +step_intro = 0x80036854; +begin_state_title_screen = 0x80036DF0; +step_title_screen = 0x800370B4; +init_demo_data = 0x80038080; +next_demo_scene = 0x800380F4; +NOP_npc_callback = 0x80038470; +mtx_ident_mirror_y = 0x80038478; +clear_npcs = 0x800384BC; +init_npc_list = 0x8003852C; +_create_npc = 0x80038598; +create_basic_npc = 0x80038844; +create_standard_npc = 0x80038864; +create_partner_npc = 0x80038880; +free_npc_by_index = 0x800388A0; +free_npc = 0x800389CC; +get_npc_by_index = 0x80038ADC; +npc_do_world_collision = 0x80038AFC; +npc_do_other_npc_collision = 0x8003900C; +npc_do_player_collision = 0x800392D8; +update_npcs = 0x80039930; +appendGfx_npc = 0x80039FD0; +render_npcs = 0x8003A7F0; +npc_move_heading = 0x8003AA54; +get_npc_unsafe = 0x8003AAEC; +get_npc_safe = 0x8003AB48; +enable_npc_shadow = 0x8003ABA0; +disable_npc_shadow = 0x8003ABFC; +enable_npc_blur = 0x8003AD24; +disable_npc_blur = 0x8003ADAC; +update_npc_blur = 0x8003ADF8; +appedGfx_npc_blur = 0x8003AE38; +set_npc_yaw = 0x8003B340; +COPY_set_defeated = 0x8003E2E0; +clear_encounter_status = 0x8003E400; +make_npcs = 0x8003E678; +kill_encounter = 0x8003E730; +kill_enemy = 0x8003E7AC; +bind_enemy_ai = 0x8003E94C; +bind_enemy_aux = 0x8003E9B4; +bind_enemy_interact = 0x8003EA1C; +bind_npc_ai = 0x8003EA84; +bind_npc_aux = 0x8003EB50; +bind_npc_interact = 0x8003EC1C; +get_enemy = 0x8003ECE8; +get_enemy_safe = 0x8003ED68; +get_defeated = 0x8003EDF0; +set_defeated = 0x8003EE40; +FadeBackgroundToBlack = 0x8003EF00; +UnfadeBackgroundFromBlack = 0x8003EF98; +GetCamLookAtObjVector = 0x8003F398; +HasMerleeCasts = 0x8003F3F4; +OnDefeatEnemy = 0x8003F580; +OnFleeBattleDrops = 0x8003F6E8; +show_first_strike_message = 0x80041C5C; +create_npcs = 0x800436B0; +SetEncounterStatusFlags = 0x80044180; +LoadDemoBattle = 0x80044264; +MakeNpcs = 0x80044298; +RemoveNpc = 0x80044340; +RemoveEncounter = 0x80044478; +GetBattleOutcome = 0x8004457C; +GetOwnerEncounterTrigger = 0x80044600; +DoNpcDefeat = 0x8004462C; +start_battle = 0x800446B4; +StartBattle = 0x80044840; +StartBattleWith = 0x80044860; +StartBossBattle = 0x8004489C; +SetBattleMusic = 0x80044A38; +BindNpcAI = 0x80044A78; +BindNpcIdle = 0x80044BAC; +RestartNpcAI = 0x80044C2C; +EnableNpcAI = 0x80044CF0; +SetNpcAux = 0x80044DA4; +BindNpcAux = 0x80044EB8; +RestartNpcAux = 0x80044F38; +EnableNpcAux = 0x80044FF0; +BindNpcInteract = 0x800450A4; +BindNpcHit = 0x80045140; +BindNpcDefeat = 0x800451DC; +SetSelfVar = 0x8004525C; +GetSelfVar = 0x800452C0; +SetNpcVar = 0x80045320; +GetNpcVar = 0x800453BC; +SetSelfRotation = 0x8004545C; +SetSelfEnemyFlags = 0x8004550C; +SetSelfEnemyFlagBits = 0x80045524; +GetSelfNpcID = 0x80045614; +ClearDefeatedEnemies = 0x80045640; +SetEnemyFlagBits = 0x80045688; +GetSelfAnimationFromTable = 0x80045734; +SetTattleString = 0x80045A58; +spawn_drops = 0x80048280; +get_coin_drop_amount = 0x80048D50; +is_point_within_region = 0x80048FD4; +DoBasicAI = 0x8004A47C; +nuAuDmaCallBack = 0x8004B074; // ! +nuAuDmaNew = 0x8004B224; +nuAuCleanDMABuffers = 0x8004B268; +alLink = 0x8004B3EC; +alUnlink = 0x8004B40C; +al_LoadINIT = 0x800542BC; +al_CopyFileTableEntry = 0x8005447C; +al_LoadPER = 0x800544F8; +al_LoadPRG = 0x800545B4; +al_LoadBank = 0x800547C8; +al_DmaCopy = 0x80054E00; +al_CopyWords = 0x80054F74; +al_LoadBKHeaders = 0x80054FC0; +alAudioFrame = 0x800565C0; +alHeapAlloc = 0x80057F90; +render_effects = 0x80059EF4; +remove_effect = 0x8005A450; +remove_all_effects = 0x8005A4E0; +play_effect = 0x8005A564; +load_map_script_lib = 0x8005A6C0; +load_map_by_IDs = 0x8005A6F4; +get_current_map_config = 0x8005ABD8; +get_current_map_header = 0x8005ABE8; +get_map_IDs_by_name = 0x8005ABF8; +load_asset_by_name = 0x8005ACE8; +get_asset_offset = 0x8005ADD0; +allocate_hit_tables = 0x8005AEA0; +initialize_collision = 0x8005AF94; +load_hit_asset = 0x8005AFC0; +load_collision = 0x8005B058; +load_stage_collision = 0x8005B1A0; +load_hit_data = 0x8005B23C; +parent_collider_to_model = 0x8005B780; +_add_hit_vert_to_buffer = 0x8005B9A0; +_get_hit_vert_index_from_buffer = 0x8005B9F4; +update_collider_transform = 0x8005BA24; +get_collider_type_by_id = 0x8005BDA8; +get_collider_center = 0x8005BE10; +test_ray_triangle_general = 0x8005BE84; +test_down_ray_triangle = 0x8005C49C; +test_up_ray_triangle = 0x8005C7A4; +test_ray_colliders = 0x8005CCD0; +test_ray_zones = 0x8005D124; +test_up_ray_collider = 0x8005D2DC; +test_ray_entities = 0x8005D448; +get_npc_pos = 0x8005DE10; +nuBoot = 0x8005E8B0; +boot_idle = 0x8005E90C; +nuScCreateScheduler = 0x8005E9B0; +nuScExecuteAudio = 0x8005EBE0; +nuScExecuteGraphics = 0x8005ED14; // ! +nuScAddClient = 0x8005EE30; // ! +nuScRemoveClient = 0x8005EEBC; +nuScResetClientMesgType = 0x8005EF38; +nuScGetGfxMQ = 0x8005EF78; +nuScGetAudioMQ = 0x8005EF84; +nuScSetFrameBufferNum = 0x8005EF90; +nuScGetFrameRate = 0x8005EF9C; +nuScEventHandler = 0x8005EFA8; +nuScEventBroadcast = 0x8005F0C0; // ! +nuScWaitTaskReady = 0x8005F120; +nuGfxFuncSet = 0x8005F250; +nuGfxPreNMIFuncSet = 0x8005F290; +nuGfxTaskAllEndWait = 0x8005F2D0; +nuGfxSetCfb = 0x8005F2F0; +nuGfxDisplayOff = 0x8005F400; +nuGfxDisplayOn = 0x8005F430; +nuPiInit = 0x8005F450; +nuPiReadRom = 0x8005F490; +nuGfxInitEX2 = 0x8005F560; +nuContInit = 0x8005F610; +nuContDataGet = 0x8005F650; +nuContPakMgrInit = 0x8005F6B0; +nuContPakMgrRemove = 0x8005F6D4; +contPakOpen = 0x8005F6F8; +contPakFree = 0x8005F748; +contPakFileReadWrite = 0x8005F770; +contPakFileOpen = 0x8005F7B0; +contPakFileDelete = 0x8005F864; +contPakFileState = 0x8005F8A4; +contPakFileNum = 0x8005F8D0; +contPakRepairId = 0x8005F8FC; +contRmbControl = 0x8005F920; +contRmbRetrace = 0x8005FB20; +nuContRmbMgrInit = 0x8005FC8C; +nuContRmbMgrRemove = 0x8005FCEC; +contRmbCheckMesg = 0x8005FD10; +contRmbStartMesg = 0x8005FD58; +contRmbStopMesg = 0x8005FDE4; +contRmbForceStopMesg = 0x8005FE0C; +contRmbForceStopEndMesg = 0x8005FE54; +nuContRmbStart = 0x8005FE90; +nuContRmbCheck = 0x8005FEF0; +nuContRmbModeSet = 0x8005FF90; +nuContRmbForceStop = 0x800600A0; +nuContRmbForceStopEnd = 0x800600C0; +nuPiReadRomOverlay = 0x800600E0; +nuGfxThreadStart = 0x800601F0; +nuGfxThread = 0x80060248; +nuGfxSwapCfbFuncSet = 0x80060310; +nuGfxSwapCfb = 0x80060350; +nuGfxRetraceWait = 0x80060370; +nuSiCallBackAdd = 0x800603F0; +nuSiCallBackRemove = 0x80060490; +nuContMgrInit = 0x80060510; +nuContMgrRemove = 0x800605E8; +nuContDataClose = 0x8006060C; +nuContDataOpen = 0x80060634; +contRetrace = 0x8006065C; +contReadData = 0x80060738; +contReadNW = 0x800607B4; +contQuery = 0x80060870; +nuContDataLock = 0x800608C0; +nuContDataUnLock = 0x800608F0; +nuContQueryRead = 0x80060920; +osSetIntMask = 0x80060940; +osCreatePiManager = 0x800609E0; +osEPiRawStartDma = 0x80060B70; +osEPiWriteIo = 0x80060D60; +osEPiReadIo = 0x80060DC0; +osEPiStartDma = 0x80060E20; +osEPiLinkHandle = 0x80060EC0; +osCartRomInit = 0x80060F10; +osDevMgrMain = 0x80061090; +osPiCreateAccessQueue = 0x80061450; +osPiGetAccess = 0x800614A4; +osPiRelAccess = 0x80061510; +osAiGetLength = 0x80061540; +osAiGetStatus = 0x80061550; +osAiSetFrequency = 0x80061560; +osAiSetNextBuffer = 0x80061680; +osInvalDCache = 0x80061720; +osInvalICache = 0x800617D0; +osWritebackDCache = 0x80061850; +osWritebackDCacheAll = 0x800618D0; +osContStartQuery = 0x80061900; +osContGetQuery = 0x80061980; +osContStartReadData = 0x800619A0; +osContGetReadData = 0x80061A28; +osPackReadData = 0x80061AC4; +osContInit = 0x80061B80; +osContGetInitData = 0x80061D1C; +osPackRequestData = 0x80061DD0; +osVirtualToPhysical = 0x80061E90; +sqrtf = 0x80061EF0; +coss = 0x80061F00; +guFrustumF = 0x80061F30; +guFrustum = 0x80062060; +guLookAtF = 0x800621B0; +guLookAt = 0x80062530; +guLookAtHiliteF = 0x800628C0; +guLookAtHilite = 0x80063244; +guLookAtReflectF = 0x80063320; +guLookAtReflect = 0x80063898; +guOrthoF = 0x80063910; +guOrtho = 0x80063A40; +guPerspectiveF = 0x80063B90; +guPerspective = 0x80063D40; +guPositionF = 0x80063F10; +guPosition = 0x800640E8; +guRotateAnglesF = 0x800642D0; +guRotateAngles = 0x80064458; +sins = 0x800645F0; +bcopy = 0x80064650; +bzero = 0x80064970; // ! +strchr = 0x80064A10; +strlen = 0x80064A50; +memcpy = 0x80064A74; +_Printf = 0x80064AA0; +_Putfld = 0x80065020; +sprintf = 0x800654F0; +proutSprintf = 0x80065548; +osCreateMesgQueue = 0x80065580; +osJamMesg = 0x800655B0; +osRecvMesg = 0x800656F0; +osSendMesg = 0x80065820; +osSetEventMesg = 0x80065950; +osGetCount = 0x80065A00; +osSpTaskLoad = 0x80065A10; +osSpTaskStartGo = 0x80065C1C; +osSpTaskYield = 0x80065C50; +osSpTaskYielded = 0x80065C70; +osSiRawStartDma = 0x80065CC0; +osSiCreateAccessQueue = 0x80065D70; +osSiGetAccess = 0x80065DC4; +osSiRelAccess = 0x80065E30; +osCreateThread = 0x80065E60; +osGetThreadPri = 0x80065F30; +osSetThreadPri = 0x80065F50; +osStartThread = 0x80066020; +osStopThread = 0x80066140; +osDequeueThread = 0x80066200; +osYieldThread = 0x80066240; +osGetActiveQueue = 0x80066290; +osGetTime = 0x800662A0; +osSetTime = 0x80066330; +osSetTimer = 0x80066350; +osTimerServicesInit = 0x80066480; +osTimerInterrupt = 0x800664D4; +osSetTimerIntr = 0x80066610; +osInsertTimer = 0x80066690; +osMapTLB = 0x800667A0; +osProbeTLB = 0x80066860; +osUnmapTLB = 0x80066920; +osUnmapTLBAll = 0x80066960; +osViGetCurrentFramebuffer = 0x800669B0; +osViGetNextFramebuffer = 0x800669F0; +osViGetCurrentMode = 0x80066A30; +osCreateViManager = 0x80066A70; +viMgrMain = 0x80066C10; +osViSetEvent = 0x80066DB0; +osViSetMode = 0x80066E10; +osViSetSpecialFeatures = 0x80066E60; +osViSetYScale = 0x80066FD0; +osViSwapBuffer = 0x80067020; +osViSwapContext = 0x80067070; +osViBlack = 0x80067380; +osViRepeatLine = 0x800673E0; +guMtxIdent = 0x80067440; +guMtxIdentF = 0x800674A0; +guMtxF2L = 0x80067500; +guMtxL2F = 0x80067580; +guMtxCatF = 0x80067600; +guScale = 0x80067700; +guScaleF = 0x800677C0; +guTranslate = 0x80067820; +guTranslateF = 0x80067900; +guMtxCat = 0x80067960; +guMtxXFML = 0x800679E0; +guMtxXFMF = 0x80067A70; +guRotateF = 0x80067B20; +guRotate = 0x80067C80; +__osMotorAccess = 0x80067E00; +osMotorInit = 0x80067F44; +osPfsAllocateFile = 0x80068190; +osPfsDeclearPage = 0x8006849C; +osPfsDeleteFile = 0x800685C0; +osPfsReleasePages = 0x8006876C; +osPfsReadWriteFile = 0x800687E0; +osPfsFileState = 0x80068C20; +osPfsFindFile = 0x80068DC0; +osPfsFreeBlocks = 0x80068F80; +osPfsNumFiles = 0x80069090; +osPfsInitPak = 0x80069190; +osPfsCheckRamArea = 0x80069388; +osPfsRepairId = 0x80069460; +osPfsGetStatus = 0x800694C0; +osPfsRequestOneChannel = 0x800695B0; +osPfsGetOneChannelData = 0x80069644; +osPfsSelectBank = 0x800696D0; +osSumcalc = 0x80069740; +osIdCheckSum = 0x80069774; +osRepairPackId = 0x800697B8; +osCheckPackId = 0x80069AA4; +osGetId = 0x80069C08; +osCheckId = 0x80069DD4; +osPfsRWInode = 0x80069E8C; +osContRamRead = 0x8006A1D0; +osContRamWrite = 0x8006A3C0; +osAfterPreNMI = 0x8006A630; +osInitialize = 0x8006A708; +osExceptionPreamble = 0x8006AA00; +func_8006AA34 = 0x8006AA34; // ! +ai = 0x8006AD64; +si = 0x8006AD90; +dp = 0x8006AE0C; +send_mesg = 0x8006AF7C; // ! +handle_CPU = 0x8006B038; // ! +osEnqueueAndYield = 0x8006B06C; // ! +osEnqueueThread = 0x8006B174; // ! +osPopThread = 0x8006B1BC; // ! +osDispatchThread = 0x8006B1D4; // ! +osDispatchThreadSave = 0x8006B1F4; +__osDisableInt = 0x8006B360; +__osRestoreInt = 0x8006B3D0; +osSetGlobalIntMask = 0x8006B3F0; +osResetGlobalIntMask = 0x8006B430; +osPiRawStartDma = 0x8006B480; +osPiGetCmdQueue = 0x8006B550; +osEPiRawReadIo = 0x8006B570; +osEPiRawWriteIo = 0x8006B6E0; +osAiDeviceBusy = 0x8006B850; +bcmp = 0x8006B870; +_Litob = 0x8006B980; +_Ldtob = 0x8006BBD0; +_Ldunscale = 0x8006C01C; +_Genld = 0x8006C0B4; +osGetCause = 0x8006C660; +osGetSR = 0x8006C670; +osSetCompare = 0x8006C680; +osSetFpcCsr = 0x8006C690; +osSetSR = 0x8006C6A0; +osSetWatchLo = 0x8006C6B0; +osSpDeviceBusy = 0x8006C6C0; +osSpGetStatus = 0x8006C6E0; +osSpSetStatus = 0x8006C6F0; +osSpSetPc = 0x8006C700; +osSpRawStartDma = 0x8006C730; +osSiRawReadIo = 0x8006C7C0; +osSiRawWriteIo = 0x8006C810; +osContAddressCrc = 0x8006C860; +osContDataCrc = 0x8006C8CC; +osDestroyThread = 0x8006C950; +osMapTLBRdb = 0x8006CA30; +osViInit = 0x8006CA90; +osViGetCurrentContext = 0x8006CBA0; +guNormalize = 0x8006CBC0; +osPfsChecker = 0x8006CC20; +corrupted_init = 0x8006D080; +corrupted = 0x8006D1D8; +osPfsIsPlug = 0x8006D340; +osPfsRequestData = 0x8006D4BC; +osPfsGetInitData = 0x8006D560; +ldiv = 0x8006D620; +lldiv = 0x8006D6A4; +osSiDeviceBusy = 0x8006D7E0; +strcpy = 0x8006ED40; +strcmp = 0x8006ED70; +memset = 0x8006EDB0; +decode_yay0 = 0x8006EDF0; +osFlashInit = 0x8006EF68; +osFlashReadStatus = 0x8006F0B8; +osFlashReadId = 0x8006F184; +osFlashClearStatus = 0x8006F29C; +osFlashAllErase = 0x8006F308; +osFlashSectorErase = 0x8006F424; +osFlashWriteBuffer = 0x8006F550; +osFlashWriteArray = 0x8006F61C; +osFlashReadArray = 0x8006F75C; +fx_walk_large = 0x8006FAD0; +fx_walk_normal = 0x8006FB30; +fx_emote = 0x8006FE90; +fx_sweat = 0x80070790; +fx_sleep_bubble = 0x800707F0; +load_battle = 0x80072C90; +setup_demo_player = 0x80072D2C; +load_demo_battle = 0x80072E14; +EnemyNpcHit = 0x80077F70; +EnemyNpcDefeat = 0x8007809C; +D_80078DB0 = 0x80078DB0; +D_80078DB4 = 0x80078DB4; +gEffectTable = 0x8007F214; +gAreas = 0x800934F0; +gBattleState = 0x800DC068; +test_below_player = 0x800DDFD0; +trace_below_player = 0x800DE54C; +collision_check_above = 0x800DE7E4; +trace_above_player = 0x800DEA08; +do_lateral_collision = 0x800DEC04; +test_player_lateral = 0x800DF460; +update_player = 0x800DF740; +check_input_use_partner = 0x800DFA00; +clear_player_status = 0x800DFC50; +enable_player_shadow = 0x800E00B0; +disable_player_shadow = 0x800E00E4; +disable_player_static_collisions = 0x800E0114; +enable_player_static_collisions = 0x800E0140; +disable_player_input = 0x800E0178; +enable_player_input = 0x800E01A4; +render_player = 0x800E1138; +render_player_model = 0x800E1168; +appendGfx_player = 0x800E12F4; +appendGfx_player_spin = 0x800E1704; +update_player_shadow = 0x800E1BC4; +update_player_input = 0x800E1F90; +input_to_move_vector = 0x800E2304; +move_player = 0x800E2778; +collision_main_above = 0x800E27E0; +update_fall_state = 0x800E2D18; +gravity_use_jump_parms = 0x800E2FD0; +gravity_use_fall_parms = 0x800E306C; +phys_player_land = 0x800E3278; +integrate_gravity = 0x800E3448; +collision_main_lateral = 0x800E363C; +collision_check_player_intersecting_world = 0x800E4308; +check_input_midair_jump = 0x800E4FCC; +get_current_partner_id = 0x800E5088; +save_ground_pos = 0x800E54E0; +set_action_state = 0x800E5DA4; +update_locomotion_state = 0x800E5F68; +start_falling = 0x800E5FD0; +start_bounce_a = 0x800E6034; +start_bounce_b = 0x800E608C; +check_input_hammer = 0x800E60E0; +check_input_jump = 0x800E6160; +check_input_spin = 0x800E6268; +make_disguise_npc = 0x800E657C; +can_pause = 0x800E69DC; +setup_partner_popup = 0x800E6B78; +setup_item_popup = 0x800E6C44; +check_input_open_menus = 0x800E6CE4; +check_input_status_menu = 0x800E728C; +clear_player_data = 0x800E73A0; +get_player_data = 0x800E7564; +add_item = 0x800E7574; +get_item_count = 0x800E75EC; +get_item_empty_count = 0x800E7620; +find_item = 0x800E7644; +sort_items = 0x800E76CC; +add_badge = 0x800E773C; +store_item = 0x800E77C4; +get_stored_count = 0x800E7814; +get_stored_empty_count = 0x800E7848; +enforce_hpfp_limits = 0x800E786C; +initialize_status_menu = 0x800E7934; +status_menu_draw_number = 0x800E7CA4; +status_menu_draw_stat = 0x800E7E34; +update_status_menu = 0x800E80B4; +coin_counter_draw_content = 0x800E92D8; +update_coin_counter = 0x800E93DC; +show_coin_counter = 0x800E9518; +hide_coin_counter = 0x800E9698; +ShowCoinCounter = 0x800E96F8; +draw_status_ui = 0x800E973C; +open_status_menu_long = 0x800E9760; +open_status_menu_short = 0x800E978C; +is_status_menu_visible = 0x800E9910; +status_menu_start_blinking_hp = 0x800E9920; +status_menu_stop_blinking_hp = 0x800E9964; +status_menu_start_blinking_fp = 0x800E998C; +status_menu_stop_blinking_fp = 0x800E99D0; +status_menu_start_blinking_coins = 0x800E99F4; +status_menu_stop_blinking_coins = 0x800E9A38; +status_menu_start_blinking_sp = 0x800E9A60; +status_menu_stop_blinking_sp = 0x800E9A94; +status_menu_start_blinking_sp_bars = 0x800E9AB8; +status_menu_start_blinking_starpoints = 0x800E9AE4; +status_menu_stop_blinking_starpoints = 0x800E9B0C; +decrement_status_menu_disabled = 0x800E9B30; +increment_status_menu_disabled = 0x800E9B54; +sync_status_menu = 0x800E9B6C; +reset_status_menu = 0x800E9BB0; +is_ability_active = 0x800E9D48; +is_partner_ability_active = 0x800EA0B8; +add_coins = 0x800EA0C0; +add_star_points = 0x800EA128; +add_star_pieces = 0x800EA170; +increment_max_SP = 0x800EA1B4; +set_max_SP = 0x800EA1D8; +add_SP = 0x800EA1F4; +recover_fp = 0x800EA264; +recover_hp = 0x800EA2CC; +subtract_hp = 0x800EA334; +has_full_hp = 0x800EA360; +has_full_fp = 0x800EA37C; +add_fortress_keys = 0x800EA398; +subtract_fortress_keys = 0x800EA3B8; +get_fortress_key_count = 0x800EA3E4; +use_consumable = 0x800EA400; +remove_consumable = 0x800EA47C; +is_current_partner_flying = 0x800EA5A4; +partner_use_ability = 0x800EB314; +partner_player_can_pause = 0x800EB3E0; +partner_can_use_ability = 0x800EB42C; +partner_reset_data = 0x800EB474; +partner_initialize_data = 0x800EB580; +partner_test_enemy_collision = 0x800EB5E4; +partner_get_ride_script = 0x800EB638; +partner_handle_before_battle = 0x800EB658; +partner_handle_after_battle = 0x800EB6C4; +partner_kill_ability_script = 0x800EB7CC; +partner_suspend_ability_script = 0x800EB818; +partner_resume_ability_script = 0x800EB860; +enable_partner_walking = 0x800EB8A8; +enable_partner_flying = 0x800ED310; +update_player_move_history = 0x800ED4B8; +enable_partner_ai = 0x800EF328; +clear_partner_move_history = 0x800EF45C; +draw_submenu_title = 0x800F4648; +draw_box = 0x800F52E0; +gPlayerStatus = 0x8010EFC8; // size:0x288 +gPlayerData = 0x8010F290; // size:0x340 +update_entities = 0x8010F6D0; +update_shadows = 0x8010FA98; +render_entities = 0x8010FEB4; +render_shadows = 0x801100CC; +update_entity_transform_matrix = 0x8011022C; +update_shadow_transform_matrix = 0x80110374; +update_entity_inverse_rotation_matrix = 0x801104A4; +get_entity_by_index = 0x801105E8; +get_shadow_by_index = 0x80110604; +get_entity_list = 0x80110620; +get_shadow_list = 0x8011064C; +get_entity_type = 0x801106A4; +delete_entity = 0x801106D0; +delete_entity_and_unload_data = 0x80110790; +entity_get_collision_flags = 0x801108B8; +test_player_entity_aabb = 0x80110AAC; +is_player_action_state = 0x80110BB0; +load_area_specific_entity_data = 0x80110C14; +clear_entity_data = 0x80110CB8; +is_entity_data_loaded = 0x8011115C; // ! +load_simple_entity_data = 0x801112A4; +load_split_entity_data = 0x80111408; +create_entity = 0x801118C4; +create_shadow_from_data = 0x80111BD8; +MakeEntity = 0x80111D38; +AssignScript = 0x80111FB0; +AssignAreaFlag = 0x80111FF8; +AssignBlockFlag = 0x8011206C; +AssignFlag = 0x801120B8; +AssignPanelFlag = 0x80112114; +AssignCrateFlag = 0x80112170; +create_entity_shadow = 0x801121CC; +create_shadow_type = 0x80112260; +set_standard_shadow_scale = 0x8011285C; +set_npc_shadow_scale = 0x80112900; +set_peach_shadow_scale = 0x801129D4; +NOP_state = 0x80112B90; +_set_game_mode = 0x80112CA8; +step_current_game_mode = 0x80112E78; +render_ui = 0x80112F58; +appendGfx_model = 0x80113090; +load_tile_header = 0x80114D6C; +get_model_property = 0x80115B0C; +_load_model_textures = 0x80115B44; +load_model_textures = 0x80115C24; +clear_model_data = 0x80115D44; +init_model_data = 0x80115FE8; +calculate_model_sizes = 0x8011612C; +render_models = 0x80116B90; +appendGfx_model_group = 0x80117C94; +get_model_from_list_index = 0x8011AD30; +load_data_for_models = 0x8011AD48; +load_model_transforms = 0x8011ADC8; +get_model_list_index_from_tree_index = 0x8011B010; +get_model_center_and_size = 0x8011B0EC; +clone_model = 0x8011B6F0; +enable_world_fog = 0x8011BB50; +disable_world_fog = 0x8011BB64; +set_world_fog_dist = 0x8011BB74; +set_world_fog_color = 0x8011BB88; +is_world_fog_enabled = 0x8011BBA4; +get_world_fog_distance = 0x8011BBB4; +get_world_fog_color = 0x8011BBD8; +set_tex_panner = 0x8011BC14; +set_main_pan_u = 0x8011BC1C; +set_main_pan_v = 0x8011BC34; +set_aux_pan_u = 0x8011BC4C; +set_aux_pan_v = 0x8011BC64; +set_background_color_blend = 0x8011BE5C; +get_background_color_blend = 0x8011BE80; +queue_render_task = 0x8011D910; +play_model_animation = 0x80120148; +clear_virtual_models = 0x80120BB0; +init_virtual_models = 0x80120C58; +load_virtual_model = 0x80120CE0; +enable_entity_fog = 0x80122FEC; +disable_entity_fog = 0x80123000; +set_entity_fog_dist = 0x80123010; +set_entity_fog_color = 0x80123028; +is_entity_fog_enabled = 0x80123050; +get_entity_fog_distance = 0x80123060; +get_entity_fog_color = 0x8012307C; +stub_dynamic_entity_delegate = 0x801230B0; +clear_dynamic_entity_list = 0x801230B8; +init_dynamic_entity_list = 0x80123114; +bind_dynamic_entity_3 = 0x80123158; +bind_dynamic_entity_7 = 0x8012323C; +bind_dynamic_entity_B = 0x80123320; +update_dynamic_entities = 0x80123404; +render_dynamic_entities = 0x80123470; +get_dynamic_entity = 0x8012363C; +clear_character_set = 0x80123660; +clear_printers = 0x80123674; +load_font_data = 0x80123708; +load_font = 0x80123734; +update_messages = 0x801237D8; +_update_message = 0x80123898; +render_messages = 0x80124204; +initialize_printer = 0x801256A4; +dma_load_string = 0x80125804; +load_message_to_buffer = 0x8012588C; +load_string = 0x80125900; +_load_string = 0x8012591C; +load_message_to_printer = 0x80125A68; +clamp_printer_coords = 0x80125AB8; +cancel_message = 0x80125B08; +set_message_images = 0x80125B2C; +set_message_string = 0x80125B3C; +set_message_value = 0x80125BE8; +close_message = 0x80125C70; +get_char_width = 0x80125DF4; +get_string_properties = 0x80125F68; +get_string_width = 0x80126474; +draw_string = 0x801264EC; +draw_digit = 0x801274C0; +draw_number = 0x8012769C; +_draw_message_box = 0x8012CC08; +draw_coin_sparkles = 0x80130B0C; +get_item_entity = 0x80130F58; +clear_item_entity_data = 0x80130FF0; +init_item_entity_list = 0x801310CC; +make_item_entity = 0x801313F4; +make_item_entity_nodelay = 0x80131A94; +make_item_entity_delayed = 0x80131AC8; +init_got_item = 0x80131B00; +update_item_entities = 0x80131EEC; +appendGfx_item_entity = 0x801321A4; +draw_item_entities = 0x80132C80; +render_item_entities = 0x80132E54; +remove_item_entity_by_reference = 0x80133930; +remove_item_entity_by_index = 0x801339FC; +test_item_player_collision = 0x80133B0C; +set_item_entity_flags = 0x80134148; +clear_item_entity_flags = 0x80134188; +set_item_entity_position = 0x8013420C; +update_item_entity_collectable = 0x80134250; +update_item_entity_static = 0x80135658; +update_item_entity_temp = 0x801356DC; +set_map_transition_effect = 0x801382A0; +init_menu_icon_list = 0x80141300; +create_icon = 0x801414A4; +update_menu_icons = 0x80141610; +render_menu_icon = 0x80142BFC; +render_menu_icons = 0x801436B4; +draw_menu_icon = 0x80144298; +draw_icon_0 = 0x801447A8; +draw_icon_1 = 0x801447C4; +draw_icon_2 = 0x801447E0; +set_menu_icon_script = 0x801447FC; +get_menu_icon_script = 0x801448B0; +get_menu_icon = 0x801448D4; +free_icon = 0x801448F4; +set_icon_render_pos = 0x80144984; +get_icon_render_pos = 0x801449AC; +set_icon_flags = 0x80144A00; +clear_icon_flags = 0x80144A2C; +icon_set_opacity = 0x80144EB0; +icon_set_tint = 0x80144EFC; +clear_saved_variables = 0x80145320; +clear_area_flags = 0x80145390; +clear_global_flag = 0x801453E0; +set_global_flag = 0x80145450; +get_global_flag = 0x801454BC; +set_global_byte = 0x80145520; +get_global_byte = 0x80145538; +clear_area_flag = 0x8014554C; +set_area_flag = 0x801455A0; +get_area_flag = 0x801455F0; +set_area_byte = 0x80145638; +get_area_byte = 0x80145650; +default_trigger_function_handler = 0x80145670; +clear_trigger_data = 0x80145680; +init_trigger_list = 0x80145728; +create_trigger = 0x8014576C; +update_triggers = 0x80145860; +delete_trigger = 0x80145BF4; +is_trigger_bound = 0x80145C6C; +get_trigger_by_id = 0x80145CD0; +load_map_bg = 0x80145D70; +read_background_size = 0x80145E28; +set_background_size = 0x80145E70; +play_ambient_sounds = 0x80147368; +set_ui_panel_properties = 0x80147CC8; +_play_sound = 0x80149AB8; +stop_sound = 0x80149C6C; +play_sound = 0x80149CB4; +play_sound_at_player = 0x80149CD8; +play_sound_at_npc = 0x80149D08; +play_sound_at_position = 0x80149D5C; +get_default_variation_for_song = 0x8014A430; +_set_music_track = 0x8014A7E0; +set_music_track = 0x8014A918; +transition_music_volume_to = 0x8014AC84; +gSongArray = 0x8014F720; +D_80156954 = 0x80156954; +gMusicUnkVolume = 0x80159AE0; +gMusicTargetVolume = 0x80159AE2; +gMusicUnkVolume2 = 0x80159AE4; +gMusicCurrentVolume = 0x80159AE6; +gMusicPlayers = 0x80159AF0; +gCollisionStatus = 0x8015A550; +get_dpad_input_radial = 0x8023E000; +initialize_battle = 0x8023E130; +update_actor_shadows = 0x8023E404; +update_battle_state = 0x8023E438; +draw_main_battle_ui = 0x8023EA7C; +draw_enemy_health_bars = 0x8023FFA0; +update_starpoints_display = 0x802403BC; +delete_actor = 0x80240BBC; +delete_player_actor = 0x80240D68; +begin_battle = 0x80241218; +update_heroes_start_turn = 0x80242024; +switch_to_player = 0x80242AC8; +pause_set_cursor_opacity = 0x80242BA0; // seg_rom:0x135EE0 +update_end_player_turn = 0x80242BB0; +pause_interp_cursor = 0x80242E6C; +switch_to_partner = 0x80242F00; +pause_interp_text_scroll = 0x80243418; +pause_interp_vertical_scroll = 0x8024346C; +pause_update_cursor = 0x802434DC; // seg_rom:0x135EE0 +pause_textbox_draw_contents = 0x80243570; +pause_tutorial_draw_contents = 0x802437F4; +switch_order = 0x80243918; +pause_init = 0x80244060; +pause_tutorial_input = 0x802442A0; +pause_handle_input = 0x80244424; +pause_cleanup = 0x80244708; // seg_rom:0x135EE0 +pause_get_total_equipped_bp_cost = 0x802447F4; +pause_draw_rect = 0x80244858; +pause_sort_item_list = 0x80244A4C; +end_battle = 0x80244A50; +pause_tabs_draw_invis = 0x80244B90; +pause_tabs_draw_stats = 0x80244B98; +pause_tabs_draw_badges = 0x80244CC0; +pause_tabs_draw_items = 0x80244DE8; +update_run_away = 0x80244F00; +pause_tabs_draw_party = 0x80244F10; +pause_tabs_draw_spirits = 0x80245038; +pause_tabs_draw_map = 0x80245160; +pause_tabs_init = 0x80245288; +pause_tabs_handle_input = 0x80245354; +pause_tabs_update = 0x802455BC; +EnablePartnerBlur = 0x802456B8; +DisablePartnerBlur = 0x802456D8; +update_swap_partner = 0x802456F8; +pause_tabs_cleanup = 0x80245930; +pause_stats_draw_contents = 0x80245980; +update_player_action = 0x80245AD0; +update_player_change_turn = 0x80246450; +pause_stats_init = 0x80246AC8; +update_partner_action = 0x80246B34; +pause_stats_handle_input = 0x80246B74; +pause_stats_cleanup = 0x80246F94; +pause_badges_comparator = 0x80246FE0; +pause_badges_count_all = 0x80247054; +pause_badges_count_equipped = 0x802470B0; +pause_badges_get_pos_x = 0x8024710C; +pause_badges_get_pos_y = 0x80247168; +pause_badges_get_column = 0x802471D8; +pause_badges_get_row = 0x80247220; +pause_badges_is_visible = 0x80247270; +pause_badges_scroll_offset_y = 0x80247298; +pause_badges_scroll_offset_x = 0x802472A8; +update_enemy_change_turn = 0x802472AC; +pause_badges_try_remove = 0x802472B0; +pause_badges_try_equip = 0x80247338; +pause_badges_draw_bp_orbs = 0x80247458; +pause_badges_draw_contents = 0x80247508; +update_enemy_action = 0x80247570; +pause_badges_load_badges = 0x80248D8C; +pause_badges_init = 0x80248FC0; +pause_badges_handle_input = 0x802490A8; +pause_badges_update = 0x8024961C; +pause_badges_cleanup = 0x80249758; +pause_items_comparator = 0x802497B0; +pause_items_get_pos_x = 0x802497D0; +pause_items_get_pos_y = 0x80249828; +pause_items_get_column = 0x80249898; +pause_items_get_row = 0x802498E0; +pause_items_is_visible = 0x80249930; +pause_items_scroll_offset_y = 0x80249958; +pause_items_scroll_offset_x = 0x80249968; +pause_items_draw_contents = 0x80249970; +pause_items_load_items = 0x8024A4DC; +pause_items_init = 0x8024A714; +pause_items_handle_input = 0x8024A7D8; +pause_items_update = 0x8024AC54; +pause_items_cleanup = 0x8024AD90; +pause_partners_load_portrait = 0x8024ADE0; +pause_partners_draw_contents = 0x8024AEF8; +pause_partners_draw_title = 0x8024BBAC; +pause_partners_draw_movelist = 0x8024BD38; +pause_partners_draw_movelist_title = 0x8024C048; +pause_partners_draw_movelist_flower = 0x8024C0A0; +pause_partners_init = 0x8024C0E0; +pause_partners_handle_input = 0x8024C338; +pause_partners_update = 0x8024C7A4; +pause_partners_cleanup = 0x8024C984; +pause_spirits_draw_contents = 0x8024CA00; +use_cam_preset = 0x8024CF34; +pause_spirits_draw_title = 0x8024D294; +pause_spirits_init = 0x8024D360; +pause_spirits_handle_input = 0x8024D44C; +pause_spirits_update = 0x8024D800; +pause_spirits_cleanup = 0x8024D8D8; +pause_map_draw_border_arrows = 0x8024DA28; +pause_map_draw_contents = 0x8024DB1C; +cam_target_actor = 0x8024E43C; +move_cam_over = 0x8024E4D8; +set_cam_target_pos = 0x8024E520; +pause_map_draw_title = 0x8024E54C; +set_cam_zoom = 0x8024E594; +add_cam_zoom = 0x8024E5B4; +set_cam_zoffset = 0x8024E5E0; +unfreeze_cam = 0x8024E600; +pause_map_init = 0x8024E604; +UseCamPreset = 0x8024E61C; +pause_map_handle_input = 0x8024E878; +SetBattleCamTarget = 0x8024E90C; +SetBattleCamOffsetZ = 0x8024EA58; +AddBattleCamOffsetZ = 0x8024EA98; +SetBattleCamYaw = 0x8024EAE4; +BattleCamTargetActor = 0x8024EB24; +MoveBattleCamOver = 0x8024EC08; +SetBattleCamZoom = 0x8024EC6C; +AddBattleCamZoom = 0x8024ECAC; +pause_map_update = 0x8024ECB0; +FreezeBattleCam = 0x8024ED78; +pause_map_cleanup = 0x8024EE2C; +pause_get_menu_string = 0x8024EE80; +pause_draw_menu_label = 0x8024EE94; +create_popup = 0x8024EF68; +show_battle_message = 0x8024F960; +show_variable_battle_message = 0x8024FA04; +is_popup_displayed = 0x8024FAB4; +set_popup_duration = 0x8024FAC4; +close_action_command_instruction_popup = 0x8024FB0C; +show_message_popup = 0x80250EA4; +ShowMessageBox = 0x802512B4; +ShowVariableMessageBox = 0x8025130C; +IsMessageBoxDisplayed = 0x80251384; +WaitForMessageBoxDone = 0x802513CC; +ForceCloseMessageBox = 0x802513F0; +SetMessageBoxDuration = 0x80251408; +calc_item_check_hit = 0x802515D0; +calc_item_damage_enemy = 0x802516E8; +ItemDamageEnemy = 0x80252728; +ItemAfflictEnemy = 0x80252924; +ItemCheckHit = 0x80252D40; +ActorSpeak = 0x80252F30; +EndActorSpeech = 0x802532D0; +ShowBattleChoice = 0x80253538; +OverrideBattleDmaDest = 0x802535F8; +LoadBattleDmaData = 0x80253624; +PlaySoundAtActor = 0x8025385C; +PlaySoundAtPart = 0x802538D0; +PlayLoopingSoundAtActor = 0x80253974; +StopLoopingSoundAtActor = 0x80253A18; +SetForegroundModelsVisibleUnsafe = 0x80253AA8; +SetForegroundModelsVisible = 0x80253AEC; +MakeStatusField = 0x80253B94; +is_actor_hp_bar_visible = 0x80253C20; +is_actortype_hpbar_visible = 0x80253C9C; +save_tattle_flags = 0x80253D10; +load_tattle_flags = 0x80253E78; +MultiplyByActorScale = 0x80253FDC; +MultiplyVec2ByActorScale = 0x80254048; +MultiplyVec3ByActorScale = 0x802540DC; +ApplyShrinkFromOwner = 0x80254198; +StartRumble = 0x80254218; +mtx_mirror_y = 0x80254288; +enable_actor_blur = 0x802542CC; +disable_actor_blur = 0x8025455C; +reset_actor_blur = 0x802545AC; +enable_partner_blur = 0x80254644; +disable_partner_blur = 0x80254668; +reset_partner_blur = 0x8025468C; +enable_player_blur = 0x802546D4; +disable_player_blur = 0x80254914; +update_actor_shadow = 0x802559BC; +update_enemy_shadows = 0x80255F5C; +update_hero_shadows = 0x80255FAC; +update_player_actor_shadow = 0x80257BAC; +_remove_part_decoration = 0x8025D03C; +activate_defend_command = 0x80260B04; +HasMerleeCastsLeft = 0x802619C8; +FXRecoverHP = 0x80261BA8; +FXRecoverFP = 0x80261C68; +IncrementPlayerHP = 0x80261D28; +IncrementPlayerFP = 0x80261D60; +create_target_list = 0x80262240; +player_create_target_list = 0x8026302C; +enemy_create_target_list = 0x80263048; +count_power_plus = 0x80263B10; +deduct_current_move_fp = 0x80263BC8; +set_animation = 0x80263CFC; +set_animation_rate = 0x80263EB8; +set_actor_yaw = 0x80263F68; +set_part_yaw = 0x80263F9C; +add_xz_vec3f = 0x80264128; +add_xz_vec3f_copy1 = 0x802641C0; +add_xz_vec3f_copy2 = 0x80264258; +play_movement_dust_effects = 0x802642F0; +get_actor_part = 0x8026445C; +load_player_actor = 0x802644A4; +load_partner_actor = 0x80264B74; +create_actor = 0x802653A4; +lookup_defense = 0x80265E44; +lookup_status_chance = 0x80265E98; +lookup_status_duration_mod = 0x80265EEC; +inflict_status = 0x80265F40; +inflict_partner_ko = 0x80266254; +get_defense = 0x802662BC; +show_damage_popup = 0x802665AC; +try_inflict_status = 0x80266B78; +inflict_status_set_duration = 0x80266CF0; +add_part_decoration = 0x80267114; +add_actor_decoration = 0x80267190; +remove_part_decoration = 0x80267218; +remove_actor_decoration = 0x80267234; +heroes_is_ability_active = 0x802672AC; +create_part_shadow = 0x8026731C; +remove_part_shadow = 0x802673A0; +create_part_shadow_by_ref = 0x802673E4; +remove_player_buffs = 0x80267454; +reset_all_actor_sounds = 0x80267A9C; +hide_foreground_models_unsafe = 0x80267BDC; +show_foreground_models_unsafe = 0x80267C48; +hide_foreground_models = 0x80267CB4; +show_foreground_models = 0x80267D28; +StartRumbleWithParams = 0x80267D9C; +start_rumble_type = 0x80267DF4; +LoadItemScript = 0x80267ED0; +LoadFreeItemScript = 0x8026801C; +LoadMoveScript = 0x80268130; +LoadActionCommand = 0x802681C0; +check_block_input = 0x80268ECC; +GetActionSuccess = 0x80269294; +SetActionSuccess = 0x802692C0; +CloseActionCommandInfo = 0x80269410; +GetActionSuccessCopy = 0x802694F8; +GetBlockResult = 0x8026957C; +count_targets = 0x80269660; +get_nearest_home_index = 0x80269698; +set_goal_pos_to_part = 0x80269754; +set_part_goal_to_actor_part = 0x802699D8; +set_actor_current_position = 0x80269C24; +set_part_absolute_position = 0x80269C70; +set_actor_home_position = 0x80269D20; +get_actor = 0x80269D6C; +LoadBattleSection = 0x80269DE4; +GetBattlePhase = 0x80269E28; +GetLastElement = 0x80269E54; +SetGoalToHome = 0x80269EC4; +SetIdleGoalToHome = 0x80269F2C; +SetGoalToIndex = 0x80269F94; +GetIndexFromPos = 0x8026A05C; +GetIndexFromHome = 0x8026A0D4; +CountPlayerTargets = 0x8026A14C; +ForceHomePos = 0x8026A1EC; +SetHomePos = 0x8026A2D0; +SetGoalToTarget = 0x8026A3A8; +SetPartGoalToTarget = 0x8026A404; +SetGoalToFirstTarget = 0x8026A49C; +SetGoalPos = 0x8026A510; +SetIdleGoal = 0x8026A62C; +AddGoalPos = 0x8026A748; +GetGoalPos = 0x8026A820; +GetIdleGoal = 0x8026A8EC; +GetPartTarget = 0x8026A9B8; +GetActorPos = 0x8026AAA8; +GetPartOffset = 0x8026AB74; +GetPartPos = 0x8026AC88; +GetHomePos = 0x8026AD74; +SetActorPos = 0x8026AE40; +SetPartPos = 0x8026AF18; +SetEnemyTargetOffset = 0x8026B0A0; +SetAnimation = 0x8026B1B0; +GetAnimation = 0x8026B238; +SetAnimationRate = 0x8026B2D0; +SetActorYaw = 0x8026B358; +GetActorYaw = 0x8026B3C8; +SetPartYaw = 0x8026B438; +GetPartYaw = 0x8026B4C0; +SetActorJumpGravity = 0x8026B55C; +SetActorIdleJumpGravity = 0x8026B5D8; +SetActorSpeed = 0x8026B654; +SetActorIdleSpeed = 0x8026B6D0; +SetPartJumpGravity = 0x8026B74C; +SetPartMoveSpeed = 0x8026B7EC; +SetJumpAnimations = 0x8026B88C; +AddActorPos = 0x8026B92C; +SetActorDispOffset = 0x8026BA04; +GetPartDispOffset = 0x8026BAE8; +SetPartDispOffset = 0x8026BC38; +AddPartDispOffset = 0x8026BD88; +GetActorVar = 0x8026BFB4; +SetActorVar = 0x8026C044; +AddActorVar = 0x8026C0D4; +GetPartMovementVar = 0x8026C170; +SetPartMovementVar = 0x8026C22C; +AddPartMovementVar = 0x8026C2E8; +SetActorRotation = 0x8026C3AC; +SetActorRotationOffset = 0x8026C4AC; +GetActorRotation = 0x8026C56C; +SetPartRotation = 0x8026C634; +SetPartRotationOffset = 0x8026C740; +GetPartRotation = 0x8026C828; +SetActorScale = 0x8026C904; +SetActorScaleModifier = 0x8026C9C4; +GetActorScale = 0x8026CA84; +SetPartScale = 0x8026CB4C; +GetPartScale = 0x8026CC34; +GetBattleFlags = 0x8026CD10; +SetBattleFlagBits = 0x8026CD3C; +GetBattleFlags2 = 0x8026CDA0; +SetBattleFlagBits2 = 0x8026CDCC; +SetActorFlags = 0x8026CE30; +SetActorFlagBits = 0x8026CE8C; +GetActorFlags = 0x8026CF20; +SetPartFlags = 0x8026CF88; +SetPartFlagBits = 0x8026D010; +SetPartTargetFlags = 0x8026D0D0; +SetPartTargetFlagBits = 0x8026D158; +GetPartFlags = 0x8026D218; +GetPartTargetFlags = 0x8026D2AC; +SetPartEventFlags = 0x8026D340; +SetPartEventBits = 0x8026D3C8; +GetPartEventFlags = 0x8026D488; +HPBarToHome = 0x8026D664; +HPBarToCurrent = 0x8026D7A8; +SummonEnemy = 0x8026DB64; +GetOwnerID = 0x8026DE00; +SetOwnerID = 0x8026DE28; +ActorExists = 0x8026DE5C; +SetBattleInputMask = 0x8026E050; +SetBattleInputButtons = 0x8026E068; +CheckButtonPress = 0x8026E098; +CheckButtonHeld = 0x8026E0D0; +CheckButtonDown = 0x8026E108; +GetBattleState = 0x8026E140; +PlayerCreateTargetList = 0x8026E2CC; +EnemyCreateTargetList = 0x8026E310; +InitTargetIterator = 0x8026E354; +SetOwnerTarget = 0x8026E3A8; +ChooseNextTarget = 0x8026E414; +GetTargetListLength = 0x8026E864; +GetOwnerTarget = 0x8026E8AC; +GetAttackerActorID = 0x8026E974; +GetDistanceToGoal = 0x8026E9FC; +AddActorDecoration = 0x8026EE88; +RemoveActorDecoration = 0x8026EF4C; +ModifyActorDecoration = 0x8026EFF0; +UseIdleAnimation = 0x8026F0EC; +GetStatusFlags = 0x8026F230; +RemovePlayerBuffs = 0x8026F44C; +SetPartAlpha = 0x8026F470; +CreatePartShadow = 0x8026F52C; +RemovePartShadow = 0x8026F59C; +SetBattleVar = 0x8026F638; +GetBattleVar = 0x8026F694; +ResetAllActorSounds = 0x8026F6EC; +SetActorSounds = 0x8026F740; +gPauseMenuStrings = 0x8026F778; +ResetActorSounds = 0x8026F838; +SetPartSounds = 0x8026FA00; +SetActorType = 0x8026FB20; +ShowShockEffect = 0x8026FBB0; +GetActorAttackBoost = 0x8026FC04; +GetActorDefenseBoost = 0x8026FC6C; +BoostAttack = 0x8026FCD4; +BoostDefense = 0x80270174; +VanishActor = 0x80270614; +ElectrifyActor = 0x8027095C; +HealActor = 0x80270CA4; +WaitForBuffDone = 0x8027114C; +CopyBuffs = 0x80271160; +dispatch_event_player = 0x80271658; +dispatch_event_player_continue_turn = 0x802716E4; +calc_player_test_enemy = 0x80271754; +calc_player_damage_enemy = 0x80271944; +dispatch_damage_event_player = 0x802731BC; +dispatch_damage_event_player_0 = 0x8027337C; +dispatch_damage_event_player_1 = 0x802733A8; +GetMenuSelection = 0x802733C4; +PlayerFallToGoal = 0x80273894; +PlayerLandJump = 0x80273B04; +PlayerRunToGoal = 0x80273C64; +CancelablePlayerRunToGoal = 0x80273EFC; +GetPlayerHP = 0x80274234; +PlayerDamageEnemy = 0x80274260; +PlayerPowerBounceEnemy = 0x802744A0; +PlayerTestEnemy = 0x802746F0; +DispatchDamagePlayerEvent = 0x8027491C; +EnablePlayerBlur = 0x80274978; +DidActionSucceed = 0x80276EB4; +dispatch_event_general = 0x80276F8C; +play_hit_sound = 0x80277004; +dispatch_event_actor = 0x80277160; +calc_enemy_test_target = 0x802771F8; +calc_enemy_damage_target = 0x8027742C; +dispatch_damage_event_actor = 0x802786D4; +dispatch_damage_event_actor_0 = 0x802788F8; +dispatch_damage_event_actor_1 = 0x80278914; +BindTakeTurn = 0x80278930; +PauseTakeTurn = 0x802789A4; +ResumeTakeTurn = 0x80278A1C; +BindIdle = 0x80278A94; +EnableIdleScript = 0x80278B4C; +BindHandleEvent = 0x80278C20; +BindNextTurn = 0x80278C94; +JumpToGoal = 0x80278D08; +IdleJumpToGoal = 0x8027910C; +JumpToGoalSimple2 = 0x80279420; +JumpWithBounce = 0x80279728; +LandJump = 0x80279AD4; +FallToGoal = 0x80279BEC; +RunToGoal = 0x80279E64; +IdleRunToGoal = 0x8027A264; +JumpPartTo = 0x8027A4E4; +FallPartTo = 0x8027A854; +LandJumpPart = 0x8027AB5C; +RunPartTo = 0x8027ACAC; +update_lerp_battle = 0x8027B0DC; +FlyToGoal = 0x8027B624; +IdleFlyToGoal = 0x8027BBB8; +FlyPartTo = 0x8027BF38; +GetLastEvent = 0x8027C4E0; +SetTargetActor = 0x8027C548; +SetEnemyHP = 0x8027C5C8; +GetActorHP = 0x8027C6A0; +GetEnemyMaxHP = 0x8027C748; +RemoveActor = 0x8027C7B0; +DropStarPoints = 0x8027C8A4; +SetDefenseTable = 0x8027CA74; +SetStatusTable = 0x8027CB08; +SetIdleAnimations = 0x8027CB7C; +EnemyDamageTarget = 0x8027CCB4; +EnemyFollowupAfflictTarget = 0x8027CED4; +EnemyTestTarget = 0x8027CFB8; +DispatchDamageEvent = 0x8027D1BC; +DispatchEvent = 0x8027D264; +SetTargetOffset = 0x8027D380; +EnableActorBlur = 0x8027D57C; +AfflictActor = 0x8027D67C; +GetEncounterState = 0x8027D7C4; +YieldTurn = 0x8027D7F0; +SetActorSize = 0x8027D810; +GetActorSize = 0x8027D8E0; +SetPartSize = 0x8027D970; +GetOriginalActorType = 0x8027DA68; +GetCurrentActorType = 0x8027DAD4; +GetLastDamage = 0x8027DB3C; +EnableActorGlow = 0x8027DBA4; +WasStatusInflicted = 0x8027DC68; +CopyStatusEffects = 0x8027DCBC; +ClearStatusEffects = 0x8027DDA0; +dispatch_event_partner = 0x8027DE80; +dispatch_event_partner_continue_turn = 0x8027DF0C; +calc_partner_test_enemy = 0x8027DF7C; +calc_partner_damage_enemy = 0x8027E328; +dispatch_damage_event_partner = 0x8027F9CC; +dispatch_damage_event_partner_0 = 0x8027FB80; +dispatch_damage_event_partner_1 = 0x8027FB9C; +MakeOwnerTargetIndex = 0x8027FBB8; +GetActorLevel = 0x8027FD48; +PartnerDamageEnemy = 0x8027FDB4; +PartnerAfflictEnemy = 0x80280004; +PartnerPowerBounceEnemy = 0x80280270; +PartnerTestEnemy = 0x802804D0; +DeletePartner = 0x802807A8; +GetDamageIntensity = 0x80280840; +ActorAddMovePos = 0x80280880; +LoadStarPowerScript = 0x80280950; +BtlPutPartnerAway = 0x80280A34; +BtlBringPartnerOut = 0x80280B6C; +draw_shop_items = 0x80281524; +MakeShop = 0x80281860; +MakeShopOwner = 0x80281BD8; +MakeDoorAdvanced = 0x80281CAC; +CheckActionState = 0x802831DC; +CreatePushBlockGrid = 0x802832E0; +SetPushBlock = 0x8028347C; +GetPushBlock = 0x802835C0; +GetGridIndexFromPos = 0x802836B8; +SetPushBlockFallEffect = 0x802837AC; +TeleportPartnerToPlayer = 0x8028387C; +gBattleDmaDest = 0x80284000; +MarioEnterStage = 0x80284A40; +PeachEnterStage = 0x80284D04; +PlayerScriptDispatcher = 0x80284EBC; +PeachScriptDispatcher = 0x80285010; +ExecutePlayerAction = 0x8028505C; +ExecutePeachAction = 0x80285174; +PlayerFirstStrike = 0x802851FC; +StartDefend = 0x802852B8; +HandleEvent_Player = 0x802852D4; +EnterWalk = 0x80285960; +EnterWalkShort = 0x80285A60; +EnterSavePoint = 0x80285CB0; +ExitWalk = 0x80285CF4; +ExitSingleDoor = 0x80285DAC; +EnterSingleDoor = 0x80285DD4; +ExitDoubleDoor = 0x80285E4C; +EnterDoubleDoor = 0x80285E74; +RunAwayStart = 0x802868BC; +RunAwayFail = 0x80287078; +RunAwayReset = 0x80287128; +PlayEatFX = 0x802878D0; +PlayDrinkFX = 0x80287948; +UseLifeShroom = 0x802879C0; +MerleeRunOut = 0x80288398; +MerleeAttackBonus = 0x80288400; +MerleeDefenseBonus = 0x8028870C; +MerleeExpBonus = 0x80288A58; +PlayerHappy = 0x80288D64; +DoDizzyAttack = 0x8028907C; +RegainAbility = 0x80289110; +UseMystery = 0x80293E40; +gMoveScriptTable = 0x80293E80; +DoSleepHit = 0x802945E0; +DoDizzyHit = 0x802945FC; +DoParalyzeHit = 0x80294618; +DoPoisonHit = 0x80294634; +DoStopHit = 0x80294650; +DoFreezeHit = 0x8029466C; +DoShinkHit = 0x802946B8; +ForceNextTarget = 0x80298BF0; +DoNormalHit = 0x80299044; +DoBurnHit = 0x8029A0D0; +DoShockHit = 0x8029A6FC; +DoImmune = 0x8029AC70; +DoDeath = 0x8029AEC0; +DoScareAway = 0x8029B22C; +DoSpinSmashHit = 0x8029B998; +DoJumpBack = 0x8029BD70; +DoReturnHome = 0x8029BEB8; +DoRecover = 0x8029BFA0; +DoAirLift = 0x8029C37C; +DoBlowAway = 0x8029C4A8; +gSpeakingActorPrintCtx = 0x8029FA60; +gSpeakingActorPrintIsDone = 0x8029FA68; +gSpeakingActorTalkAnim = 0x8029FA6C; +gSpeakingActorIdleAnim = 0x8029FA70; +gSpeakingActor = 0x8029FA74; +gSpeakingActorPart = 0x8029FA78; +draw_battle_wheel = 0x802A1C54; +can_switch_to_player = 0x802A5818; +update_player_menu = 0x802A5988; +update_partner_menu = 0x802A81C8; +func_802A91F8 = 0x802A91F8; +func_802A9208 = 0x802A9208; +func_802A9228 = 0x802A9228; +func_802A9234 = 0x802A9234; +func_802A9254 = 0x802A9254; +func_802A9278 = 0x802A9278; +func_802A928C = 0x802A928C; +func_802A9294 = 0x802A9294; +func_802A9298 = 0x802A9298; +func_802A92A0 = 0x802A92A0; +func_802A92D4 = 0x802A92D4; +func_802A92DC = 0x802A92DC; +func_802A92F0 = 0x802A92F0; +func_802A9310 = 0x802A9310; +func_802A936C = 0x802A936C; +func_802A9378 = 0x802A9378; +func_802A948C = 0x802A948C; +func_802A94A4 = 0x802A94A4; +func_802A94D8 = 0x802A94D8; +func_802A9544 = 0x802A9544; +func_802A955C = 0x802A955C; +func_802A9590 = 0x802A9590; +func_802A959C = 0x802A959C; +func_802A9634 = 0x802A9634; +func_802A963C = 0x802A963C; +func_802A9664 = 0x802A9664; +func_802A96B8 = 0x802A96B8; +func_802A96DC = 0x802A96DC; +func_802A96EC = 0x802A96EC; +func_802A96F4 = 0x802A96F4; +func_802A9708 = 0x802A9708; +func_802A9718 = 0x802A9718; +func_802A9720 = 0x802A9720; +func_802A973C = 0x802A973C; +func_802A9744 = 0x802A9744; +func_802A9764 = 0x802A9764; +func_802A97AC = 0x802A97AC; +func_802A97BC = 0x802A97BC; +func_802A97CC = 0x802A97CC; +func_802A97F8 = 0x802A97F8; +func_802A97FC = 0x802A97FC; +func_802A9810 = 0x802A9810; +func_802A981C = 0x802A981C; +func_802A9834 = 0x802A9834; +func_802A984C = 0x802A984C; +func_802A9894 = 0x802A9894; +func_802A9898 = 0x802A9898; +func_802A98B0 = 0x802A98B0; +func_802A98D0 = 0x802A98D0; +func_802A98DC = 0x802A98DC; +func_802A98E0 = 0x802A98E0; +func_802A9914 = 0x802A9914; +func_802A992C = 0x802A992C; +func_802A9990 = 0x802A9990; +func_802A99D4 = 0x802A99D4; +func_802A9A30 = 0x802A9A30; +func_802A9A54 = 0x802A9A54; +func_802AA014 = 0x802AA014; +func_802AA0D8 = 0x802AA0D8; +update_targeting_enemies = 0x802AA688; +func_802AB330 = 0x802AB330; +func_802AB338 = 0x802AB338; +func_802B71D4 = 0x802B71D4; +func_802B71E8 = 0x802B71E8; +func_802BD7DC = 0x802BD7DC; +func_802BE070 = 0x802BE070; +sort_scripts = 0x802C3000; +find_script_labels = 0x802C3148; +clear_script_list = 0x802C31DC; +init_script_list = 0x802C32EC; +start_script = 0x802C33E0; +start_script_in_group = 0x802C35D0; +start_child_script = 0x802C37C8; +restart_script = 0x802C3D04; +update_scripts = 0x802C3D74; +kill_script = 0x802C3F3C; +kill_script_by_ID = 0x802C40AC; +kill_all_scripts = 0x802C4114; +does_script_exist = 0x802C4164; +does_script_exist_by_ref = 0x802C41A4; +set_script_priority = 0x802C41D8; +set_script_timescale = 0x802C41E0; +set_global_timespace = 0x802C4200; +get_global_timespace = 0x802C420C; +set_script_group = 0x802C4218; +bind_trigger = 0x802C4220; +bind_trigger_1 = 0x802C42A8; +suspend_group_script = 0x802C42D8; +resume_group_script = 0x802C437C; +suspend_all_script = 0x802C4420; +resume_all_script = 0x802C448C; +suspend_group_script_index = 0x802C44F8; +resume_group_script_index = 0x802C4570; +suspend_all_group = 0x802C45E8; +resume_all_group = 0x802C4648; +suspend_group_others = 0x802C46A8; +resume_group_others = 0x802C471C; +get_script_by_index = 0x802C4790; +get_script_by_id = 0x802C47A8; +set_script_flags = 0x802C47E8; +clear_script_flags = 0x802C4880; +fixed_var_to_float = 0x802C4920; +float_to_fixed_var = 0x802C496C; +si_handle_return = 0x802C4998; +si_handle_label = 0x802C49B8; +si_handle_goto = 0x802C49C0; +si_handle_loop = 0x802C4A00; +si_handle_end_loop = 0x802C4A48; +si_handle_break_loop = 0x802C4B0C; +si_handle_wait = 0x802C4B5C; +si_handle_wait_seconds = 0x802C4BB8; +si_handle_if_equal = 0x802C4C40; +si_handle_if_not_equal = 0x802C4CA0; +si_handle_if_less = 0x802C4D00; +si_handle_if_greater = 0x802C4D64; +si_handle_if_less_equal = 0x802C4DC8; +si_handle_if_greater_equal = 0x802C4E2C; +si_handle_if_AND = 0x802C4E90; +si_handle_if_not_AND = 0x802C4EE8; +si_handle_else = 0x802C4F40; +si_handle_end_if = 0x802C4F6C; +si_handle_switch = 0x802C4F74; +si_handle_switch_const = 0x802C4FE4; +si_handle_case_equal = 0x802C5030; +si_handle_case_not_equal = 0x802C50BC; +si_handle_case_less = 0x802C5148; +si_handle_case_less_equal = 0x802C51D8; +si_handle_case_greater = 0x802C5268; +si_handle_case_greater_equal = 0x802C52F8; +si_handle_case_range = 0x802C5388; +si_handle_case_default = 0x802C5444; +si_handle_case_AND = 0x802C549C; +si_handle_case_equal_OR = 0x802C5518; +si_handle_case_equal_AND = 0x802C55B8; +si_handle_end_case_group = 0x802C565C; +si_handle_break_case = 0x802C56D4; +si_handle_end_switch = 0x802C5718; +si_handle_set_var = 0x802C5744; +si_handle_set_const = 0x802C5790; +si_handle_set_float = 0x802C57B8; +si_handle_add = 0x802C5804; +si_handle_subtract = 0x802C5868; +si_handle_multiply = 0x802C58CC; +si_handle_divide = 0x802C5934; +si_handle_mod = 0x802C59BC; +si_handle_addF = 0x802C5A84; +si_handle_subtractF = 0x802C5AEC; +si_handle_multiplyF = 0x802C5B54; +si_handle_divideF = 0x802C5BC0; +si_handle_set_int_buffer_ptr = 0x802C5C28; +si_handle_set_float_buffer_ptr = 0x802C5C5C; +si_handle_get_1_word = 0x802C5C90; +si_handle_get_2_word = 0x802C5CC4; +si_handle_get_3_word = 0x802C5D2C; +si_handle_get_4_word = 0x802C5DB4; +si_handle_get_Nth_word = 0x802C5E5C; +si_handle_get_1_float = 0x802C5EB4; +si_handle_get_2_float = 0x802C5F0C; +si_handle_get_3_float = 0x802C5F9C; +si_handle_get_4_float = 0x802C605C; +si_handle_get_Nth_float = 0x802C614C; +si_handle_set_array = 0x802C61AC; +si_handle_set_flag_array = 0x802C61E0; +si_handle_allocate_array = 0x802C6214; +si_handle_AND = 0x802C6270; +si_handle_AND_const = 0x802C62D4; +si_handle_OR = 0x802C632C; +si_handle_OR_const = 0x802C6390; +si_handle_call = 0x802C63E8; +si_handle_exec1 = 0x802C646C; +si_handle_exec2 = 0x802C6524; +si_handle_exec_wait = 0x802C65FC; +si_handle_jump = 0x802C6640; +_bound_script_trigger_handler = 0x802C667C; +si_handle_bind = 0x802C6714; +DeleteTrigger = 0x802C6824; +si_handle_unbind = 0x802C6850; +si_handle_kill = 0x802C6870; +si_handle_set_priority = 0x802C689C; +si_handle_set_timescale = 0x802C68D8; +si_handle_set_group = 0x802C6914; +si_handle_suspend_all = 0x802C6950; +si_handle_resume_all = 0x802C697C; +si_handle_suspend_others = 0x802C69A8; +si_handle_resume_others = 0x802C69E4; +si_handle_suspend = 0x802C6A20; +si_handle_resume = 0x802C6A4C; +si_handle_does_script_exist = 0x802C6A78; +si_standard_trigger_executor = 0x802C6AD0; +si_handle_bind_lock = 0x802C6B54; +si_handle_thread = 0x802C6C78; +si_handle_end_thread = 0x802C6D4C; +si_handle_child_thread = 0x802C6D6C; +si_handle_end_child_thread = 0x802C6DF4; +si_handle_print_debug_var = 0x802C6E1C; +si_execute_next_command = 0x802C7404; +get_variable = 0x802C7ABC; +get_variable_index = 0x802C7DA8; +get_variable_index_alt = 0x802C7F20; +set_variable = 0x802C8098; +get_float_variable = 0x802C842C; +set_float_variable = 0x802C8640; +si_find_label = 0x802C8890; +si_skip_if = 0x802C88FC; +si_skip_else = 0x802C8978; +si_goto_end_case = 0x802C89E4; // ! +si_goto_next_case = 0x802C8A60; +si_goto_end_loop = 0x802C8AE4; +TranslateModel = 0x802C8B60; +RotateModel = 0x802C8C64; +ScaleModel = 0x802C8D88; +GetModelIndex = 0x802C8E8C; +CloneModel = 0x802C8F28; +GetModelCenter = 0x802C8F80; +SetTexPanner = 0x802C9000; +SetModelFlag10 = 0x802C907C; +EnableTexPanning = 0x802C9208; +EnableModel = 0x802C9288; +SetGroupEnabled = 0x802C9308; +SetTexPanOffset = 0x802C9364; +SetModelFlags = 0x802C9518; +TranslateGroup = 0x802C97B4; +RotateGroup = 0x802C98D8; +ScaleGroup = 0x802C9A1C; +EnableGroup = 0x802C9B98; +modify_collider_family_flags = 0x802C9CE8; +ModifyColliderFlags = 0x802C9DCC; +ResetFromLava = 0x802C9ED8; +GetColliderCenter = 0x802CA0AC; +ParentColliderToModel = 0x802CA114; +UpdateColliderTransform = 0x802CA188; +set_zone_enabled = 0x802CA1B8; +SetZoneEnabled = 0x802CA254; +goto_map = 0x802CA304; +GotoMap = 0x802CA400; +GotoMapSpecial = 0x802CA420; +GotoMapByID = 0x802CA440; +GetEntryID = 0x802CA460; +GetMapID = 0x802CA490; +GetLoadType = 0x802CA4C0; +SetRenderMode = 0x802CA4F4; +PlaySoundAtModel = 0x802CA558; +PlaySoundAtCollider = 0x802CA614; +SetCamEnabled = 0x802CA6C0; +SetCamFlag80 = 0x802CA774; +SetCamPerspective = 0x802CA828; +SetCamViewport = 0x802CAB18; +SetCamBGColor = 0x802CAD98; +SetCamTarget = 0x802CAF2C; +ShakeCam = 0x802CB2A8; +exec_ShakeCam1 = 0x802CB56C; +exec_ShakeCamX = 0x802CB5C8; +SetCamLeadPlayer = 0x802CB680; +PanToTarget = 0x802CB79C; +UseSettingsFrom = 0x802CB860; +LoadSettings = 0x802CB9F8; +SetCamType = 0x802CBAB4; +SetCamPitch = 0x802CBB48; +SetCamDistance = 0x802CBBE4; +SetCamPosA = 0x802CBC58; +SetCamPosB = 0x802CBCF4; +SetCamPosC = 0x802CBD90; +SetPanTarget = 0x802CBE2C; +SetCamSpeed = 0x802CBEF0; +GetCamType = 0x802CBF64; +GetCamPitch = 0x802CBFF4; +GetCamDistance = 0x802CC084; +GetCamPosA = 0x802CC0F4; +GetCamPosB = 0x802CC184; +GetCamPosC = 0x802CC214; +GetCamPosition = 0x802CC2A4; +WaitForCam = 0x802CC354; +SetCamProperties = 0x802CC3EC; +AdjustCam = 0x802CC660; +ResetCam = 0x802CC8C8; +draw_anim_models = 0x802CCB18; +LoadModelAnimation = 0x802CCCEC; +PlayModelAnimation = 0x802CCE6C; +ChangeModelAnimation = 0x802CCF6C; +SetAnimModelPosition = 0x802CCFE4; +GetAnimModelPosition = 0x802CD090; +AddAnimModelPosition = 0x802CD12C; +SetAnimModelRotation = 0x802CD1F0; +SetAnimModelScale = 0x802CD29C; +resolve_npc = 0x802CDAC0; +set_npc_animation = 0x802CDB0C; +CreateNpc = 0x802CDBA4; +DeleteNpc = 0x802CDC1C; +GetNpcPointer = 0x802CDC58; +SetNpcPos = 0x802CDCB0; +SetNpcRotation = 0x802CDDB0; +SetNpcScale = 0x802CDED4; +SetNpcCollisionSize = 0x802CDF8C; +SetNpcSpeed = 0x802CE01C; +SetNpcJumpscale = 0x802CE088; +SetNpcAnimation = 0x802CE0F4; +GetNpcAnimation = 0x802CE160; +SetNpcAnimationSpeed = 0x802CE1C0; +NpcMoveTo = 0x802CE22C; +_npc_jump_to = 0x802CE434; +NpcJump0 = 0x802CE6C4; +NpcJump1 = 0x802CE6E0; +NpcFlyTo = 0x802CE6FC; +GetNpcYaw = 0x802CEA10; +SetNpcYaw = 0x802CEA84; +InterpNpcYaw = 0x802CEB04; +NpcFacePlayer = 0x802CECC8; +NpcFaceNpc = 0x802CEE80; +SetNpcFlagBits = 0x802CF060; +GetNpcPos = 0x802CF0F4; +EnableNpcShadow = 0x802CF268; +EnableNpcBlur = 0x802CF2EC; +ClearPartnerMoveHistory = 0x802CF370; +NpcSetHomePosToCurrent = 0x802CF3BC; +GetPartnerPos = 0x802CF438; +DisablePartnerAI = 0x802CF4E8; +EnablePartnerAI = 0x802CF52C; +BringPartnerOut = 0x802CF5B8; +PutPartnerAway = 0x802CF988; +GetCurrentPartnerID = 0x802CFC74; +PartnerCanUseAbility = 0x802CFCA0; +PartnerIsFlying = 0x802CFCE8; +SetNpcEffect = 0x802D0118; +PlaySoundAtNpc = 0x802D01AC; +SpeakToPlayer = 0x802D02B0; +EndSpeech = 0x802D02CC; +ContinueSpeech = 0x802D02E8; +SpeakToNpc = 0x802D0304; +_show_message = 0x802D0320; +ShowMessageAtScreenPos = 0x802D0894; +ShowMessageAtWorldPos = 0x802D095C; +CloseMessage = 0x802D0A98; +SwitchMessage = 0x802D0AFC; +ShowChoice = 0x802D0B6C; +CloseChoice = 0x802D0BF8; +CancelMessage = 0x802D0C20; +CancelMessageAndBlock = 0x802D0C48; +SetMessageImages = 0x802D0C70; +SetMessageString = 0x802D0CEC; +SetMessageValue = 0x802D0D44; +HidePlayerShadow = 0x802D0DA0; +DisablePlayerPhysics = 0x802D0DE4; +DisablePlayerInput = 0x802D0E28; +SetPlayerPos = 0x802D0EF0; +SetPlayerCollisionSize = 0x802D0FB0; +SetPlayerSpeed = 0x802D1024; +SetPlayerJumpscale = 0x802D1054; +SetPlayerAnimation = 0x802D1084; +SetPlayerActionState = 0x802D10D8; +SetPlayerAnimationSpeed = 0x802D1104; +PlayerMoveTo = 0x802D1134; +player_jump = 0x802D14E0; +PlayerJump = 0x802D18E8; +PlayerJump1 = 0x802D1904; +PlayerJump2 = 0x802D1920; +InterpPlayerYaw = 0x802D193C; +PlayerFaceNpc = 0x802D1B04; +GetPlayerTargetYaw = 0x802D1D28; +SetPlayerFlagBits = 0x802D1D60; +GetPlayerActionState = 0x802D1DD0; +GetPlayerPos = 0x802D1DFC; +GetPlayerAnimation = 0x802D1E94; +FullyRestoreHPandFP = 0x802D1EC0; +FullyRestoreSP = 0x802D1EE0; +EnablePartner = 0x802D1EFC; +DisablePartner = 0x802D1F38; +UseEntryHeading = 0x802D1F70; +UseExitHeading = 0x802D216C; +DisablePulseStone = 0x802D2AA8; +GetCurrentPartner = 0x802D2B0C; +Disable8bitMario = 0x802D2B88; +PlaySoundAtPlayer = 0x802D2CD8; +MakeLerp = 0x802D45B0; +UpdateLerp = 0x802D462C; +RandInt = 0x802D46B0; +GetAngleBetweenNPCs = 0x802D4708; +GetAngleToNPC = 0x802D47B4; +GetAngleToPlayer = 0x802D4830; +AwaitPlayerApproach = 0x802D48AC; +IsPlayerWithin = 0x802D4964; +AwaitPlayerLeave = 0x802D4A5C; +AddVectorPolar = 0x802D4B14; +setup_path_data = 0x802D4DAC; +LoadPath = 0x802D5430; +GetNextPathPos = 0x802D5524; +GetDist2D = 0x802D5770; +SetValueByRef = 0x802D58E0; +GetValueByRef = 0x802D593C; +EnableStatusMenu = 0x802D5998; +ShowStatusMenu = 0x802D59DC; +SetGameMode = 0x802D5A28; +ClampAngleInt = 0x802D5A58; +ClampAngleFloat = 0x802D5AB4; +FadeOutMusic = 0x802D5CE0; +SetMusicTrack = 0x802D5D4C; +FadeInMusic = 0x802D5DF4; +ClearAmbientSounds = 0x802D60E8; +PlayAmbientSounds = 0x802D611C; +PlaySound = 0x802D6150; +PlaySoundAt = 0x802D61DC; +StopSound = 0x802D62B8; +UseDoorSounds = 0x802D6314; +PlaySoundAtF = 0x802D636C; +RemoveKeyItemAt = 0x802D6858; +RemoveItemAt = 0x802D688C; +AddKeyItem = 0x802D68C8; +HasKeyItem = 0x802D699C; +FindKeyItem = 0x802D6A14; +AddItem = 0x802D6A98; +FindItem = 0x802D6B18; +RemoveItem = 0x802D6B9C; +CountFortressKeys = 0x802D6C4C; +RemoveFortressKeys = 0x802D6C94; +MakeItemEntity = 0x802D6CC0; +DropItemEntity = 0x802D6DC0; +DropItemEntityB = 0x802D6EC0; +RemoveItemEntity = 0x802D6FCC; +AddBadge = 0x802D6FF8; +RemoveBadge = 0x802D7050; +SetItemPos = 0x802D70D0; +SetItemFlags = 0x802D7194; +AddCoin = 0x802D7278; +AddStarPoints = 0x802D72B4; +AddStarPieces = 0x802D72F0; +GetItemPower = 0x802D732C; +ShowGotItem = 0x802D73A4; +ShowEmote = 0x802D78A0; +RemoveEffect = 0x802D7AE4; +ShowSleepBubble = 0x802D8028; +PlayEffect = 0x802D829C; +SetSpriteShading = 0x802D9700; +EnableSpriteShading = 0x802D9A3C; +GetDemoState = 0x802D9A90; +DemoPressButton = 0x802D9AC0; +DemoReleaseButton = 0x802D9AF8; +DemoSetButtons = 0x802D9B34; +DemoJoystickRadial = 0x802D9B64; +DemoJoystickXY = 0x802D9C10; +gStaticScriptCounter = 0x802D9CA0; +D_802D9CA4 = 0x802D9CA4; +gGlobalTimeSpace = 0x802D9CA8; +ShakeCam1 = 0x802D9CB0; +ShakeCamX = 0x802D9CE8; +D_802D9D50 = 0x802D9D50; +spr_appendMDL_component = 0x802DC8F4; +spr_transform_point = 0x802DCD00; +spr_draw_component = 0x802DCEDC; +_spr_sign_extend_12bit = 0x802DD0DC; +_spr_sign_extend_16bit = 0x802DD0FC; +update_component = 0x802DD11C; +set_anim_timescale = 0x802DD88C; +render_sprite = 0x802DDC40; +load_sprite = 0x802DEB0C; +create_shadow_callback = 0x802E0D90; +save_game_at_player_position = 0x802E11A0; +entity_init_BlueSwitch = 0x802E2380; +entity_init_HugeBlueSwitch = 0x802E2408; +entity_init_Hammer23Block_normal = 0x802E36E4; +entity_init_Hammer1Block_normal = 0x802E3E00; +entity_init_HammerBlock_small = 0x802E3E30; +entity_init_Chest = 0x802E7D84; +player_enter_blue_pipe = 0x802E8CCC; +push_entity_matrix = 0x802E8E4C; diff --git a/undefined_syms.txt b/undefined_syms.txt index 160771f675..db0ab13eb9 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -74,10 +74,6 @@ gBattleState = 0x800DC068; gBattleStatus = 0x800DC070; gPauseMenuStrings = 0x8026F778; -mapScriptLibStart = 0x7E0E80; -mapScriptLibEnd = 0x7E73A0; -mapScriptLibVram = 0x80280000; - D_000759B0 = 0x000759B0; D_000759B0_end = 0x000A5DD0; D_000A5DD0 = 0x000A5DD0; @@ -277,5 +273,4 @@ EnemyNpcDefeat = 0x8007809C; D_80078DB0 = 0x80078DB0; D_80078DB4 = 0x80078DB4; -gAreas = 0x800934F0; gSongsUsingVariationFlag = 0x8014F720;