From e430f549fcde9a8c90f72b407ab4d762f01e99e9 Mon Sep 17 00:00:00 2001 From: farisawan-2000 Date: Fri, 26 Mar 2021 17:56:17 -0400 Subject: [PATCH] migrated some kirby .data --- asm/non_matchings/ovl1/ovl1_6/func_800AE138.s | 4 +- .../ovl10/ovl10_1/func_801DC598_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DCCB8_ovl10.s | 6 +- .../ovl10/ovl10_1/func_801DCF48_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DCFC4_ovl10.s | 8 +- .../ovl10/ovl10_1/func_801DD2CC_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DD390_ovl10.s | 8 +- .../ovl10/ovl10_1/func_801DD674_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DDAC8_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DDB88_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DDEB8_ovl10.s | 8 +- .../ovl10/ovl10_1/func_801DE124_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DE5CC_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DE650_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DEA98_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DEB94_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DF310_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DF394_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DF50C_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801DFF88_ovl10.s | 8 +- .../ovl10/ovl10_1/func_801E03CC_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E0460_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E0B94_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E0E78_ovl10.s | 8 +- .../ovl10/ovl10_1/func_801E100C_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E1550_ovl10.s | 8 +- .../ovl10/ovl10_1/func_801E18A8_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E1D3C_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E1DD0_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E1FD8_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E206C_ovl10.s | 4 +- .../ovl10/ovl10_1/func_801E28C8_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E2D40_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E3874_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E3BE4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E3E04_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E4030_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E4518_ovl10.s | 6 +- .../ovl10/ovl10_2/func_801E48C8_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E4C7C_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E50A4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E5278_ovl10.s | 10 +- .../ovl10/ovl10_2/func_801E5468_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E56C4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E63FC_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E6444_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E66E0_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E6AB4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E6D08_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E6D50_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E7000_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E7248_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E75E4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E762C_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E78D4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E7C38_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E8008_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E8050_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E8300_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E8548_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E8988_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E89D0_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E8C68_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E8F24_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E91B0_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E91F8_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801E94C4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E9770_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801E9A10_ovl10.s | 6 +- .../ovl10/ovl10_2/func_801E9DCC_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EA1E4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EA718_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EA784_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EA7CC_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801EAA98_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EAF3C_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EB0C0_ovl10.s | 8 +- .../ovl10/ovl10_2/func_801EB39C_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EB744_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EC37C_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EC3C8_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EC4CC_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EC6D8_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EC930_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801ECA34_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801ECCEC_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801ECE90_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801ED208_ovl10.s | 6 +- .../ovl10/ovl10_2/func_801ED2CC_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801ED6E4_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801ED930_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EDAA0_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EDD24_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EDF84_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EE050_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EE410_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EEB30_ovl10.s | 4 +- .../ovl10/ovl10_2/func_801EEFCC_ovl10.s | 12 +- .../ovl11/ovl11/func_801DB8E8_ovl11.s | 16 +- .../ovl11/ovl11/func_801DBB4C_ovl11.s | 4 +- .../ovl11/ovl11/func_801DC258_ovl11.s | 4 +- .../ovl11/ovl11/func_801DC45C_ovl11.s | 24 +- .../ovl11/ovl11/func_801DC83C_ovl11.s | 4 +- .../ovl11/ovl11/func_801DC8F8_ovl11.s | 8 +- .../ovl11/ovl11/func_801DCBE0_ovl11.s | 4 +- .../ovl11/ovl11/func_801DCF70_ovl11.s | 4 +- .../ovl11/ovl11/func_801DD160_ovl11.s | 4 +- .../ovl11/ovl11/func_801DD588_ovl11.s | 4 +- .../ovl11/ovl11/func_801DD7D4_ovl11.s | 4 +- .../ovl11/ovl11/func_801DD9C8_ovl11.s | 4 +- .../ovl11/ovl11/func_801DDEC0_ovl11.s | 4 +- .../ovl11/ovl11/func_801DDF08_ovl11.s | 8 +- .../ovl11/ovl11/func_801DE1EC_ovl11.s | 4 +- .../ovl11/ovl11/func_801DE454_ovl11.s | 8 +- .../ovl11/ovl11/func_801DE8D0_ovl11.s | 10 +- .../ovl11/ovl11/func_801DEAE8_ovl11.s | 4 +- .../ovl11/ovl11/func_801DEF9C_ovl11.s | 4 +- .../ovl11/ovl11/func_801DEFE4_ovl11.s | 4 +- .../ovl11/ovl11/func_801DF318_ovl11.s | 4 +- .../ovl11/ovl11/func_801DF3DC_ovl11.s | 6 +- .../ovl16/ovl16/func_801DB528_ovl16.s | 4 +- .../ovl16/ovl16/func_801DB698_ovl16.s | 8 +- .../ovl16/ovl16/func_801DCBF8_ovl16.s | 4 +- .../ovl16/ovl16/func_801DD50C_ovl16.s | 16 +- .../ovl16/ovl16/func_801DDA98_ovl16.s | 8 +- .../ovl16/ovl16/func_801DE8DC_ovl16.s | 4 +- .../ovl16/ovl16/func_801DEAE0_ovl16.s | 8 +- .../ovl16/ovl16/func_801DED40_ovl16.s | 4 +- .../ovl16/ovl16/func_801DFC4C_ovl16.s | 4 +- .../ovl16/ovl16/func_801DFF40_ovl16.s | 4 +- .../ovl16/ovl16/func_801E0820_ovl16.s | 4 +- .../ovl16/ovl16/func_801E0F04_ovl16.s | 4 +- .../ovl16/ovl16/func_801E16F8_ovl16.s | 4 +- .../ovl16/ovl16/func_801E18BC_ovl16.s | 4 +- .../ovl16/ovl16/func_801E1E84_ovl16.s | 4 +- .../ovl16/ovl16/func_801E20D8_ovl16.s | 4 +- .../ovl16/ovl16/func_801E2960_ovl16.s | 4 +- .../ovl16/ovl16/func_801E2B08_ovl16.s | 4 +- .../ovl16/ovl16/func_801E2D88_ovl16.s | 4 +- .../ovl16/ovl16/func_801E2E44_ovl16.s | 4 +- .../ovl16/ovl16/func_801E3284_ovl16.s | 4 +- .../ovl16/ovl16/func_801E33AC_ovl16.s | 4 +- .../ovl16/ovl16/func_801E3518_ovl16.s | 4 +- .../ovl16/ovl16/func_801E35D4_ovl16.s | 4 +- .../ovl16/ovl16/func_801E4024_ovl16.s | 4 +- .../ovl16/ovl16/func_801E4148_ovl16.s | 4 +- .../ovl16/ovl16/func_801E4698_ovl16.s | 4 +- .../ovl16/ovl16/func_801E4754_ovl16.s | 4 +- .../ovl16/ovl16/func_801E5734_ovl16.s | 4 +- .../ovl16/ovl16/func_801E58D8_ovl16.s | 4 +- .../ovl16/ovl16/func_801E5A28_ovl16.s | 4 +- .../ovl16/ovl16/func_801E5AE4_ovl16.s | 4 +- .../ovl16/ovl16/func_801E68E0_ovl16.s | 4 +- .../ovl16/ovl16/func_801E6A84_ovl16.s | 4 +- .../ovl16/ovl16/func_801E6BD4_ovl16.s | 4 +- .../ovl16/ovl16/func_801E6E0C_ovl16.s | 4 +- .../ovl16/ovl16/func_801E72C4_ovl16.s | 4 +- .../ovl16/ovl16/func_801E74E8_ovl16.s | 4 +- .../ovl16/ovl16/func_801E7650_ovl16.s | 4 +- .../ovl17/ovl17_last-0/func_801E4488_ovl17.s | 8 +- .../ovl18/ovl18_1/func_802204F8_ovl18.s | 4 +- .../ovl18/ovl18_5/func_80224FCC_ovl18.s | 4 +- .../ovl18/ovl18_5/func_80225724_ovl18.s | 4 +- asm/non_matchings/ovl2_8/func_8011CFF4.s | 4 +- .../ovl3/ovl3/func_80151E94_ovl3.s | 15 +- .../ovl3/ovl3_5/func_8016BF60_ovl3.s | 32 +- .../ovl3/ovl3_5/func_8016C510_ovl3.s | 19 - .../ovl3/ovl3_5/func_8016D1E8_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016D81C_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016DD0C_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016E15C_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016F240_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016F7C8_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016FB58_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8016FFF8_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80170D88_ovl3.s | 2 +- .../ovl3/ovl3_5/func_801717F0_ovl3.s | 4 +- .../ovl3/ovl3_5/func_80172234_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80172A3C_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80173AF4_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80176DE0_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80177438_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8017782C_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80177CBC_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80177FB4_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80178420_ovl3.s | 2 +- .../ovl3/ovl3_5/func_8017883C_ovl3.s | 2 +- .../ovl3/ovl3_5/func_80178B18_ovl3.s | 2 +- .../ovl4/ovl4_3/func_80159B00_ovl4.s | 4 +- .../ovl4/ovl4_3/func_80159DE8_ovl4.s | 8 +- .../ovl9/ovl9_16/func_8021A5C0_ovl9.s | 8 +- .../ovl9/ovl9_16/func_8021AD88_ovl9.s | 8 +- .../ovl9/ovl9_16/func_8021B0D0_ovl9.s | 4 +- .../ovl9/ovl9_16/func_8021B3A0_ovl9.s | 4 +- .../ovl9/ovl9_16/func_8021B58C_ovl9.s | 4 +- .../ovl9/ovl9_16/func_8021B5D4_ovl9.s | 8 +- .../ovl9/ovl9_16/func_8021B71C_ovl9.s | 4 +- asm/ovl1/ovl1_bss.s | 2 +- asm/ovl12/ovl12.s | 36 +- asm/ovl13/ovl13.s | 36 +- asm/ovl14/ovl14.s | 40 +- asm/ovl15/ovl15.s | 24 +- asm/ovl16/ovl16_2.s | 104 +-- asm/ovl17/ovl17_2.s | 40 +- asm/ovl17/ovl17_3.s | 68 +- asm/ovl18/ovl18_6.s | 24 +- asm/ovl19/ovl19_3.s | 32 +- asm/ovl19/ovl19_4.s | 12 +- asm/ovl7/ovl7_1.s | 4 +- asm/ovl7/ovl7_13.s | 24 +- asm/ovl7/ovl7_17.s | 16 +- asm/ovl7/ovl7_4.s | 8 +- asm/ovl7/ovl7_7.s | 4 +- asm/ovl7/ovl7_9.s | 20 +- asm/ovl8/ovl8_4.s | 24 +- asm/ovl9/ovl9.s | 484 +++++----- data/kirby.0F0D50.s | 869 ------------------ data/ovl3/kirby.0F0D50.1.s | 138 +++ data/ovl3/kirby.0F0D50.2.s | 22 - data/ovl3/kirby.s | 146 +++ kirby.us.ld | 3 + src/ovl1/ovl1_1.c | 2 +- src/ovl1/ovl1_6.c | 2 +- src/ovl1/ovl1_6.h | 2 +- src/ovl10/ovl10_1.c | 80 +- src/ovl10/ovl10_2.c | 178 ++-- src/ovl11/boss2.c | 88 +- src/ovl16/ovl16.c | 82 +- src/ovl17/ovl17_last-0.c | 4 +- src/ovl18/ovl18_1.c | 36 +- src/ovl18/ovl18_1.h | 2 +- src/ovl18/ovl18_3.c | 52 +- src/ovl18/ovl18_5.c | 36 +- src/ovl19/ovl19.c | 6 +- src/ovl2/ovl2_4.c | 4 +- src/ovl2/ovl2_8.c | 2 +- src/ovl3/ovl3.c | 3 +- src/ovl3/ovl3_5.c | 279 +++--- src/ovl4/ovl4_3.c | 6 +- src/ovl8/ovl8_2.c | 2 +- src/ovl9/ovl9_16.c | 36 +- undefined_syms.txt | 1 - 242 files changed, 1733 insertions(+), 2330 deletions(-) delete mode 100644 asm/non_matchings/ovl3/ovl3_5/func_8016C510_ovl3.s create mode 100644 data/ovl3/kirby.0F0D50.1.s create mode 100644 data/ovl3/kirby.s diff --git a/asm/non_matchings/ovl1/ovl1_6/func_800AE138.s b/asm/non_matchings/ovl1/ovl1_6/func_800AE138.s index b258031e..624109bf 100644 --- a/asm/non_matchings/ovl1/ovl1_6/func_800AE138.s +++ b/asm/non_matchings/ovl1/ovl1_6/func_800AE138.s @@ -31,9 +31,9 @@ glabel func_800AE138 /* 0563FC 800AE1AC 3C01800E */ lui $at, %hi(D_800DDE10) /* 056400 800AE1B0 00220821 */ addu $at, $at, $v0 /* 056404 800AE1B4 AC20DE10 */ sw $zero, %lo(D_800DDE10)($at) -/* 056408 800AE1B8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 056408 800AE1B8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 05640C 800AE1BC 00220821 */ addu $at, $at, $v0 -/* 056410 800AE1C0 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 056410 800AE1C0 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 056414 800AE1C4 3C01800E */ lui $at, %hi(D_800DD8D0) /* 056418 800AE1C8 00220821 */ addu $at, $at, $v0 /* 05641C 800AE1CC AC20D8D0 */ sw $zero, %lo(D_800DD8D0)($at) diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DC598_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DC598_ovl10.s index 5e7665ea..591607ce 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DC598_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DC598_ovl10.s @@ -52,8 +52,8 @@ glabel func_801DC598_ovl10 /* 1CD3D0 801DC660 0C0288B5 */ jal func_800A22D4 /* 1CD3D4 801DC664 00402025 */ move $a0, $v0 .L801DC668_ovl10: -/* 1CD3D8 801DC668 3C0F800E */ lui $t7, %hi(D_800DDC50) # $t7, 0x800e -/* 1CD3DC 801DC66C 25EFDC50 */ addiu $t7, %lo(D_800DDC50) # addiu $t7, $t7, -0x23b0 +/* 1CD3D8 801DC668 3C0F800E */ lui $t7, %hi(gEntityVtableIndexArray) # $t7, 0x800e +/* 1CD3DC 801DC66C 25EFDC50 */ addiu $t7, %lo(gEntityVtableIndexArray) # addiu $t7, $t7, -0x23b0 /* 1CD3E0 801DC670 020F6821 */ addu $t5, $s0, $t7 /* 1CD3E4 801DC674 AFAD0024 */ sw $t5, 0x24($sp) /* 1CD3E8 801DC678 8DB90000 */ lw $t9, ($t5) diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DCCB8_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DCCB8_ovl10.s index 0b41b51c..4be00deb 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DCCB8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DCCB8_ovl10.s @@ -50,7 +50,7 @@ glabel func_801DCCB8_ovl10 /* 1CDAE8 801DCD78 00194880 */ sll $t1, $t9, 2 /* 1CDAEC 801DCD7C 01094021 */ addu $t0, $t0, $t1 /* 1CDAF0 801DCD80 8D081B50 */ lw $t0, %lo(D_800E1B50)($t0) -/* 1CDAF4 801DCD84 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CDAF4 801DCD84 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CDAF8 801DCD88 24843F94 */ addiu $a0, %lo(D_801F3F94_ovl10) # addiu $a0, $a0, 0x3f94 /* 1CDAFC 801DCD8C AD0F0098 */ sw $t7, 0x98($t0) /* 1CDB00 801DCD90 8E0A0000 */ lw $t2, ($s0) @@ -61,12 +61,12 @@ glabel func_801DCCB8_ovl10 /* 1CDB14 801DCDA4 AC240490 */ sw $a0, 0x0490($at) /* 1CDB18 801DCDA8 8E0E0000 */ lw $t6, ($s0) /* 1CDB1C 801DCDAC 8FBF001C */ lw $ra, 0x1c($sp) -/* 1CDB20 801DCDB0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CDB20 801DCDB0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CDB24 801DCDB4 8DD80000 */ lw $t8, ($t6) /* 1CDB28 801DCDB8 240B0001 */ li $t3, 1 /* 1CDB2C 801DCDBC 8FB00018 */ lw $s0, 0x18($sp) /* 1CDB30 801DCDC0 0018C880 */ sll $t9, $t8, 2 /* 1CDB34 801DCDC4 00390821 */ addu $at, $at, $t9 -/* 1CDB38 801DCDC8 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1CDB38 801DCDC8 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1CDB3C 801DCDCC 03E00008 */ jr $ra /* 1CDB40 801DCDD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DCF48_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DCF48_ovl10.s index c34a511a..46cefa30 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DCF48_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DCF48_ovl10.s @@ -16,9 +16,9 @@ glabel func_801DCF48_ovl10 /* 1CDCF0 801DCF80 01C37021 */ addu $t6, $t6, $v1 /* 1CDCF4 801DCF84 8DCE83E0 */ lw $t6, %lo(D_800E83E0)($t6) /* 1CDCF8 801DCF88 15C1000A */ bne $t6, $at, .L801DCFB4_ovl10 -/* 1CDCFC 801DCF8C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CDCFC 801DCF8C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CDD00 801DCF90 00230821 */ addu $at, $at, $v1 -/* 1CDD04 801DCF94 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1CDD04 801DCF94 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1CDD08 801DCF98 8C580000 */ lw $t8, ($v0) /* 1CDD0C 801DCF9C 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1CDD10 801DCFA0 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DCFC4_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DCFC4_ovl10.s index 06fbf70f..2cf59fd2 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DCFC4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DCFC4_ovl10.s @@ -179,19 +179,19 @@ glabel func_801DCFC4_ovl10 /* 1CDFD4 801DD264 10400008 */ beqz $v0, .L801DD288_ovl10 /* 1CDFD8 801DD268 AC620000 */ sw $v0, ($v1) /* 1CDFDC 801DD26C 8C8B0000 */ lw $t3, ($a0) -/* 1CDFE0 801DD270 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CDFE0 801DD270 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CDFE4 801DD274 24190004 */ li $t9, 4 /* 1CDFE8 801DD278 000B6880 */ sll $t5, $t3, 2 /* 1CDFEC 801DD27C 002D0821 */ addu $at, $at, $t5 /* 1CDFF0 801DD280 10000007 */ b .L801DD2A0_ovl10 -/* 1CDFF4 801DD284 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1CDFF4 801DD284 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) .L801DD288_ovl10: /* 1CDFF8 801DD288 8C8E0000 */ lw $t6, ($a0) -/* 1CDFFC 801DD28C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CDFFC 801DD28C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CE000 801DD290 240F0003 */ li $t7, 3 /* 1CE004 801DD294 000EC080 */ sll $t8, $t6, 2 /* 1CE008 801DD298 00380821 */ addu $at, $at, $t8 -/* 1CE00C 801DD29C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1CE00C 801DD29C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) .L801DD2A0_ovl10: /* 1CE010 801DD2A0 8FBF0044 */ lw $ra, 0x44($sp) /* 1CE014 801DD2A4 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DD2CC_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DD2CC_ovl10.s index a209f1ee..b3cbaa83 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DD2CC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DD2CC_ovl10.s @@ -35,9 +35,9 @@ glabel func_801DD2CC_ovl10 /* 1CE0BC 801DD34C 01264821 */ addu $t1, $t1, $a2 /* 1CE0C0 801DD350 8D2983E0 */ lw $t1, %lo(D_800E83E0)($t1) /* 1CE0C4 801DD354 1521000A */ bne $t1, $at, .L801DD380_ovl10 -/* 1CE0C8 801DD358 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CE0C8 801DD358 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CE0CC 801DD35C 00260821 */ addu $at, $at, $a2 -/* 1CE0D0 801DD360 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1CE0D0 801DD360 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 1CE0D4 801DD364 8C6B0000 */ lw $t3, ($v1) /* 1CE0D8 801DD368 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1CE0DC 801DD36C 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DD390_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DD390_ovl10.s index 88168786..c73ded20 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DD390_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DD390_ovl10.s @@ -167,14 +167,14 @@ glabel func_801DD390_ovl10 /* 1CE38C 801DD61C 8D2A0000 */ lw $t2, ($t1) /* 1CE390 801DD620 29410065 */ slti $at, $t2, 0x65 /* 1CE394 801DD624 14200004 */ bnez $at, .L801DD638_ovl10 -/* 1CE398 801DD628 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CE398 801DD628 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CE39C 801DD62C 00310821 */ addu $at, $at, $s1 /* 1CE3A0 801DD630 10000004 */ b .L801DD644_ovl10 -/* 1CE3A4 801DD634 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1CE3A4 801DD634 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) .L801DD638_ovl10: -/* 1CE3A8 801DD638 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CE3A8 801DD638 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CE3AC 801DD63C 00310821 */ addu $at, $at, $s1 -/* 1CE3B0 801DD640 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1CE3B0 801DD640 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) .L801DD644_ovl10: /* 1CE3B4 801DD644 8FBF0044 */ lw $ra, 0x44($sp) /* 1CE3B8 801DD648 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DD674_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DD674_ovl10.s index 7316088d..97d242d0 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DD674_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DD674_ovl10.s @@ -46,9 +46,9 @@ glabel func_801DD674_ovl10 /* 1CE48C 801DD71C 01866021 */ addu $t4, $t4, $a2 /* 1CE490 801DD720 8D8C83E0 */ lw $t4, %lo(D_800E83E0)($t4) /* 1CE494 801DD724 1581000A */ bne $t4, $at, .L801DD750_ovl10 -/* 1CE498 801DD728 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CE498 801DD728 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CE49C 801DD72C 00260821 */ addu $at, $at, $a2 -/* 1CE4A0 801DD730 AC2DDC50 */ sw $t5, %lo(D_800DDC50)($at) +/* 1CE4A0 801DD730 AC2DDC50 */ sw $t5, %lo(gEntityVtableIndexArray)($at) /* 1CE4A4 801DD734 8C6F0000 */ lw $t7, ($v1) /* 1CE4A8 801DD738 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1CE4AC 801DD73C 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DDAC8_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DDAC8_ovl10.s index 0d824b4f..069ce6a5 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DDAC8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DDAC8_ovl10.s @@ -40,12 +40,12 @@ glabel func_801DDAC8_ovl10 .L801DDB5C_ovl10: /* 1CE8CC 801DDB5C 8C6E0000 */ lw $t6, ($v1) /* 1CE8D0 801DDB60 8FBF0024 */ lw $ra, 0x24($sp) -/* 1CE8D4 801DDB64 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CE8D4 801DDB64 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CE8D8 801DDB68 000E7880 */ sll $t7, $t6, 2 /* 1CE8DC 801DDB6C 002F0821 */ addu $at, $at, $t7 /* 1CE8E0 801DDB70 8FB00018 */ lw $s0, 0x18($sp) /* 1CE8E4 801DDB74 8FB1001C */ lw $s1, 0x1c($sp) /* 1CE8E8 801DDB78 8FB20020 */ lw $s2, 0x20($sp) -/* 1CE8EC 801DDB7C AC25DC50 */ sw $a1, %lo(D_800DDC50)($at) +/* 1CE8EC 801DDB7C AC25DC50 */ sw $a1, %lo(gEntityVtableIndexArray)($at) /* 1CE8F0 801DDB80 03E00008 */ jr $ra /* 1CE8F4 801DDB84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DDB88_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DDB88_ovl10.s index d4f2b4c0..ed88add3 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DDB88_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DDB88_ovl10.s @@ -196,7 +196,7 @@ glabel func_801DDB88_ovl10 /* 1CEBEC 801DDE7C 348402C6 */ ori $a0, (0x000102C6 & 0xFFFF) # ori $a0, $a0, 0x2c6 /* 1CEBF0 801DDE80 8E280000 */ lw $t0, ($s1) /* 1CEBF4 801DDE84 8FBF0024 */ lw $ra, 0x24($sp) -/* 1CEBF8 801DDE88 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CEBF8 801DDE88 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CEBFC 801DDE8C 8D090000 */ lw $t1, ($t0) /* 1CEC00 801DDE90 240C0002 */ li $t4, 2 /* 1CEC04 801DDE94 8FB10018 */ lw $s1, 0x18($sp) @@ -205,6 +205,6 @@ glabel func_801DDB88_ovl10 /* 1CEC10 801DDEA0 8FB00014 */ lw $s0, 0x14($sp) /* 1CEC14 801DDEA4 8FB2001C */ lw $s2, 0x1c($sp) /* 1CEC18 801DDEA8 8FB30020 */ lw $s3, 0x20($sp) -/* 1CEC1C 801DDEAC AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 1CEC1C 801DDEAC AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 1CEC20 801DDEB0 03E00008 */ jr $ra /* 1CEC24 801DDEB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DDEB8_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DDEB8_ovl10.s index 4674e2fa..99dc2a90 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DDEB8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DDEB8_ovl10.s @@ -111,14 +111,14 @@ glabel func_801DDEB8_ovl10 /* 1CEDD8 801DE068 0C05A50C */ jal func_80169430_ovl10 /* 1CEDDC 801DE06C 24070001 */ li $a3, 1 /* 1CEDE0 801DE070 8E030000 */ lw $v1, ($s0) -/* 1CEDE4 801DE074 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CEDE4 801DE074 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CEDE8 801DE078 24080006 */ li $t0, 6 /* 1CEDEC 801DE07C 8C690000 */ lw $t1, ($v1) /* 1CEDF0 801DE080 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1CEDF4 801DE084 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1CEDF8 801DE088 0009C080 */ sll $t8, $t1, 2 /* 1CEDFC 801DE08C 00380821 */ addu $at, $at, $t8 -/* 1CEE00 801DE090 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1CEE00 801DE090 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1CEE04 801DE094 8C6A0000 */ lw $t2, ($v1) /* 1CEE08 801DE098 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 /* 1CEE0C 801DE09C 000A5880 */ sll $t3, $t2, 2 @@ -140,9 +140,9 @@ glabel func_801DDEB8_ovl10 .L801DE0DC_ovl10: /* 1CEE4C 801DE0DC 1481000C */ bne $a0, $at, .L801DE110_ovl10 /* 1CEE50 801DE0E0 24190009 */ li $t9, 9 -/* 1CEE54 801DE0E4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CEE54 801DE0E4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CEE58 801DE0E8 00260821 */ addu $at, $at, $a2 -/* 1CEE5C 801DE0EC AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1CEE5C 801DE0EC AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 1CEE60 801DE0F0 8C690000 */ lw $t1, ($v1) /* 1CEE64 801DE0F4 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1CEE68 801DE0F8 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DE124_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DE124_ovl10.s index d7a03be3..5a8a6a17 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DE124_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DE124_ovl10.s @@ -294,7 +294,7 @@ glabel func_801DE124_ovl10 /* 1CF2F4 801DE584 348402C6 */ ori $a0, (0x000102C6 & 0xFFFF) # ori $a0, $a0, 0x2c6 /* 1CF2F8 801DE588 8E6E0000 */ lw $t6, ($s3) /* 1CF2FC 801DE58C 8FBF0044 */ lw $ra, 0x44($sp) -/* 1CF300 801DE590 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CF300 801DE590 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CF304 801DE594 8DD80000 */ lw $t8, ($t6) /* 1CF308 801DE598 240F0002 */ li $t7, 2 /* 1CF30C 801DE59C 8FB30040 */ lw $s3, 0x40($sp) @@ -306,6 +306,6 @@ glabel func_801DE124_ovl10 /* 1CF324 801DE5B4 8FB00034 */ lw $s0, 0x34($sp) /* 1CF328 801DE5B8 8FB10038 */ lw $s1, 0x38($sp) /* 1CF32C 801DE5BC 8FB2003C */ lw $s2, 0x3c($sp) -/* 1CF330 801DE5C0 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1CF330 801DE5C0 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1CF334 801DE5C4 03E00008 */ jr $ra /* 1CF338 801DE5C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DE5CC_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DE5CC_ovl10.s index d317bc7f..234e4aac 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DE5CC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DE5CC_ovl10.s @@ -18,9 +18,9 @@ glabel func_801DE5CC_ovl10 /* 1CF37C 801DE60C 01C37021 */ addu $t6, $t6, $v1 /* 1CF380 801DE610 8DCE83E0 */ lw $t6, %lo(D_800E83E0)($t6) /* 1CF384 801DE614 15C1000A */ bne $t6, $at, .L801DE640_ovl10 -/* 1CF388 801DE618 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CF388 801DE618 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CF38C 801DE61C 00230821 */ addu $at, $at, $v1 -/* 1CF390 801DE620 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1CF390 801DE620 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1CF394 801DE624 8C580000 */ lw $t8, ($v0) /* 1CF398 801DE628 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1CF39C 801DE62C 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DE650_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DE650_ovl10.s index 20a7514a..e93377e6 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DE650_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DE650_ovl10.s @@ -269,7 +269,7 @@ glabel func_801DE650_ovl10 /* 1CF7CC 801DEA5C 348402CE */ ori $a0, (0x000102CE & 0xFFFF) # ori $a0, $a0, 0x2ce /* 1CF7D0 801DEA60 8E090000 */ lw $t1, ($s0) /* 1CF7D4 801DEA64 8FBF002C */ lw $ra, 0x2c($sp) -/* 1CF7D8 801DEA68 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CF7D8 801DEA68 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CF7DC 801DEA6C 8D2D0000 */ lw $t5, ($t1) /* 1CF7E0 801DEA70 240B0002 */ li $t3, 2 /* 1CF7E4 801DEA74 8FB00020 */ lw $s0, 0x20($sp) @@ -278,6 +278,6 @@ glabel func_801DE650_ovl10 /* 1CF7F0 801DEA80 D7B40018 */ ldc1 $f20, 0x18($sp) /* 1CF7F4 801DEA84 8FB10024 */ lw $s1, 0x24($sp) /* 1CF7F8 801DEA88 8FB20028 */ lw $s2, 0x28($sp) -/* 1CF7FC 801DEA8C AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1CF7FC 801DEA8C AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1CF800 801DEA90 03E00008 */ jr $ra /* 1CF804 801DEA94 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DEA98_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DEA98_ovl10.s index a82e342d..3cbc730d 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DEA98_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DEA98_ovl10.s @@ -28,9 +28,9 @@ glabel func_801DEA98_ovl10 /* 1CF870 801DEB00 01224821 */ addu $t1, $t1, $v0 /* 1CF874 801DEB04 8D2983E0 */ lw $t1, %lo(D_800E83E0)($t1) /* 1CF878 801DEB08 1521000E */ bne $t1, $at, .L801DEB44_ovl10 -/* 1CF87C 801DEB0C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CF87C 801DEB0C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CF880 801DEB10 00220821 */ addu $at, $at, $v0 -/* 1CF884 801DEB14 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1CF884 801DEB14 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 1CF888 801DEB18 8C6B0000 */ lw $t3, ($v1) /* 1CF88C 801DEB1C 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1CF890 801DEB20 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DEB94_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DEB94_ovl10.s index 0e7fe23a..27a7d0b8 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DEB94_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DEB94_ovl10.s @@ -419,7 +419,7 @@ glabel func_801DEB94_ovl10 /* 1CFF54 801DF1E4 02227021 */ addu $t6, $s1, $v0 .L801DF1E8_ovl10: /* 1CFF58 801DF1E8 8FBF005C */ lw $ra, 0x5c($sp) -/* 1CFF5C 801DF1EC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1CFF5C 801DF1EC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1CFF60 801DF1F0 00220821 */ addu $at, $at, $v0 /* 1CFF64 801DF1F4 240F0002 */ li $t7, 2 /* 1CFF68 801DF1F8 D7B40020 */ ldc1 $f20, 0x20($sp) @@ -434,6 +434,6 @@ glabel func_801DEB94_ovl10 /* 1CFF8C 801DF21C 8FB60050 */ lw $s6, 0x50($sp) /* 1CFF90 801DF220 8FB70054 */ lw $s7, 0x54($sp) /* 1CFF94 801DF224 8FBE0058 */ lw $fp, 0x58($sp) -/* 1CFF98 801DF228 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1CFF98 801DF228 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1CFF9C 801DF22C 03E00008 */ jr $ra /* 1CFFA0 801DF230 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DF310_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DF310_ovl10.s index 10b27cc9..74592886 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DF310_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DF310_ovl10.s @@ -18,9 +18,9 @@ glabel func_801DF310_ovl10 /* 1D00C0 801DF350 01C37021 */ addu $t6, $t6, $v1 /* 1D00C4 801DF354 8DCE83E0 */ lw $t6, %lo(D_800E83E0)($t6) /* 1D00C8 801DF358 15C1000A */ bne $t6, $at, .L801DF384_ovl10 -/* 1D00CC 801DF35C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D00CC 801DF35C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D00D0 801DF360 00230821 */ addu $at, $at, $v1 -/* 1D00D4 801DF364 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D00D4 801DF364 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D00D8 801DF368 8C580000 */ lw $t8, ($v0) /* 1D00DC 801DF36C 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1D00E0 801DF370 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DF394_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DF394_ovl10.s index e5cad87a..7655eaac 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DF394_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DF394_ovl10.s @@ -70,11 +70,11 @@ glabel func_801DF394_ovl10 /* 1D0210 801DF4A0 3C188005 */ lui $t8, %hi(D_8004A7C4) # $t8, 0x8005 /* 1D0214 801DF4A4 8F18A7C4 */ lw $t8, %lo(D_8004A7C4)($t8) /* 1D0218 801DF4A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 1D021C 801DF4AC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D021C 801DF4AC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D0220 801DF4B0 8F0C0000 */ lw $t4, ($t8) /* 1D0224 801DF4B4 240E000A */ li $t6, 10 /* 1D0228 801DF4B8 27BD0018 */ addiu $sp, $sp, 0x18 /* 1D022C 801DF4BC 000C4080 */ sll $t0, $t4, 2 /* 1D0230 801DF4C0 00280821 */ addu $at, $at, $t0 /* 1D0234 801DF4C4 03E00008 */ jr $ra -/* 1D0238 801DF4C8 AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 1D0238 801DF4C8 AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DF50C_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DF50C_ovl10.s index fbb43bfa..be0653b6 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DF50C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DF50C_ovl10.s @@ -446,7 +446,7 @@ glabel func_801DF50C_ovl10 /* 1D0920 801DFBB0 002C0821 */ addu $at, $at, $t4 /* 1D0924 801DFBB4 AC229C60 */ sw $v0, %lo(D_800E9C60)($at) /* 1D0928 801DFBB8 8CAE0000 */ lw $t6, ($a1) -/* 1D092C 801DFBBC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D092C 801DFBBC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D0930 801DFBC0 D7B40018 */ ldc1 $f20, 0x18($sp) /* 1D0934 801DFBC4 000E7880 */ sll $t7, $t6, 2 /* 1D0938 801DFBC8 002F0821 */ addu $at, $at, $t7 @@ -459,6 +459,6 @@ glabel func_801DF50C_ovl10 /* 1D0954 801DFBE4 8FB5003C */ lw $s5, 0x3c($sp) /* 1D0958 801DFBE8 8FB70044 */ lw $s7, 0x44($sp) /* 1D095C 801DFBEC 8FBE0048 */ lw $fp, 0x48($sp) -/* 1D0960 801DFBF0 AC2DDC50 */ sw $t5, %lo(D_800DDC50)($at) +/* 1D0960 801DFBF0 AC2DDC50 */ sw $t5, %lo(gEntityVtableIndexArray)($at) /* 1D0964 801DFBF4 03E00008 */ jr $ra /* 1D0968 801DFBF8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801DFF88_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801DFF88_ovl10.s index 3bd29fa2..ac414eb7 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801DFF88_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801DFF88_ovl10.s @@ -269,15 +269,15 @@ glabel func_801DFF88_ovl10 .L801E0370_ovl10: /* 1D10E0 801E0370 14A00006 */ bnez $a1, .L801E038C_ovl10 /* 1D10E4 801E0374 240A000D */ li $t2, 13 -/* 1D10E8 801E0378 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D10E8 801E0378 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D10EC 801E037C 00230821 */ addu $at, $at, $v1 /* 1D10F0 801E0380 240B000C */ li $t3, 12 /* 1D10F4 801E0384 10000004 */ b .L801E0398_ovl10 -/* 1D10F8 801E0388 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D10F8 801E0388 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) .L801E038C_ovl10: -/* 1D10FC 801E038C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D10FC 801E038C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D1100 801E0390 00230821 */ addu $at, $at, $v1 -/* 1D1104 801E0394 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1D1104 801E0394 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) .L801E0398_ovl10: /* 1D1108 801E0398 8FBF004C */ lw $ra, 0x4c($sp) /* 1D110C 801E039C D7B40010 */ ldc1 $f20, 0x10($sp) diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E03CC_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E03CC_ovl10.s index 59239b1f..9ff99d66 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E03CC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E03CC_ovl10.s @@ -22,9 +22,9 @@ glabel func_801E03CC_ovl10 /* 1D118C 801E041C 0323C821 */ addu $t9, $t9, $v1 /* 1D1190 801E0420 8F3983E0 */ lw $t9, %lo(D_800E83E0)($t9) /* 1D1194 801E0424 1721000A */ bne $t9, $at, .L801E0450_ovl10 -/* 1D1198 801E0428 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D1198 801E0428 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D119C 801E042C 00230821 */ addu $at, $at, $v1 -/* 1D11A0 801E0430 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1D11A0 801E0430 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1D11A4 801E0434 8C490000 */ lw $t1, ($v0) /* 1D11A8 801E0438 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1D11AC 801E043C 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E0460_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E0460_ovl10.s index 1733ebee..e917dc38 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E0460_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E0460_ovl10.s @@ -463,7 +463,7 @@ glabel func_801E0460_ovl10 /* 1D18B0 801E0B40 E4369020 */ swc1 $f22, %lo(D_800E9020)($at) /* 1D18B4 801E0B44 8CB90000 */ lw $t9, ($a1) /* 1D18B8 801E0B48 8FBF004C */ lw $ra, 0x4c($sp) -/* 1D18BC 801E0B4C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D18BC 801E0B4C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D18C0 801E0B50 00195880 */ sll $t3, $t9, 2 /* 1D18C4 801E0B54 002B0821 */ addu $at, $at, $t3 /* 1D18C8 801E0B58 240A000B */ li $t2, 11 @@ -478,6 +478,6 @@ glabel func_801E0460_ovl10 /* 1D18EC 801E0B7C 8FB60040 */ lw $s6, 0x40($sp) /* 1D18F0 801E0B80 8FB70044 */ lw $s7, 0x44($sp) /* 1D18F4 801E0B84 8FBE0048 */ lw $fp, 0x48($sp) -/* 1D18F8 801E0B88 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1D18F8 801E0B88 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 1D18FC 801E0B8C 03E00008 */ jr $ra /* 1D1900 801E0B90 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E0B94_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E0B94_ovl10.s index 4a65d703..a4b58bc3 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E0B94_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E0B94_ovl10.s @@ -178,9 +178,9 @@ glabel func_801E0B94_ovl10 /* 1D1BA4 801E0E34 01A36821 */ addu $t5, $t5, $v1 /* 1D1BA8 801E0E38 8DAD83E0 */ lw $t5, %lo(D_800E83E0)($t5) /* 1D1BAC 801E0E3C 15A1000A */ bne $t5, $at, .L801E0E68_ovl10 -/* 1D1BB0 801E0E40 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D1BB0 801E0E40 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D1BB4 801E0E44 00230821 */ addu $at, $at, $v1 -/* 1D1BB8 801E0E48 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 1D1BB8 801E0E48 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 1D1BBC 801E0E4C 8CCE0000 */ lw $t6, ($a2) /* 1D1BC0 801E0E50 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1D1BC4 801E0E54 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E0E78_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E0E78_ovl10.s index 8b9ba6ec..5f4d634c 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E0E78_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E0E78_ovl10.s @@ -97,15 +97,15 @@ glabel func_801E0E78_ovl10 .L801E0FD4_ovl10: /* 1D1D44 801E0FD4 14A00006 */ bnez $a1, .L801E0FF0_ovl10 /* 1D1D48 801E0FD8 240C0010 */ li $t4, 16 -/* 1D1D4C 801E0FDC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D1D4C 801E0FDC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D1D50 801E0FE0 00230821 */ addu $at, $at, $v1 /* 1D1D54 801E0FE4 2409000E */ li $t1, 14 /* 1D1D58 801E0FE8 10000004 */ b .L801E0FFC_ovl10 -/* 1D1D5C 801E0FEC AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1D1D5C 801E0FEC AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) .L801E0FF0_ovl10: -/* 1D1D60 801E0FF0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D1D60 801E0FF0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D1D64 801E0FF4 00230821 */ addu $at, $at, $v1 -/* 1D1D68 801E0FF8 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 1D1D68 801E0FF8 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) .L801E0FFC_ovl10: /* 1D1D6C 801E0FFC 8FBF0014 */ lw $ra, 0x14($sp) /* 1D1D70 801E1000 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E100C_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E100C_ovl10.s index 62947c04..b6e75bc0 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E100C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E100C_ovl10.s @@ -219,7 +219,7 @@ glabel func_801E100C_ovl10 /* 1D20C0 801E1350 348402F6 */ ori $a0, (0x000102F6 & 0xFFFF) # ori $a0, $a0, 0x2f6 /* 1D20C4 801E1354 8ECC0000 */ lw $t4, ($s6) /* 1D20C8 801E1358 8FBF0044 */ lw $ra, 0x44($sp) -/* 1D20CC 801E135C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D20CC 801E135C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D20D0 801E1360 8D880000 */ lw $t0, ($t4) /* 1D20D4 801E1364 2418000B */ li $t8, 11 /* 1D20D8 801E1368 8FB60040 */ lw $s6, 0x40($sp) @@ -233,6 +233,6 @@ glabel func_801E100C_ovl10 /* 1D20F8 801E1388 8FB30034 */ lw $s3, 0x34($sp) /* 1D20FC 801E138C 8FB40038 */ lw $s4, 0x38($sp) /* 1D2100 801E1390 8FB5003C */ lw $s5, 0x3c($sp) -/* 1D2104 801E1394 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1D2104 801E1394 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1D2108 801E1398 03E00008 */ jr $ra /* 1D210C 801E139C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E1550_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E1550_ovl10.s index b8201566..e423bf9f 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E1550_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E1550_ovl10.s @@ -165,14 +165,14 @@ glabel func_801E1550_ovl10 /* 1D2534 801E17C4 24070002 */ li $a3, 2 /* 1D2538 801E17C8 3C038005 */ lui $v1, %hi(D_8004A7C4) # $v1, 0x8005 /* 1D253C 801E17CC 8C63A7C4 */ lw $v1, %lo(D_8004A7C4)($v1) -/* 1D2540 801E17D0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D2540 801E17D0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D2544 801E17D4 2419000F */ li $t9, 15 /* 1D2548 801E17D8 8C680000 */ lw $t0, ($v1) /* 1D254C 801E17DC 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D2550 801E17E0 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1D2554 801E17E4 00087880 */ sll $t7, $t0, 2 /* 1D2558 801E17E8 002F0821 */ addu $at, $at, $t7 -/* 1D255C 801E17EC AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1D255C 801E17EC AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 1D2560 801E17F0 8C690000 */ lw $t1, ($v1) /* 1D2564 801E17F4 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 /* 1D2568 801E17F8 00095080 */ sll $t2, $t1, 2 @@ -195,9 +195,9 @@ glabel func_801E1550_ovl10 .L801E183C_ovl10: /* 1D25AC 801E183C 1481000C */ bne $a0, $at, .L801E1870_ovl10 /* 1D25B0 801E1840 24180012 */ li $t8, 18 -/* 1D25B4 801E1844 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D25B4 801E1844 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D25B8 801E1848 00260821 */ addu $at, $at, $a2 -/* 1D25BC 801E184C AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1D25BC 801E184C AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1D25C0 801E1850 8C680000 */ lw $t0, ($v1) /* 1D25C4 801E1854 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D25C8 801E1858 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E18A8_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E18A8_ovl10.s index c91ec295..2f63ae4a 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E18A8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E18A8_ovl10.s @@ -289,7 +289,7 @@ glabel func_801E18A8_ovl10 /* 1D2A64 801E1CF4 348402F4 */ ori $a0, (0x000102F4 & 0xFFFF) # ori $a0, $a0, 0x2f4 /* 1D2A68 801E1CF8 8E490000 */ lw $t1, ($s2) /* 1D2A6C 801E1CFC 8FBF0044 */ lw $ra, 0x44($sp) -/* 1D2A70 801E1D00 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D2A70 801E1D00 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D2A74 801E1D04 8D2A0000 */ lw $t2, ($t1) /* 1D2A78 801E1D08 2408000B */ li $t0, 11 /* 1D2A7C 801E1D0C 8FB2003C */ lw $s2, 0x3c($sp) @@ -301,6 +301,6 @@ glabel func_801E18A8_ovl10 /* 1D2A94 801E1D24 8FB00034 */ lw $s0, 0x34($sp) /* 1D2A98 801E1D28 8FB10038 */ lw $s1, 0x38($sp) /* 1D2A9C 801E1D2C 8FB30040 */ lw $s3, 0x40($sp) -/* 1D2AA0 801E1D30 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1D2AA0 801E1D30 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1D2AA4 801E1D34 03E00008 */ jr $ra /* 1D2AA8 801E1D38 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E1D3C_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E1D3C_ovl10.s index 69bb8199..42d049a9 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E1D3C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E1D3C_ovl10.s @@ -22,9 +22,9 @@ glabel func_801E1D3C_ovl10 /* 1D2AFC 801E1D8C 0323C821 */ addu $t9, $t9, $v1 /* 1D2B00 801E1D90 8F3983E0 */ lw $t9, %lo(D_800E83E0)($t9) /* 1D2B04 801E1D94 1721000A */ bne $t9, $at, .L801E1DC0_ovl10 -/* 1D2B08 801E1D98 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D2B08 801E1D98 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D2B0C 801E1D9C 00230821 */ addu $at, $at, $v1 -/* 1D2B10 801E1DA0 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1D2B10 801E1DA0 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1D2B14 801E1DA4 8C490000 */ lw $t1, ($v0) /* 1D2B18 801E1DA8 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1D2B1C 801E1DAC 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E1DD0_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E1DD0_ovl10.s index b11e44da..e2ece303 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E1DD0_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E1DD0_ovl10.s @@ -117,7 +117,7 @@ glabel func_801E1DD0_ovl10 /* 1D2D04 801E1F94 348402FE */ ori $a0, (0x000102FE & 0xFFFF) # ori $a0, $a0, 0x2fe /* 1D2D08 801E1F98 8E6E0000 */ lw $t6, ($s3) /* 1D2D0C 801E1F9C 8FBF0034 */ lw $ra, 0x34($sp) -/* 1D2D10 801E1FA0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D2D10 801E1FA0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D2D14 801E1FA4 8DD80000 */ lw $t8, ($t6) /* 1D2D18 801E1FA8 240F000B */ li $t7, 11 /* 1D2D1C 801E1FAC 8FB30030 */ lw $s3, 0x30($sp) @@ -128,6 +128,6 @@ glabel func_801E1DD0_ovl10 /* 1D2D30 801E1FC0 8FB00024 */ lw $s0, 0x24($sp) /* 1D2D34 801E1FC4 8FB10028 */ lw $s1, 0x28($sp) /* 1D2D38 801E1FC8 8FB2002C */ lw $s2, 0x2c($sp) -/* 1D2D3C 801E1FCC AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D2D3C 801E1FCC AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D2D40 801E1FD0 03E00008 */ jr $ra /* 1D2D44 801E1FD4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E1FD8_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E1FD8_ovl10.s index 4225c934..df149f09 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E1FD8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E1FD8_ovl10.s @@ -22,9 +22,9 @@ glabel func_801E1FD8_ovl10 /* 1D2D98 801E2028 0323C821 */ addu $t9, $t9, $v1 /* 1D2D9C 801E202C 8F3983E0 */ lw $t9, %lo(D_800E83E0)($t9) /* 1D2DA0 801E2030 1721000A */ bne $t9, $at, .L801E205C_ovl10 -/* 1D2DA4 801E2034 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D2DA4 801E2034 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D2DA8 801E2038 00230821 */ addu $at, $at, $v1 -/* 1D2DAC 801E203C AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1D2DAC 801E203C AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1D2DB0 801E2040 8C490000 */ lw $t1, ($v0) /* 1D2DB4 801E2044 3C05801E */ lui $a1, %hi(D_801DBD38) # $a1, 0x801e /* 1D2DB8 801E2048 24A5BD38 */ addiu $a1, %lo(D_801DBD38) # addiu $a1, $a1, -0x42c8 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E206C_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E206C_ovl10.s index 836d0696..85b84182 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E206C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E206C_ovl10.s @@ -432,7 +432,7 @@ glabel func_801E206C_ovl10 /* 1D3448 801E26D8 002A0821 */ addu $at, $at, $t2 /* 1D344C 801E26DC AC299C60 */ sw $t1, %lo(D_800E9C60)($at) /* 1D3450 801E26E0 8C8C0000 */ lw $t4, ($a0) -/* 1D3454 801E26E4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D3454 801E26E4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D3458 801E26E8 D7B40020 */ ldc1 $f20, 0x20($sp) /* 1D345C 801E26EC 000C6880 */ sll $t5, $t4, 2 /* 1D3460 801E26F0 002D0821 */ addu $at, $at, $t5 @@ -445,6 +445,6 @@ glabel func_801E206C_ovl10 /* 1D347C 801E270C 8FB50044 */ lw $s5, 0x44($sp) /* 1D3480 801E2710 8FB7004C */ lw $s7, 0x4c($sp) /* 1D3484 801E2714 8FBE0050 */ lw $fp, 0x50($sp) -/* 1D3488 801E2718 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1D3488 801E2718 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1D348C 801E271C 03E00008 */ jr $ra /* 1D3490 801E2720 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/ovl10/ovl10_1/func_801E28C8_ovl10.s b/asm/non_matchings/ovl10/ovl10_1/func_801E28C8_ovl10.s index c6922b0d..9781c2df 100644 --- a/asm/non_matchings/ovl10/ovl10_1/func_801E28C8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_1/func_801E28C8_ovl10.s @@ -160,11 +160,11 @@ glabel func_801E28C8_ovl10 /* 1D3888 801E2B18 10410026 */ beq $v0, $at, .L801E2BB4_ovl10 /* 1D388C 801E2B1C ADC20000 */ sw $v0, ($t6) /* 1D3890 801E2B20 8C640000 */ lw $a0, ($v1) -/* 1D3894 801E2B24 3C0F800E */ lui $t7, %hi(D_800DDC50) +/* 1D3894 801E2B24 3C0F800E */ lui $t7, %hi(gEntityVtableIndexArray) /* 1D3898 801E2B28 44804000 */ mtc1 $zero, $f8 /* 1D389C 801E2B2C 00042080 */ sll $a0, $a0, 2 /* 1D38A0 801E2B30 01E47821 */ addu $t7, $t7, $a0 -/* 1D38A4 801E2B34 8DEFDC50 */ lw $t7, %lo(D_800DDC50)($t7) +/* 1D38A4 801E2B34 8DEFDC50 */ lw $t7, %lo(gEntityVtableIndexArray)($t7) /* 1D38A8 801E2B38 00A45021 */ addu $t2, $a1, $a0 /* 1D38AC 801E2B3C 00A46821 */ addu $t5, $a1, $a0 /* 1D38B0 801E2B40 29E1000A */ slti $at, $t7, 0xa diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E2D40_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E2D40_ovl10.s index 1fe38855..48961f56 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E2D40_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E2D40_ovl10.s @@ -18,8 +18,8 @@ glabel func_801E2D40_ovl10 /* 1D3AF0 801E2D80 0C02911F */ jal call_virtual_function /* 1D3AF4 801E2D84 90847880 */ lbu $a0, %lo(D_800E7880)($a0) /* 1D3AF8 801E2D88 3C12801F */ lui $s2, %hi(D_801F43FC_ovl10) # $s2, 0x801f -/* 1D3AFC 801E2D8C 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 1D3B00 801E2D90 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 1D3AFC 801E2D8C 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 1D3B00 801E2D90 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 1D3B04 801E2D94 265243FC */ addiu $s2, %lo(D_801F43FC_ovl10) # addiu $s2, $s2, 0x43fc /* 1D3B08 801E2D98 8E180000 */ lw $t8, ($s0) .L801E2D9C_ovl10: diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E3874_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E3874_ovl10.s index 4dc036a1..dcf665ee 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E3874_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E3874_ovl10.s @@ -107,14 +107,14 @@ glabel func_801E3874_ovl10 /* 1D4770 801E3A00 0C067AF3 */ jal func_8019EBCC_ovl10 /* 1D4774 801E3A04 8C84E350 */ lw $a0, %lo(D_800DE350)($a0) /* 1D4778 801E3A08 8E220000 */ lw $v0, ($s1) -/* 1D477C 801E3A0C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D477C 801E3A0C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D4780 801E3A10 240F0007 */ li $t7, 7 /* 1D4784 801E3A14 8C580000 */ lw $t8, ($v0) /* 1D4788 801E3A18 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D478C 801E3A1C 3C05801E */ lui $a1, %hi(D_801E5754) # $a1, 0x801e /* 1D4790 801E3A20 0018C880 */ sll $t9, $t8, 2 /* 1D4794 801E3A24 00390821 */ addu $at, $at, $t9 -/* 1D4798 801E3A28 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D4798 801E3A28 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D479C 801E3A2C 8C4E0000 */ lw $t6, ($v0) /* 1D47A0 801E3A30 24A55754 */ addiu $a1, %lo(D_801E5754) # addiu $a1, $a1, 0x5754 /* 1D47A4 801E3A34 000E4880 */ sll $t1, $t6, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E3BE4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E3BE4_ovl10.s index a3c7dbf5..9c9c2f58 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E3BE4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E3BE4_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E3BE4_ovl10 /* 1D4960 801E3BF0 AFBF0014 */ sw $ra, 0x14($sp) /* 1D4964 801E3BF4 AFA40018 */ sw $a0, 0x18($sp) /* 1D4968 801E3BF8 8DCF0000 */ lw $t7, ($t6) -/* 1D496C 801E3BFC 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D496C 801E3BFC 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D4970 801E3C00 3C06801F */ lui $a2, %hi(D_801F44B4_ovl10) # $a2, 0x801f /* 1D4974 801E3C04 000FC080 */ sll $t8, $t7, 2 /* 1D4978 801E3C08 00982021 */ addu $a0, $a0, $t8 -/* 1D497C 801E3C0C 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D497C 801E3C0C 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D4980 801E3C10 24C644B4 */ addiu $a2, %lo(D_801F44B4_ovl10) # addiu $a2, $a2, 0x44b4 /* 1D4984 801E3C14 0C02911F */ jal call_virtual_function /* 1D4988 801E3C18 24050009 */ li $a1, 9 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E3E04_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E3E04_ovl10.s index 5abdea8e..ab898b6f 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E3E04_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E3E04_ovl10.s @@ -70,11 +70,11 @@ glabel func_801E3E04_ovl10 /* 1D4C74 801E3F04 3C0D800F */ lui $t5, %hi(D_800E9C60) /* 1D4C78 801E3F08 01A36821 */ addu $t5, $t5, $v1 /* 1D4C7C 801E3F0C 8DAD9C60 */ lw $t5, %lo(D_800E9C60)($t5) -/* 1D4C80 801E3F10 3C0E800E */ lui $t6, %hi(D_800DDC50) +/* 1D4C80 801E3F10 3C0E800E */ lui $t6, %hi(gEntityVtableIndexArray) /* 1D4C84 801E3F14 01C37021 */ addu $t6, $t6, $v1 /* 1D4C88 801E3F18 11A0000B */ beqz $t5, .L801E3F48_ovl10 /* 1D4C8C 801E3F1C 00000000 */ nop -/* 1D4C90 801E3F20 8DCEDC50 */ lw $t6, %lo(D_800DDC50)($t6) +/* 1D4C90 801E3F20 8DCEDC50 */ lw $t6, %lo(gEntityVtableIndexArray)($t6) /* 1D4C94 801E3F24 24010007 */ li $at, 7 /* 1D4C98 801E3F28 11C10007 */ beq $t6, $at, .L801E3F48_ovl10 /* 1D4C9C 801E3F2C 00000000 */ nop diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E4030_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E4030_ovl10.s index abe38334..763fe906 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E4030_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E4030_ovl10.s @@ -6,7 +6,7 @@ glabel func_801E4030_ovl10 /* 1D4DB0 801E4040 AFA40018 */ sw $a0, 0x18($sp) /* 1D4DB4 801E4044 8C430000 */ lw $v1, ($v0) /* 1D4DB8 801E4048 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1D4DBC 801E404C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D4DBC 801E404C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D4DC0 801E4050 00031880 */ sll $v1, $v1, 2 /* 1D4DC4 801E4054 01C37021 */ addu $t6, $t6, $v1 /* 1D4DC8 801E4058 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801E4030_ovl10 /* 1D4DD0 801E4060 240F0001 */ li $t7, 1 /* 1D4DD4 801E4064 11C00009 */ beqz $t6, .L801E408C_ovl10 /* 1D4DD8 801E4068 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1D4DDC 801E406C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D4DDC 801E406C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D4DE0 801E4070 8C580000 */ lw $t8, ($v0) /* 1D4DE4 801E4074 3C05801E */ lui $a1, %hi(D_801E3BE4) # $a1, 0x801e /* 1D4DE8 801E4078 24A53BE4 */ addiu $a1, %lo(D_801E3BE4) # addiu $a1, $a1, 0x3be4 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E4518_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E4518_ovl10.s index 593ba9f2..cfced83a 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E4518_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E4518_ovl10.s @@ -94,7 +94,7 @@ glabel func_801E4518_ovl10 /* 1D53EC 801E467C 1300001B */ beqz $t8, .L801E46EC_ovl10 /* 1D53F0 801E4680 00821821 */ addu $v1, $a0, $v0 /* 1D53F4 801E4684 8C790000 */ lw $t9, ($v1) -/* 1D53F8 801E4688 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D53F8 801E4688 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D53FC 801E468C 272EFFFF */ addiu $t6, $t9, -1 /* 1D5400 801E4690 AC6E0000 */ sw $t6, ($v1) /* 1D5404 801E4694 8CC20000 */ lw $v0, ($a2) @@ -107,10 +107,10 @@ glabel func_801E4518_ovl10 /* 1D5420 801E46B0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D5424 801E46B4 17000005 */ bnez $t8, .L801E46CC_ovl10 /* 1D5428 801E46B8 00000000 */ nop -/* 1D542C 801E46BC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D542C 801E46BC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D5430 801E46C0 00220821 */ addu $at, $at, $v0 /* 1D5434 801E46C4 10000002 */ b .L801E46D0_ovl10 -/* 1D5438 801E46C8 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1D5438 801E46C8 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) .L801E46CC_ovl10: /* 1D543C 801E46CC AC2EDC50 */ sw $t6, -0x23b0($at) .L801E46D0_ovl10: diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E48C8_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E48C8_ovl10.s index 894a4d92..94b5a8ea 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E48C8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E48C8_ovl10.s @@ -20,9 +20,9 @@ glabel func_801E48C8_ovl10 /* 1D5680 801E4910 3C09800E */ lui $t1, %hi(D_800DD8D0) /* 1D5684 801E4914 14D8000E */ bne $a2, $t8, .L801E4950_ovl10 /* 1D5688 801E4918 01224821 */ addu $t1, $t1, $v0 -/* 1D568C 801E491C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D568C 801E491C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D5690 801E4920 00220821 */ addu $at, $at, $v0 -/* 1D5694 801E4924 AC26DC50 */ sw $a2, %lo(D_800DDC50)($at) +/* 1D5694 801E4924 AC26DC50 */ sw $a2, %lo(gEntityVtableIndexArray)($at) /* 1D5698 801E4928 8C790000 */ lw $t9, ($v1) /* 1D569C 801E492C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D56A0 801E4930 3C05801E */ lui $a1, %hi(D_801E3BE4) # $a1, 0x801e diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E4C7C_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E4C7C_ovl10.s index b1d6fd71..2fef7b39 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E4C7C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E4C7C_ovl10.s @@ -37,17 +37,17 @@ glabel func_801E4C7C_ovl10 /* 1D5A78 801E4D08 002D0821 */ addu $at, $at, $t5 /* 1D5A7C 801E4D0C AC2B93A0 */ sw $t3, %lo(D_800E93A0)($at) /* 1D5A80 801E4D10 8C6F0000 */ lw $t7, ($v1) -/* 1D5A84 801E4D14 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D5A84 801E4D14 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D5A88 801E4D18 240E0001 */ li $t6, 1 /* 1D5A8C 801E4D1C 000FC080 */ sll $t8, $t7, 2 /* 1D5A90 801E4D20 00380821 */ addu $at, $at, $t8 /* 1D5A94 801E4D24 10000005 */ b .L801E4D3C_ovl10 -/* 1D5A98 801E4D28 AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 1D5A98 801E4D28 AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) .L801E4D2C_ovl10: -/* 1D5A9C 801E4D2C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D5A9C 801E4D2C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D5AA0 801E4D30 00220821 */ addu $at, $at, $v0 /* 1D5AA4 801E4D34 24190004 */ li $t9, 4 -/* 1D5AA8 801E4D38 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1D5AA8 801E4D38 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) .L801E4D3C_ovl10: /* 1D5AAC 801E4D3C 8C680000 */ lw $t0, ($v1) /* 1D5AB0 801E4D40 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E50A4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E50A4_ovl10.s index c952cbbe..f2b1bfc1 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E50A4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E50A4_ovl10.s @@ -43,9 +43,9 @@ glabel func_801E50A4_ovl10 /* 1D5EB0 801E5140 8DEF9E20 */ lw $t7, %lo(D_800E9E20)($t7) /* 1D5EB4 801E5144 24010002 */ li $at, 2 /* 1D5EB8 801E5148 15E1000A */ bne $t7, $at, .L801E5174_ovl10 -/* 1D5EBC 801E514C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D5EBC 801E514C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D5EC0 801E5150 00220821 */ addu $at, $at, $v0 -/* 1D5EC4 801E5154 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1D5EC4 801E5154 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1D5EC8 801E5158 8C790000 */ lw $t9, ($v1) /* 1D5ECC 801E515C 3C05801E */ lui $a1, %hi(D_801E3BE4) # $a1, 0x801e /* 1D5ED0 801E5160 24A53BE4 */ addiu $a1, %lo(D_801E3BE4) # addiu $a1, $a1, 0x3be4 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E5278_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E5278_ovl10.s index c20adcba..739f2c1a 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E5278_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E5278_ovl10.s @@ -27,27 +27,27 @@ glabel func_801E5278_ovl10 /* 1D604C 801E52DC 00021080 */ sll $v0, $v0, 2 /* 1D6050 801E52E0 00220821 */ addu $at, $at, $v0 /* 1D6054 801E52E4 C4286A10 */ lwc1 $f8, %lo(D_800E6A10)($at) -/* 1D6058 801E52E8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D6058 801E52E8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D605C 801E52EC 00220821 */ addu $at, $at, $v0 /* 1D6060 801E52F0 46083032 */ c.eq.s $f6, $f8 /* 1D6064 801E52F4 240A0005 */ li $t2, 5 /* 1D6068 801E52F8 45010005 */ bc1t .L801E5310_ovl10 /* 1D606C 801E52FC 00000000 */ nop -/* 1D6070 801E5300 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D6070 801E5300 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D6074 801E5304 00220821 */ addu $at, $at, $v0 /* 1D6078 801E5308 1000000A */ b .L801E5334_ovl10 -/* 1D607C 801E530C AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1D607C 801E530C AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) .L801E5310_ovl10: /* 1D6080 801E5310 10000008 */ b .L801E5334_ovl10 /* 1D6084 801E5314 AC2ADC50 */ sw $t2, -0x23b0($at) .L801E5318_ovl10: /* 1D6088 801E5318 8CA30000 */ lw $v1, ($a1) -/* 1D608C 801E531C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D608C 801E531C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D6090 801E5320 240B0005 */ li $t3, 5 /* 1D6094 801E5324 8C6C0000 */ lw $t4, ($v1) /* 1D6098 801E5328 000C6880 */ sll $t5, $t4, 2 /* 1D609C 801E532C 002D0821 */ addu $at, $at, $t5 -/* 1D60A0 801E5330 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D60A0 801E5330 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) .L801E5334_ovl10: /* 1D60A4 801E5334 8C6E0000 */ lw $t6, ($v1) /* 1D60A8 801E5338 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E5468_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E5468_ovl10.s index 5ca35496..d9f8052f 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E5468_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E5468_ovl10.s @@ -33,11 +33,11 @@ glabel func_801E5468_ovl10 /* 1D6254 801E54E4 00280821 */ addu $at, $at, $t0 /* 1D6258 801E54E8 E4286850 */ swc1 $f8, %lo(D_800E6850)($at) /* 1D625C 801E54EC 8C4A0000 */ lw $t2, ($v0) -/* 1D6260 801E54F0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D6260 801E54F0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D6264 801E54F4 3C05801E */ lui $a1, %hi(D_801E3BE4) # $a1, 0x801e /* 1D6268 801E54F8 000A5880 */ sll $t3, $t2, 2 /* 1D626C 801E54FC 002B0821 */ addu $at, $at, $t3 -/* 1D6270 801E5500 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1D6270 801E5500 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 1D6274 801E5504 8C4C0000 */ lw $t4, ($v0) /* 1D6278 801E5508 24A53BE4 */ addiu $a1, %lo(D_801E3BE4) # addiu $a1, $a1, 0x3be4 /* 1D627C 801E550C 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E56C4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E56C4_ovl10.s index 4cb02f36..38814afe 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E56C4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E56C4_ovl10.s @@ -15,7 +15,7 @@ glabel func_801E56C4_ovl10 /* 1D6468 801E56F8 51C00013 */ beql $t6, $zero, .L801E5748_ovl10 /* 1D646C 801E56FC 8FBF0014 */ lw $ra, 0x14($sp) /* 1D6470 801E5700 C4440000 */ lwc1 $f4, ($v0) -/* 1D6474 801E5704 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D6474 801E5704 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D6478 801E5708 24180005 */ li $t8, 5 /* 1D647C 801E570C 46002187 */ neg.s $f6, $f4 /* 1D6480 801E5710 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) @@ -25,7 +25,7 @@ glabel func_801E56C4_ovl10 /* 1D6490 801E5720 24A53BE4 */ addiu $a1, %lo(D_801E3BE4) # addiu $a1, $a1, 0x3be4 /* 1D6494 801E5724 00194080 */ sll $t0, $t9, 2 /* 1D6498 801E5728 00280821 */ addu $at, $at, $t0 -/* 1D649C 801E572C AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1D649C 801E572C AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1D64A0 801E5730 8C690000 */ lw $t1, ($v1) /* 1D64A4 801E5734 00095080 */ sll $t2, $t1, 2 /* 1D64A8 801E5738 008A2021 */ addu $a0, $a0, $t2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E63FC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E63FC_ovl10.s index 8d767b18..89ff942e 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E63FC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E63FC_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E63FC_ovl10 /* 1D7178 801E6408 AFBF0014 */ sw $ra, 0x14($sp) /* 1D717C 801E640C AFA40018 */ sw $a0, 0x18($sp) /* 1D7180 801E6410 8DCF0000 */ lw $t7, ($t6) -/* 1D7184 801E6414 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D7184 801E6414 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D7188 801E6418 3C06801F */ lui $a2, %hi(D_801F4510_ovl10) # $a2, 0x801f /* 1D718C 801E641C 000FC080 */ sll $t8, $t7, 2 /* 1D7190 801E6420 00982021 */ addu $a0, $a0, $t8 -/* 1D7194 801E6424 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D7194 801E6424 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D7198 801E6428 24C64510 */ addiu $a2, %lo(D_801F4510_ovl10) # addiu $a2, $a2, 0x4510 /* 1D719C 801E642C 0C02911F */ jal call_virtual_function /* 1D71A0 801E6430 24050003 */ li $a1, 3 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E6444_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E6444_ovl10.s index 3e960db0..32ab7457 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E6444_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E6444_ovl10.s @@ -44,11 +44,11 @@ glabel func_801E6444_ovl10 /* 1D725C 801E64EC 00230821 */ addu $at, $at, $v1 /* 1D7260 801E64F0 E424B160 */ swc1 $f4, %lo(D_800EB160)($at) /* 1D7264 801E64F4 8C4A0000 */ lw $t2, ($v0) -/* 1D7268 801E64F8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D7268 801E64F8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D726C 801E64FC 000A5880 */ sll $t3, $t2, 2 /* 1D7270 801E6500 002B0821 */ addu $at, $at, $t3 /* 1D7274 801E6504 0C02A5D8 */ jal func_800A9760 -/* 1D7278 801E6508 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1D7278 801E6508 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1D727C 801E650C 8FAD001C */ lw $t5, 0x1c($sp) /* 1D7280 801E6510 3C0C801D */ lui $t4, %hi(D_801CB494) # $t4, 0x801d /* 1D7284 801E6514 258CB494 */ addiu $t4, %lo(D_801CB494) # addiu $t4, $t4, -0x4b6c @@ -58,7 +58,7 @@ glabel func_801E6444_ovl10 /* 1D7294 801E6524 ADAC0098 */ sw $t4, 0x98($t5) /* 1D7298 801E6528 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 /* 1D729C 801E652C 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6) -/* 1D72A0 801E6530 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D72A0 801E6530 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D72A4 801E6534 3C06801F */ lui $a2, %hi(D_801F4510_ovl10) # $a2, 0x801f /* 1D72A8 801E6538 8DCF0000 */ lw $t7, ($t6) /* 1D72AC 801E653C 24C64510 */ addiu $a2, %lo(D_801F4510_ovl10) # addiu $a2, $a2, 0x4510 @@ -66,7 +66,7 @@ glabel func_801E6444_ovl10 /* 1D72B4 801E6544 000FC080 */ sll $t8, $t7, 2 /* 1D72B8 801E6548 00982021 */ addu $a0, $a0, $t8 /* 1D72BC 801E654C 0C02911F */ jal call_virtual_function -/* 1D72C0 801E6550 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D72C0 801E6550 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D72C4 801E6554 8FBF0014 */ lw $ra, 0x14($sp) /* 1D72C8 801E6558 27BD0020 */ addiu $sp, $sp, 0x20 /* 1D72CC 801E655C 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E66E0_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E66E0_ovl10.s index 94d9fb75..3a6db4bd 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E66E0_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E66E0_ovl10.s @@ -28,14 +28,14 @@ glabel func_801E66E0_ovl10 /* 1D74B8 801E6748 C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1D74BC 801E674C 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1D74C0 801E6750 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1D74C4 801E6754 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D74C4 801E6754 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D74C8 801E6758 240B0001 */ li $t3, 1 /* 1D74CC 801E675C 8C4C0000 */ lw $t4, ($v0) /* 1D74D0 801E6760 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D74D4 801E6764 3C05801E */ lui $a1, %hi(D_801E63FC) # $a1, 0x801e /* 1D74D8 801E6768 000C6880 */ sll $t5, $t4, 2 /* 1D74DC 801E676C 002D0821 */ addu $at, $at, $t5 -/* 1D74E0 801E6770 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D74E0 801E6770 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1D74E4 801E6774 8C4E0000 */ lw $t6, ($v0) /* 1D74E8 801E6778 24A563FC */ addiu $a1, %lo(D_801E63FC) # addiu $a1, $a1, 0x63fc /* 1D74EC 801E677C 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E6AB4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E6AB4_ovl10.s index 69072793..7b09c67d 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E6AB4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E6AB4_ovl10.s @@ -46,11 +46,11 @@ glabel func_801E6AB4_ovl10 /* 1D78CC 801E6B5C 00220821 */ addu $at, $at, $v0 /* 1D78D0 801E6B60 AC388920 */ sw $t8, %lo(D_800E8920)($at) /* 1D78D4 801E6B64 8C790000 */ lw $t9, ($v1) -/* 1D78D8 801E6B68 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D78D8 801E6B68 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D78DC 801E6B6C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D78E0 801E6B70 00194080 */ sll $t0, $t9, 2 /* 1D78E4 801E6B74 00280821 */ addu $at, $at, $t0 -/* 1D78E8 801E6B78 AC26DC50 */ sw $a2, %lo(D_800DDC50)($at) +/* 1D78E8 801E6B78 AC26DC50 */ sw $a2, %lo(gEntityVtableIndexArray)($at) /* 1D78EC 801E6B7C 8C690000 */ lw $t1, ($v1) /* 1D78F0 801E6B80 3C05801E */ lui $a1, %hi(D_801E63FC) # $a1, 0x801e /* 1D78F4 801E6B84 24A563FC */ addiu $a1, %lo(D_801E63FC) # addiu $a1, $a1, 0x63fc diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E6D08_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E6D08_ovl10.s index 29d7971b..6f0493b3 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E6D08_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E6D08_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E6D08_ovl10 /* 1D7A84 801E6D14 AFBF0014 */ sw $ra, 0x14($sp) /* 1D7A88 801E6D18 AFA40018 */ sw $a0, 0x18($sp) /* 1D7A8C 801E6D1C 8DCF0000 */ lw $t7, ($t6) -/* 1D7A90 801E6D20 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D7A90 801E6D20 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D7A94 801E6D24 3C06801F */ lui $a2, %hi(D_801F4528_ovl10) # $a2, 0x801f /* 1D7A98 801E6D28 000FC080 */ sll $t8, $t7, 2 /* 1D7A9C 801E6D2C 00982021 */ addu $a0, $a0, $t8 -/* 1D7AA0 801E6D30 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D7AA0 801E6D30 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D7AA4 801E6D34 24C64528 */ addiu $a2, %lo(D_801F4528_ovl10) # addiu $a2, $a2, 0x4528 /* 1D7AA8 801E6D38 0C02911F */ jal call_virtual_function /* 1D7AAC 801E6D3C 24050003 */ li $a1, 3 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E6D50_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E6D50_ovl10.s index 74321dd8..61514038 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E6D50_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E6D50_ovl10.s @@ -49,11 +49,11 @@ glabel func_801E6D50_ovl10 /* 1D7B7C 801E6E0C 002B0821 */ addu $at, $at, $t3 /* 1D7B80 801E6E10 AC208920 */ sw $zero, %lo(D_800E8920)($at) /* 1D7B84 801E6E14 8C4C0000 */ lw $t4, ($v0) -/* 1D7B88 801E6E18 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D7B88 801E6E18 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D7B8C 801E6E1C 000C6880 */ sll $t5, $t4, 2 /* 1D7B90 801E6E20 002D0821 */ addu $at, $at, $t5 /* 1D7B94 801E6E24 0C02A5D8 */ jal func_800A9760 -/* 1D7B98 801E6E28 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1D7B98 801E6E28 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1D7B9C 801E6E2C 8FAF001C */ lw $t7, 0x1c($sp) /* 1D7BA0 801E6E30 3C0E801D */ lui $t6, %hi(D_801CB590) # $t6, 0x801d /* 1D7BA4 801E6E34 25CEB590 */ addiu $t6, %lo(D_801CB590) # addiu $t6, $t6, -0x4a70 @@ -63,7 +63,7 @@ glabel func_801E6D50_ovl10 /* 1D7BB4 801E6E44 ADEE0098 */ sw $t6, 0x98($t7) /* 1D7BB8 801E6E48 3C188005 */ lui $t8, %hi(D_8004A7C4) # $t8, 0x8005 /* 1D7BBC 801E6E4C 8F18A7C4 */ lw $t8, %lo(D_8004A7C4)($t8) -/* 1D7BC0 801E6E50 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D7BC0 801E6E50 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D7BC4 801E6E54 3C06801F */ lui $a2, %hi(D_801F4528_ovl10) # $a2, 0x801f /* 1D7BC8 801E6E58 8F190000 */ lw $t9, ($t8) /* 1D7BCC 801E6E5C 24C64528 */ addiu $a2, %lo(D_801F4528_ovl10) # addiu $a2, $a2, 0x4528 @@ -71,7 +71,7 @@ glabel func_801E6D50_ovl10 /* 1D7BD4 801E6E64 00194080 */ sll $t0, $t9, 2 /* 1D7BD8 801E6E68 00882021 */ addu $a0, $a0, $t0 /* 1D7BDC 801E6E6C 0C02911F */ jal call_virtual_function -/* 1D7BE0 801E6E70 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D7BE0 801E6E70 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D7BE4 801E6E74 8FBF0014 */ lw $ra, 0x14($sp) /* 1D7BE8 801E6E78 27BD0020 */ addiu $sp, $sp, 0x20 /* 1D7BEC 801E6E7C 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E7000_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E7000_ovl10.s index 7feeeeb8..c24cbd79 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E7000_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E7000_ovl10.s @@ -28,14 +28,14 @@ glabel func_801E7000_ovl10 /* 1D7DD8 801E7068 C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1D7DDC 801E706C 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1D7DE0 801E7070 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1D7DE4 801E7074 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D7DE4 801E7074 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D7DE8 801E7078 240B0001 */ li $t3, 1 /* 1D7DEC 801E707C 8C4C0000 */ lw $t4, ($v0) /* 1D7DF0 801E7080 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D7DF4 801E7084 3C05801E */ lui $a1, %hi(D_801E6D08) # $a1, 0x801e /* 1D7DF8 801E7088 000C6880 */ sll $t5, $t4, 2 /* 1D7DFC 801E708C 002D0821 */ addu $at, $at, $t5 -/* 1D7E00 801E7090 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D7E00 801E7090 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1D7E04 801E7094 8C4E0000 */ lw $t6, ($v0) /* 1D7E08 801E7098 24A56D08 */ addiu $a1, %lo(D_801E6D08) # addiu $a1, $a1, 0x6d08 /* 1D7E0C 801E709C 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E7248_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E7248_ovl10.s index abe96a71..20c5043f 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E7248_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E7248_ovl10.s @@ -13,9 +13,9 @@ glabel func_801E7248_ovl10 /* 1D7FE4 801E7274 240F0002 */ li $t7, 2 /* 1D7FE8 801E7278 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D7FEC 801E727C 15C1000A */ bne $t6, $at, .L801E72A8_ovl10 -/* 1D7FF0 801E7280 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D7FF0 801E7280 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D7FF4 801E7284 00230821 */ addu $at, $at, $v1 -/* 1D7FF8 801E7288 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D7FF8 801E7288 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D7FFC 801E728C 8C580000 */ lw $t8, ($v0) /* 1D8000 801E7290 3C05801E */ lui $a1, %hi(D_801E6D08) # $a1, 0x801e /* 1D8004 801E7294 24A56D08 */ addiu $a1, %lo(D_801E6D08) # addiu $a1, $a1, 0x6d08 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E75E4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E75E4_ovl10.s index cbda253c..36ac39bc 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E75E4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E75E4_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E75E4_ovl10 /* 1D8360 801E75F0 AFBF0014 */ sw $ra, 0x14($sp) /* 1D8364 801E75F4 AFA40018 */ sw $a0, 0x18($sp) /* 1D8368 801E75F8 8DCF0000 */ lw $t7, ($t6) -/* 1D836C 801E75FC 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D836C 801E75FC 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D8370 801E7600 3C06801F */ lui $a2, %hi(D_801F4540_ovl10) # $a2, 0x801f /* 1D8374 801E7604 000FC080 */ sll $t8, $t7, 2 /* 1D8378 801E7608 00982021 */ addu $a0, $a0, $t8 -/* 1D837C 801E760C 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D837C 801E760C 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D8380 801E7610 24C64540 */ addiu $a2, %lo(D_801F4540_ovl10) # addiu $a2, $a2, 0x4540 /* 1D8384 801E7614 0C02911F */ jal call_virtual_function /* 1D8388 801E7618 24050003 */ li $a1, 3 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E762C_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E762C_ovl10.s index 071dd9ec..21b0cdd0 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E762C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E762C_ovl10.s @@ -49,11 +49,11 @@ glabel func_801E762C_ovl10 /* 1D8458 801E76E8 002B0821 */ addu $at, $at, $t3 /* 1D845C 801E76EC AC208920 */ sw $zero, %lo(D_800E8920)($at) /* 1D8460 801E76F0 8C4C0000 */ lw $t4, ($v0) -/* 1D8464 801E76F4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D8464 801E76F4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D8468 801E76F8 000C6880 */ sll $t5, $t4, 2 /* 1D846C 801E76FC 002D0821 */ addu $at, $at, $t5 /* 1D8470 801E7700 0C02A5D8 */ jal func_800A9760 -/* 1D8474 801E7704 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1D8474 801E7704 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1D8478 801E7708 8FAF001C */ lw $t7, 0x1c($sp) /* 1D847C 801E770C 3C0E801D */ lui $t6, %hi(D_801CB494) # $t6, 0x801d /* 1D8480 801E7710 25CEB494 */ addiu $t6, %lo(D_801CB494) # addiu $t6, $t6, -0x4b6c @@ -63,7 +63,7 @@ glabel func_801E762C_ovl10 /* 1D8490 801E7720 ADEE0098 */ sw $t6, 0x98($t7) /* 1D8494 801E7724 3C188005 */ lui $t8, %hi(D_8004A7C4) # $t8, 0x8005 /* 1D8498 801E7728 8F18A7C4 */ lw $t8, %lo(D_8004A7C4)($t8) -/* 1D849C 801E772C 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D849C 801E772C 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D84A0 801E7730 3C06801F */ lui $a2, %hi(D_801F4540_ovl10) # $a2, 0x801f /* 1D84A4 801E7734 8F190000 */ lw $t9, ($t8) /* 1D84A8 801E7738 24C64540 */ addiu $a2, %lo(D_801F4540_ovl10) # addiu $a2, $a2, 0x4540 @@ -71,7 +71,7 @@ glabel func_801E762C_ovl10 /* 1D84B0 801E7740 00194080 */ sll $t0, $t9, 2 /* 1D84B4 801E7744 00882021 */ addu $a0, $a0, $t0 /* 1D84B8 801E7748 0C02911F */ jal call_virtual_function -/* 1D84BC 801E774C 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D84BC 801E774C 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D84C0 801E7750 8FBF0014 */ lw $ra, 0x14($sp) /* 1D84C4 801E7754 27BD0020 */ addiu $sp, $sp, 0x20 /* 1D84C8 801E7758 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E78D4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E78D4_ovl10.s index fae7e0b4..3239ab1f 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E78D4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E78D4_ovl10.s @@ -28,14 +28,14 @@ glabel func_801E78D4_ovl10 /* 1D86AC 801E793C C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1D86B0 801E7940 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1D86B4 801E7944 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1D86B8 801E7948 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D86B8 801E7948 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D86BC 801E794C 240B0001 */ li $t3, 1 /* 1D86C0 801E7950 8C4C0000 */ lw $t4, ($v0) /* 1D86C4 801E7954 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D86C8 801E7958 3C05801E */ lui $a1, %hi(D_801E75E4) # $a1, 0x801e /* 1D86CC 801E795C 000C6880 */ sll $t5, $t4, 2 /* 1D86D0 801E7960 002D0821 */ addu $at, $at, $t5 -/* 1D86D4 801E7964 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D86D4 801E7964 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1D86D8 801E7968 8C4E0000 */ lw $t6, ($v0) /* 1D86DC 801E796C 24A575E4 */ addiu $a1, %lo(D_801E75E4) # addiu $a1, $a1, 0x75e4 /* 1D86E0 801E7970 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E7C38_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E7C38_ovl10.s index e3d5e95d..7afcf655 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E7C38_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E7C38_ovl10.s @@ -17,11 +17,11 @@ glabel func_801E7C38_ovl10 /* 1D89E4 801E7C74 00230821 */ addu $at, $at, $v1 /* 1D89E8 801E7C78 AC2F8920 */ sw $t7, %lo(D_800E8920)($at) /* 1D89EC 801E7C7C 8C590000 */ lw $t9, ($v0) -/* 1D89F0 801E7C80 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D89F0 801E7C80 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D89F4 801E7C84 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D89F8 801E7C88 00194080 */ sll $t0, $t9, 2 /* 1D89FC 801E7C8C 00280821 */ addu $at, $at, $t0 -/* 1D8A00 801E7C90 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1D8A00 801E7C90 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1D8A04 801E7C94 8C490000 */ lw $t1, ($v0) /* 1D8A08 801E7C98 3C05801E */ lui $a1, %hi(D_801E75E4) # $a1, 0x801e /* 1D8A0C 801E7C9C 24A575E4 */ addiu $a1, %lo(D_801E75E4) # addiu $a1, $a1, 0x75e4 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8008_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8008_ovl10.s index 6b07e63d..fb3ab89e 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8008_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8008_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E8008_ovl10 /* 1D8D84 801E8014 AFBF0014 */ sw $ra, 0x14($sp) /* 1D8D88 801E8018 AFA40018 */ sw $a0, 0x18($sp) /* 1D8D8C 801E801C 8DCF0000 */ lw $t7, ($t6) -/* 1D8D90 801E8020 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D8D90 801E8020 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D8D94 801E8024 3C06801F */ lui $a2, %hi(D_801F4558_ovl10) # $a2, 0x801f /* 1D8D98 801E8028 000FC080 */ sll $t8, $t7, 2 /* 1D8D9C 801E802C 00982021 */ addu $a0, $a0, $t8 -/* 1D8DA0 801E8030 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D8DA0 801E8030 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D8DA4 801E8034 24C64558 */ addiu $a2, %lo(D_801F4558_ovl10) # addiu $a2, $a2, 0x4558 /* 1D8DA8 801E8038 0C02911F */ jal call_virtual_function /* 1D8DAC 801E803C 24050003 */ li $a1, 3 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8050_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8050_ovl10.s index 0badcd0e..6795793a 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8050_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8050_ovl10.s @@ -49,11 +49,11 @@ glabel func_801E8050_ovl10 /* 1D8E7C 801E810C 002B0821 */ addu $at, $at, $t3 /* 1D8E80 801E8110 AC208920 */ sw $zero, %lo(D_800E8920)($at) /* 1D8E84 801E8114 8C4C0000 */ lw $t4, ($v0) -/* 1D8E88 801E8118 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D8E88 801E8118 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D8E8C 801E811C 000C6880 */ sll $t5, $t4, 2 /* 1D8E90 801E8120 002D0821 */ addu $at, $at, $t5 /* 1D8E94 801E8124 0C02A5D8 */ jal func_800A9760 -/* 1D8E98 801E8128 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1D8E98 801E8128 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1D8E9C 801E812C 8FAF001C */ lw $t7, 0x1c($sp) /* 1D8EA0 801E8130 3C0E801D */ lui $t6, %hi(D_801CB590) # $t6, 0x801d /* 1D8EA4 801E8134 25CEB590 */ addiu $t6, %lo(D_801CB590) # addiu $t6, $t6, -0x4a70 @@ -63,7 +63,7 @@ glabel func_801E8050_ovl10 /* 1D8EB4 801E8144 ADEE0098 */ sw $t6, 0x98($t7) /* 1D8EB8 801E8148 3C188005 */ lui $t8, %hi(D_8004A7C4) # $t8, 0x8005 /* 1D8EBC 801E814C 8F18A7C4 */ lw $t8, %lo(D_8004A7C4)($t8) -/* 1D8EC0 801E8150 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D8EC0 801E8150 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D8EC4 801E8154 3C06801F */ lui $a2, %hi(D_801F4558_ovl10) # $a2, 0x801f /* 1D8EC8 801E8158 8F190000 */ lw $t9, ($t8) /* 1D8ECC 801E815C 24C64558 */ addiu $a2, %lo(D_801F4558_ovl10) # addiu $a2, $a2, 0x4558 @@ -71,7 +71,7 @@ glabel func_801E8050_ovl10 /* 1D8ED4 801E8164 00194080 */ sll $t0, $t9, 2 /* 1D8ED8 801E8168 00882021 */ addu $a0, $a0, $t0 /* 1D8EDC 801E816C 0C02911F */ jal call_virtual_function -/* 1D8EE0 801E8170 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D8EE0 801E8170 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D8EE4 801E8174 8FBF0014 */ lw $ra, 0x14($sp) /* 1D8EE8 801E8178 27BD0020 */ addiu $sp, $sp, 0x20 /* 1D8EEC 801E817C 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8300_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8300_ovl10.s index 69ac0bd3..d50394a6 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8300_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8300_ovl10.s @@ -28,14 +28,14 @@ glabel func_801E8300_ovl10 /* 1D90D8 801E8368 C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1D90DC 801E836C 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1D90E0 801E8370 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1D90E4 801E8374 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D90E4 801E8374 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D90E8 801E8378 240B0001 */ li $t3, 1 /* 1D90EC 801E837C 8C4C0000 */ lw $t4, ($v0) /* 1D90F0 801E8380 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D90F4 801E8384 3C05801F */ lui $a1, %hi(D_801E8008) # $a1, 0x801f /* 1D90F8 801E8388 000C6880 */ sll $t5, $t4, 2 /* 1D90FC 801E838C 002D0821 */ addu $at, $at, $t5 -/* 1D9100 801E8390 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D9100 801E8390 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1D9104 801E8394 8C4E0000 */ lw $t6, ($v0) /* 1D9108 801E8398 24A58008 */ addiu $a1, %lo(D_801E8008) # addiu $a1, $a1, -0x7ff8 /* 1D910C 801E839C 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8548_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8548_ovl10.s index cc53b5aa..6d726f4f 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8548_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8548_ovl10.s @@ -13,9 +13,9 @@ glabel func_801E8548_ovl10 /* 1D92E4 801E8574 240F0002 */ li $t7, 2 /* 1D92E8 801E8578 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D92EC 801E857C 15C1000A */ bne $t6, $at, .L801E85A8_ovl10 -/* 1D92F0 801E8580 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D92F0 801E8580 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D92F4 801E8584 00230821 */ addu $at, $at, $v1 -/* 1D92F8 801E8588 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D92F8 801E8588 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D92FC 801E858C 8C580000 */ lw $t8, ($v0) /* 1D9300 801E8590 3C05801F */ lui $a1, %hi(D_801E8008) # $a1, 0x801f /* 1D9304 801E8594 24A58008 */ addiu $a1, %lo(D_801E8008) # addiu $a1, $a1, -0x7ff8 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8988_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8988_ovl10.s index 41fd574b..54507b35 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8988_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8988_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E8988_ovl10 /* 1D9704 801E8994 AFBF0014 */ sw $ra, 0x14($sp) /* 1D9708 801E8998 AFA40018 */ sw $a0, 0x18($sp) /* 1D970C 801E899C 8DCF0000 */ lw $t7, ($t6) -/* 1D9710 801E89A0 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D9710 801E89A0 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D9714 801E89A4 3C06801F */ lui $a2, %hi(D_801F4570_ovl10) # $a2, 0x801f /* 1D9718 801E89A8 000FC080 */ sll $t8, $t7, 2 /* 1D971C 801E89AC 00982021 */ addu $a0, $a0, $t8 -/* 1D9720 801E89B0 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D9720 801E89B0 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D9724 801E89B4 24C64570 */ addiu $a2, %lo(D_801F4570_ovl10) # addiu $a2, $a2, 0x4570 /* 1D9728 801E89B8 0C02911F */ jal call_virtual_function /* 1D972C 801E89BC 24050003 */ li $a1, 3 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E89D0_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E89D0_ovl10.s index 8d2594b7..528225ce 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E89D0_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E89D0_ovl10.s @@ -49,18 +49,18 @@ glabel func_801E89D0_ovl10 /* 1D97FC 801E8A8C E424B160 */ swc1 $f4, %lo(D_800EB160)($at) /* 1D9800 801E8A90 AD6A0098 */ sw $t2, 0x98($t3) /* 1D9804 801E8A94 8CAC0000 */ lw $t4, ($a1) -/* 1D9808 801E8A98 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D9808 801E8A98 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D980C 801E8A9C 8D8D0000 */ lw $t5, ($t4) /* 1D9810 801E8AA0 000D7080 */ sll $t6, $t5, 2 /* 1D9814 801E8AA4 002E0821 */ addu $at, $at, $t6 /* 1D9818 801E8AA8 0C02A5D8 */ jal func_800A9760 -/* 1D981C 801E8AAC AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1D981C 801E8AAC AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1D9820 801E8AB0 3C04801F */ lui $a0, %hi(D_801E8988) # $a0, 0x801f /* 1D9824 801E8AB4 0C068354 */ jal func_801A0D50_ovl10 /* 1D9828 801E8AB8 24848988 */ addiu $a0, %lo(D_801E8988) # addiu $a0, $a0, -0x7678 /* 1D982C 801E8ABC 3C0F8005 */ lui $t7, %hi(D_8004A7C4) # $t7, 0x8005 /* 1D9830 801E8AC0 8DEFA7C4 */ lw $t7, %lo(D_8004A7C4)($t7) -/* 1D9834 801E8AC4 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D9834 801E8AC4 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D9838 801E8AC8 3C06801F */ lui $a2, %hi(D_801F4570_ovl10) # $a2, 0x801f /* 1D983C 801E8ACC 8DF80000 */ lw $t8, ($t7) /* 1D9840 801E8AD0 24C64570 */ addiu $a2, %lo(D_801F4570_ovl10) # addiu $a2, $a2, 0x4570 @@ -68,7 +68,7 @@ glabel func_801E89D0_ovl10 /* 1D9848 801E8AD8 0018C880 */ sll $t9, $t8, 2 /* 1D984C 801E8ADC 00992021 */ addu $a0, $a0, $t9 /* 1D9850 801E8AE0 0C02911F */ jal call_virtual_function -/* 1D9854 801E8AE4 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D9854 801E8AE4 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D9858 801E8AE8 8FBF0014 */ lw $ra, 0x14($sp) /* 1D985C 801E8AEC 27BD0020 */ addiu $sp, $sp, 0x20 /* 1D9860 801E8AF0 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8C68_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8C68_ovl10.s index 8f67a9a8..ba0374dd 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8C68_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8C68_ovl10.s @@ -28,14 +28,14 @@ glabel func_801E8C68_ovl10 /* 1D9A40 801E8CD0 C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1D9A44 801E8CD4 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1D9A48 801E8CD8 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1D9A4C 801E8CDC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D9A4C 801E8CDC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D9A50 801E8CE0 240B0001 */ li $t3, 1 /* 1D9A54 801E8CE4 8C4C0000 */ lw $t4, ($v0) /* 1D9A58 801E8CE8 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1D9A5C 801E8CEC 3C05801F */ lui $a1, %hi(D_801E8988) # $a1, 0x801f /* 1D9A60 801E8CF0 000C6880 */ sll $t5, $t4, 2 /* 1D9A64 801E8CF4 002D0821 */ addu $at, $at, $t5 -/* 1D9A68 801E8CF8 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1D9A68 801E8CF8 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1D9A6C 801E8CFC 8C4E0000 */ lw $t6, ($v0) /* 1D9A70 801E8D00 24A58988 */ addiu $a1, %lo(D_801E8988) # addiu $a1, $a1, -0x7678 /* 1D9A74 801E8D04 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E8F24_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E8F24_ovl10.s index 11525bf5..fc8f49ab 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E8F24_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E8F24_ovl10.s @@ -6,7 +6,7 @@ glabel func_801E8F24_ovl10 /* 1D9CA4 801E8F34 AFA40018 */ sw $a0, 0x18($sp) /* 1D9CA8 801E8F38 8C430000 */ lw $v1, ($v0) /* 1D9CAC 801E8F3C 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1D9CB0 801E8F40 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1D9CB0 801E8F40 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1D9CB4 801E8F44 00031880 */ sll $v1, $v1, 2 /* 1D9CB8 801E8F48 01C37021 */ addu $t6, $t6, $v1 /* 1D9CBC 801E8F4C 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801E8F24_ovl10 /* 1D9CC4 801E8F54 240F0002 */ li $t7, 2 /* 1D9CC8 801E8F58 11C00009 */ beqz $t6, .L801E8F80_ovl10 /* 1D9CCC 801E8F5C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1D9CD0 801E8F60 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1D9CD0 801E8F60 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1D9CD4 801E8F64 8C580000 */ lw $t8, ($v0) /* 1D9CD8 801E8F68 3C05801F */ lui $a1, %hi(D_801E8988) # $a1, 0x801f /* 1D9CDC 801E8F6C 24A58988 */ addiu $a1, %lo(D_801E8988) # addiu $a1, $a1, -0x7678 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E91B0_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E91B0_ovl10.s index d7c13712..f20af450 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E91B0_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E91B0_ovl10.s @@ -5,11 +5,11 @@ glabel func_801E91B0_ovl10 /* 1D9F2C 801E91BC AFBF0014 */ sw $ra, 0x14($sp) /* 1D9F30 801E91C0 AFA40018 */ sw $a0, 0x18($sp) /* 1D9F34 801E91C4 8DCF0000 */ lw $t7, ($t6) -/* 1D9F38 801E91C8 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1D9F38 801E91C8 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1D9F3C 801E91CC 3C06801F */ lui $a2, %hi(D_801F4588_ovl10) # $a2, 0x801f /* 1D9F40 801E91D0 000FC080 */ sll $t8, $t7, 2 /* 1D9F44 801E91D4 00982021 */ addu $a0, $a0, $t8 -/* 1D9F48 801E91D8 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1D9F48 801E91D8 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1D9F4C 801E91DC 24C64588 */ addiu $a2, %lo(D_801F4588_ovl10) # addiu $a2, $a2, 0x4588 /* 1D9F50 801E91E0 0C02911F */ jal call_virtual_function /* 1D9F54 801E91E4 24050006 */ li $a1, 6 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E91F8_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E91F8_ovl10.s index f971d7a2..3b5faf9b 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E91F8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E91F8_ovl10.s @@ -49,11 +49,11 @@ glabel func_801E91F8_ovl10 /* 1DA024 801E92B4 00230821 */ addu $at, $at, $v1 /* 1DA028 801E92B8 E424B160 */ swc1 $f4, %lo(D_800EB160)($at) /* 1DA02C 801E92BC 8C4C0000 */ lw $t4, ($v0) -/* 1DA030 801E92C0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DA030 801E92C0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DA034 801E92C4 000C6880 */ sll $t5, $t4, 2 /* 1DA038 801E92C8 002D0821 */ addu $at, $at, $t5 /* 1DA03C 801E92CC 0C02A5D8 */ jal func_800A9760 -/* 1DA040 801E92D0 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1DA040 801E92D0 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1DA044 801E92D4 8FAF001C */ lw $t7, 0x1c($sp) /* 1DA048 801E92D8 3C0E801F */ lui $t6, %hi(D_801F4124_ovl10) # $t6, 0x801f /* 1DA04C 801E92DC 25CE4124 */ addiu $t6, %lo(D_801F4124_ovl10) # addiu $t6, $t6, 0x4124 @@ -63,7 +63,7 @@ glabel func_801E91F8_ovl10 /* 1DA05C 801E92EC ADEE0098 */ sw $t6, 0x98($t7) /* 1DA060 801E92F0 3C188005 */ lui $t8, %hi(D_8004A7C4) # $t8, 0x8005 /* 1DA064 801E92F4 8F18A7C4 */ lw $t8, %lo(D_8004A7C4)($t8) -/* 1DA068 801E92F8 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1DA068 801E92F8 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1DA06C 801E92FC 3C06801F */ lui $a2, %hi(D_801F4588_ovl10) # $a2, 0x801f /* 1DA070 801E9300 8F190000 */ lw $t9, ($t8) /* 1DA074 801E9304 24C64588 */ addiu $a2, %lo(D_801F4588_ovl10) # addiu $a2, $a2, 0x4588 @@ -71,7 +71,7 @@ glabel func_801E91F8_ovl10 /* 1DA07C 801E930C 00194080 */ sll $t0, $t9, 2 /* 1DA080 801E9310 00882021 */ addu $a0, $a0, $t0 /* 1DA084 801E9314 0C02911F */ jal call_virtual_function -/* 1DA088 801E9318 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1DA088 801E9318 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1DA08C 801E931C 8FBF0014 */ lw $ra, 0x14($sp) /* 1DA090 801E9320 27BD0020 */ addiu $sp, $sp, 0x20 /* 1DA094 801E9324 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E94C4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E94C4_ovl10.s index 6f24e40e..b334f36d 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E94C4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E94C4_ovl10.s @@ -45,14 +45,14 @@ glabel func_801E94C4_ovl10 /* 1DA2E0 801E9570 C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1DA2E4 801E9574 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1DA2E8 801E9578 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1DA2EC 801E957C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DA2EC 801E957C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DA2F0 801E9580 24180001 */ li $t8, 1 /* 1DA2F4 801E9584 8C590000 */ lw $t9, ($v0) /* 1DA2F8 801E9588 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DA2FC 801E958C 3C05801F */ lui $a1, %hi(D_801E91B0) # $a1, 0x801f /* 1DA300 801E9590 00194080 */ sll $t0, $t9, 2 /* 1DA304 801E9594 00280821 */ addu $at, $at, $t0 -/* 1DA308 801E9598 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1DA308 801E9598 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1DA30C 801E959C 8C490000 */ lw $t1, ($v0) /* 1DA310 801E95A0 24A591B0 */ addiu $a1, %lo(D_801E91B0) # addiu $a1, $a1, -0x6e50 /* 1DA314 801E95A4 00095080 */ sll $t2, $t1, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E9770_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E9770_ovl10.s index e473092a..bd465181 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E9770_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E9770_ovl10.s @@ -22,11 +22,11 @@ glabel func_801E9770_ovl10 /* 1DA530 801E97C0 00390821 */ addu $at, $at, $t9 /* 1DA534 801E97C4 AC209560 */ sw $zero, %lo(D_800E9560)($at) /* 1DA538 801E97C8 8C490000 */ lw $t1, ($v0) -/* 1DA53C 801E97CC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DA53C 801E97CC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DA540 801E97D0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DA544 801E97D4 00095080 */ sll $t2, $t1, 2 /* 1DA548 801E97D8 002A0821 */ addu $at, $at, $t2 -/* 1DA54C 801E97DC AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1DA54C 801E97DC AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1DA550 801E97E0 8C4B0000 */ lw $t3, ($v0) /* 1DA554 801E97E4 3C05801F */ lui $a1, %hi(D_801E91B0) # $a1, 0x801f /* 1DA558 801E97E8 24A591B0 */ addiu $a1, %lo(D_801E91B0) # addiu $a1, $a1, -0x6e50 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E9A10_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E9A10_ovl10.s index a7208c61..51beae36 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E9A10_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E9A10_ovl10.s @@ -18,7 +18,7 @@ glabel func_801E9A10_ovl10 /* 1DA7C0 801E9A50 3C038005 */ lui $v1, %hi(D_8004A7C4) # $v1, 0x8005 /* 1DA7C4 801E9A54 8C63A7C4 */ lw $v1, %lo(D_8004A7C4)($v1) /* 1DA7C8 801E9A58 3C08800F */ lui $t0, %hi(D_800E9FE0) -/* 1DA7CC 801E9A5C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DA7CC 801E9A5C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DA7D0 801E9A60 8C620000 */ lw $v0, ($v1) /* 1DA7D4 801E9A64 240A0004 */ li $t2, 4 /* 1DA7D8 801E9A68 240B0003 */ li $t3, 3 @@ -30,10 +30,10 @@ glabel func_801E9A10_ovl10 /* 1DA7F0 801E9A80 31090001 */ andi $t1, $t0, 1 /* 1DA7F4 801E9A84 11200005 */ beqz $t1, .L801E9A9C_ovl10 /* 1DA7F8 801E9A88 00000000 */ nop -/* 1DA7FC 801E9A8C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DA7FC 801E9A8C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DA800 801E9A90 00220821 */ addu $at, $at, $v0 /* 1DA804 801E9A94 10000002 */ b .L801E9AA0_ovl10 -/* 1DA808 801E9A98 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1DA808 801E9A98 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) .L801E9A9C_ovl10: /* 1DA80C 801E9A9C AC2BDC50 */ sw $t3, -0x23b0($at) .L801E9AA0_ovl10: diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801E9DCC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801E9DCC_ovl10.s index 1b5dfe38..175b5a50 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801E9DCC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801E9DCC_ovl10.s @@ -48,11 +48,11 @@ glabel func_801E9DCC_ovl10 /* 1DABEC 801E9E7C 3C0A800F */ lui $t2, %hi(D_800E9E20) /* 1DABF0 801E9E80 01425021 */ addu $t2, $t2, $v0 /* 1DABF4 801E9E84 8D4A9E20 */ lw $t2, %lo(D_800E9E20)($t2) -/* 1DABF8 801E9E88 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DABF8 801E9E88 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DABFC 801E9E8C 00220821 */ addu $at, $at, $v0 /* 1DAC00 801E9E90 1140000A */ beqz $t2, .L801E9EBC_ovl10 /* 1DAC04 801E9E94 240B0005 */ li $t3, 5 -/* 1DAC08 801E9E98 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1DAC08 801E9E98 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1DAC0C 801E9E9C 8C6C0000 */ lw $t4, ($v1) /* 1DAC10 801E9EA0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DAC14 801E9EA4 3C05801F */ lui $a1, %hi(D_801E91B0) # $a1, 0x801f diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EA1E4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EA1E4_ovl10.s index 5a1dd7fa..d492b024 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EA1E4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EA1E4_ovl10.s @@ -84,9 +84,9 @@ glabel func_801EA1E4_ovl10 .L801EA320_ovl10: /* 1DB090 801EA320 1481000C */ bne $a0, $at, .L801EA354_ovl10 /* 1DB094 801EA324 24090005 */ li $t1, 5 -/* 1DB098 801EA328 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DB098 801EA328 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DB09C 801EA32C 00230821 */ addu $at, $at, $v1 -/* 1DB0A0 801EA330 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1DB0A0 801EA330 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 1DB0A4 801EA334 8C4A0000 */ lw $t2, ($v0) /* 1DB0A8 801EA338 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DB0AC 801EA33C 3C05801F */ lui $a1, %hi(D_801E91B0) # $a1, 0x801f diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EA718_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EA718_ovl10.s index d692d80e..64455f8c 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EA718_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EA718_ovl10.s @@ -6,7 +6,7 @@ glabel func_801EA718_ovl10 /* 1DB498 801EA728 AFA40018 */ sw $a0, 0x18($sp) /* 1DB49C 801EA72C 8C430000 */ lw $v1, ($v0) /* 1DB4A0 801EA730 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1DB4A4 801EA734 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DB4A4 801EA734 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DB4A8 801EA738 00031880 */ sll $v1, $v1, 2 /* 1DB4AC 801EA73C 01C37021 */ addu $t6, $t6, $v1 /* 1DB4B0 801EA740 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801EA718_ovl10 /* 1DB4B8 801EA748 240F0002 */ li $t7, 2 /* 1DB4BC 801EA74C 11C00009 */ beqz $t6, .L801EA774_ovl10 /* 1DB4C0 801EA750 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1DB4C4 801EA754 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1DB4C4 801EA754 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1DB4C8 801EA758 8C580000 */ lw $t8, ($v0) /* 1DB4CC 801EA75C 3C05801F */ lui $a1, %hi(D_801E91B0) # $a1, 0x801f /* 1DB4D0 801EA760 24A591B0 */ addiu $a1, %lo(D_801E91B0) # addiu $a1, $a1, -0x6e50 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EA784_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EA784_ovl10.s index 05503647..625bbb2d 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EA784_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EA784_ovl10.s @@ -5,11 +5,11 @@ glabel func_801EA784_ovl10 /* 1DB500 801EA790 AFBF0014 */ sw $ra, 0x14($sp) /* 1DB504 801EA794 AFA40018 */ sw $a0, 0x18($sp) /* 1DB508 801EA798 8DCF0000 */ lw $t7, ($t6) -/* 1DB50C 801EA79C 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1DB50C 801EA79C 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1DB510 801EA7A0 3C06801F */ lui $a2, %hi(D_801F45B8_ovl10) # $a2, 0x801f /* 1DB514 801EA7A4 000FC080 */ sll $t8, $t7, 2 /* 1DB518 801EA7A8 00982021 */ addu $a0, $a0, $t8 -/* 1DB51C 801EA7AC 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1DB51C 801EA7AC 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1DB520 801EA7B0 24C645B8 */ addiu $a2, %lo(D_801F45B8_ovl10) # addiu $a2, $a2, 0x45b8 /* 1DB524 801EA7B4 0C02911F */ jal call_virtual_function /* 1DB528 801EA7B8 24050005 */ li $a1, 5 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EA7CC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EA7CC_ovl10.s index b1b7ea69..bba47ad7 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EA7CC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EA7CC_ovl10.s @@ -49,11 +49,11 @@ glabel func_801EA7CC_ovl10 /* 1DB5F8 801EA888 00230821 */ addu $at, $at, $v1 /* 1DB5FC 801EA88C E424B160 */ swc1 $f4, %lo(D_800EB160)($at) /* 1DB600 801EA890 8C4C0000 */ lw $t4, ($v0) -/* 1DB604 801EA894 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DB604 801EA894 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DB608 801EA898 000C6880 */ sll $t5, $t4, 2 /* 1DB60C 801EA89C 002D0821 */ addu $at, $at, $t5 /* 1DB610 801EA8A0 0C02A5D8 */ jal func_800A9760 -/* 1DB614 801EA8A4 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1DB614 801EA8A4 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1DB618 801EA8A8 8FAF001C */ lw $t7, 0x1c($sp) /* 1DB61C 801EA8AC 3C0E801D */ lui $t6, %hi(D_801CB494) # $t6, 0x801d /* 1DB620 801EA8B0 25CEB494 */ addiu $t6, %lo(D_801CB494) # addiu $t6, $t6, -0x4b6c @@ -63,7 +63,7 @@ glabel func_801EA7CC_ovl10 /* 1DB630 801EA8C0 ADEE0098 */ sw $t6, 0x98($t7) /* 1DB634 801EA8C4 3C188005 */ lui $t8, %hi(D_8004A7C4) # $t8, 0x8005 /* 1DB638 801EA8C8 8F18A7C4 */ lw $t8, %lo(D_8004A7C4)($t8) -/* 1DB63C 801EA8CC 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1DB63C 801EA8CC 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1DB640 801EA8D0 3C06801F */ lui $a2, %hi(D_801F45B8_ovl10) # $a2, 0x801f /* 1DB644 801EA8D4 8F190000 */ lw $t9, ($t8) /* 1DB648 801EA8D8 24C645B8 */ addiu $a2, %lo(D_801F45B8_ovl10) # addiu $a2, $a2, 0x45b8 @@ -71,7 +71,7 @@ glabel func_801EA7CC_ovl10 /* 1DB650 801EA8E0 00194080 */ sll $t0, $t9, 2 /* 1DB654 801EA8E4 00882021 */ addu $a0, $a0, $t0 /* 1DB658 801EA8E8 0C02911F */ jal call_virtual_function -/* 1DB65C 801EA8EC 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1DB65C 801EA8EC 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1DB660 801EA8F0 8FBF0014 */ lw $ra, 0x14($sp) /* 1DB664 801EA8F4 27BD0020 */ addiu $sp, $sp, 0x20 /* 1DB668 801EA8F8 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EAA98_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EAA98_ovl10.s index f3c07b6a..c24e9aff 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EAA98_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EAA98_ovl10.s @@ -45,14 +45,14 @@ glabel func_801EAA98_ovl10 /* 1DB8B4 801EAB44 C42C6B10 */ lwc1 $f12, %lo(D_800D6B10)($at) /* 1DB8B8 801EAB48 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1DB8BC 801EAB4C 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1DB8C0 801EAB50 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DB8C0 801EAB50 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DB8C4 801EAB54 24180001 */ li $t8, 1 /* 1DB8C8 801EAB58 8C590000 */ lw $t9, ($v0) /* 1DB8CC 801EAB5C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DB8D0 801EAB60 3C05801F */ lui $a1, %hi(D_801EA784) # $a1, 0x801f /* 1DB8D4 801EAB64 00194080 */ sll $t0, $t9, 2 /* 1DB8D8 801EAB68 00280821 */ addu $at, $at, $t0 -/* 1DB8DC 801EAB6C AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1DB8DC 801EAB6C AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1DB8E0 801EAB70 8C490000 */ lw $t1, ($v0) /* 1DB8E4 801EAB74 24A5A784 */ addiu $a1, %lo(D_801EA784) # addiu $a1, $a1, -0x587c /* 1DB8E8 801EAB78 00095080 */ sll $t2, $t1, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EAF3C_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EAF3C_ovl10.s index 1736520e..cad439e2 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EAF3C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EAF3C_ovl10.s @@ -41,10 +41,10 @@ glabel func_801EAF3C_ovl10 .L801EAFD4_ovl10: /* 1DBD44 801EAFD4 8DEF9E20 */ lw $t7, %lo(D_800E9E20)($t7) /* 1DBD48 801EAFD8 24060002 */ li $a2, 2 -/* 1DBD4C 801EAFDC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DBD4C 801EAFDC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DBD50 801EAFE0 14CF0009 */ bne $a2, $t7, .L801EB008_ovl10 /* 1DBD54 801EAFE4 00220821 */ addu $at, $at, $v0 -/* 1DBD58 801EAFE8 AC26DC50 */ sw $a2, %lo(D_800DDC50)($at) +/* 1DBD58 801EAFE8 AC26DC50 */ sw $a2, %lo(gEntityVtableIndexArray)($at) /* 1DBD5C 801EAFEC 8C780000 */ lw $t8, ($v1) /* 1DBD60 801EAFF0 3C05801F */ lui $a1, %hi(D_801EA784) # $a1, 0x801f /* 1DBD64 801EAFF4 24A5A784 */ addiu $a1, %lo(D_801EA784) # addiu $a1, $a1, -0x587c diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EB0C0_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EB0C0_ovl10.s index d5e70a06..798b02e1 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EB0C0_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EB0C0_ovl10.s @@ -33,19 +33,19 @@ glabel func_801EB0C0_ovl10 /* 1DBEA8 801EB138 8FA40018 */ lw $a0, 0x18($sp) /* 1DBEAC 801EB13C 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1DBEB0 801EB140 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1DBEB4 801EB144 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DBEB4 801EB144 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DBEB8 801EB148 24080003 */ li $t0, 3 /* 1DBEBC 801EB14C 8C490000 */ lw $t1, ($v0) /* 1DBEC0 801EB150 00095080 */ sll $t2, $t1, 2 /* 1DBEC4 801EB154 002A0821 */ addu $at, $at, $t2 -/* 1DBEC8 801EB158 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1DBEC8 801EB158 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1DBECC 801EB15C 8C430000 */ lw $v1, ($v0) /* 1DBED0 801EB160 10000006 */ b .L801EB17C_ovl10 /* 1DBED4 801EB164 00031880 */ sll $v1, $v1, 2 .L801EB168_ovl10: -/* 1DBED8 801EB168 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DBED8 801EB168 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DBEDC 801EB16C 00230821 */ addu $at, $at, $v1 -/* 1DBEE0 801EB170 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1DBEE0 801EB170 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1DBEE4 801EB174 8C430000 */ lw $v1, ($v0) /* 1DBEE8 801EB178 00031880 */ sll $v1, $v1, 2 .L801EB17C_ovl10: diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EB39C_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EB39C_ovl10.s index a3cb5272..95e15f96 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EB39C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EB39C_ovl10.s @@ -6,7 +6,7 @@ glabel func_801EB39C_ovl10 /* 1DC11C 801EB3AC AFA40018 */ sw $a0, 0x18($sp) /* 1DC120 801EB3B0 8C430000 */ lw $v1, ($v0) /* 1DC124 801EB3B4 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1DC128 801EB3B8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DC128 801EB3B8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DC12C 801EB3BC 00031880 */ sll $v1, $v1, 2 /* 1DC130 801EB3C0 01C37021 */ addu $t6, $t6, $v1 /* 1DC134 801EB3C4 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801EB39C_ovl10 /* 1DC13C 801EB3CC 240F0002 */ li $t7, 2 /* 1DC140 801EB3D0 11C00009 */ beqz $t6, .L801EB3F8_ovl10 /* 1DC144 801EB3D4 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1DC148 801EB3D8 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1DC148 801EB3D8 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1DC14C 801EB3DC 8C580000 */ lw $t8, ($v0) /* 1DC150 801EB3E0 3C05801F */ lui $a1, %hi(D_801EA784) # $a1, 0x801f /* 1DC154 801EB3E4 24A5A784 */ addiu $a1, %lo(D_801EA784) # addiu $a1, $a1, -0x587c diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EB744_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EB744_ovl10.s index f0ad2b80..389a4805 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EB744_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EB744_ovl10.s @@ -14,9 +14,9 @@ glabel func_801EB744_ovl10 /* 1DC4E4 801EB774 3C08800F */ lui $t0, %hi(D_800E8920) /* 1DC4E8 801EB778 14CF000E */ bne $a2, $t7, .L801EB7B4_ovl10 /* 1DC4EC 801EB77C 01024021 */ addu $t0, $t0, $v0 -/* 1DC4F0 801EB780 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DC4F0 801EB780 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DC4F4 801EB784 00220821 */ addu $at, $at, $v0 -/* 1DC4F8 801EB788 AC26DC50 */ sw $a2, %lo(D_800DDC50)($at) +/* 1DC4F8 801EB788 AC26DC50 */ sw $a2, %lo(gEntityVtableIndexArray)($at) /* 1DC4FC 801EB78C 8C780000 */ lw $t8, ($v1) /* 1DC500 801EB790 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DC504 801EB794 3C05801F */ lui $a1, %hi(D_801EA784) # $a1, 0x801f diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EC37C_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EC37C_ovl10.s index e9c71cc8..bc78e8ad 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EC37C_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EC37C_ovl10.s @@ -7,13 +7,13 @@ glabel func_801EC37C_ovl10 /* 1DD100 801EC390 2484C3C8 */ addiu $a0, %lo(D_801EC3C8) # addiu $a0, $a0, -0x3c38 /* 1DD104 801EC394 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 /* 1DD108 801EC398 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6) -/* 1DD10C 801EC39C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DD10C 801EC39C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DD110 801EC3A0 8FA40018 */ lw $a0, 0x18($sp) /* 1DD114 801EC3A4 8DCF0000 */ lw $t7, ($t6) /* 1DD118 801EC3A8 000FC080 */ sll $t8, $t7, 2 /* 1DD11C 801EC3AC 00380821 */ addu $at, $at, $t8 /* 1DD120 801EC3B0 0C07B0F2 */ jal D_801EC3C8_ovl10 -/* 1DD124 801EC3B4 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1DD124 801EC3B4 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1DD128 801EC3B8 8FBF0014 */ lw $ra, 0x14($sp) /* 1DD12C 801EC3BC 27BD0018 */ addiu $sp, $sp, 0x18 /* 1DD130 801EC3C0 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EC3C8_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EC3C8_ovl10.s index fa69c5e1..57de5dd9 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EC3C8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EC3C8_ovl10.s @@ -20,11 +20,11 @@ glabel func_801EC3C8_ovl10 /* 1DD180 801EC410 02308821 */ addu $s1, $s1, $s0 /* 1DD184 801EC414 3C14800F */ lui $s4, %hi(D_800E9AA0) # $s4, 0x800f /* 1DD188 801EC418 3C15800E */ lui $s5, %hi(D_800DF150) # $s5, 0x800e -/* 1DD18C 801EC41C 3C16800E */ lui $s6, %hi(D_800DDC50) # $s6, 0x800e +/* 1DD18C 801EC41C 3C16800E */ lui $s6, %hi(gEntityVtableIndexArray) # $s6, 0x800e /* 1DD190 801EC420 3C17801F */ lui $s7, %hi(D_801F45E4_ovl10) # $s7, 0x801f /* 1DD194 801EC424 8E311B50 */ lw $s1, %lo(D_800E1B50)($s1) /* 1DD198 801EC428 26F745E4 */ addiu $s7, %lo(D_801F45E4_ovl10) # addiu $s7, $s7, 0x45e4 -/* 1DD19C 801EC42C 26D6DC50 */ addiu $s6, %lo(D_800DDC50) # addiu $s6, $s6, -0x23b0 +/* 1DD19C 801EC42C 26D6DC50 */ addiu $s6, %lo(gEntityVtableIndexArray) # addiu $s6, $s6, -0x23b0 /* 1DD1A0 801EC430 26B5F150 */ addiu $s5, %lo(D_800DF150) # addiu $s5, $s5, -0xeb0 /* 1DD1A4 801EC434 26949AA0 */ addiu $s4, %lo(D_800E9AA0) # addiu $s4, $s4, -0x6560 /* 1DD1A8 801EC438 2652C4CC */ addiu $s2, %lo(D_801EC4CC) # addiu $s2, $s2, -0x3b34 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EC4CC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EC4CC_ovl10.s index 995fa0a2..3d42854c 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EC4CC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EC4CC_ovl10.s @@ -116,14 +116,14 @@ glabel func_801EC4CC_ovl10 /* 1DD3E4 801EC674 10400014 */ beqz $v0, .L801EC6C8_ovl10 /* 1DD3E8 801EC678 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1DD3EC 801EC67C 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1DD3F0 801EC680 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DD3F0 801EC680 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DD3F4 801EC684 240F0009 */ li $t7, 9 /* 1DD3F8 801EC688 8C580000 */ lw $t8, ($v0) /* 1DD3FC 801EC68C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DD400 801EC690 3C05801F */ lui $a1, %hi(D_801EC3C8) # $a1, 0x801f /* 1DD404 801EC694 0018C880 */ sll $t9, $t8, 2 /* 1DD408 801EC698 00390821 */ addu $at, $at, $t9 -/* 1DD40C 801EC69C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1DD40C 801EC69C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1DD410 801EC6A0 8C480000 */ lw $t0, ($v0) /* 1DD414 801EC6A4 24A5C3C8 */ addiu $a1, %lo(D_801EC3C8) # addiu $a1, $a1, -0x3c38 /* 1DD418 801EC6A8 00084880 */ sll $t1, $t0, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EC6D8_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EC6D8_ovl10.s index ffdcfee5..b0e7dfff 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EC6D8_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EC6D8_ovl10.s @@ -136,7 +136,7 @@ glabel func_801EC6D8_ovl10 /* 1DD658 801EC8E8 002D0821 */ addu $at, $at, $t5 /* 1DD65C 801EC8EC AC2B98E0 */ sw $t3, %lo(D_800E98E0)($at) /* 1DD660 801EC8F0 8C6F0000 */ lw $t7, ($v1) -/* 1DD664 801EC8F4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DD664 801EC8F4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DD668 801EC8F8 8FB40034 */ lw $s4, 0x34($sp) /* 1DD66C 801EC8FC 000FC080 */ sll $t8, $t7, 2 /* 1DD670 801EC900 00380821 */ addu $at, $at, $t8 @@ -146,6 +146,6 @@ glabel func_801EC6D8_ovl10 /* 1DD680 801EC910 8FB00024 */ lw $s0, 0x24($sp) /* 1DD684 801EC914 D7B60018 */ ldc1 $f22, 0x18($sp) /* 1DD688 801EC918 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 1DD68C 801EC91C AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 1DD68C 801EC91C AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) /* 1DD690 801EC920 03E00008 */ jr $ra /* 1DD694 801EC924 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EC930_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EC930_ovl10.s index e5941e36..57fea07a 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EC930_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EC930_ovl10.s @@ -47,12 +47,12 @@ glabel func_801EC930_ovl10 /* 1DD74C 801EC9DC 3C0C8005 */ lui $t4, %hi(D_8004A7C4) # $t4, 0x8005 /* 1DD750 801EC9E0 8D8CA7C4 */ lw $t4, %lo(D_8004A7C4)($t4) /* 1DD754 801EC9E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 1DD758 801EC9E8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DD758 801EC9E8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DD75C 801EC9EC 8D8D0000 */ lw $t5, ($t4) /* 1DD760 801EC9F0 240B0002 */ li $t3, 2 /* 1DD764 801EC9F4 8FB00018 */ lw $s0, 0x18($sp) /* 1DD768 801EC9F8 000D7080 */ sll $t6, $t5, 2 /* 1DD76C 801EC9FC 002E0821 */ addu $at, $at, $t6 -/* 1DD770 801ECA00 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1DD770 801ECA00 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1DD774 801ECA04 03E00008 */ jr $ra /* 1DD778 801ECA08 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ECA34_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ECA34_ovl10.s index 216b24e1..41b151fd 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ECA34_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ECA34_ovl10.s @@ -43,14 +43,14 @@ glabel func_801ECA34_ovl10 /* 1DD848 801ECAD8 0C07BBF3 */ jal func_801EEFCC_ovl10 /* 1DD84C 801ECADC 00000000 */ nop /* 1DD850 801ECAE0 8EA90000 */ lw $t1, ($s5) -/* 1DD854 801ECAE4 3C02800E */ lui $v0, %hi(D_800DDC50) +/* 1DD854 801ECAE4 3C02800E */ lui $v0, %hi(gEntityVtableIndexArray) /* 1DD858 801ECAE8 3C14800E */ lui $s4, %hi(D_800E6A10) # $s4, 0x800e /* 1DD85C 801ECAEC 8D310000 */ lw $s1, ($t1) /* 1DD860 801ECAF0 26946A10 */ addiu $s4, %lo(D_800E6A10) # addiu $s4, $s4, 0x6a10 /* 1DD864 801ECAF4 24010008 */ li $at, 8 /* 1DD868 801ECAF8 00118880 */ sll $s1, $s1, 2 /* 1DD86C 801ECAFC 00511021 */ addu $v0, $v0, $s1 -/* 1DD870 801ECB00 8C42DC50 */ lw $v0, %lo(D_800DDC50)($v0) +/* 1DD870 801ECB00 8C42DC50 */ lw $v0, %lo(gEntityVtableIndexArray)($v0) /* 1DD874 801ECB04 02915021 */ addu $t2, $s4, $s1 /* 1DD878 801ECB08 10410002 */ beq $v0, $at, .L801ECB14_ovl10 /* 1DD87C 801ECB0C 2401000C */ li $at, 12 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ECCEC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ECCEC_ovl10.s index cca8118b..290b862c 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ECCEC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ECCEC_ovl10.s @@ -97,12 +97,12 @@ glabel func_801ECCEC_ovl10 /* 1DDBD0 801ECE60 3C0C8005 */ lui $t4, %hi(D_8004A7C4) # $t4, 0x8005 /* 1DDBD4 801ECE64 8D8CA7C4 */ lw $t4, %lo(D_8004A7C4)($t4) /* 1DDBD8 801ECE68 8FBF001C */ lw $ra, 0x1c($sp) -/* 1DDBDC 801ECE6C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DDBDC 801ECE6C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DDBE0 801ECE70 8D8D0000 */ lw $t5, ($t4) /* 1DDBE4 801ECE74 240B0001 */ li $t3, 1 /* 1DDBE8 801ECE78 8FB00018 */ lw $s0, 0x18($sp) /* 1DDBEC 801ECE7C 000D7080 */ sll $t6, $t5, 2 /* 1DDBF0 801ECE80 002E0821 */ addu $at, $at, $t6 -/* 1DDBF4 801ECE84 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1DDBF4 801ECE84 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 1DDBF8 801ECE88 03E00008 */ jr $ra /* 1DDBFC 801ECE8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ECE90_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ECE90_ovl10.s index 2a6e07fa..264aa810 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ECE90_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ECE90_ovl10.s @@ -27,14 +27,14 @@ glabel func_801ECE90_ovl10 /* 1DDC64 801ECEF4 14410010 */ bne $v0, $at, .L801ECF38_ovl10 /* 1DDC68 801ECEF8 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1DDC6C 801ECEFC 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1DDC70 801ECF00 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DDC70 801ECF00 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DDC74 801ECF04 240A0004 */ li $t2, 4 /* 1DDC78 801ECF08 8C4B0000 */ lw $t3, ($v0) /* 1DDC7C 801ECF0C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DDC80 801ECF10 3C05801F */ lui $a1, %hi(D_801EC3C8) # $a1, 0x801f /* 1DDC84 801ECF14 000B6080 */ sll $t4, $t3, 2 /* 1DDC88 801ECF18 002C0821 */ addu $at, $at, $t4 -/* 1DDC8C 801ECF1C AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1DDC8C 801ECF1C AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 1DDC90 801ECF20 8C4D0000 */ lw $t5, ($v0) /* 1DDC94 801ECF24 24A5C3C8 */ addiu $a1, %lo(D_801EC3C8) # addiu $a1, $a1, -0x3c38 /* 1DDC98 801ECF28 000D7080 */ sll $t6, $t5, 2 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ED208_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ED208_ovl10.s index bf8714b8..d454d6c6 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ED208_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ED208_ovl10.s @@ -27,14 +27,14 @@ glabel func_801ED208_ovl10 /* 1DDFDC 801ED26C 01E27821 */ addu $t7, $t7, $v0 /* 1DDFE0 801ED270 8DEF9C60 */ lw $t7, %lo(D_800E9C60)($t7) /* 1DDFE4 801ED274 24190007 */ li $t9, 7 -/* 1DDFE8 801ED278 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DDFE8 801ED278 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DDFEC 801ED27C 11E00006 */ beqz $t7, .L801ED298_ovl10 /* 1DDFF0 801ED280 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1DDFF4 801ED284 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DDFF4 801ED284 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DDFF8 801ED288 00220821 */ addu $at, $at, $v0 /* 1DDFFC 801ED28C 24180005 */ li $t8, 5 /* 1DE000 801ED290 10000003 */ b .L801ED2A0_ovl10 -/* 1DE004 801ED294 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1DE004 801ED294 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) .L801ED298_ovl10: /* 1DE008 801ED298 00220821 */ addu $at, $at, $v0 /* 1DE00C 801ED29C AC39DC50 */ sw $t9, -0x23b0($at) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ED2CC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ED2CC_ovl10.s index 0eba1c25..db471155 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ED2CC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ED2CC_ovl10.s @@ -248,9 +248,9 @@ glabel func_801ED2CC_ovl10 .L801ED69C_ovl10: /* 1DE40C 801ED69C 8FBF0014 */ lw $ra, 0x14($sp) .L801ED6A0_ovl10: -/* 1DE410 801ED6A0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DE410 801ED6A0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DE414 801ED6A4 00230821 */ addu $at, $at, $v1 /* 1DE418 801ED6A8 240D0006 */ li $t5, 6 -/* 1DE41C 801ED6AC AC2DDC50 */ sw $t5, %lo(D_800DDC50)($at) +/* 1DE41C 801ED6AC AC2DDC50 */ sw $t5, %lo(gEntityVtableIndexArray)($at) /* 1DE420 801ED6B0 03E00008 */ jr $ra /* 1DE424 801ED6B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ED6E4_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ED6E4_ovl10.s index f3577623..d9f4894e 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ED6E4_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ED6E4_ovl10.s @@ -48,11 +48,11 @@ glabel func_801ED6E4_ovl10 /* 1DE50C 801ED79C 3C0A8005 */ lui $t2, %hi(D_8004A7C4) # $t2, 0x8005 /* 1DE510 801ED7A0 8D4AA7C4 */ lw $t2, %lo(D_8004A7C4)($t2) /* 1DE514 801ED7A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 1DE518 801ED7A8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DE518 801ED7A8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DE51C 801ED7AC 8D4B0000 */ lw $t3, ($t2) /* 1DE520 801ED7B0 24090001 */ li $t1, 1 /* 1DE524 801ED7B4 27BD0018 */ addiu $sp, $sp, 0x18 /* 1DE528 801ED7B8 000B6080 */ sll $t4, $t3, 2 /* 1DE52C 801ED7BC 002C0821 */ addu $at, $at, $t4 /* 1DE530 801ED7C0 03E00008 */ jr $ra -/* 1DE534 801ED7C4 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1DE534 801ED7C4 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801ED930_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801ED930_ovl10.s index 20ea160b..db5f5787 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801ED930_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801ED930_ovl10.s @@ -81,11 +81,11 @@ glabel func_801ED930_ovl10 /* 1DE7DC 801EDA6C 3C0B8005 */ lui $t3, %hi(D_8004A7C4) # $t3, 0x8005 /* 1DE7E0 801EDA70 8D6BA7C4 */ lw $t3, %lo(D_8004A7C4)($t3) /* 1DE7E4 801EDA74 8FBF001C */ lw $ra, 0x1c($sp) -/* 1DE7E8 801EDA78 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DE7E8 801EDA78 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DE7EC 801EDA7C 8D6C0000 */ lw $t4, ($t3) /* 1DE7F0 801EDA80 240A0001 */ li $t2, 1 /* 1DE7F4 801EDA84 27BD0020 */ addiu $sp, $sp, 0x20 /* 1DE7F8 801EDA88 000C6880 */ sll $t5, $t4, 2 /* 1DE7FC 801EDA8C 002D0821 */ addu $at, $at, $t5 /* 1DE800 801EDA90 03E00008 */ jr $ra -/* 1DE804 801EDA94 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1DE804 801EDA94 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EDAA0_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EDAA0_ovl10.s index ee420972..1071c049 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EDAA0_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EDAA0_ovl10.s @@ -150,7 +150,7 @@ glabel func_801EDAA0_ovl10 /* 1DEA54 801EDCE4 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) /* 1DEA58 801EDCE8 8FBF003C */ lw $ra, 0x3c($sp) .L801EDCEC_ovl10: -/* 1DEA5C 801EDCEC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DEA5C 801EDCEC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DEA60 801EDCF0 00230821 */ addu $at, $at, $v1 /* 1DEA64 801EDCF4 2418000B */ li $t8, 11 /* 1DEA68 801EDCF8 D7B40010 */ ldc1 $f20, 0x10($sp) @@ -159,6 +159,6 @@ glabel func_801EDAA0_ovl10 /* 1DEA74 801EDD04 D7BA0028 */ ldc1 $f26, 0x28($sp) /* 1DEA78 801EDD08 8FB00034 */ lw $s0, 0x34($sp) /* 1DEA7C 801EDD0C 8FB10038 */ lw $s1, 0x38($sp) -/* 1DEA80 801EDD10 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 1DEA80 801EDD10 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 1DEA84 801EDD14 03E00008 */ jr $ra /* 1DEA88 801EDD18 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EDD24_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EDD24_ovl10.s index 2c4a0cce..cdeaad08 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EDD24_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EDD24_ovl10.s @@ -139,12 +139,12 @@ glabel func_801EDD24_ovl10 /* 1DEC9C 801EDF2C 8E2A0000 */ lw $t2, ($s1) /* 1DECA0 801EDF30 8FBF0024 */ lw $ra, 0x24($sp) .L801EDF34_ovl10: -/* 1DECA4 801EDF34 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DECA4 801EDF34 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DECA8 801EDF38 00250821 */ addu $at, $at, $a1 /* 1DECAC 801EDF3C 2419000A */ li $t9, 10 /* 1DECB0 801EDF40 8FB00018 */ lw $s0, 0x18($sp) /* 1DECB4 801EDF44 8FB1001C */ lw $s1, 0x1c($sp) /* 1DECB8 801EDF48 8FB20020 */ lw $s2, 0x20($sp) -/* 1DECBC 801EDF4C AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1DECBC 801EDF4C AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 1DECC0 801EDF50 03E00008 */ jr $ra /* 1DECC4 801EDF54 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EDF84_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EDF84_ovl10.s index 466e2248..859874b0 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EDF84_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EDF84_ovl10.s @@ -40,11 +40,11 @@ glabel func_801EDF84_ovl10 /* 1DED8C 801EE01C 3C0A8005 */ lui $t2, %hi(D_8004A7C4) # $t2, 0x8005 /* 1DED90 801EE020 8D4AA7C4 */ lw $t2, %lo(D_8004A7C4)($t2) /* 1DED94 801EE024 8FBF0014 */ lw $ra, 0x14($sp) -/* 1DED98 801EE028 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DED98 801EE028 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DED9C 801EE02C 8D4B0000 */ lw $t3, ($t2) /* 1DEDA0 801EE030 24090001 */ li $t1, 1 /* 1DEDA4 801EE034 27BD0018 */ addiu $sp, $sp, 0x18 /* 1DEDA8 801EE038 000B6080 */ sll $t4, $t3, 2 /* 1DEDAC 801EE03C 002C0821 */ addu $at, $at, $t4 /* 1DEDB0 801EE040 03E00008 */ jr $ra -/* 1DEDB4 801EE044 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1DEDB4 801EE044 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EE050_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EE050_ovl10.s index fc91ecac..618ee1e1 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EE050_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EE050_ovl10.s @@ -116,11 +116,11 @@ glabel func_801EE050_ovl10 /* 1DEF88 801EE218 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 1DEF8C 801EE21C 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 1DEF90 801EE220 8FBF001C */ lw $ra, 0x1c($sp) -/* 1DEF94 801EE224 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DEF94 801EE224 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DEF98 801EE228 8F280000 */ lw $t0, ($t9) /* 1DEF9C 801EE22C 240F0001 */ li $t7, 1 /* 1DEFA0 801EE230 27BD0020 */ addiu $sp, $sp, 0x20 /* 1DEFA4 801EE234 00084880 */ sll $t1, $t0, 2 /* 1DEFA8 801EE238 00290821 */ addu $at, $at, $t1 /* 1DEFAC 801EE23C 03E00008 */ jr $ra -/* 1DEFB0 801EE240 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1DEFB0 801EE240 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EE410_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EE410_ovl10.s index 7121d44a..5d0c27ed 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EE410_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EE410_ovl10.s @@ -93,11 +93,11 @@ glabel func_801EE410_ovl10 /* 1DF2EC 801EE57C 3C088005 */ lui $t0, %hi(D_8004A7C4) # $t0, 0x8005 /* 1DF2F0 801EE580 8D08A7C4 */ lw $t0, %lo(D_8004A7C4)($t0) /* 1DF2F4 801EE584 8FBF0014 */ lw $ra, 0x14($sp) -/* 1DF2F8 801EE588 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DF2F8 801EE588 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DF2FC 801EE58C 8D090000 */ lw $t1, ($t0) /* 1DF300 801EE590 24190001 */ li $t9, 1 /* 1DF304 801EE594 27BD0018 */ addiu $sp, $sp, 0x18 /* 1DF308 801EE598 00095080 */ sll $t2, $t1, 2 /* 1DF30C 801EE59C 002A0821 */ addu $at, $at, $t2 /* 1DF310 801EE5A0 03E00008 */ jr $ra -/* 1DF314 801EE5A4 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1DF314 801EE5A4 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EEB30_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EEB30_ovl10.s index 3ebbec56..51f193ad 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EEB30_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EEB30_ovl10.s @@ -118,10 +118,10 @@ glabel func_801EEB30_ovl10 /* 1DFA58 801EECE8 8C2E4BF8 */ lw $t6, %lo(D_801F4BF8_ovl10)($at) /* 1DFA5C 801EECEC 01C00008 */ jr $t6 /* 1DFA60 801EECF0 00000000 */ nop -/* 1DFA64 801EECF4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DFA64 801EECF4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DFA68 801EECF8 00230821 */ addu $at, $at, $v1 /* 1DFA6C 801EECFC 240F000E */ li $t7, 14 -/* 1DFA70 801EED00 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1DFA70 801EED00 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1DFA74 801EED04 8D180000 */ lw $t8, ($t0) /* 1DFA78 801EED08 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1DFA7C 801EED0C 3C05801F */ lui $a1, %hi(D_801EC3C8) # $a1, 0x801f diff --git a/asm/non_matchings/ovl10/ovl10_2/func_801EEFCC_ovl10.s b/asm/non_matchings/ovl10/ovl10_2/func_801EEFCC_ovl10.s index 6ac2ec02..f154935b 100644 --- a/asm/non_matchings/ovl10/ovl10_2/func_801EEFCC_ovl10.s +++ b/asm/non_matchings/ovl10/ovl10_2/func_801EEFCC_ovl10.s @@ -43,9 +43,9 @@ glabel func_801EEFCC_ovl10 /* 1DFDD4 801EF064 1000001C */ b .L801EF0D8_ovl10 /* 1DFDD8 801EF068 8FBF0024 */ lw $ra, 0x24($sp) .L801EF06C_ovl10: -/* 1DFDDC 801EF06C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DFDDC 801EF06C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DFDE0 801EF070 00240821 */ addu $at, $at, $a0 -/* 1DFDE4 801EF074 AC32DC50 */ sw $s2, %lo(D_800DDC50)($at) +/* 1DFDE4 801EF074 AC32DC50 */ sw $s2, %lo(gEntityVtableIndexArray)($at) /* 1DFDE8 801EF078 8C6F0000 */ lw $t7, ($v1) /* 1DFDEC 801EF07C 3C19800F */ lui $t9, %hi(D_800E98E0) # $t9, 0x800f /* 1DFDF0 801EF080 273998E0 */ addiu $t9, %lo(D_800E98E0) # addiu $t9, $t9, -0x6720 @@ -53,9 +53,9 @@ glabel func_801EEFCC_ovl10 /* 1DFDF8 801EF088 10000012 */ b .L801EF0D4_ovl10 /* 1DFDFC 801EF08C 03193021 */ addu $a2, $t8, $t9 .L801EF090_ovl10: -/* 1DFE00 801EF090 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DFE00 801EF090 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DFE04 801EF094 00240821 */ addu $at, $at, $a0 -/* 1DFE08 801EF098 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 1DFE08 801EF098 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 1DFE0C 801EF09C 8C690000 */ lw $t1, ($v1) /* 1DFE10 801EF0A0 3C0B800F */ lui $t3, %hi(D_800E98E0) # $t3, 0x800f /* 1DFE14 801EF0A4 256B98E0 */ addiu $t3, %lo(D_800E98E0) # addiu $t3, $t3, -0x6720 @@ -63,9 +63,9 @@ glabel func_801EEFCC_ovl10 /* 1DFE1C 801EF0AC 10000009 */ b .L801EF0D4_ovl10 /* 1DFE20 801EF0B0 014B3021 */ addu $a2, $t2, $t3 .L801EF0B4_ovl10: -/* 1DFE24 801EF0B4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1DFE24 801EF0B4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1DFE28 801EF0B8 00240821 */ addu $at, $at, $a0 -/* 1DFE2C 801EF0BC AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 1DFE2C 801EF0BC AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 1DFE30 801EF0C0 8C6D0000 */ lw $t5, ($v1) /* 1DFE34 801EF0C4 3C0F800F */ lui $t7, %hi(D_800E98E0) # $t7, 0x800f /* 1DFE38 801EF0C8 25EF98E0 */ addiu $t7, %lo(D_800E98E0) # addiu $t7, $t7, -0x6720 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DB8E8_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DB8E8_ovl11.s index c06de7bf..8fddfc51 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DB8E8_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DB8E8_ovl11.s @@ -4,10 +4,10 @@ glabel func_801DB8E8_ovl11 /* 1E61B0 801DB8F0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1E61B4 801DB8F4 AFBF0014 */ sw $ra, 0x14($sp) /* 1E61B8 801DB8F8 8C820000 */ lw $v0, ($a0) -/* 1E61BC 801DB8FC 3C0E800E */ lui $t6, %hi(D_800DDC50) # $t6, 0x800e +/* 1E61BC 801DB8FC 3C0E800E */ lui $t6, %hi(gEntityVtableIndexArray) # $t6, 0x800e /* 1E61C0 801DB900 3C03800F */ lui $v1, %hi(D_800EA520) /* 1E61C4 801DB904 00021080 */ sll $v0, $v0, 2 -/* 1E61C8 801DB908 25CEDC50 */ addiu $t6, %lo(D_800DDC50) # addiu $t6, $t6, -0x23b0 +/* 1E61C8 801DB908 25CEDC50 */ addiu $t6, %lo(gEntityVtableIndexArray) # addiu $t6, $t6, -0x23b0 /* 1E61CC 801DB90C 00621821 */ addu $v1, $v1, $v0 /* 1E61D0 801DB910 8C63A520 */ lw $v1, %lo(D_800EA520)($v1) /* 1E61D4 801DB914 004E2821 */ addu $a1, $v0, $t6 @@ -27,32 +27,32 @@ glabel func_801DB8E8_ovl11 /* 1E6208 801DB948 00000000 */ nop /* 1E620C 801DB94C ACA80000 */ sw $t0, ($a1) /* 1E6210 801DB950 8C820000 */ lw $v0, ($a0) -/* 1E6214 801DB954 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6214 801DB954 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6218 801DB958 00021080 */ sll $v0, $v0, 2 /* 1E621C 801DB95C 00C23021 */ addu $a2, $a2, $v0 /* 1E6220 801DB960 10000014 */ b .L801DB9B4_ovl11 -/* 1E6224 801DB964 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6224 801DB964 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DB968_ovl11: /* 1E6228 801DB968 24080002 */ li $t0, 2 /* 1E622C 801DB96C 10E80011 */ beq $a3, $t0, .L801DB9B4_ovl11 /* 1E6230 801DB970 00000000 */ nop /* 1E6234 801DB974 ACA80000 */ sw $t0, ($a1) /* 1E6238 801DB978 8C820000 */ lw $v0, ($a0) -/* 1E623C 801DB97C 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E623C 801DB97C 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6240 801DB980 00021080 */ sll $v0, $v0, 2 /* 1E6244 801DB984 00C23021 */ addu $a2, $a2, $v0 /* 1E6248 801DB988 1000000A */ b .L801DB9B4_ovl11 -/* 1E624C 801DB98C 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E624C 801DB98C 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) /* 1E6250 801DB990 24030003 */ li $v1, 3 .L801DB994_ovl11: /* 1E6254 801DB994 10E30007 */ beq $a3, $v1, .L801DB9B4_ovl11 /* 1E6258 801DB998 00000000 */ nop /* 1E625C 801DB99C ACA30000 */ sw $v1, ($a1) /* 1E6260 801DB9A0 8C820000 */ lw $v0, ($a0) -/* 1E6264 801DB9A4 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6264 801DB9A4 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6268 801DB9A8 00021080 */ sll $v0, $v0, 2 /* 1E626C 801DB9AC 00C23021 */ addu $a2, $a2, $v0 -/* 1E6270 801DB9B0 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6270 801DB9B0 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DB9B4_ovl11: /* 1E6274 801DB9B4 10E60006 */ beq $a3, $a2, .L801DB9D0_ovl11 /* 1E6278 801DB9B8 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) diff --git a/asm/non_matchings/ovl11/ovl11/func_801DBB4C_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DBB4C_ovl11.s index e6efb154..4460b82f 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DBB4C_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DBB4C_ovl11.s @@ -81,14 +81,14 @@ glabel func_801DBB4C_ovl11 /* 1E6538 801DBC78 45020011 */ bc1fl .L801DBCC0_ovl11 /* 1E653C 801DBC7C 8FBF0014 */ lw $ra, 0x14($sp) /* 1E6540 801DBC80 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1E6544 801DBC84 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E6544 801DBC84 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E6548 801DBC88 240E0004 */ li $t6, 4 /* 1E654C 801DBC8C 8C4F0000 */ lw $t7, ($v0) /* 1E6550 801DBC90 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E6554 801DBC94 3C05801E */ lui $a1, %hi(D_801DB8A0) # $a1, 0x801e /* 1E6558 801DBC98 000FC080 */ sll $t8, $t7, 2 /* 1E655C 801DBC9C 00380821 */ addu $at, $at, $t8 -/* 1E6560 801DBCA0 AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 1E6560 801DBCA0 AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) /* 1E6564 801DBCA4 8C480000 */ lw $t0, ($v0) /* 1E6568 801DBCA8 24A5B8A0 */ addiu $a1, %lo(D_801DB8A0) # addiu $a1, $a1, -0x4760 /* 1E656C 801DBCAC 0008C880 */ sll $t9, $t0, 2 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DC258_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DC258_ovl11.s index 693b242b..b8d54fd1 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DC258_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DC258_ovl11.s @@ -5,11 +5,11 @@ glabel func_801DC258_ovl11 /* 1E6B24 801DC264 AFBF0014 */ sw $ra, 0x14($sp) /* 1E6B28 801DC268 AFA40018 */ sw $a0, 0x18($sp) /* 1E6B2C 801DC26C 8DCF0000 */ lw $t7, ($t6) -/* 1E6B30 801DC270 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1E6B30 801DC270 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1E6B34 801DC274 3C06801E */ lui $a2, %hi(D_801E0B4C) # $a2, 0x801e /* 1E6B38 801DC278 000FC080 */ sll $t8, $t7, 2 /* 1E6B3C 801DC27C 00982021 */ addu $a0, $a0, $t8 -/* 1E6B40 801DC280 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1E6B40 801DC280 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1E6B44 801DC284 24C60B4C */ addiu $a2, %lo(D_801E0B4C) # addiu $a2, $a2, 0xb4c /* 1E6B48 801DC288 0C02911F */ jal call_virtual_function /* 1E6B4C 801DC28C 24050009 */ li $a1, 9 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DC45C_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DC45C_ovl11.s index f52c706e..bb60c4a2 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DC45C_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DC45C_ovl11.s @@ -4,10 +4,10 @@ glabel func_801DC45C_ovl11 /* 1E6D24 801DC464 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1E6D28 801DC468 AFBF0014 */ sw $ra, 0x14($sp) /* 1E6D2C 801DC46C 8C830000 */ lw $v1, ($a0) -/* 1E6D30 801DC470 3C0E800E */ lui $t6, %hi(D_800DDC50) # $t6, 0x800e +/* 1E6D30 801DC470 3C0E800E */ lui $t6, %hi(gEntityVtableIndexArray) # $t6, 0x800e /* 1E6D34 801DC474 3C02800F */ lui $v0, %hi(D_800EA520) /* 1E6D38 801DC478 00031880 */ sll $v1, $v1, 2 -/* 1E6D3C 801DC47C 25CEDC50 */ addiu $t6, %lo(D_800DDC50) # addiu $t6, $t6, -0x23b0 +/* 1E6D3C 801DC47C 25CEDC50 */ addiu $t6, %lo(gEntityVtableIndexArray) # addiu $t6, $t6, -0x23b0 /* 1E6D40 801DC480 00431021 */ addu $v0, $v0, $v1 /* 1E6D44 801DC484 8C42A520 */ lw $v0, %lo(D_800EA520)($v0) /* 1E6D48 801DC488 006E2821 */ addu $a1, $v1, $t6 @@ -28,21 +28,21 @@ glabel func_801DC45C_ovl11 /* 1E6D80 801DC4C0 00000000 */ nop /* 1E6D84 801DC4C4 ACA80000 */ sw $t0, ($a1) /* 1E6D88 801DC4C8 8C830000 */ lw $v1, ($a0) -/* 1E6D8C 801DC4CC 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6D8C 801DC4CC 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6D90 801DC4D0 00031880 */ sll $v1, $v1, 2 /* 1E6D94 801DC4D4 00C33021 */ addu $a2, $a2, $v1 /* 1E6D98 801DC4D8 1000002A */ b .L801DC584_ovl11 -/* 1E6D9C 801DC4DC 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6D9C 801DC4DC 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DC4E0_ovl11: /* 1E6DA0 801DC4E0 10E90028 */ beq $a3, $t1, .L801DC584_ovl11 /* 1E6DA4 801DC4E4 00000000 */ nop /* 1E6DA8 801DC4E8 ACA90000 */ sw $t1, ($a1) /* 1E6DAC 801DC4EC 8C830000 */ lw $v1, ($a0) -/* 1E6DB0 801DC4F0 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6DB0 801DC4F0 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6DB4 801DC4F4 00031880 */ sll $v1, $v1, 2 /* 1E6DB8 801DC4F8 00C33021 */ addu $a2, $a2, $v1 /* 1E6DBC 801DC4FC 10000021 */ b .L801DC584_ovl11 -/* 1E6DC0 801DC500 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6DC0 801DC500 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DC504_ovl11: /* 1E6DC4 801DC504 3C02800F */ lui $v0, %hi(D_800E9560) /* 1E6DC8 801DC508 00431021 */ addu $v0, $v0, $v1 @@ -59,26 +59,26 @@ glabel func_801DC45C_ovl11 /* 1E6DF4 801DC534 ACAF0000 */ sw $t7, ($a1) .L801DC538_ovl11: /* 1E6DF8 801DC538 8C830000 */ lw $v1, ($a0) -/* 1E6DFC 801DC53C 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6DFC 801DC53C 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6E00 801DC540 00031880 */ sll $v1, $v1, 2 /* 1E6E04 801DC544 00C33021 */ addu $a2, $a2, $v1 /* 1E6E08 801DC548 1000000E */ b .L801DC584_ovl11 -/* 1E6E0C 801DC54C 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6E0C 801DC54C 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DC550_ovl11: /* 1E6E10 801DC550 ACB80000 */ sw $t8, ($a1) /* 1E6E14 801DC554 8C830000 */ lw $v1, ($a0) -/* 1E6E18 801DC558 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6E18 801DC558 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6E1C 801DC55C 00031880 */ sll $v1, $v1, 2 /* 1E6E20 801DC560 00C33021 */ addu $a2, $a2, $v1 /* 1E6E24 801DC564 10000007 */ b .L801DC584_ovl11 -/* 1E6E28 801DC568 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6E28 801DC568 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DC56C_ovl11: /* 1E6E2C 801DC56C ACB90000 */ sw $t9, ($a1) /* 1E6E30 801DC570 8C830000 */ lw $v1, ($a0) -/* 1E6E34 801DC574 3C06800E */ lui $a2, %hi(D_800DDC50) +/* 1E6E34 801DC574 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) /* 1E6E38 801DC578 00031880 */ sll $v1, $v1, 2 /* 1E6E3C 801DC57C 00C33021 */ addu $a2, $a2, $v1 -/* 1E6E40 801DC580 8CC6DC50 */ lw $a2, %lo(D_800DDC50)($a2) +/* 1E6E40 801DC580 8CC6DC50 */ lw $a2, %lo(gEntityVtableIndexArray)($a2) .L801DC584_ovl11: /* 1E6E44 801DC584 10E60006 */ beq $a3, $a2, .L801DC5A0_ovl11 /* 1E6E48 801DC588 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) diff --git a/asm/non_matchings/ovl11/ovl11/func_801DC83C_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DC83C_ovl11.s index 54fa3307..2129bcb5 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DC83C_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DC83C_ovl11.s @@ -29,14 +29,14 @@ glabel func_801DC83C_ovl11 /* 1E7164 801DC8A4 00000000 */ nop /* 1E7168 801DC8A8 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1E716C 801DC8AC 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1E7170 801DC8B0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E7170 801DC8B0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E7174 801DC8B4 24090008 */ li $t1, 8 /* 1E7178 801DC8B8 8C4A0000 */ lw $t2, ($v0) /* 1E717C 801DC8BC 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E7180 801DC8C0 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E7184 801DC8C4 000A5880 */ sll $t3, $t2, 2 /* 1E7188 801DC8C8 002B0821 */ addu $at, $at, $t3 -/* 1E718C 801DC8CC AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1E718C 801DC8CC AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 1E7190 801DC8D0 8C4C0000 */ lw $t4, ($v0) /* 1E7194 801DC8D4 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 /* 1E7198 801DC8D8 000C6880 */ sll $t5, $t4, 2 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DC8F8_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DC8F8_ovl11.s index b60910ee..380fc44a 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DC8F8_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DC8F8_ovl11.s @@ -47,11 +47,11 @@ glabel func_801DC8F8_ovl11 /* 1E726C 801DC9AC 00390821 */ addu $at, $at, $t9 /* 1E7270 801DC9B0 E426A8A0 */ swc1 $f6, %lo(D_800EA8A0)($at) /* 1E7274 801DC9B4 8C480000 */ lw $t0, ($v0) -/* 1E7278 801DC9B8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E7278 801DC9B8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E727C 801DC9BC 2409FFFF */ li $t1, -1 /* 1E7280 801DC9C0 00085080 */ sll $t2, $t0, 2 /* 1E7284 801DC9C4 002A0821 */ addu $at, $at, $t2 -/* 1E7288 801DC9C8 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1E7288 801DC9C8 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1E728C 801DC9CC 8C4B0000 */ lw $t3, ($v0) /* 1E7290 801DC9D0 3C01800F */ lui $at, %hi(D_800E93A0) /* 1E7294 801DC9D4 000B6080 */ sll $t4, $t3, 2 @@ -70,7 +70,7 @@ glabel func_801DC8F8_ovl11 /* 1E72C8 801DCA08 00000000 */ nop /* 1E72CC 801DCA0C 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 1E72D0 801DCA10 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) -/* 1E72D4 801DCA14 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1E72D4 801DCA14 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1E72D8 801DCA18 3C06801E */ lui $a2, %hi(D_801E0B4C) # $a2, 0x801e /* 1E72DC 801DCA1C 8F280000 */ lw $t0, ($t9) /* 1E72E0 801DCA20 24C60B4C */ addiu $a2, %lo(D_801E0B4C) # addiu $a2, $a2, 0xb4c @@ -78,7 +78,7 @@ glabel func_801DC8F8_ovl11 /* 1E72E8 801DCA28 00085080 */ sll $t2, $t0, 2 /* 1E72EC 801DCA2C 008A2021 */ addu $a0, $a0, $t2 /* 1E72F0 801DCA30 0C02911F */ jal call_virtual_function -/* 1E72F4 801DCA34 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1E72F4 801DCA34 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1E72F8 801DCA38 8FBF0014 */ lw $ra, 0x14($sp) /* 1E72FC 801DCA3C 27BD0018 */ addiu $sp, $sp, 0x18 /* 1E7300 801DCA40 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl11/ovl11/func_801DCBE0_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DCBE0_ovl11.s index 8cef5915..e6bdc577 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DCBE0_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DCBE0_ovl11.s @@ -6,7 +6,7 @@ glabel func_801DCBE0_ovl11 /* 1E74B0 801DCBF0 AFA40018 */ sw $a0, 0x18($sp) /* 1E74B4 801DCBF4 8C430000 */ lw $v1, ($v0) /* 1E74B8 801DCBF8 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1E74BC 801DCBFC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E74BC 801DCBFC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E74C0 801DCC00 00031880 */ sll $v1, $v1, 2 /* 1E74C4 801DCC04 01C37021 */ addu $t6, $t6, $v1 /* 1E74C8 801DCC08 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801DCBE0_ovl11 /* 1E74D0 801DCC10 240F0001 */ li $t7, 1 /* 1E74D4 801DCC14 11C00009 */ beqz $t6, .L801DCC3C_ovl11 /* 1E74D8 801DCC18 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1E74DC 801DCC1C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E74DC 801DCC1C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E74E0 801DCC20 8C580000 */ lw $t8, ($v0) /* 1E74E4 801DCC24 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E74E8 801DCC28 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DCF70_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DCF70_ovl11.s index 8853c0ab..73f0a505 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DCF70_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DCF70_ovl11.s @@ -18,11 +18,11 @@ glabel func_801DCF70_ovl11 /* 1E7870 801DCFB0 3C0F800F */ lui $t7, %hi(D_800E9AA0) /* 1E7874 801DCFB4 01E27821 */ addu $t7, $t7, $v0 /* 1E7878 801DCFB8 8DEF9AA0 */ lw $t7, %lo(D_800E9AA0)($t7) -/* 1E787C 801DCFBC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E787C 801DCFBC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E7880 801DCFC0 00220821 */ addu $at, $at, $v0 /* 1E7884 801DCFC4 14EF0037 */ bne $a3, $t7, .L801DD0A4_ovl11 /* 1E7888 801DCFC8 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1E788C 801DCFCC AC27DC50 */ sw $a3, %lo(D_800DDC50)($at) +/* 1E788C 801DCFCC AC27DC50 */ sw $a3, %lo(gEntityVtableIndexArray)($at) /* 1E7890 801DCFD0 8CD80000 */ lw $t8, ($a2) /* 1E7894 801DCFD4 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E7898 801DCFD8 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DD160_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DD160_ovl11.s index 378b04ca..d22c7aed 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DD160_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DD160_ovl11.s @@ -6,7 +6,7 @@ glabel func_801DD160_ovl11 /* 1E7A30 801DD170 AFA40018 */ sw $a0, 0x18($sp) /* 1E7A34 801DD174 8C430000 */ lw $v1, ($v0) /* 1E7A38 801DD178 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1E7A3C 801DD17C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E7A3C 801DD17C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E7A40 801DD180 00031880 */ sll $v1, $v1, 2 /* 1E7A44 801DD184 01C37021 */ addu $t6, $t6, $v1 /* 1E7A48 801DD188 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801DD160_ovl11 /* 1E7A50 801DD190 240F0001 */ li $t7, 1 /* 1E7A54 801DD194 11C00009 */ beqz $t6, .L801DD1BC_ovl11 /* 1E7A58 801DD198 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1E7A5C 801DD19C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E7A5C 801DD19C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E7A60 801DD1A0 8C580000 */ lw $t8, ($v0) /* 1E7A64 801DD1A4 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E7A68 801DD1A8 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DD588_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DD588_ovl11.s index b50f107c..0c269526 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DD588_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DD588_ovl11.s @@ -36,14 +36,14 @@ glabel func_801DD588_ovl11 /* 1E7ECC 801DD60C 24040177 */ li $a0, 375 /* 1E7ED0 801DD610 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1E7ED4 801DD614 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1E7ED8 801DD618 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E7ED8 801DD618 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E7EDC 801DD61C 240F0006 */ li $t7, 6 /* 1E7EE0 801DD620 8C580000 */ lw $t8, ($v0) /* 1E7EE4 801DD624 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E7EE8 801DD628 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E7EEC 801DD62C 0018C880 */ sll $t9, $t8, 2 /* 1E7EF0 801DD630 00390821 */ addu $at, $at, $t9 -/* 1E7EF4 801DD634 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E7EF4 801DD634 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E7EF8 801DD638 8C480000 */ lw $t0, ($v0) /* 1E7EFC 801DD63C 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 /* 1E7F00 801DD640 00084880 */ sll $t1, $t0, 2 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DD7D4_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DD7D4_ovl11.s index 658fcd20..df95154d 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DD7D4_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DD7D4_ovl11.s @@ -6,7 +6,7 @@ glabel func_801DD7D4_ovl11 /* 1E80A4 801DD7E4 AFA40018 */ sw $a0, 0x18($sp) /* 1E80A8 801DD7E8 8C430000 */ lw $v1, ($v0) /* 1E80AC 801DD7EC 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1E80B0 801DD7F0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E80B0 801DD7F0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E80B4 801DD7F4 00031880 */ sll $v1, $v1, 2 /* 1E80B8 801DD7F8 01C37021 */ addu $t6, $t6, $v1 /* 1E80BC 801DD7FC 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801DD7D4_ovl11 /* 1E80C4 801DD804 240F0001 */ li $t7, 1 /* 1E80C8 801DD808 11C00009 */ beqz $t6, .L801DD830_ovl11 /* 1E80CC 801DD80C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1E80D0 801DD810 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E80D0 801DD810 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E80D4 801DD814 8C580000 */ lw $t8, ($v0) /* 1E80D8 801DD818 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E80DC 801DD81C 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DD9C8_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DD9C8_ovl11.s index 80812301..81ac852e 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DD9C8_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DD9C8_ovl11.s @@ -16,11 +16,11 @@ glabel func_801DD9C8_ovl11 /* 1E82C0 801DDA00 8FBF0014 */ lw $ra, 0x14($sp) /* 1E82C4 801DDA04 AC209720 */ sw $zero, %lo(D_800E9720)($at) /* 1E82C8 801DDA08 8C580000 */ lw $t8, ($v0) -/* 1E82CC 801DDA0C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E82CC 801DDA0C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E82D0 801DDA10 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E82D4 801DDA14 0018C880 */ sll $t9, $t8, 2 /* 1E82D8 801DDA18 00390821 */ addu $at, $at, $t9 -/* 1E82DC 801DDA1C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E82DC 801DDA1C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E82E0 801DDA20 8C480000 */ lw $t0, ($v0) /* 1E82E4 801DDA24 3C05801E */ lui $a1, %hi(D_801DC258) # $a1, 0x801e /* 1E82E8 801DDA28 24A5C258 */ addiu $a1, %lo(D_801DC258) # addiu $a1, $a1, -0x3da8 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DDEC0_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DDEC0_ovl11.s index efd176b1..2217204b 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DDEC0_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DDEC0_ovl11.s @@ -5,11 +5,11 @@ glabel func_801DDEC0_ovl11 /* 1E878C 801DDECC AFBF0014 */ sw $ra, 0x14($sp) /* 1E8790 801DDED0 AFA40018 */ sw $a0, 0x18($sp) /* 1E8794 801DDED4 8DCF0000 */ lw $t7, ($t6) -/* 1E8798 801DDED8 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1E8798 801DDED8 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1E879C 801DDEDC 3C06801E */ lui $a2, %hi(D_801E0B9C) # $a2, 0x801e /* 1E87A0 801DDEE0 000FC080 */ sll $t8, $t7, 2 /* 1E87A4 801DDEE4 00982021 */ addu $a0, $a0, $t8 -/* 1E87A8 801DDEE8 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1E87A8 801DDEE8 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1E87AC 801DDEEC 24C60B9C */ addiu $a2, %lo(D_801E0B9C) # addiu $a2, $a2, 0xb9c /* 1E87B0 801DDEF0 0C02911F */ jal call_virtual_function /* 1E87B4 801DDEF4 24050005 */ li $a1, 5 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DDF08_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DDF08_ovl11.s index 34fa5d67..e8b67f7b 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DDF08_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DDF08_ovl11.s @@ -35,13 +35,13 @@ glabel func_801DDF08_ovl11 /* 1E884C 801DDF8C 2463A7C4 */ addiu $v1, %lo(D_8004A7C4) # addiu $v1, $v1, -0x583c /* 1E8850 801DDF90 8C6A0000 */ lw $t2, ($v1) /* 1E8854 801DDF94 8FAE001C */ lw $t6, 0x1c($sp) -/* 1E8858 801DDF98 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E8858 801DDF98 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E885C 801DDF9C 8D4B0000 */ lw $t3, ($t2) /* 1E8860 801DDFA0 3C0D801E */ lui $t5, %hi(D_801DAF18) # $t5, 0x801e /* 1E8864 801DDFA4 25ADAF18 */ addiu $t5, %lo(D_801DAF18) # addiu $t5, $t5, -0x50e8 /* 1E8868 801DDFA8 000B6080 */ sll $t4, $t3, 2 /* 1E886C 801DDFAC 002C0821 */ addu $at, $at, $t4 -/* 1E8870 801DDFB0 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1E8870 801DDFB0 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1E8874 801DDFB4 ADCD0098 */ sw $t5, 0x98($t6) /* 1E8878 801DDFB8 8C620000 */ lw $v0, ($v1) /* 1E887C 801DDFBC 3C01800E */ lui $at, %hi(D_800E7CE0) @@ -62,7 +62,7 @@ glabel func_801DDF08_ovl11 /* 1E88B8 801DDFF8 E4246A10 */ swc1 $f4, %lo(D_800E6A10)($at) /* 1E88BC 801DDFFC 3C0A8005 */ lui $t2, %hi(D_8004A7C4) # $t2, 0x8005 /* 1E88C0 801DE000 8D4AA7C4 */ lw $t2, %lo(D_8004A7C4)($t2) -/* 1E88C4 801DE004 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1E88C4 801DE004 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1E88C8 801DE008 3C06801E */ lui $a2, %hi(D_801E0B9C) # $a2, 0x801e /* 1E88CC 801DE00C 8D4B0000 */ lw $t3, ($t2) /* 1E88D0 801DE010 24C60B9C */ addiu $a2, %lo(D_801E0B9C) # addiu $a2, $a2, 0xb9c @@ -70,7 +70,7 @@ glabel func_801DDF08_ovl11 /* 1E88D8 801DE018 000B6080 */ sll $t4, $t3, 2 /* 1E88DC 801DE01C 008C2021 */ addu $a0, $a0, $t4 /* 1E88E0 801DE020 0C02911F */ jal call_virtual_function -/* 1E88E4 801DE024 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1E88E4 801DE024 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1E88E8 801DE028 8FBF0014 */ lw $ra, 0x14($sp) /* 1E88EC 801DE02C 27BD0020 */ addiu $sp, $sp, 0x20 /* 1E88F0 801DE030 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl11/ovl11/func_801DE1EC_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DE1EC_ovl11.s index 836f44b1..ac375c0a 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DE1EC_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DE1EC_ovl11.s @@ -6,7 +6,7 @@ glabel func_801DE1EC_ovl11 /* 1E8ABC 801DE1FC AFA40018 */ sw $a0, 0x18($sp) /* 1E8AC0 801DE200 8C430000 */ lw $v1, ($v0) /* 1E8AC4 801DE204 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1E8AC8 801DE208 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E8AC8 801DE208 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E8ACC 801DE20C 00031880 */ sll $v1, $v1, 2 /* 1E8AD0 801DE210 01C37021 */ addu $t6, $t6, $v1 /* 1E8AD4 801DE214 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801DE1EC_ovl11 /* 1E8ADC 801DE21C 240F0001 */ li $t7, 1 /* 1E8AE0 801DE220 11C00009 */ beqz $t6, .L801DE248_ovl11 /* 1E8AE4 801DE224 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1E8AE8 801DE228 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E8AE8 801DE228 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E8AEC 801DE22C 8C580000 */ lw $t8, ($v0) /* 1E8AF0 801DE230 3C05801E */ lui $a1, %hi(D_801DDEC0) # $a1, 0x801e /* 1E8AF4 801DE234 24A5DEC0 */ addiu $a1, %lo(D_801DDEC0) # addiu $a1, $a1, -0x2140 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DE454_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DE454_ovl11.s index 657ba748..9c38c01a 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DE454_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DE454_ovl11.s @@ -32,7 +32,7 @@ glabel func_801DE454_ovl11 /* 1E8D8C 801DE4CC 00290821 */ addu $at, $at, $t1 /* 1E8D90 801DE4D0 E42464D0 */ swc1 $f4, %lo(D_800E64D0)($at) /* 1E8D94 801DE4D4 8C620000 */ lw $v0, ($v1) -/* 1E8D98 801DE4D8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E8D98 801DE4D8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E8D9C 801DE4DC 240C0002 */ li $t4, 2 /* 1E8DA0 801DE4E0 00021080 */ sll $v0, $v0, 2 /* 1E8DA4 801DE4E4 01425021 */ addu $t2, $t2, $v0 @@ -41,12 +41,12 @@ glabel func_801DE454_ovl11 /* 1E8DB0 801DE4F0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E8DB4 801DE4F4 11400005 */ beqz $t2, .L801DE50C_ovl11 /* 1E8DB8 801DE4F8 00000000 */ nop -/* 1E8DBC 801DE4FC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E8DBC 801DE4FC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E8DC0 801DE500 00220821 */ addu $at, $at, $v0 /* 1E8DC4 801DE504 10000002 */ b .L801DE510_ovl11 -/* 1E8DC8 801DE508 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 1E8DC8 801DE508 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) .L801DE50C_ovl11: -/* 1E8DCC 801DE50C AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 1E8DCC 801DE50C AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) .L801DE510_ovl11: /* 1E8DD0 801DE510 8C6D0000 */ lw $t5, ($v1) /* 1E8DD4 801DE514 3C05801E */ lui $a1, %hi(D_801DDEC0) # $a1, 0x801e diff --git a/asm/non_matchings/ovl11/ovl11/func_801DE8D0_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DE8D0_ovl11.s index 024eb941..fe6d0b5f 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DE8D0_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DE8D0_ovl11.s @@ -18,13 +18,13 @@ glabel func_801DE8D0_ovl11 /* 1E91D0 801DE910 24A59FE0 */ addiu $a1, %lo(D_800E9FE0) # addiu $a1, $a1, -0x6020 /* 1E91D4 801DE914 00A32021 */ addu $a0, $a1, $v1 /* 1E91D8 801DE918 8C8F0000 */ lw $t7, ($a0) -/* 1E91DC 801DE91C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E91DC 801DE91C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E91E0 801DE920 24090001 */ li $t1, 1 /* 1E91E4 801DE924 25F8FFFF */ addiu $t8, $t7, -1 /* 1E91E8 801DE928 AC980000 */ sw $t8, ($a0) /* 1E91EC 801DE92C 8C430000 */ lw $v1, ($v0) /* 1E91F0 801DE930 240F0002 */ li $t7, 2 -/* 1E91F4 801DE934 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1E91F4 801DE934 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1E91F8 801DE938 00031880 */ sll $v1, $v1, 2 /* 1E91FC 801DE93C 00A3C821 */ addu $t9, $a1, $v1 /* 1E9200 801DE940 8F280000 */ lw $t0, ($t9) @@ -33,14 +33,14 @@ glabel func_801DE8D0_ovl11 /* 1E920C 801DE94C 00000000 */ nop /* 1E9210 801DE950 A0C9003C */ sb $t1, 0x3c($a2) /* 1E9214 801DE954 8CE20000 */ lw $v0, ($a3) -/* 1E9218 801DE958 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E9218 801DE958 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E921C 801DE95C 240A0001 */ li $t2, 1 /* 1E9220 801DE960 8C4B0000 */ lw $t3, ($v0) /* 1E9224 801DE964 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E9228 801DE968 3C05801E */ lui $a1, %hi(D_801DDEC0) # $a1, 0x801e /* 1E922C 801DE96C 000B6080 */ sll $t4, $t3, 2 /* 1E9230 801DE970 002C0821 */ addu $at, $at, $t4 -/* 1E9234 801DE974 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1E9234 801DE974 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 1E9238 801DE978 8C4D0000 */ lw $t5, ($v0) /* 1E923C 801DE97C 24A5DEC0 */ addiu $a1, %lo(D_801DDEC0) # addiu $a1, $a1, -0x2140 /* 1E9240 801DE980 000D7080 */ sll $t6, $t5, 2 @@ -50,7 +50,7 @@ glabel func_801DE8D0_ovl11 /* 1E9250 801DE990 1000000A */ b .L801DE9BC_ovl11 /* 1E9254 801DE994 8FBF0014 */ lw $ra, 0x14($sp) .L801DE998_ovl11: -/* 1E9258 801DE998 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E9258 801DE998 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E925C 801DE99C 8C580000 */ lw $t8, ($v0) /* 1E9260 801DE9A0 3C05801E */ lui $a1, %hi(D_801DDEC0) # $a1, 0x801e /* 1E9264 801DE9A4 24A5DEC0 */ addiu $a1, %lo(D_801DDEC0) # addiu $a1, $a1, -0x2140 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DEAE8_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DEAE8_ovl11.s index f4ed90ee..f53ce816 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DEAE8_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DEAE8_ovl11.s @@ -17,14 +17,14 @@ glabel func_801DEAE8_ovl11 /* 1E93E4 801DEB24 24180001 */ li $t8, 1 /* 1E93E8 801DEB28 A078003C */ sb $t8, 0x3c($v1) /* 1E93EC 801DEB2C 8CC20000 */ lw $v0, ($a2) -/* 1E93F0 801DEB30 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E93F0 801DEB30 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E93F4 801DEB34 24190001 */ li $t9, 1 /* 1E93F8 801DEB38 8C480000 */ lw $t0, ($v0) /* 1E93FC 801DEB3C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E9400 801DEB40 3C05801E */ lui $a1, %hi(D_801DDEC0) # $a1, 0x801e /* 1E9404 801DEB44 00084880 */ sll $t1, $t0, 2 /* 1E9408 801DEB48 00290821 */ addu $at, $at, $t1 -/* 1E940C 801DEB4C AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1E940C 801DEB4C AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 1E9410 801DEB50 8C4A0000 */ lw $t2, ($v0) /* 1E9414 801DEB54 24A5DEC0 */ addiu $a1, %lo(D_801DDEC0) # addiu $a1, $a1, -0x2140 /* 1E9418 801DEB58 000A5880 */ sll $t3, $t2, 2 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DEF9C_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DEF9C_ovl11.s index 6978a148..f58e3b75 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DEF9C_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DEF9C_ovl11.s @@ -5,11 +5,11 @@ glabel func_801DEF9C_ovl11 /* 1E9868 801DEFA8 AFBF0014 */ sw $ra, 0x14($sp) /* 1E986C 801DEFAC AFA40018 */ sw $a0, 0x18($sp) /* 1E9870 801DEFB0 8DCF0000 */ lw $t7, ($t6) -/* 1E9874 801DEFB4 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1E9874 801DEFB4 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1E9878 801DEFB8 3C06801E */ lui $a2, %hi(D_801E0BC4) # $a2, 0x801e /* 1E987C 801DEFBC 000FC080 */ sll $t8, $t7, 2 /* 1E9880 801DEFC0 00982021 */ addu $a0, $a0, $t8 -/* 1E9884 801DEFC4 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1E9884 801DEFC4 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1E9888 801DEFC8 24C60BC4 */ addiu $a2, %lo(D_801E0BC4) # addiu $a2, $a2, 0xbc4 /* 1E988C 801DEFCC 0C02911F */ jal call_virtual_function /* 1E9890 801DEFD0 24050003 */ li $a1, 3 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DEFE4_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DEFE4_ovl11.s index 9cde042f..5d19eaae 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DEFE4_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DEFE4_ovl11.s @@ -33,8 +33,8 @@ glabel func_801DEFE4_ovl11 /* 1E9920 801DF060 3484009D */ ori $a0, (0x0001009D & 0xFFFF) # ori $a0, $a0, 0x9d /* 1E9924 801DF064 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1E9928 801DF068 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1E992C 801DF06C 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 1E9930 801DF070 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 1E992C 801DF06C 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 1E9930 801DF070 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 1E9934 801DF074 8C4A0000 */ lw $t2, ($v0) /* 1E9938 801DF078 3C06801E */ lui $a2, %hi(D_801E0BC4) # $a2, 0x801e /* 1E993C 801DF07C 24C60BC4 */ addiu $a2, %lo(D_801E0BC4) # addiu $a2, $a2, 0xbc4 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DF318_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DF318_ovl11.s index 02eca77b..36b279b5 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DF318_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DF318_ovl11.s @@ -6,7 +6,7 @@ glabel func_801DF318_ovl11 /* 1E9BE8 801DF328 AFA40018 */ sw $a0, 0x18($sp) /* 1E9BEC 801DF32C 8C430000 */ lw $v1, ($v0) /* 1E9BF0 801DF330 3C0E800F */ lui $t6, %hi(D_800E9E20) -/* 1E9BF4 801DF334 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E9BF4 801DF334 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E9BF8 801DF338 00031880 */ sll $v1, $v1, 2 /* 1E9BFC 801DF33C 01C37021 */ addu $t6, $t6, $v1 /* 1E9C00 801DF340 8DCE9E20 */ lw $t6, %lo(D_800E9E20)($t6) @@ -14,7 +14,7 @@ glabel func_801DF318_ovl11 /* 1E9C08 801DF348 240F0001 */ li $t7, 1 /* 1E9C0C 801DF34C 11C00009 */ beqz $t6, .L801DF374_ovl11 /* 1E9C10 801DF350 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) -/* 1E9C14 801DF354 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1E9C14 801DF354 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1E9C18 801DF358 8C580000 */ lw $t8, ($v0) /* 1E9C1C 801DF35C 3C05801E */ lui $a1, %hi(D_801DEF9C) # $a1, 0x801e /* 1E9C20 801DF360 24A5EF9C */ addiu $a1, %lo(D_801DEF9C) # addiu $a1, $a1, -0x1064 diff --git a/asm/non_matchings/ovl11/ovl11/func_801DF3DC_ovl11.s b/asm/non_matchings/ovl11/ovl11/func_801DF3DC_ovl11.s index 2eb5fcfc..d6cce8d0 100644 --- a/asm/non_matchings/ovl11/ovl11/func_801DF3DC_ovl11.s +++ b/asm/non_matchings/ovl11/ovl11/func_801DF3DC_ovl11.s @@ -14,7 +14,7 @@ glabel func_801DF3DC_ovl11 /* 1E9CCC 801DF40C 3C01800D */ lui $at, %hi(D_800D70D8) /* 1E9CD0 801DF410 14A0000E */ bnez $a1, .L801DF44C_ovl11 /* 1E9CD4 801DF414 24A8FFFF */ addiu $t0, $a1, -1 -/* 1E9CD8 801DF418 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E9CD8 801DF418 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E9CDC 801DF41C 00230821 */ addu $at, $at, $v1 /* 1E9CE0 801DF420 AC2FDC50 */ sw $t7, %lo(D_800CDC50)($at) /* 1E9CE4 801DF424 8C580000 */ lw $t8, ($v0) @@ -37,11 +37,11 @@ glabel func_801DF3DC_ovl11 /* 1E9D24 801DF464 4502000F */ bc1fl .L801DF4A4_ovl11 /* 1E9D28 801DF468 8FBF0014 */ lw $ra, 0x14($sp) /* 1E9D2C 801DF46C 8C4A0000 */ lw $t2, ($v0) -/* 1E9D30 801DF470 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1E9D30 801DF470 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1E9D34 801DF474 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1E9D38 801DF478 000A5880 */ sll $t3, $t2, 2 /* 1E9D3C 801DF47C 002B0821 */ addu $at, $at, $t3 -/* 1E9D40 801DF480 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1E9D40 801DF480 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 1E9D44 801DF484 8C4C0000 */ lw $t4, ($v0) /* 1E9D48 801DF488 3C05801E */ lui $a1, %hi(D_801DEF9C) # $a1, 0x801e /* 1E9D4C 801DF48C 24A5EF9C */ addiu $a1, %lo(D_801DEF9C) # addiu $a1, $a1, -0x1064 diff --git a/asm/non_matchings/ovl16/ovl16/func_801DB528_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DB528_ovl16.s index c6893eca..c0ef4f65 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DB528_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DB528_ovl16.s @@ -64,13 +64,13 @@ glabel func_801DB528_ovl16 /* 2118C8 801DB618 1101000C */ beq $t0, $at, .L801DB64C_ovl16 /* 2118CC 801DB61C 01304821 */ addu $t1, $t1, $s0 /* 2118D0 801DB620 8D290D50 */ lw $t1, %lo(D_800E0D50)($t1) -/* 2118D4 801DB624 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2118D4 801DB624 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2118D8 801DB628 00300821 */ addu $at, $at, $s0 /* 2118DC 801DB62C 11200007 */ beqz $t1, .L801DB64C_ovl16 /* 2118E0 801DB630 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 2118E4 801DB634 00902021 */ addu $a0, $a0, $s0 /* 2118E8 801DB638 3C05801A */ lui $a1, %hi(D_801A3E80) # $a1, 0x801a -/* 2118EC 801DB63C AC33DC50 */ sw $s3, %lo(D_800DDC50)($at) +/* 2118EC 801DB63C AC33DC50 */ sw $s3, %lo(gEntityVtableIndexArray)($at) /* 2118F0 801DB640 24A53E80 */ addiu $a1, %lo(D_801A3E80) # addiu $a1, $a1, 0x3e80 /* 2118F4 801DB644 0C02C7B2 */ jal assign_new_process_entry /* 2118F8 801DB648 8C84E510 */ lw $a0, %lo(gEntityGObjProcessArray)($a0) diff --git a/asm/non_matchings/ovl16/ovl16/func_801DB698_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DB698_ovl16.s index 20ae885d..3681e3ee 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DB698_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DB698_ovl16.s @@ -101,10 +101,10 @@ glabel func_801DB698_ovl16 /* 211AC4 801DB814 000C6880 */ sll $t5, $t4, 2 /* 211AC8 801DB818 01CD7021 */ addu $t6, $t6, $t5 /* 211ACC 801DB81C 8DCEF5E0 */ lw $t6, %lo(D_801EF5E0_ovl16)($t6) -/* 211AD0 801DB820 3C01800E */ lui $at, %hi(D_800DDC50) +/* 211AD0 801DB820 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 211AD4 801DB824 000FC080 */ sll $t8, $t7, 2 /* 211AD8 801DB828 00380821 */ addu $at, $at, $t8 -/* 211ADC 801DB82C AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 211ADC 801DB82C AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) /* 211AE0 801DB830 8CD90000 */ lw $t9, ($a2) /* 211AE4 801DB834 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 211AE8 801DB838 3C05801E */ lui $a1, %hi(func_801DB338_ovl16) # $a1, 0x801e @@ -230,10 +230,10 @@ glabel func_801DB698_ovl16 /* 211CB4 801DBA04 8CCE0000 */ lw $t6, ($a2) /* 211CB8 801DBA08 01ED7821 */ addu $t7, $t7, $t5 /* 211CBC 801DBA0C 8DEFF5E0 */ lw $t7, %lo(D_801EF5E0_ovl16)($t7) -/* 211CC0 801DBA10 3C01800E */ lui $at, %hi(D_800DDC50) +/* 211CC0 801DBA10 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 211CC4 801DBA14 000EC080 */ sll $t8, $t6, 2 /* 211CC8 801DBA18 00380821 */ addu $at, $at, $t8 -/* 211CCC 801DBA1C AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 211CCC 801DBA1C AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 211CD0 801DBA20 8CD90000 */ lw $t9, ($a2) /* 211CD4 801DBA24 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 211CD8 801DBA28 3C05801E */ lui $a1, %hi(func_801DB338_ovl16) # $a1, 0x801e diff --git a/asm/non_matchings/ovl16/ovl16/func_801DCBF8_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DCBF8_ovl16.s index 8798fb1b..1454d69d 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DCBF8_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DCBF8_ovl16.s @@ -116,10 +116,10 @@ glabel func_801DCBF8_ovl16 /* 213050 801DCDA0 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 /* 213054 801DCDA4 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6) /* 213058 801DCDA8 8FBF0014 */ lw $ra, 0x14($sp) -/* 21305C 801DCDAC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21305C 801DCDAC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 213060 801DCDB0 8DCF0000 */ lw $t7, ($t6) /* 213064 801DCDB4 27BD0018 */ addiu $sp, $sp, 0x18 /* 213068 801DCDB8 000FC080 */ sll $t8, $t7, 2 /* 21306C 801DCDBC 00380821 */ addu $at, $at, $t8 /* 213070 801DCDC0 03E00008 */ jr $ra -/* 213074 801DCDC4 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 213074 801DCDC4 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801DD50C_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DD50C_ovl16.s index 51703960..d9103149 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DD50C_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DD50C_ovl16.s @@ -48,10 +48,10 @@ glabel func_801DD50C_ovl16 /* 213874 801DD5C4 8C2EFE2C */ lw $t6, %lo(D_801EFE2C_ovl16)($at) /* 213878 801DD5C8 01C00008 */ jr $t6 /* 21387C 801DD5CC 00000000 */ nop -/* 213880 801DD5D0 3C15800E */ lui $s5, %hi(D_800DDC50) # $s5, 0x800e +/* 213880 801DD5D0 3C15800E */ lui $s5, %hi(gEntityVtableIndexArray) # $s5, 0x800e /* 213884 801DD5D4 3C11800E */ lui $s1, %hi(D_800DFBD0) # $s1, 0x800e /* 213888 801DD5D8 2631FBD0 */ addiu $s1, %lo(D_800DFBD0) # addiu $s1, $s1, -0x430 -/* 21388C 801DD5DC 26B5DC50 */ addiu $s5, %lo(D_800DDC50) # addiu $s5, $s5, -0x23b0 +/* 21388C 801DD5DC 26B5DC50 */ addiu $s5, %lo(gEntityVtableIndexArray) # addiu $s5, $s5, -0x23b0 /* 213890 801DD5E0 00009025 */ move $s2, $zero /* 213894 801DD5E4 24170014 */ li $s7, 20 /* 213898 801DD5E8 24140001 */ li $s4, 1 @@ -98,10 +98,10 @@ glabel func_801DD50C_ovl16 /* 213938 801DD688 8ECF0000 */ lw $t7, ($s6) /* 21393C 801DD68C 100000CB */ b .L801DD9BC_ovl16 /* 213940 801DD690 00000000 */ nop -/* 213944 801DD694 3C15800E */ lui $s5, %hi(D_800DDC50) # $s5, 0x800e +/* 213944 801DD694 3C15800E */ lui $s5, %hi(gEntityVtableIndexArray) # $s5, 0x800e /* 213948 801DD698 3C11800E */ lui $s1, %hi(D_800DFBD0) # $s1, 0x800e /* 21394C 801DD69C 2631FBD0 */ addiu $s1, %lo(D_800DFBD0) # addiu $s1, $s1, -0x430 -/* 213950 801DD6A0 26B5DC50 */ addiu $s5, %lo(D_800DDC50) # addiu $s5, $s5, -0x23b0 +/* 213950 801DD6A0 26B5DC50 */ addiu $s5, %lo(gEntityVtableIndexArray) # addiu $s5, $s5, -0x23b0 /* 213954 801DD6A4 00009025 */ move $s2, $zero /* 213958 801DD6A8 24170014 */ li $s7, 20 /* 21395C 801DD6AC 24140001 */ li $s4, 1 @@ -204,8 +204,8 @@ glabel func_801DD50C_ovl16 /* 213ADC 801DD82C 10000063 */ b .L801DD9BC_ovl16 /* 213AE0 801DD830 00000000 */ nop /* 213AE4 801DD834 8ECC0000 */ lw $t4, ($s6) -/* 213AE8 801DD838 3C15800E */ lui $s5, %hi(D_800DDC50) # $s5, 0x800e -/* 213AEC 801DD83C 26B5DC50 */ addiu $s5, %lo(D_800DDC50) # addiu $s5, $s5, -0x23b0 +/* 213AE8 801DD838 3C15800E */ lui $s5, %hi(gEntityVtableIndexArray) # $s5, 0x800e +/* 213AEC 801DD83C 26B5DC50 */ addiu $s5, %lo(gEntityVtableIndexArray) # addiu $s5, $s5, -0x23b0 /* 213AF0 801DD840 8D8B0000 */ lw $t3, ($t4) /* 213AF4 801DD844 24140001 */ li $s4, 1 /* 213AF8 801DD848 3C12800D */ lui $s2, %hi(D_800D6B10) # $s2, 0x800d @@ -253,10 +253,10 @@ glabel func_801DD50C_ovl16 /* 213BA0 801DD8F0 00000000 */ nop /* 213BA4 801DD8F4 10000031 */ b .L801DD9BC_ovl16 /* 213BA8 801DD8F8 00000000 */ nop -/* 213BAC 801DD8FC 3C15800E */ lui $s5, %hi(D_800DDC50) # $s5, 0x800e +/* 213BAC 801DD8FC 3C15800E */ lui $s5, %hi(gEntityVtableIndexArray) # $s5, 0x800e /* 213BB0 801DD900 3C11800E */ lui $s1, %hi(D_800DFBD0) # $s1, 0x800e /* 213BB4 801DD904 2631FBD0 */ addiu $s1, %lo(D_800DFBD0) # addiu $s1, $s1, -0x430 -/* 213BB8 801DD908 26B5DC50 */ addiu $s5, %lo(D_800DDC50) # addiu $s5, $s5, -0x23b0 +/* 213BB8 801DD908 26B5DC50 */ addiu $s5, %lo(gEntityVtableIndexArray) # addiu $s5, $s5, -0x23b0 /* 213BBC 801DD90C 00009025 */ move $s2, $zero /* 213BC0 801DD910 24170014 */ li $s7, 20 /* 213BC4 801DD914 24140001 */ li $s4, 1 diff --git a/asm/non_matchings/ovl16/ovl16/func_801DDA98_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DDA98_ovl16.s index 5a00b436..f8a43da1 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DDA98_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DDA98_ovl16.s @@ -89,8 +89,8 @@ glabel func_801DDA98_ovl16 /* 213E9C 801DDBEC 02F39021 */ addu $s2, $s7, $s3 /* 213EA0 801DDBF0 4481B000 */ mtc1 $at, $f22 /* 213EA4 801DDBF4 C64A0000 */ lwc1 $f10, ($s2) -/* 213EA8 801DDBF8 3C15800E */ lui $s5, %hi(D_800DDC50) # $s5, 0x800e -/* 213EAC 801DDBFC 26B5DC50 */ addiu $s5, %lo(D_800DDC50) # addiu $s5, $s5, -0x23b0 +/* 213EA8 801DDBF8 3C15800E */ lui $s5, %hi(gEntityVtableIndexArray) # $s5, 0x800e +/* 213EAC 801DDBFC 26B5DC50 */ addiu $s5, %lo(gEntityVtableIndexArray) # addiu $s5, $s5, -0x23b0 /* 213EB0 801DDC00 460AB03C */ c.lt.s $f22, $f10 /* 213EB4 801DDC04 3C01C47A */ li $at, 0xC47A0000 # -1000.000000 /* 213EB8 801DDC08 24140001 */ li $s4, 1 @@ -127,8 +127,8 @@ glabel func_801DDA98_ovl16 /* 213F2C 801DDC7C 26107098 */ addiu $s0, %lo(D_800D7098) # addiu $s0, $s0, 0x7098 /* 213F30 801DDC80 8E0D0004 */ lw $t5, 4($s0) /* 213F34 801DDC84 24110005 */ li $s1, 5 -/* 213F38 801DDC88 3C15800E */ lui $s5, %hi(D_800DDC50) # $s5, 0x800e -/* 213F3C 801DDC8C 26B5DC50 */ addiu $s5, %lo(D_800DDC50) # addiu $s5, $s5, -0x23b0 +/* 213F38 801DDC88 3C15800E */ lui $s5, %hi(gEntityVtableIndexArray) # $s5, 0x800e +/* 213F3C 801DDC8C 26B5DC50 */ addiu $s5, %lo(gEntityVtableIndexArray) # addiu $s5, $s5, -0x23b0 /* 213F40 801DDC90 162D0060 */ bne $s1, $t5, .L801DDE14_ovl16 /* 213F44 801DDC94 24140001 */ li $s4, 1 /* 213F48 801DDC98 8E0E0018 */ lw $t6, 0x18($s0) diff --git a/asm/non_matchings/ovl16/ovl16/func_801DE8DC_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DE8DC_ovl16.s index f03e2d20..7694eb8c 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DE8DC_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DE8DC_ovl16.s @@ -103,9 +103,9 @@ glabel func_801DE8DC_ovl16 /* 214D20 801DEA70 AC227098 */ sw $v0, %lo(D_800D7098)($at) /* 214D24 801DEA74 8F2C0000 */ lw $t4, ($t9) /* 214D28 801DEA78 8FBF0014 */ lw $ra, 0x14($sp) -/* 214D2C 801DEA7C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 214D2C 801DEA7C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 214D30 801DEA80 000C4880 */ sll $t1, $t4, 2 /* 214D34 801DEA84 00290821 */ addu $at, $at, $t1 -/* 214D38 801DEA88 AC22DC50 */ sw $v0, %lo(D_800DDC50)($at) +/* 214D38 801DEA88 AC22DC50 */ sw $v0, %lo(gEntityVtableIndexArray)($at) /* 214D3C 801DEA8C 03E00008 */ jr $ra /* 214D40 801DEA90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl16/ovl16/func_801DEAE0_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DEAE0_ovl16.s index c9333fb0..926af2c8 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DEAE0_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DEAE0_ovl16.s @@ -111,25 +111,25 @@ glabel func_801DEAE0_ovl16 /* 214F40 801DEC90 3C058005 */ lui $a1, %hi(D_8004A7C4) # $a1, 0x8005 /* 214F44 801DEC94 24A5A7C4 */ addiu $a1, %lo(D_8004A7C4) # addiu $a1, $a1, -0x583c /* 214F48 801DEC98 8CAF0000 */ lw $t7, ($a1) -/* 214F4C 801DEC9C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 214F4C 801DEC9C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 214F50 801DECA0 240A0022 */ li $t2, 34 /* 214F54 801DECA4 8DF80000 */ lw $t8, ($t7) /* 214F58 801DECA8 00184080 */ sll $t0, $t8, 2 /* 214F5C 801DECAC 00280821 */ addu $at, $at, $t0 /* 214F60 801DECB0 1000000C */ b .L801DECE4_ovl16 -/* 214F64 801DECB4 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 214F64 801DECB4 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) .L801DECB8_ovl16: /* 214F68 801DECB8 0C002DAF */ jal func_8000B6BC /* 214F6C 801DECBC 2404001E */ li $a0, 30 /* 214F70 801DECC0 3C058005 */ lui $a1, %hi(D_8004A7C4) # $a1, 0x8005 /* 214F74 801DECC4 24A5A7C4 */ addiu $a1, %lo(D_8004A7C4) # addiu $a1, $a1, -0x583c /* 214F78 801DECC8 8CAE0000 */ lw $t6, ($a1) -/* 214F7C 801DECCC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 214F7C 801DECCC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 214F80 801DECD0 24190002 */ li $t9, 2 /* 214F84 801DECD4 8DC90000 */ lw $t1, ($t6) /* 214F88 801DECD8 00095880 */ sll $t3, $t1, 2 /* 214F8C 801DECDC 002B0821 */ addu $at, $at, $t3 -/* 214F90 801DECE0 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 214F90 801DECE0 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) .L801DECE4_ovl16: /* 214F94 801DECE4 8FBF0014 */ lw $ra, 0x14($sp) /* 214F98 801DECE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl16/ovl16/func_801DED40_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DED40_ovl16.s index 54cecd72..0a4076b2 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DED40_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DED40_ovl16.s @@ -381,7 +381,7 @@ glabel func_801DED40_ovl16 /* 21558C 801DF2DC AC2098E0 */ sw $zero, %lo(D_800E98E0)($at) /* 215590 801DF2E0 8E6D0004 */ lw $t5, 4($s3) /* 215594 801DF2E4 8C8C0000 */ lw $t4, ($a0) -/* 215598 801DF2E8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 215598 801DF2E8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21559C 801DF2EC 000D7080 */ sll $t6, $t5, 2 /* 2155A0 801DF2F0 01EE7821 */ addu $t7, $t7, $t6 /* 2155A4 801DF2F4 8DEFF7F4 */ lw $t7, %lo(D_801EF7F4_ovl16)($t7) @@ -391,4 +391,4 @@ glabel func_801DED40_ovl16 /* 2155B4 801DF304 8FB00018 */ lw $s0, 0x18($sp) /* 2155B8 801DF308 27BD0030 */ addiu $sp, $sp, 0x30 /* 2155BC 801DF30C 03E00008 */ jr $ra -/* 2155C0 801DF310 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 2155C0 801DF310 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801DFC4C_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DFC4C_ovl16.s index 87cba9e0..7ac450c1 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DFC4C_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DFC4C_ovl16.s @@ -57,10 +57,10 @@ glabel func_801DFC4C_ovl16 /* 215FD0 801DFD20 8FBF001C */ lw $ra, 0x1c($sp) /* 215FD4 801DFD24 0329C821 */ addu $t9, $t9, $t1 /* 215FD8 801DFD28 8F39F864 */ lw $t9, %lo(D_801EF864_ovl16)($t9) -/* 215FDC 801DFD2C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 215FDC 801DFD2C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 215FE0 801DFD30 000B6080 */ sll $t4, $t3, 2 /* 215FE4 801DFD34 002C0821 */ addu $at, $at, $t4 /* 215FE8 801DFD38 8FB00018 */ lw $s0, 0x18($sp) /* 215FEC 801DFD3C 27BD0020 */ addiu $sp, $sp, 0x20 /* 215FF0 801DFD40 03E00008 */ jr $ra -/* 215FF4 801DFD44 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 215FF4 801DFD44 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801DFF40_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801DFF40_ovl16.s index da9a4579..5f9a09bb 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801DFF40_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801DFF40_ovl16.s @@ -288,7 +288,7 @@ glabel func_801DFF40_ovl16 /* 216640 801E0390 AFA80058 */ sw $t0, 0x58($sp) /* 216644 801E0394 8E2B0000 */ lw $t3, ($s1) /* 216648 801E0398 8FBF0054 */ lw $ra, 0x54($sp) -/* 21664C 801E039C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21664C 801E039C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 216650 801E03A0 8D6C0000 */ lw $t4, ($t3) /* 216654 801E03A4 240A0007 */ li $t2, 7 /* 216658 801E03A8 8FB10034 */ lw $s1, 0x34($sp) @@ -305,6 +305,6 @@ glabel func_801DFF40_ovl16 /* 216684 801E03D4 8FB60048 */ lw $s6, 0x48($sp) /* 216688 801E03D8 8FB7004C */ lw $s7, 0x4c($sp) /* 21668C 801E03DC 8FBE0050 */ lw $fp, 0x50($sp) -/* 216690 801E03E0 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 216690 801E03E0 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 216694 801E03E4 03E00008 */ jr $ra /* 216698 801E03E8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E0820_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E0820_ovl16.s index 65b6f924..933d0756 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E0820_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E0820_ovl16.s @@ -287,7 +287,7 @@ glabel func_801E0820_ovl16 /* 216F1C 801E0C6C AFA90058 */ sw $t1, 0x58($sp) /* 216F20 801E0C70 8E2C0000 */ lw $t4, ($s1) /* 216F24 801E0C74 8FBF0054 */ lw $ra, 0x54($sp) -/* 216F28 801E0C78 3C01800E */ lui $at, %hi(D_800DDC50) +/* 216F28 801E0C78 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 216F2C 801E0C7C 8D8D0000 */ lw $t5, ($t4) /* 216F30 801E0C80 240B0007 */ li $t3, 7 /* 216F34 801E0C84 8FB10034 */ lw $s1, 0x34($sp) @@ -304,6 +304,6 @@ glabel func_801E0820_ovl16 /* 216F60 801E0CB0 8FB60048 */ lw $s6, 0x48($sp) /* 216F64 801E0CB4 8FB7004C */ lw $s7, 0x4c($sp) /* 216F68 801E0CB8 8FBE0050 */ lw $fp, 0x50($sp) -/* 216F6C 801E0CBC AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 216F6C 801E0CBC AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 216F70 801E0CC0 03E00008 */ jr $ra /* 216F74 801E0CC4 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E0F04_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E0F04_ovl16.s index f9e868ee..9de5cf01 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E0F04_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E0F04_ovl16.s @@ -322,7 +322,7 @@ glabel func_801E0F04_ovl16 /* 217694 801E13E4 34840482 */ ori $a0, (0x00010482 & 0xFFFF) # ori $a0, $a0, 0x482 /* 217698 801E13E8 8E4E0000 */ lw $t6, ($s2) /* 21769C 801E13EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 2176A0 801E13F0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2176A0 801E13F0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2176A4 801E13F4 8DD90000 */ lw $t9, ($t6) /* 2176A8 801E13F8 240F0007 */ li $t7, 7 /* 2176AC 801E13FC 8FB20020 */ lw $s2, 0x20($sp) @@ -330,6 +330,6 @@ glabel func_801E0F04_ovl16 /* 2176B4 801E1404 002A0821 */ addu $at, $at, $t2 /* 2176B8 801E1408 8FB00018 */ lw $s0, 0x18($sp) /* 2176BC 801E140C 8FB1001C */ lw $s1, 0x1c($sp) -/* 2176C0 801E1410 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 2176C0 801E1410 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 2176C4 801E1414 03E00008 */ jr $ra /* 2176C8 801E1418 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E16F8_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E16F8_ovl16.s index ac1217e8..ea3d2527 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E16F8_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E16F8_ovl16.s @@ -50,10 +50,10 @@ glabel func_801E16F8_ovl16 /* 217A68 801E17B8 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 217A6C 801E17BC 8D2A0000 */ lw $t2, ($t1) /* 217A70 801E17C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 217A74 801E17C4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 217A74 801E17C4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 217A78 801E17C8 000A5880 */ sll $t3, $t2, 2 /* 217A7C 801E17CC 002B0821 */ addu $at, $at, $t3 /* 217A80 801E17D0 24080021 */ li $t0, 33 -/* 217A84 801E17D4 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 217A84 801E17D4 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 217A88 801E17D8 03E00008 */ jr $ra /* 217A8C 801E17DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E18BC_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E18BC_ovl16.s index 7a5f9ef2..99951a6f 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E18BC_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E18BC_ovl16.s @@ -218,12 +218,12 @@ glabel func_801E18BC_ovl16 .L801E1BF0_ovl16: /* 217EA0 801E1BF0 8C6A0000 */ lw $t2, ($v1) /* 217EA4 801E1BF4 8FBF001C */ lw $ra, 0x1c($sp) -/* 217EA8 801E1BF8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 217EA8 801E1BF8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 217EAC 801E1BFC 000A5880 */ sll $t3, $t2, 2 /* 217EB0 801E1C00 002B0821 */ addu $at, $at, $t3 /* 217EB4 801E1C04 24090007 */ li $t1, 7 /* 217EB8 801E1C08 8FB00014 */ lw $s0, 0x14($sp) /* 217EBC 801E1C0C 8FB10018 */ lw $s1, 0x18($sp) -/* 217EC0 801E1C10 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 217EC0 801E1C10 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 217EC4 801E1C14 03E00008 */ jr $ra /* 217EC8 801E1C18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E1E84_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E1E84_ovl16.s index 92659cc3..178d9ca7 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E1E84_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E1E84_ovl16.s @@ -40,9 +40,9 @@ glabel func_801E1E84_ovl16 /* 2181CC 801E1F1C 8FBF0014 */ lw $ra, 0x14($sp) /* 2181D0 801E1F20 01184021 */ addu $t0, $t0, $t8 /* 2181D4 801E1F24 8D08F914 */ lw $t0, %lo(D_801EF914_ovl16)($t0) -/* 2181D8 801E1F28 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2181D8 801E1F28 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2181DC 801E1F2C 00195080 */ sll $t2, $t9, 2 /* 2181E0 801E1F30 002A0821 */ addu $at, $at, $t2 /* 2181E4 801E1F34 27BD0018 */ addiu $sp, $sp, 0x18 /* 2181E8 801E1F38 03E00008 */ jr $ra -/* 2181EC 801E1F3C AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 2181EC 801E1F3C AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E20D8_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E20D8_ovl16.s index 3b7d16e2..30f89d66 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E20D8_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E20D8_ovl16.s @@ -465,12 +465,12 @@ glabel func_801E20D8_ovl16 /* 218AA0 801E27F0 E5520048 */ swc1 $f18, 0x48($t2) /* 218AA4 801E27F4 8E0C0000 */ lw $t4, ($s0) /* 218AA8 801E27F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 218AAC 801E27FC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 218AAC 801E27FC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 218AB0 801E2800 8D8D0000 */ lw $t5, ($t4) /* 218AB4 801E2804 240B000B */ li $t3, 11 /* 218AB8 801E2808 8FB00018 */ lw $s0, 0x18($sp) /* 218ABC 801E280C 000D7880 */ sll $t7, $t5, 2 /* 218AC0 801E2810 002F0821 */ addu $at, $at, $t7 -/* 218AC4 801E2814 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 218AC4 801E2814 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 218AC8 801E2818 03E00008 */ jr $ra /* 218ACC 801E281C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E2960_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E2960_ovl16.s index 635d9201..8ac2e3c1 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E2960_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E2960_ovl16.s @@ -42,10 +42,10 @@ glabel func_801E2960_ovl16 /* 218CB0 801E2A00 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 218CB4 801E2A04 8D090000 */ lw $t1, ($t0) /* 218CB8 801E2A08 8FBF0014 */ lw $ra, 0x14($sp) -/* 218CBC 801E2A0C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 218CBC 801E2A0C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 218CC0 801E2A10 00095080 */ sll $t2, $t1, 2 /* 218CC4 801E2A14 002A0821 */ addu $at, $at, $t2 /* 218CC8 801E2A18 24190021 */ li $t9, 33 -/* 218CCC 801E2A1C AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 218CCC 801E2A1C AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 218CD0 801E2A20 03E00008 */ jr $ra /* 218CD4 801E2A24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E2B08_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E2B08_ovl16.s index 7ae3a720..46be2577 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E2B08_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E2B08_ovl16.s @@ -77,7 +77,7 @@ glabel func_801E2B08_ovl16 /* 218EE4 801E2C34 000A5880 */ sll $t3, $t2, 2 /* 218EE8 801E2C38 004B6021 */ addu $t4, $v0, $t3 /* 218EEC 801E2C3C 8D8D0000 */ lw $t5, ($t4) -/* 218EF0 801E2C40 3C01800E */ lui $at, %hi(D_800DDC50) +/* 218EF0 801E2C40 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 218EF4 801E2C44 240B000B */ li $t3, 11 /* 218EF8 801E2C48 8DAF0010 */ lw $t7, 0x10($t5) /* 218EFC 801E2C4C E5E00040 */ swc1 $f0, 0x40($t7) @@ -95,4 +95,4 @@ glabel func_801E2B08_ovl16 /* 218F2C 801E2C7C 000D7880 */ sll $t7, $t5, 2 /* 218F30 801E2C80 002F0821 */ addu $at, $at, $t7 /* 218F34 801E2C84 03E00008 */ jr $ra -/* 218F38 801E2C88 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 218F38 801E2C88 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E2D88_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E2D88_ovl16.s index b7821018..c5680fdc 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E2D88_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E2D88_ovl16.s @@ -40,9 +40,9 @@ glabel func_801E2D88_ovl16 /* 2190D0 801E2E20 8FBF0014 */ lw $ra, 0x14($sp) /* 2190D4 801E2E24 01184021 */ addu $t0, $t0, $t8 /* 2190D8 801E2E28 8D08F920 */ lw $t0, %lo(D_801EF920_ovl16)($t0) -/* 2190DC 801E2E2C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2190DC 801E2E2C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2190E0 801E2E30 00195080 */ sll $t2, $t9, 2 /* 2190E4 801E2E34 002A0821 */ addu $at, $at, $t2 /* 2190E8 801E2E38 27BD0018 */ addiu $sp, $sp, 0x18 /* 2190EC 801E2E3C 03E00008 */ jr $ra -/* 2190F0 801E2E40 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 2190F0 801E2E40 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E2E44_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E2E44_ovl16.s index 34a34936..00872fd4 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E2E44_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E2E44_ovl16.s @@ -211,7 +211,7 @@ glabel func_801E2E44_ovl16 /* 219404 801E3154 AC289AA0 */ sw $t0, %lo(D_800E9AA0)($at) /* 219408 801E3158 8CAA0000 */ lw $t2, ($a1) /* 21940C 801E315C 8FBF0044 */ lw $ra, 0x44($sp) -/* 219410 801E3160 3C01800E */ lui $at, %hi(D_800DDC50) +/* 219410 801E3160 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 219414 801E3164 000A5880 */ sll $t3, $t2, 2 /* 219418 801E3168 002B0821 */ addu $at, $at, $t3 /* 21941C 801E316C 2409000F */ li $t1, 15 @@ -225,6 +225,6 @@ glabel func_801E2E44_ovl16 /* 21943C 801E318C 8FB60038 */ lw $s6, 0x38($sp) /* 219440 801E3190 8FB7003C */ lw $s7, 0x3c($sp) /* 219444 801E3194 8FBE0040 */ lw $fp, 0x40($sp) -/* 219448 801E3198 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 219448 801E3198 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 21944C 801E319C 03E00008 */ jr $ra /* 219450 801E31A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E3284_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E3284_ovl16.s index 74966953..0bf21905 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E3284_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E3284_ovl16.s @@ -12,8 +12,8 @@ glabel func_801E3284_ovl16 /* 21955C 801E32AC 3C01800D */ lui $at, %hi(D_800D70A8) # $at, 0x800d /* 219560 801E32B0 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 219564 801E32B4 8C480000 */ lw $t0, ($v0) -/* 219568 801E32B8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 219568 801E32B8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21956C 801E32BC 00084880 */ sll $t1, $t0, 2 /* 219570 801E32C0 00290821 */ addu $at, $at, $t1 /* 219574 801E32C4 03E00008 */ jr $ra -/* 219578 801E32C8 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 219578 801E32C8 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E33AC_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E33AC_ovl16.s index d8a6671d..3108c4d0 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E33AC_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E33AC_ovl16.s @@ -55,8 +55,8 @@ glabel func_801E33AC_ovl16 /* 219730 801E3480 00230821 */ addu $at, $at, $v1 /* 219734 801E3484 E4283AD0 */ swc1 $f8, %lo(D_800E3AD0)($at) /* 219738 801E3488 8C4D0000 */ lw $t5, ($v0) -/* 21973C 801E348C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21973C 801E348C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 219740 801E3490 000D7880 */ sll $t7, $t5, 2 /* 219744 801E3494 002F0821 */ addu $at, $at, $t7 /* 219748 801E3498 03E00008 */ jr $ra -/* 21974C 801E349C AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 21974C 801E349C AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E3518_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E3518_ovl16.s index e5b6c555..d00d1295 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E3518_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E3518_ovl16.s @@ -40,9 +40,9 @@ glabel func_801E3518_ovl16 /* 219860 801E35B0 8FBF0014 */ lw $ra, 0x14($sp) /* 219864 801E35B4 01184021 */ addu $t0, $t0, $t8 /* 219868 801E35B8 8D08F92C */ lw $t0, %lo(D_801EF92C_ovl16)($t0) -/* 21986C 801E35BC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21986C 801E35BC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 219870 801E35C0 00195080 */ sll $t2, $t9, 2 /* 219874 801E35C4 002A0821 */ addu $at, $at, $t2 /* 219878 801E35C8 27BD0018 */ addiu $sp, $sp, 0x18 /* 21987C 801E35CC 03E00008 */ jr $ra -/* 219880 801E35D0 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 219880 801E35D0 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E35D4_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E35D4_ovl16.s index e43cde84..770404ec 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E35D4_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E35D4_ovl16.s @@ -478,7 +478,7 @@ glabel func_801E35D4_ovl16 /* 219F48 801E3C98 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 /* 219F4C 801E3C9C 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6) /* 219F50 801E3CA0 8FBF004C */ lw $ra, 0x4c($sp) -/* 219F54 801E3CA4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 219F54 801E3CA4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 219F58 801E3CA8 8DCC0000 */ lw $t4, ($t6) /* 219F5C 801E3CAC 240B0013 */ li $t3, 19 /* 219F60 801E3CB0 D7B40018 */ ldc1 $f20, 0x18($sp) @@ -494,6 +494,6 @@ glabel func_801E35D4_ovl16 /* 219F88 801E3CD8 8FB60040 */ lw $s6, 0x40($sp) /* 219F8C 801E3CDC 8FB70044 */ lw $s7, 0x44($sp) /* 219F90 801E3CE0 8FBE0048 */ lw $fp, 0x48($sp) -/* 219F94 801E3CE4 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 219F94 801E3CE4 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 219F98 801E3CE8 03E00008 */ jr $ra /* 219F9C 801E3CEC 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E4024_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E4024_ovl16.s index f244c1ad..652f42d7 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E4024_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E4024_ovl16.s @@ -12,8 +12,8 @@ glabel func_801E4024_ovl16 /* 21A2FC 801E404C 3C01800D */ lui $at, %hi(D_800D70A8) # $at, 0x800d /* 21A300 801E4050 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 21A304 801E4054 8C480000 */ lw $t0, ($v0) -/* 21A308 801E4058 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21A308 801E4058 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21A30C 801E405C 00084880 */ sll $t1, $t0, 2 /* 21A310 801E4060 00290821 */ addu $at, $at, $t1 /* 21A314 801E4064 03E00008 */ jr $ra -/* 21A318 801E4068 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 21A318 801E4068 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E4148_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E4148_ovl16.s index 7ee9c25f..0a4f03ae 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E4148_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E4148_ovl16.s @@ -119,7 +119,7 @@ glabel func_801E4148_ovl16 /* 21A5BC 801E430C 3C0D8005 */ lui $t5, %hi(D_8004A7C4) # $t5, 0x8005 /* 21A5C0 801E4310 8DADA7C4 */ lw $t5, %lo(D_8004A7C4)($t5) /* 21A5C4 801E4314 8FBF0034 */ lw $ra, 0x34($sp) -/* 21A5C8 801E4318 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21A5C8 801E4318 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21A5CC 801E431C 8DAF0000 */ lw $t7, ($t5) /* 21A5D0 801E4320 240C0013 */ li $t4, 19 /* 21A5D4 801E4324 D7B40010 */ ldc1 $f20, 0x10($sp) @@ -130,6 +130,6 @@ glabel func_801E4148_ovl16 /* 21A5E8 801E4338 8FB10028 */ lw $s1, 0x28($sp) /* 21A5EC 801E433C 8FB2002C */ lw $s2, 0x2c($sp) /* 21A5F0 801E4340 8FB30030 */ lw $s3, 0x30($sp) -/* 21A5F4 801E4344 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 21A5F4 801E4344 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 21A5F8 801E4348 03E00008 */ jr $ra /* 21A5FC 801E434C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E4698_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E4698_ovl16.s index f9d3695b..35f705a0 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E4698_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E4698_ovl16.s @@ -40,9 +40,9 @@ glabel func_801E4698_ovl16 /* 21A9E0 801E4730 8FBF0014 */ lw $ra, 0x14($sp) /* 21A9E4 801E4734 01184021 */ addu $t0, $t0, $t8 /* 21A9E8 801E4738 8D08F9B4 */ lw $t0, %lo(D_801EF9B4_ovl16)($t0) -/* 21A9EC 801E473C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21A9EC 801E473C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21A9F0 801E4740 00195080 */ sll $t2, $t9, 2 /* 21A9F4 801E4744 002A0821 */ addu $at, $at, $t2 /* 21A9F8 801E4748 27BD0018 */ addiu $sp, $sp, 0x18 /* 21A9FC 801E474C 03E00008 */ jr $ra -/* 21AA00 801E4750 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 21AA00 801E4750 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E4754_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E4754_ovl16.s index 9c6cca47..a513da64 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E4754_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E4754_ovl16.s @@ -805,12 +805,12 @@ glabel func_801E4754_ovl16 /* 21B60C 801E535C 00280821 */ addu $at, $at, $t0 /* 21B610 801E5360 AC209FE0 */ sw $zero, %lo(D_800E9FE0)($at) /* 21B614 801E5364 8C6A0000 */ lw $t2, ($v1) -/* 21B618 801E5368 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21B618 801E5368 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21B61C 801E536C 8FB10024 */ lw $s1, 0x24($sp) /* 21B620 801E5370 000A6880 */ sll $t5, $t2, 2 /* 21B624 801E5374 002D0821 */ addu $at, $at, $t5 /* 21B628 801E5378 8FB00020 */ lw $s0, 0x20($sp) /* 21B62C 801E537C D7B40018 */ ldc1 $f20, 0x18($sp) -/* 21B630 801E5380 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 21B630 801E5380 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 21B634 801E5384 03E00008 */ jr $ra /* 21B638 801E5388 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E5734_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E5734_ovl16.s index 7d6cdd69..90d2372e 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E5734_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E5734_ovl16.s @@ -42,10 +42,10 @@ glabel func_801E5734_ovl16 /* 21BA84 801E57D4 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 21BA88 801E57D8 8D090000 */ lw $t1, ($t0) /* 21BA8C 801E57DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 21BA90 801E57E0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21BA90 801E57E0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21BA94 801E57E4 00095080 */ sll $t2, $t1, 2 /* 21BA98 801E57E8 002A0821 */ addu $at, $at, $t2 /* 21BA9C 801E57EC 24190021 */ li $t9, 33 -/* 21BAA0 801E57F0 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 21BAA0 801E57F0 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 21BAA4 801E57F4 03E00008 */ jr $ra /* 21BAA8 801E57F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E58D8_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E58D8_ovl16.s index d11c2d15..3b488c5c 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E58D8_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E58D8_ovl16.s @@ -49,8 +49,8 @@ glabel func_801E58D8_ovl16 /* 21BC44 801E5994 00230821 */ addu $at, $at, $v1 /* 21BC48 801E5998 E4283AD0 */ swc1 $f8, %lo(D_800E3AD0)($at) /* 21BC4C 801E599C 8C4A0000 */ lw $t2, ($v0) -/* 21BC50 801E59A0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21BC50 801E59A0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21BC54 801E59A4 000A5880 */ sll $t3, $t2, 2 /* 21BC58 801E59A8 002B0821 */ addu $at, $at, $t3 /* 21BC5C 801E59AC 03E00008 */ jr $ra -/* 21BC60 801E59B0 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 21BC60 801E59B0 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E5A28_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E5A28_ovl16.s index 3f7b5f05..09fb51b0 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E5A28_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E5A28_ovl16.s @@ -40,9 +40,9 @@ glabel func_801E5A28_ovl16 /* 21BD70 801E5AC0 8FBF0014 */ lw $ra, 0x14($sp) /* 21BD74 801E5AC4 01184021 */ addu $t0, $t0, $t8 /* 21BD78 801E5AC8 8D08F9D8 */ lw $t0, %lo(D_801EF9D8_ovl16)($t0) -/* 21BD7C 801E5ACC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21BD7C 801E5ACC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21BD80 801E5AD0 00195080 */ sll $t2, $t9, 2 /* 21BD84 801E5AD4 002A0821 */ addu $at, $at, $t2 /* 21BD88 801E5AD8 27BD0018 */ addiu $sp, $sp, 0x18 /* 21BD8C 801E5ADC 03E00008 */ jr $ra -/* 21BD90 801E5AE0 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 21BD90 801E5AE0 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E5AE4_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E5AE4_ovl16.s index 2c369e19..8bc5607e 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E5AE4_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E5AE4_ovl16.s @@ -503,7 +503,7 @@ glabel func_801E5AE4_ovl16 /* 21C508 801E6258 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 21C50C 801E625C 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) /* 21C510 801E6260 8FBF006C */ lw $ra, 0x6c($sp) -/* 21C514 801E6264 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21C514 801E6264 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21C518 801E6268 8C580000 */ lw $t8, ($v0) /* 21C51C 801E626C 240F001B */ li $t7, 27 /* 21C520 801E6270 D7B40018 */ ldc1 $f20, 0x18($sp) @@ -523,6 +523,6 @@ glabel func_801E5AE4_ovl16 /* 21C558 801E62A8 8FB60060 */ lw $s6, 0x60($sp) /* 21C55C 801E62AC 8FB70064 */ lw $s7, 0x64($sp) /* 21C560 801E62B0 8FBE0068 */ lw $fp, 0x68($sp) -/* 21C564 801E62B4 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 21C564 801E62B4 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 21C568 801E62B8 03E00008 */ jr $ra /* 21C56C 801E62BC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E68E0_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E68E0_ovl16.s index a79317d2..e03bff74 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E68E0_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E68E0_ovl16.s @@ -42,10 +42,10 @@ glabel func_801E68E0_ovl16 /* 21CC30 801E6980 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 21CC34 801E6984 8D090000 */ lw $t1, ($t0) /* 21CC38 801E6988 8FBF0014 */ lw $ra, 0x14($sp) -/* 21CC3C 801E698C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21CC3C 801E698C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21CC40 801E6990 00095080 */ sll $t2, $t1, 2 /* 21CC44 801E6994 002A0821 */ addu $at, $at, $t2 /* 21CC48 801E6998 24190021 */ li $t9, 33 -/* 21CC4C 801E699C AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 21CC4C 801E699C AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 21CC50 801E69A0 03E00008 */ jr $ra /* 21CC54 801E69A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E6A84_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E6A84_ovl16.s index 0452d83a..050ab98c 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E6A84_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E6A84_ovl16.s @@ -49,8 +49,8 @@ glabel func_801E6A84_ovl16 /* 21CDF0 801E6B40 00230821 */ addu $at, $at, $v1 /* 21CDF4 801E6B44 E4283AD0 */ swc1 $f8, %lo(D_800E3AD0)($at) /* 21CDF8 801E6B48 8C4A0000 */ lw $t2, ($v0) -/* 21CDFC 801E6B4C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21CDFC 801E6B4C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21CE00 801E6B50 000A5880 */ sll $t3, $t2, 2 /* 21CE04 801E6B54 002B0821 */ addu $at, $at, $t3 /* 21CE08 801E6B58 03E00008 */ jr $ra -/* 21CE0C 801E6B5C AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 21CE0C 801E6B5C AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E6BD4_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E6BD4_ovl16.s index 894c731d..9dba13bc 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E6BD4_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E6BD4_ovl16.s @@ -40,9 +40,9 @@ glabel func_801E6BD4_ovl16 /* 21CF1C 801E6C6C 8FBF0014 */ lw $ra, 0x14($sp) /* 21CF20 801E6C70 01184021 */ addu $t0, $t0, $t8 /* 21CF24 801E6C74 8D08F9F8 */ lw $t0, %lo(D_801EF9F8_ovl16)($t0) -/* 21CF28 801E6C78 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21CF28 801E6C78 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21CF2C 801E6C7C 00195080 */ sll $t2, $t9, 2 /* 21CF30 801E6C80 002A0821 */ addu $at, $at, $t2 /* 21CF34 801E6C84 27BD0018 */ addiu $sp, $sp, 0x18 /* 21CF38 801E6C88 03E00008 */ jr $ra -/* 21CF3C 801E6C8C AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 21CF3C 801E6C8C AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E6E0C_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E6E0C_ovl16.s index 57e96fcf..631eb455 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E6E0C_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E6E0C_ovl16.s @@ -135,7 +135,7 @@ glabel func_801E6E0C_ovl16 /* 21D2B8 801E7008 AD6A0000 */ sw $t2, ($t3) /* 21D2BC 801E700C 8C6D0000 */ lw $t5, ($v1) /* 21D2C0 801E7010 8FBF003C */ lw $ra, 0x3c($sp) -/* 21D2C4 801E7014 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21D2C4 801E7014 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21D2C8 801E7018 000D7880 */ sll $t7, $t5, 2 /* 21D2CC 801E701C 002F0821 */ addu $at, $at, $t7 /* 21D2D0 801E7020 240C001F */ li $t4, 31 @@ -148,6 +148,6 @@ glabel func_801E6E0C_ovl16 /* 21D2EC 801E703C 8FB10020 */ lw $s1, 0x20($sp) /* 21D2F0 801E7040 8FB0001C */ lw $s0, 0x1c($sp) /* 21D2F4 801E7044 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 21D2F8 801E7048 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 21D2F8 801E7048 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 21D2FC 801E704C 03E00008 */ jr $ra /* 21D300 801E7050 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/ovl16/ovl16/func_801E72C4_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E72C4_ovl16.s index 1f0d7ea0..8f976dd4 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E72C4_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E72C4_ovl16.s @@ -12,8 +12,8 @@ glabel func_801E72C4_ovl16 /* 21D59C 801E72EC 3C01800D */ lui $at, %hi(D_800D70A8) # $at, 0x800d /* 21D5A0 801E72F0 AC2070A8 */ sw $zero, %lo(D_800D70A8)($at) /* 21D5A4 801E72F4 8C480000 */ lw $t0, ($v0) -/* 21D5A8 801E72F8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21D5A8 801E72F8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21D5AC 801E72FC 00084880 */ sll $t1, $t0, 2 /* 21D5B0 801E7300 00290821 */ addu $at, $at, $t1 /* 21D5B4 801E7304 03E00008 */ jr $ra -/* 21D5B8 801E7308 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 21D5B8 801E7308 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E74E8_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E74E8_ovl16.s index 4a09fdeb..17f15c61 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E74E8_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E74E8_ovl16.s @@ -55,8 +55,8 @@ glabel func_801E74E8_ovl16 /* 21D86C 801E75BC 00230821 */ addu $at, $at, $v1 /* 21D870 801E75C0 E4283AD0 */ swc1 $f8, %lo(D_800E3AD0)($at) /* 21D874 801E75C4 8C4D0000 */ lw $t5, ($v0) -/* 21D878 801E75C8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21D878 801E75C8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21D87C 801E75CC 000D7880 */ sll $t7, $t5, 2 /* 21D880 801E75D0 002F0821 */ addu $at, $at, $t7 /* 21D884 801E75D4 03E00008 */ jr $ra -/* 21D888 801E75D8 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 21D888 801E75D8 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/non_matchings/ovl16/ovl16/func_801E7650_ovl16.s b/asm/non_matchings/ovl16/ovl16/func_801E7650_ovl16.s index b98cbca8..a0699270 100644 --- a/asm/non_matchings/ovl16/ovl16/func_801E7650_ovl16.s +++ b/asm/non_matchings/ovl16/ovl16/func_801E7650_ovl16.s @@ -126,7 +126,7 @@ glabel func_801E7650_ovl16 /* 21DAE8 801E7838 44818000 */ mtc1 $at, $f16 /* 21DAEC 801E783C 8E8E0080 */ lw $t6, 0x80($s4) /* 21DAF0 801E7840 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 -/* 21DAF4 801E7844 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21DAF4 801E7844 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21DAF8 801E7848 E5D00010 */ swc1 $f16, 0x10($t6) /* 21DAFC 801E784C AE60002C */ sw $zero, 0x2c($s3) /* 21DB00 801E7850 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) @@ -141,6 +141,6 @@ glabel func_801E7650_ovl16 /* 21DB24 801E7874 8FB10024 */ lw $s1, 0x24($sp) /* 21DB28 801E7878 8FB00020 */ lw $s0, 0x20($sp) /* 21DB2C 801E787C D7B40018 */ ldc1 $f20, 0x18($sp) -/* 21DB30 801E7880 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 21DB30 801E7880 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 21DB34 801E7884 03E00008 */ jr $ra /* 21DB38 801E7888 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/ovl17/ovl17_last-0/func_801E4488_ovl17.s b/asm/non_matchings/ovl17/ovl17_last-0/func_801E4488_ovl17.s index 3bea1762..d71b3a54 100644 --- a/asm/non_matchings/ovl17/ovl17_last-0/func_801E4488_ovl17.s +++ b/asm/non_matchings/ovl17/ovl17_last-0/func_801E4488_ovl17.s @@ -60,9 +60,9 @@ glabel func_801E4488_ovl17 /* 22F754 801E4564 10810020 */ beq $a0, $at, .L801E45E8_ovl17 /* 22F758 801E4568 00000000 */ nop /* 22F75C 801E456C 14860039 */ bne $a0, $a2, .L801E4654_ovl17 -/* 22F760 801E4570 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22F760 801E4570 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22F764 801E4574 00230821 */ addu $at, $at, $v1 -/* 22F768 801E4578 AC26DC50 */ sw $a2, %lo(D_800DDC50)($at) +/* 22F768 801E4578 AC26DC50 */ sw $a2, %lo(gEntityVtableIndexArray)($at) /* 22F76C 801E457C 8C4A0000 */ lw $t2, ($v0) /* 22F770 801E4580 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 22F774 801E4584 3C05801E */ lui $a1, %hi(func_801E40F4) # $a1, 0x801e @@ -96,11 +96,11 @@ glabel func_801E4488_ovl17 /* 22F7DC 801E45EC 00230821 */ addu $at, $at, $v1 /* 22F7E0 801E45F0 AC2C7CE0 */ sw $t4, %lo(D_800E7CE0)($at) /* 22F7E4 801E45F4 8C4A0000 */ lw $t2, ($v0) -/* 22F7E8 801E45F8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22F7E8 801E45F8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22F7EC 801E45FC 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 22F7F0 801E4600 000A7080 */ sll $t6, $t2, 2 /* 22F7F4 801E4604 002E0821 */ addu $at, $at, $t6 -/* 22F7F8 801E4608 AC2DDC50 */ sw $t5, %lo(D_800DDC50)($at) +/* 22F7F8 801E4608 AC2DDC50 */ sw $t5, %lo(gEntityVtableIndexArray)($at) /* 22F7FC 801E460C 8C580000 */ lw $t8, ($v0) /* 22F800 801E4610 3C05801E */ lui $a1, %hi(func_801E40F4) # $a1, 0x801e /* 22F804 801E4614 24A540F4 */ addiu $a1, %lo(func_801E40F4) # addiu $a1, $a1, 0x40f4 diff --git a/asm/non_matchings/ovl18/ovl18_1/func_802204F8_ovl18.s b/asm/non_matchings/ovl18/ovl18_1/func_802204F8_ovl18.s index 4e13ea19..ab1d924c 100644 --- a/asm/non_matchings/ovl18/ovl18_1/func_802204F8_ovl18.s +++ b/asm/non_matchings/ovl18/ovl18_1/func_802204F8_ovl18.s @@ -27,14 +27,14 @@ glabel func_802204F8_ovl18 /* 232EF8 80220558 10400010 */ beqz $v0, .L8022059C_ovl18 /* 232EFC 8022055C 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 232F00 80220560 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 232F04 80220564 3C01800E */ lui $at, %hi(D_800DDC50) +/* 232F04 80220564 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 232F08 80220568 240A0001 */ li $t2, 1 /* 232F0C 8022056C 8C4B0000 */ lw $t3, ($v0) /* 232F10 80220570 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 232F14 80220574 3C058022 */ lui $a1, %hi(func_802202B8_ovl18) # $a1, 0x8022 /* 232F18 80220578 000B6080 */ sll $t4, $t3, 2 /* 232F1C 8022057C 002C0821 */ addu $at, $at, $t4 -/* 232F20 80220580 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 232F20 80220580 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 232F24 80220584 8C4D0000 */ lw $t5, ($v0) /* 232F28 80220588 24A502B8 */ addiu $a1, %lo(func_802202B8_ovl18) # addiu $a1, $a1, 0x2b8 /* 232F2C 8022058C 000D7080 */ sll $t6, $t5, 2 diff --git a/asm/non_matchings/ovl18/ovl18_5/func_80224FCC_ovl18.s b/asm/non_matchings/ovl18/ovl18_5/func_80224FCC_ovl18.s index c7824ea9..588dde21 100644 --- a/asm/non_matchings/ovl18/ovl18_5/func_80224FCC_ovl18.s +++ b/asm/non_matchings/ovl18/ovl18_5/func_80224FCC_ovl18.s @@ -53,7 +53,7 @@ glabel func_80224FCC_ovl18 /* 237A2C 8022508C 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 237A30 80225090 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) /* 237A34 80225094 3C0A800F */ lui $t2, %hi(D_800E9E20) -/* 237A38 80225098 3C01800E */ lui $at, %hi(D_800DDC50) +/* 237A38 80225098 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 237A3C 8022509C 8C430000 */ lw $v1, ($v0) /* 237A40 802250A0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 237A44 802250A4 00031880 */ sll $v1, $v1, 2 @@ -62,7 +62,7 @@ glabel func_80224FCC_ovl18 /* 237A50 802250B0 00230821 */ addu $at, $at, $v1 /* 237A54 802250B4 5140000A */ beql $t2, $zero, .L802250E0_ovl18 /* 237A58 802250B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 237A5C 802250BC AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 237A5C 802250BC AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 237A60 802250C0 8C4B0000 */ lw $t3, ($v0) /* 237A64 802250C4 3C058022 */ lui $a1, %hi(func_80224B54_ovl18) # $a1, 0x8022 /* 237A68 802250C8 24A54B54 */ addiu $a1, %lo(func_80224B54_ovl18) # addiu $a1, $a1, 0x4b54 diff --git a/asm/non_matchings/ovl18/ovl18_5/func_80225724_ovl18.s b/asm/non_matchings/ovl18/ovl18_5/func_80225724_ovl18.s index 220b24d5..bc1b4915 100644 --- a/asm/non_matchings/ovl18/ovl18_5/func_80225724_ovl18.s +++ b/asm/non_matchings/ovl18/ovl18_5/func_80225724_ovl18.s @@ -11,11 +11,11 @@ glabel func_80225724_ovl18 /* 2380E8 80225748 004E2021 */ addu $a0, $v0, $t6 /* 2380EC 8022574C 8C850000 */ lw $a1, ($a0) /* 2380F0 80225750 240F0001 */ li $t7, 1 -/* 2380F4 80225754 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2380F4 80225754 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2380F8 80225758 14A0000D */ bnez $a1, .L80225790_ovl18 /* 2380FC 8022575C 24A8FFFF */ addiu $t0, $a1, -1 /* 238100 80225760 00220821 */ addu $at, $at, $v0 -/* 238104 80225764 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 238104 80225764 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 238108 80225768 8C780000 */ lw $t8, ($v1) /* 23810C 8022576C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 238110 80225770 3C058022 */ lui $a1, %hi(func_80225478_ovl18) # $a1, 0x8022 diff --git a/asm/non_matchings/ovl2_8/func_8011CFF4.s b/asm/non_matchings/ovl2_8/func_8011CFF4.s index 9ba749d5..2f6a5573 100644 --- a/asm/non_matchings/ovl2_8/func_8011CFF4.s +++ b/asm/non_matchings/ovl2_8/func_8011CFF4.s @@ -33,14 +33,14 @@ glabel func_8011CFF4 /* 0A5AD8 8011D068 50610021 */ beql $v1, $at, .L8011D0F0_ovl2 /* 0A5ADC 8011D06C 8FBF0014 */ lw $ra, 0x14($sp) /* 0A5AE0 8011D070 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 0A5AE4 8011D074 3C01800E */ lui $at, %hi(D_800DDC50) +/* 0A5AE4 8011D074 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 0A5AE8 8011D078 240CFFFF */ li $t4, -1 /* 0A5AEC 8011D07C 8C4A0000 */ lw $t2, ($v0) /* 0A5AF0 8011D080 3C0D800D */ lui $t5, %hi(D_800D6FB2) # $t5, 0x800d /* 0A5AF4 8011D084 3C058023 */ lui $a1, %hi(D_8022947C) # $a1, 0x8023 /* 0A5AF8 8011D088 000A5880 */ sll $t3, $t2, 2 /* 0A5AFC 8011D08C 002B0821 */ addu $at, $at, $t3 -/* 0A5B00 8011D090 AC23DC50 */ sw $v1, %lo(D_800DDC50)($at) +/* 0A5B00 8011D090 AC23DC50 */ sw $v1, %lo(gEntityVtableIndexArray)($at) /* 0A5B04 8011D094 AC8C0000 */ sw $t4, ($a0) /* 0A5B08 8011D098 95AD6FB2 */ lhu $t5, %lo(D_800D6FB2)($t5) /* 0A5B0C 8011D09C 24010002 */ li $at, 2 diff --git a/asm/non_matchings/ovl3/ovl3/func_80151E94_ovl3.s b/asm/non_matchings/ovl3/ovl3/func_80151E94_ovl3.s index 4d8e447a..4a0560f7 100644 --- a/asm/non_matchings/ovl3/ovl3/func_80151E94_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3/func_80151E94_ovl3.s @@ -16,7 +16,7 @@ # .word L8015202C_ovl3 .text -glabel func_80151E94_ovl3 +glabel ovl3_process_command_string /* 0B28D4 80151E94 3C0E800D */ lui $t6, %hi(D_800D6B54) # $t6, 0x800d /* 0B28D8 80151E98 8DCE6B54 */ lw $t6, %lo(D_800D6B54)($t6) /* 0B28DC 80151E9C 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -46,6 +46,7 @@ glabel func_80151E94_ovl3 /* 0B2934 80151EF4 8C386DD4 */ lw $t8, %lo(jtbl_80196DD4)($at) /* 0B2938 80151EF8 03000008 */ jr $t8 /* 0B293C 80151EFC 00000000 */ nop +.L80151F00_ovl3: /* 0B2940 80151F00 92190017 */ lbu $t9, 0x17($s0) /* 0B2944 80151F04 1720004C */ bnez $t9, .L80152038_ovl3 /* 0B2948 80151F08 00000000 */ nop @@ -53,6 +54,7 @@ glabel func_80151E94_ovl3 /* 0B2950 80151F10 AFA30024 */ sw $v1, 0x24($sp) /* 0B2954 80151F14 10000048 */ b .L80152038_ovl3 /* 0B2958 80151F18 8FA30024 */ lw $v1, 0x24($sp) +.L80151F1C_ovl3: /* 0B295C 80151F1C 92080017 */ lbu $t0, 0x17($s0) /* 0B2960 80151F20 15000045 */ bnez $t0, .L80152038_ovl3 /* 0B2964 80151F24 00000000 */ nop @@ -60,6 +62,7 @@ glabel func_80151E94_ovl3 /* 0B296C 80151F2C 00000000 */ nop /* 0B2970 80151F30 10000041 */ b .L80152038_ovl3 /* 0B2974 80151F34 00401825 */ move $v1, $v0 +.L80151F38_ovl3: /* 0B2978 80151F38 92090017 */ lbu $t1, 0x17($s0) /* 0B297C 80151F3C 1520003E */ bnez $t1, .L80152038_ovl3 /* 0B2980 80151F40 00000000 */ nop @@ -67,6 +70,7 @@ glabel func_80151E94_ovl3 /* 0B2988 80151F48 00000000 */ nop /* 0B298C 80151F4C 1000003A */ b .L80152038_ovl3 /* 0B2990 80151F50 00401825 */ move $v1, $v0 +.L80151F54_ovl3: /* 0B2994 80151F54 920A0017 */ lbu $t2, 0x17($s0) /* 0B2998 80151F58 15400037 */ bnez $t2, .L80152038_ovl3 /* 0B299C 80151F5C 00000000 */ nop @@ -74,6 +78,7 @@ glabel func_80151E94_ovl3 /* 0B29A4 80151F64 00000000 */ nop /* 0B29A8 80151F68 10000033 */ b .L80152038_ovl3 /* 0B29AC 80151F6C 00401825 */ move $v1, $v0 +.L80151F70_ovl3: /* 0B29B0 80151F70 920B0017 */ lbu $t3, 0x17($s0) /* 0B29B4 80151F74 15600030 */ bnez $t3, .L80152038_ovl3 /* 0B29B8 80151F78 00000000 */ nop @@ -81,6 +86,7 @@ glabel func_80151E94_ovl3 /* 0B29C0 80151F80 00000000 */ nop /* 0B29C4 80151F84 1000002C */ b .L80152038_ovl3 /* 0B29C8 80151F88 00401825 */ move $v1, $v0 +.L80151F8C_ovl3: /* 0B29CC 80151F8C 920C0017 */ lbu $t4, 0x17($s0) /* 0B29D0 80151F90 15800029 */ bnez $t4, .L80152038_ovl3 /* 0B29D4 80151F94 00000000 */ nop @@ -88,6 +94,7 @@ glabel func_80151E94_ovl3 /* 0B29DC 80151F9C 00000000 */ nop /* 0B29E0 80151FA0 10000025 */ b .L80152038_ovl3 /* 0B29E4 80151FA4 00401825 */ move $v1, $v0 +.L80151FA8_ovl3: /* 0B29E8 80151FA8 920D0017 */ lbu $t5, 0x17($s0) /* 0B29EC 80151FAC 15A00022 */ bnez $t5, .L80152038_ovl3 /* 0B29F0 80151FB0 00000000 */ nop @@ -95,6 +102,7 @@ glabel func_80151E94_ovl3 /* 0B29F8 80151FB8 00000000 */ nop /* 0B29FC 80151FBC 1000001E */ b .L80152038_ovl3 /* 0B2A00 80151FC0 00401825 */ move $v1, $v0 +.L80151FC4_ovl3: /* 0B2A04 80151FC4 920E0017 */ lbu $t6, 0x17($s0) /* 0B2A08 80151FC8 15C0001B */ bnez $t6, .L80152038_ovl3 /* 0B2A0C 80151FCC 00000000 */ nop @@ -102,6 +110,7 @@ glabel func_80151E94_ovl3 /* 0B2A14 80151FD4 00000000 */ nop /* 0B2A18 80151FD8 10000017 */ b .L80152038_ovl3 /* 0B2A1C 80151FDC 00401825 */ move $v1, $v0 +.L80151FE0_ovl3: /* 0B2A20 80151FE0 920F0017 */ lbu $t7, 0x17($s0) /* 0B2A24 80151FE4 15E00014 */ bnez $t7, .L80152038_ovl3 /* 0B2A28 80151FE8 00000000 */ nop @@ -109,18 +118,22 @@ glabel func_80151E94_ovl3 /* 0B2A30 80151FF0 00000000 */ nop /* 0B2A34 80151FF4 10000010 */ b .L80152038_ovl3 /* 0B2A38 80151FF8 00401825 */ move $v1, $v0 +.L80151FFC_ovl3: /* 0B2A3C 80151FFC 0C054675 */ jal func_801519D4_ovl3 /* 0B2A40 80152000 00000000 */ nop /* 0B2A44 80152004 1000000C */ b .L80152038_ovl3 /* 0B2A48 80152008 00401825 */ move $v1, $v0 +.L8015200C_ovl3: /* 0B2A4C 8015200C 0C0546BD */ jal func_80151AF4_ovl3 /* 0B2A50 80152010 00000000 */ nop /* 0B2A54 80152014 10000008 */ b .L80152038_ovl3 /* 0B2A58 80152018 00401825 */ move $v1, $v0 +.L8015201C_ovl3: /* 0B2A5C 8015201C 0C0546DE */ jal func_80151B78_ovl3 /* 0B2A60 80152020 00000000 */ nop /* 0B2A64 80152024 10000004 */ b .L80152038_ovl3 /* 0B2A68 80152028 00401825 */ move $v1, $v0 +.L8015202C_ovl3: /* 0B2A6C 8015202C 0C05471E */ jal func_80151C78_ovl3 /* 0B2A70 80152030 00000000 */ nop /* 0B2A74 80152034 00401825 */ move $v1, $v0 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016BF60_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016BF60_ovl3.s index 9f2f2090..5e889c9a 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016BF60_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016BF60_ovl3.s @@ -164,8 +164,8 @@ glabel func_8016BF60_ovl3 /* 0CCC04 8016C1C4 01A00008 */ jr $t5 /* 0CCC08 8016C1C8 00000000 */ nop /* 0CCC0C 8016C1CC 8D020000 */ lw $v0, ($t0) -/* 0CCC10 8016C1D0 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 0CCC14 8016C1D4 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCC10 8016C1D0 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 0CCC14 8016C1D4 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCC18 8016C1D8 8C580000 */ lw $t8, ($v0) /* 0CCC1C 8016C1DC 00184880 */ sll $t1, $t8, 2 /* 0CCC20 8016C1E0 00695021 */ addu $t2, $v1, $t1 @@ -173,7 +173,7 @@ glabel func_8016BF60_ovl3 /* 0CCC28 8016C1E8 AD400000 */ sw $zero, ($t2) /* 0CCC2C 8016C1EC 00025800 */ sll $t3, $v0, 0 /* 0CCC30 8016C1F0 0561000C */ bgez $t3, .L8016C224_ovl3 -/* 0CCC34 8016C1F4 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e +/* 0CCC34 8016C1F4 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e /* 0CCC38 8016C1F8 8D020000 */ lw $v0, ($t0) /* 0CCC3C 8016C1FC 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 0CCC40 8016C200 44815000 */ mtc1 $at, $f10 @@ -198,7 +198,7 @@ glabel func_8016BF60_ovl3 /* 0CCC88 8016C248 A0F8000B */ sb $t8, 0xb($a3) .L8016C24C_ovl3: /* 0CCC8C 8016C24C 8C4A0000 */ lw $t2, ($v0) -/* 0CCC90 8016C250 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCC90 8016C250 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCC94 8016C254 24090047 */ li $t1, 71 /* 0CCC98 8016C258 000A5880 */ sll $t3, $t2, 2 /* 0CCC9C 8016C25C 006BC821 */ addu $t9, $v1, $t3 @@ -206,7 +206,7 @@ glabel func_8016BF60_ovl3 /* 0CCCA4 8016C264 AF290000 */ sw $t1, ($t9) /* 0CCCA8 8016C268 00026000 */ sll $t4, $v0, 0 /* 0CCCAC 8016C26C 0581000A */ bgez $t4, .L8016C298_ovl3 -/* 0CCCB0 8016C270 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e +/* 0CCCB0 8016C270 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e /* 0CCCB4 8016C274 8D020000 */ lw $v0, ($t0) /* 0CCCB8 8016C278 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 0CCCBC 8016C27C 44819000 */ mtc1 $at, $f18 @@ -229,7 +229,7 @@ glabel func_8016BF60_ovl3 /* 0CCCF8 8016C2B8 240A0001 */ li $t2, 1 /* 0CCCFC 8016C2BC A0EA000B */ sb $t2, 0xb($a3) /* 0CCD00 8016C2C0 8C490000 */ lw $t1, ($v0) -/* 0CCD04 8016C2C4 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCD04 8016C2C4 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCD08 8016C2C8 240B0047 */ li $t3, 71 /* 0CCD0C 8016C2CC 0009C880 */ sll $t9, $t1, 2 /* 0CCD10 8016C2D0 00796021 */ addu $t4, $v1, $t9 @@ -260,8 +260,8 @@ glabel func_8016BF60_ovl3 /* 0CCD6C 8016C32C 24090002 */ li $t1, 2 /* 0CCD70 8016C330 A0E9000B */ sb $t1, 0xb($a3) /* 0CCD74 8016C334 8C4B0000 */ lw $t3, ($v0) -/* 0CCD78 8016C338 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 0CCD7C 8016C33C 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCD78 8016C338 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 0CCD7C 8016C33C 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCD80 8016C340 000B6080 */ sll $t4, $t3, 2 /* 0CCD84 8016C344 006C7021 */ addu $t6, $v1, $t4 /* 0CCD88 8016C348 24190047 */ li $t9, 71 @@ -269,7 +269,7 @@ glabel func_8016BF60_ovl3 /* 0CCD90 8016C350 ADD90000 */ sw $t9, ($t6) /* 0CCD94 8016C354 90EF0004 */ lbu $t7, 4($a3) /* 0CCD98 8016C358 00024800 */ sll $t1, $v0, 0 -/* 0CCD9C 8016C35C 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e +/* 0CCD9C 8016C35C 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e /* 0CCDA0 8016C360 15E00004 */ bnez $t7, .L8016C374_ovl3 /* 0CCDA4 8016C364 240D0005 */ li $t5, 5 /* 0CCDA8 8016C368 ACE5003C */ sw $a1, 0x3c($a3) @@ -308,7 +308,7 @@ glabel func_8016BF60_ovl3 /* 0CCE1C 8016C3DC E4306A10 */ swc1 $f16, %lo(D_800E6A10)($at) .L8016C3E0_ovl3: /* 0CCE20 8016C3E0 8C4D0000 */ lw $t5, ($v0) -/* 0CCE24 8016C3E4 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCE24 8016C3E4 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCE28 8016C3E8 240F0047 */ li $t7, 71 /* 0CCE2C 8016C3EC 000DC080 */ sll $t8, $t5, 2 /* 0CCE30 8016C3F0 00785021 */ addu $t2, $v1, $t8 @@ -316,7 +316,7 @@ glabel func_8016BF60_ovl3 /* 0CCE38 8016C3F8 AD4F0000 */ sw $t7, ($t2) /* 0CCE3C 8016C3FC 90E90004 */ lbu $t1, 4($a3) /* 0CCE40 8016C400 0002C800 */ sll $t9, $v0, 0 -/* 0CCE44 8016C404 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e +/* 0CCE44 8016C404 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e /* 0CCE48 8016C408 15200004 */ bnez $t1, .L8016C41C_ovl3 /* 0CCE4C 8016C40C 240B0006 */ li $t3, 6 /* 0CCE50 8016C410 ACE5003C */ sw $a1, 0x3c($a3) @@ -349,7 +349,7 @@ glabel func_8016BF60_ovl3 /* 0CCEB0 8016C470 E4246A10 */ swc1 $f4, %lo(D_800E6A10)($at) .L8016C474_ovl3: /* 0CCEB4 8016C474 8C490000 */ lw $t1, ($v0) -/* 0CCEB8 8016C478 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCEB8 8016C478 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCEBC 8016C47C 240A0047 */ li $t2, 71 /* 0CCEC0 8016C480 00095880 */ sll $t3, $t1, 2 /* 0CCEC4 8016C484 006B6021 */ addu $t4, $v1, $t3 @@ -362,8 +362,8 @@ glabel func_8016BF60_ovl3 /* 0CCEDC 8016C49C 3C088005 */ lui $t0, %hi(D_8004A7C4) # $t0, 0x8005 /* 0CCEE0 8016C4A0 2508A7C4 */ addiu $t0, %lo(D_8004A7C4) # addiu $t0, $t0, -0x583c /* 0CCEE4 8016C4A4 8D020000 */ lw $v0, ($t0) -/* 0CCEE8 8016C4A8 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 0CCEEC 8016C4AC 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCEE8 8016C4A8 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 0CCEEC 8016C4AC 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCEF0 8016C4B0 8C590000 */ lw $t9, ($v0) /* 0CCEF4 8016C4B4 00197080 */ sll $t6, $t9, 2 /* 0CCEF8 8016C4B8 006E6821 */ addu $t5, $v1, $t6 @@ -371,8 +371,8 @@ glabel func_8016BF60_ovl3 /* 0CCF00 8016C4C0 ADA00000 */ sw $zero, ($t5) /* 0CCF04 8016C4C4 8D020000 */ lw $v0, ($t0) .L8016C4C8_ovl3: -/* 0CCF08 8016C4C8 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 0CCF0C 8016C4CC 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 0CCF08 8016C4C8 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 0CCF0C 8016C4CC 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 0CCF10 8016C4D0 8C580000 */ lw $t8, ($v0) /* 0CCF14 8016C4D4 00187880 */ sll $t7, $t8, 2 /* 0CCF18 8016C4D8 006F4821 */ addu $t1, $v1, $t7 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016C510_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016C510_ovl3.s deleted file mode 100644 index 470661c4..00000000 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016C510_ovl3.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8016C510_ovl3 -/* 0CCF50 8016C510 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 -/* 0CCF54 8016C514 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6) -/* 0CCF58 8016C518 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0CCF5C 8016C51C AFBF0014 */ sw $ra, 0x14($sp) -/* 0CCF60 8016C520 AFA40018 */ sw $a0, 0x18($sp) -/* 0CCF64 8016C524 8DCF0000 */ lw $t7, ($t6) -/* 0CCF68 8016C528 3C04800E */ lui $a0, %hi(D_800DDC50) -/* 0CCF6C 8016C52C 3C068019 */ lui $a2, %hi(D_80196990) # $a2, 0x8019 -/* 0CCF70 8016C530 000FC080 */ sll $t8, $t7, 2 -/* 0CCF74 8016C534 00982021 */ addu $a0, $a0, $t8 -/* 0CCF78 8016C538 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) -/* 0CCF7C 8016C53C 24C66990 */ addiu $a2, %lo(D_80196990) # addiu $a2, $a2, 0x6990 -/* 0CCF80 8016C540 0C02911F */ jal call_virtual_function -/* 0CCF84 8016C544 24050056 */ li $a1, 86 -/* 0CCF88 8016C548 8FBF0014 */ lw $ra, 0x14($sp) -/* 0CCF8C 8016C54C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0CCF90 8016C550 03E00008 */ jr $ra -/* 0CCF94 8016C554 00000000 */ nop diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016D1E8_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016D1E8_ovl3.s index 1c94873e..e8360b19 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016D1E8_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016D1E8_ovl3.s @@ -22,7 +22,7 @@ glabel func_8016D1E8_ovl3 /* 0CDC78 8016D238 AC2898E0 */ sw $t0, %lo(D_800E98E0)($at) /* 0CDC7C 8016D23C 0C0473D6 */ jal func_8011CF58 /* 0CDC80 8016D240 00000000 */ nop -/* 0CDC84 8016D244 0C0547A5 */ jal func_80151E94_ovl3 +/* 0CDC84 8016D244 0C0547A5 */ jal ovl3_process_command_string /* 0CDC88 8016D248 27A40028 */ addiu $a0, $sp, 0x28 /* 0CDC8C 8016D24C 3C058013 */ lui $a1, %hi(gKirbyState) # $a1, 0x8013 /* 0CDC90 8016D250 14400004 */ bnez $v0, .L8016D264_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016D81C_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016D81C_ovl3.s index ed2441a7..2c038929 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016D81C_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016D81C_ovl3.s @@ -40,7 +40,7 @@ glabel func_8016D81C_ovl3 /* 0CE2F0 8016D8B0 0C02BB48 */ jal func_800AED20 /* 0CE2F4 8016D8B4 00000000 */ nop .L8016D8B8_ovl3: -/* 0CE2F8 8016D8B8 0C0547A5 */ jal func_80151E94_ovl3 +/* 0CE2F8 8016D8B8 0C0547A5 */ jal ovl3_process_command_string /* 0CE2FC 8016D8BC 27A40020 */ addiu $a0, $sp, 0x20 /* 0CE300 8016D8C0 1440004E */ bnez $v0, .L8016D9FC_ovl3 /* 0CE304 8016D8C4 00000000 */ nop diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016DD0C_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016DD0C_ovl3.s index 483068c2..ec50eae9 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016DD0C_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016DD0C_ovl3.s @@ -12,7 +12,7 @@ glabel func_8016DD0C_ovl3 /* 0CE774 8016DD34 B9D90006 */ swr $t9, 6($t6) /* 0CE778 8016DD38 0C0473D6 */ jal func_8011CF58 /* 0CE77C 8016DD3C 00000000 */ nop -/* 0CE780 8016DD40 0C0547A5 */ jal func_80151E94_ovl3 +/* 0CE780 8016DD40 0C0547A5 */ jal ovl3_process_command_string /* 0CE784 8016DD44 27A40018 */ addiu $a0, $sp, 0x18 /* 0CE788 8016DD48 14400023 */ bnez $v0, .L8016DDD8_ovl3 /* 0CE78C 8016DD4C 3C088005 */ lui $t0, %hi(D_8004A7C4) # $t0, 0x8005 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016E15C_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016E15C_ovl3.s index 87fb2fc2..8e5c23e4 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016E15C_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016E15C_ovl3.s @@ -10,7 +10,7 @@ glabel func_8016E15C_ovl3 /* 0CEBBC 8016E17C 99F90006 */ lwr $t9, 6($t7) /* 0CEBC0 8016E180 0C054E61 */ jal func_80153984_ovl3 /* 0CEBC4 8016E184 B9D90006 */ swr $t9, 6($t6) -/* 0CEBC8 8016E188 0C0547A5 */ jal func_80151E94_ovl3 +/* 0CEBC8 8016E188 0C0547A5 */ jal ovl3_process_command_string /* 0CEBCC 8016E18C 27A40020 */ addiu $a0, $sp, 0x20 /* 0CEBD0 8016E190 1040000E */ beqz $v0, .L8016E1CC_ovl3 /* 0CEBD4 8016E194 3C078013 */ lui $a3, %hi(gKirbyState) diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016F240_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016F240_ovl3.s index 5ab3020b..2c6b6e0c 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016F240_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016F240_ovl3.s @@ -12,7 +12,7 @@ glabel func_8016F240_ovl3 /* 0CFCA8 8016F268 B9D90006 */ swr $t9, 6($t6) /* 0CFCAC 8016F26C 0C0473D6 */ jal func_8011CF58 /* 0CFCB0 8016F270 00000000 */ nop -/* 0CFCB4 8016F274 0C0547A5 */ jal func_80151E94_ovl3 +/* 0CFCB4 8016F274 0C0547A5 */ jal ovl3_process_command_string /* 0CFCB8 8016F278 27A40030 */ addiu $a0, $sp, 0x30 /* 0CFCBC 8016F27C 144000F2 */ bnez $v0, .L8016F648_ovl3 /* 0CFCC0 8016F280 3C018013 */ lui $at, %hi(gKirbyState + 7) diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016F7C8_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016F7C8_ovl3.s index 49f1ec52..3e18d245 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016F7C8_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016F7C8_ovl3.s @@ -10,7 +10,7 @@ glabel func_8016F7C8_ovl3 /* 0D0228 8016F7E8 99F90006 */ lwr $t9, 6($t7) /* 0D022C 8016F7EC 0C054E61 */ jal func_80153984_ovl3 /* 0D0230 8016F7F0 B9D90006 */ swr $t9, 6($t6) -/* 0D0234 8016F7F4 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D0234 8016F7F4 0C0547A5 */ jal ovl3_process_command_string /* 0D0238 8016F7F8 27A40018 */ addiu $a0, $sp, 0x18 /* 0D023C 8016F7FC 8FBF0014 */ lw $ra, 0x14($sp) /* 0D0240 8016F800 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016FB58_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016FB58_ovl3.s index aba8d2ae..d72ba866 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016FB58_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016FB58_ovl3.s @@ -10,7 +10,7 @@ glabel func_8016FB58_ovl3 /* 0D05B8 8016FB78 95F90004 */ lhu $t9, 4($t7) /* 0D05BC 8016FB7C 0C054E61 */ jal func_80153984_ovl3 /* 0D05C0 8016FB80 A5D90004 */ sh $t9, 4($t6) -/* 0D05C4 8016FB84 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D05C4 8016FB84 0C0547A5 */ jal ovl3_process_command_string /* 0D05C8 8016FB88 27A40020 */ addiu $a0, $sp, 0x20 /* 0D05CC 8016FB8C 1440005A */ bnez $v0, .L8016FCF8_ovl3 /* 0D05D0 8016FB90 3C078013 */ lui $a3, %hi(gKirbyState) diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8016FFF8_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8016FFF8_ovl3.s index 4219812b..bc087a99 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8016FFF8_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8016FFF8_ovl3.s @@ -8,7 +8,7 @@ glabel func_8016FFF8_ovl3 /* 0D0A50 80170010 27AE0024 */ addiu $t6, $sp, 0x24 /* 0D0A54 80170014 0C054E61 */ jal func_80153984_ovl3 /* 0D0A58 80170018 B9D90002 */ swr $t9, 2($t6) -/* 0D0A5C 8017001C 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D0A5C 8017001C 0C0547A5 */ jal ovl3_process_command_string /* 0D0A60 80170020 27A40024 */ addiu $a0, $sp, 0x24 /* 0D0A64 80170024 10400009 */ beqz $v0, .L8017004C_ovl3 /* 0D0A68 80170028 3C038013 */ lui $v1, %hi(gKirbyState) # $v1, 0x8013 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80170D88_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80170D88_ovl3.s index 64c2e601..e7e2eaf4 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80170D88_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80170D88_ovl3.s @@ -22,7 +22,7 @@ glabel func_80170D88_ovl3 /* 0D1818 80170DD8 00000000 */ nop /* 0D181C 80170DDC AC208920 */ sw $zero, %lo(D_800E8920)($at) .L80170DE0_ovl3: -/* 0D1820 80170DE0 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D1820 80170DE0 0C0547A5 */ jal ovl3_process_command_string /* 0D1824 80170DE4 27A40024 */ addiu $a0, $sp, 0x24 /* 0D1828 80170DE8 3C18800D */ lui $t8, %hi(D_800D6B54) # $t8, 0x800d /* 0D182C 80170DEC 8F186B54 */ lw $t8, %lo(D_800D6B54)($t8) diff --git a/asm/non_matchings/ovl3/ovl3_5/func_801717F0_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_801717F0_ovl3.s index ad311836..432fbea0 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_801717F0_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_801717F0_ovl3.s @@ -45,12 +45,12 @@ glabel func_801717F0_ovl3 /* 0D22D4 80171894 8D4A98E0 */ lw $t2, %lo(D_800E98E0)($t2) /* 0D22D8 80171898 15410005 */ bne $t2, $at, .L801718B0_ovl3 /* 0D22DC 8017189C 00000000 */ nop -/* 0D22E0 801718A0 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D22E0 801718A0 0C0547A5 */ jal ovl3_process_command_string /* 0D22E4 801718A4 27A4003C */ addiu $a0, $sp, 0x3c /* 0D22E8 801718A8 10000003 */ b .L801718B8_ovl3 /* 0D22EC 801718AC 00000000 */ nop .L801718B0_ovl3: -/* 0D22F0 801718B0 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D22F0 801718B0 0C0547A5 */ jal ovl3_process_command_string /* 0D22F4 801718B4 27A40040 */ addiu $a0, $sp, 0x40 .L801718B8_ovl3: /* 0D22F8 801718B8 10400097 */ beqz $v0, .L80171B18_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80172234_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80172234_ovl3.s index cf806b8c..cd50d15c 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80172234_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80172234_ovl3.s @@ -59,7 +59,7 @@ glabel func_80172234_ovl3 /* 0D2D48 80172308 8CAF003C */ lw $t7, 0x3c($a1) /* 0D2D4C 8017230C 15E000A1 */ bnez $t7, .L80172594_ovl3 /* 0D2D50 80172310 00000000 */ nop -/* 0D2D54 80172314 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D2D54 80172314 0C0547A5 */ jal ovl3_process_command_string /* 0D2D58 80172318 27A4003C */ addiu $a0, $sp, 0x3c /* 0D2D5C 8017231C 1040009D */ beqz $v0, .L80172594_ovl3 /* 0D2D60 80172320 00000000 */ nop diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80172A3C_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80172A3C_ovl3.s index 4346e9d1..83b5f6fd 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80172A3C_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80172A3C_ovl3.s @@ -6,7 +6,7 @@ glabel func_80172A3C_ovl3 /* 0D348C 80172A4C AFA40020 */ sw $a0, 0x20($sp) /* 0D3490 80172A50 0C054E61 */ jal func_80153984_ovl3 /* 0D3494 80172A54 AFAE001C */ sw $t6, 0x1c($sp) -/* 0D3498 80172A58 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D3498 80172A58 0C0547A5 */ jal ovl3_process_command_string /* 0D349C 80172A5C 27A4001C */ addiu $a0, $sp, 0x1c /* 0D34A0 80172A60 14400015 */ bnez $v0, .L80172AB8_ovl3 /* 0D34A4 80172A64 3C0F8013 */ lui $t7, %hi(D_8012E7F4) # $t7, 0x8013 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80173AF4_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80173AF4_ovl3.s index f7b3221c..00878fa4 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80173AF4_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80173AF4_ovl3.s @@ -28,7 +28,7 @@ glabel func_80173AF4_ovl3 .L80173B5C_ovl3: /* 0D459C 80173B5C 0C054E61 */ jal func_80153984_ovl3 /* 0D45A0 80173B60 00000000 */ nop -/* 0D45A4 80173B64 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D45A4 80173B64 0C0547A5 */ jal ovl3_process_command_string /* 0D45A8 80173B68 27A4001C */ addiu $a0, $sp, 0x1c /* 0D45AC 80173B6C 10400003 */ beqz $v0, .L80173B7C_ovl3 /* 0D45B0 80173B70 00000000 */ nop diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80176DE0_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80176DE0_ovl3.s index d06b21ee..4284b6c4 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80176DE0_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80176DE0_ovl3.s @@ -60,7 +60,7 @@ glabel func_80176DE0_ovl3 /* 0D78FC 80176EBC 256CFFFF */ addiu $t4, $t3, -1 /* 0D7900 80176EC0 AC6C0000 */ sw $t4, ($v1) .L80176EC4_ovl3: -/* 0D7904 80176EC4 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D7904 80176EC4 0C0547A5 */ jal ovl3_process_command_string /* 0D7908 80176EC8 27A40028 */ addiu $a0, $sp, 0x28 /* 0D790C 80176ECC 3C058005 */ lui $a1, %hi(D_8004A7C4) # $a1, 0x8005 /* 0D7910 80176ED0 14400047 */ bnez $v0, .L80176FF0_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80177438_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80177438_ovl3.s index 1ce0b137..6e813fa7 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80177438_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80177438_ovl3.s @@ -23,7 +23,7 @@ glabel func_80177438_ovl3 /* 0D7ECC 8017748C 10000093 */ b .L801776DC_ovl3 /* 0D7ED0 80177490 8FBF0014 */ lw $ra, 0x14($sp) .L80177494_ovl3: -/* 0D7ED4 80177494 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D7ED4 80177494 0C0547A5 */ jal ovl3_process_command_string /* 0D7ED8 80177498 27A40024 */ addiu $a0, $sp, 0x24 /* 0D7EDC 8017749C 3C068013 */ lui $a2, %hi(gKirbyState) # $a2, 0x8013 /* 0D7EE0 801774A0 1440008D */ bnez $v0, .L801776D8_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8017782C_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8017782C_ovl3.s index dd0406ba..33af38f5 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8017782C_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8017782C_ovl3.s @@ -23,7 +23,7 @@ glabel func_8017782C_ovl3 /* 0D82C0 80177880 100000AC */ b .L80177B34_ovl3 /* 0D82C4 80177884 8FBF0014 */ lw $ra, 0x14($sp) .L80177888_ovl3: -/* 0D82C8 80177888 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D82C8 80177888 0C0547A5 */ jal ovl3_process_command_string /* 0D82CC 8017788C 27A40024 */ addiu $a0, $sp, 0x24 /* 0D82D0 80177890 3C068013 */ lui $a2, %hi(gKirbyState) # $a2, 0x8013 /* 0D82D4 80177894 144000A6 */ bnez $v0, .L80177B30_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80177CBC_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80177CBC_ovl3.s index 1d2ef6e2..d3a4d62c 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80177CBC_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80177CBC_ovl3.s @@ -13,7 +13,7 @@ glabel func_80177CBC_ovl3 /* 0D8728 80177CE8 00390821 */ addu $at, $at, $t9 /* 0D872C 80177CEC 0C054E61 */ jal func_80153984_ovl3 /* 0D8730 80177CF0 AC208920 */ sw $zero, %lo(D_800E8920)($at) -/* 0D8734 80177CF4 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D8734 80177CF4 0C0547A5 */ jal ovl3_process_command_string /* 0D8738 80177CF8 27A40024 */ addiu $a0, $sp, 0x24 /* 0D873C 80177CFC 1440005A */ bnez $v0, .L80177E68_ovl3 /* 0D8740 80177D00 3C068013 */ lui $a2, %hi(gKirbyState) # $a2, 0x8013 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80177FB4_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80177FB4_ovl3.s index cf6526ef..16b8f339 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80177FB4_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80177FB4_ovl3.s @@ -22,7 +22,7 @@ glabel func_80177FB4_ovl3 /* 0D8A44 80178004 100000AD */ b .L801782BC_ovl3 /* 0D8A48 80178008 8FBF0014 */ lw $ra, 0x14($sp) .L8017800C_ovl3: -/* 0D8A4C 8017800C 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D8A4C 8017800C 0C0547A5 */ jal ovl3_process_command_string /* 0D8A50 80178010 27A40024 */ addiu $a0, $sp, 0x24 /* 0D8A54 80178014 144000A8 */ bnez $v0, .L801782B8_ovl3 /* 0D8A58 80178018 3C18800D */ lui $t8, %hi(D_800D6FE8) # $t8, 0x800d diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80178420_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80178420_ovl3.s index eb837efb..e44e71ac 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80178420_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80178420_ovl3.s @@ -23,7 +23,7 @@ glabel func_80178420_ovl3 /* 0D8EB4 80178474 100000A9 */ b .L8017871C_ovl3 /* 0D8EB8 80178478 8FBF0014 */ lw $ra, 0x14($sp) .L8017847C_ovl3: -/* 0D8EBC 8017847C 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D8EBC 8017847C 0C0547A5 */ jal ovl3_process_command_string /* 0D8EC0 80178480 27A40024 */ addiu $a0, $sp, 0x24 /* 0D8EC4 80178484 3C058013 */ lui $a1, %hi(gKirbyState) # $a1, 0x8013 /* 0D8EC8 80178488 144000A3 */ bnez $v0, .L80178718_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_8017883C_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_8017883C_ovl3.s index 8579fe38..bf858483 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_8017883C_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_8017883C_ovl3.s @@ -21,7 +21,7 @@ glabel func_8017883C_ovl3 /* 0D92C8 80178888 24010002 */ li $at, 2 /* 0D92CC 8017888C 5061004F */ beql $v1, $at, .L801789CC_ovl3 /* 0D92D0 80178890 8FBF0014 */ lw $ra, 0x14($sp) -/* 0D92D4 80178894 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D92D4 80178894 0C0547A5 */ jal ovl3_process_command_string /* 0D92D8 80178898 27A40024 */ addiu $a0, $sp, 0x24 /* 0D92DC 8017889C 3C058013 */ lui $a1, %hi(gKirbyState) # $a1, 0x8013 /* 0D92E0 801788A0 14400049 */ bnez $v0, .L801789C8_ovl3 diff --git a/asm/non_matchings/ovl3/ovl3_5/func_80178B18_ovl3.s b/asm/non_matchings/ovl3/ovl3_5/func_80178B18_ovl3.s index 62479330..b555cfc6 100644 --- a/asm/non_matchings/ovl3/ovl3_5/func_80178B18_ovl3.s +++ b/asm/non_matchings/ovl3/ovl3_5/func_80178B18_ovl3.s @@ -13,7 +13,7 @@ glabel func_80178B18_ovl3 /* 0D9584 80178B44 00390821 */ addu $at, $at, $t9 /* 0D9588 80178B48 0C054E61 */ jal func_80153984_ovl3 /* 0D958C 80178B4C AC208920 */ sw $zero, %lo(D_800E8920)($at) -/* 0D9590 80178B50 0C0547A5 */ jal func_80151E94_ovl3 +/* 0D9590 80178B50 0C0547A5 */ jal ovl3_process_command_string /* 0D9594 80178B54 27A40024 */ addiu $a0, $sp, 0x24 /* 0D9598 80178B58 1440013D */ bnez $v0, .L80179050_ovl3 /* 0D959C 80178B5C 3C068013 */ lui $a2, %hi(gKirbyState) # $a2, 0x8013 diff --git a/asm/non_matchings/ovl4/ovl4_3/func_80159B00_ovl4.s b/asm/non_matchings/ovl4/ovl4_3/func_80159B00_ovl4.s index fb299f5d..c3bfaaf3 100644 --- a/asm/non_matchings/ovl4/ovl4_3/func_80159B00_ovl4.s +++ b/asm/non_matchings/ovl4/ovl4_3/func_80159B00_ovl4.s @@ -4,11 +4,11 @@ glabel func_80159B00_ovl4 /* 101038 80159B08 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 10103C 80159B0C AFBF0014 */ sw $ra, 0x14($sp) /* 101040 80159B10 8DCF0000 */ lw $t7, ($t6) -/* 101044 80159B14 3C02800E */ lui $v0, %hi(D_800DDC50) +/* 101044 80159B14 3C02800E */ lui $v0, %hi(gEntityVtableIndexArray) /* 101048 80159B18 24010001 */ li $at, 1 /* 10104C 80159B1C 000FC080 */ sll $t8, $t7, 2 /* 101050 80159B20 00581021 */ addu $v0, $v0, $t8 -/* 101054 80159B24 8C42DC50 */ lw $v0, %lo(D_800DDC50)($v0) +/* 101054 80159B24 8C42DC50 */ lw $v0, %lo(gEntityVtableIndexArray)($v0) /* 101058 80159B28 10400005 */ beqz $v0, .L80159B40_ovl4 /* 10105C 80159B2C 00000000 */ nop /* 101060 80159B30 10410007 */ beq $v0, $at, .L80159B50_ovl4 diff --git a/asm/non_matchings/ovl4/ovl4_3/func_80159DE8_ovl4.s b/asm/non_matchings/ovl4/ovl4_3/func_80159DE8_ovl4.s index 83b9750b..10fbf12a 100644 --- a/asm/non_matchings/ovl4/ovl4_3/func_80159DE8_ovl4.s +++ b/asm/non_matchings/ovl4/ovl4_3/func_80159DE8_ovl4.s @@ -25,10 +25,10 @@ glabel func_80159DE8_ovl4 /* 101374 80159E44 3C03800D */ lui $v1, %hi(D_800D71F8) # $v1, 0x800d /* 101378 80159E48 246371F8 */ addiu $v1, %lo(D_800D71F8) # addiu $v1, $v1, 0x71f8 /* 10137C 80159E4C 0002C080 */ sll $t8, $v0, 2 -/* 101380 80159E50 3C01800E */ lui $at, %hi(D_800DDC50) +/* 101380 80159E50 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 101384 80159E54 AC620000 */ sw $v0, ($v1) /* 101388 80159E58 00380821 */ addu $at, $at, $t8 -/* 10138C 80159E5C AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 10138C 80159E5C AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 101390 80159E60 24040005 */ li $a0, 5 /* 101394 80159E64 00002825 */ move $a1, $zero /* 101398 80159E68 0C02BB02 */ jal func_800AEC08 @@ -36,12 +36,12 @@ glabel func_80159DE8_ovl4 /* 1013A0 80159E70 3C03800D */ lui $v1, %hi(D_800D71FC) # $v1, 0x800d /* 1013A4 80159E74 246371FC */ addiu $v1, %lo(D_800D71FC) # addiu $v1, $v1, 0x71fc /* 1013A8 80159E78 00024880 */ sll $t1, $v0, 2 -/* 1013AC 80159E7C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1013AC 80159E7C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1013B0 80159E80 AC620000 */ sw $v0, ($v1) /* 1013B4 80159E84 00290821 */ addu $at, $at, $t1 /* 1013B8 80159E88 24190001 */ li $t9, 1 /* 1013BC 80159E8C 3C058016 */ lui $a1, %hi(D_80159D78) # $a1, 0x8016 -/* 1013C0 80159E90 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 1013C0 80159E90 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 1013C4 80159E94 24A59D78 */ addiu $a1, %lo(D_80159D78) # addiu $a1, $a1, -0x6288 /* 1013C8 80159E98 00002025 */ move $a0, $zero /* 1013CC 80159E9C 2406001A */ li $a2, 26 diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021A5C0_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021A5C0_ovl9.s index 8b111a9b..ba067aa8 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021A5C0_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021A5C0_ovl9.s @@ -6,7 +6,7 @@ glabel func_8021A5C0_ovl9 /* 1C8620 8021A5D0 3C038005 */ lui $v1, %hi(D_8004A7C4) # $v1, 0x8005 /* 1C8624 8021A5D4 8C63A7C4 */ lw $v1, %lo(D_8004A7C4)($v1) /* 1C8628 8021A5D8 3C0E800F */ lui $t6, %hi(D_800E98E0) -/* 1C862C 8021A5DC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C862C 8021A5DC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C8630 8021A5E0 8C620000 */ lw $v0, ($v1) /* 1C8634 8021A5E4 3C08800F */ lui $t0, %hi(D_800E9C60) /* 1C8638 8021A5E8 240F0001 */ li $t7, 1 @@ -17,7 +17,7 @@ glabel func_8021A5C0_ovl9 /* 1C864C 8021A5FC 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1C8650 8021A600 11C0000B */ beqz $t6, .L8021A630_ovl9 /* 1C8654 8021A604 01024021 */ addu $t0, $t0, $v0 -/* 1C8658 8021A608 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 1C8658 8021A608 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 1C865C 8021A60C 8C780000 */ lw $t8, ($v1) /* 1C8660 8021A610 3C058022 */ lui $a1, %hi(func_8021A22C) # $a1, 0x8022 /* 1C8664 8021A614 24A5A22C */ addiu $a1, %lo(func_8021A22C) # addiu $a1, $a1, -0x5dd4 @@ -29,11 +29,11 @@ glabel func_8021A5C0_ovl9 /* 1C867C 8021A62C 8FBF0014 */ lw $ra, 0x14($sp) .L8021A630_ovl9: /* 1C8680 8021A630 8D089C60 */ lw $t0, %lo(D_800E9C60)($t0) -/* 1C8684 8021A634 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C8684 8021A634 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C8688 8021A638 00220821 */ addu $at, $at, $v0 /* 1C868C 8021A63C 1100000A */ beqz $t0, .L8021A668_ovl9 /* 1C8690 8021A640 24090002 */ li $t1, 2 -/* 1C8694 8021A644 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 1C8694 8021A644 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 1C8698 8021A648 8C6A0000 */ lw $t2, ($v1) /* 1C869C 8021A64C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1C86A0 8021A650 3C058022 */ lui $a1, %hi(func_8021A22C) # $a1, 0x8022 diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021AD88_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021AD88_ovl9.s index 5c50be01..b4867750 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021AD88_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021AD88_ovl9.s @@ -66,10 +66,10 @@ glabel func_8021AD88_ovl9 /* 1C8ED8 8021AE88 002B0821 */ addu $at, $at, $t3 /* 1C8EDC 8021AE8C E4223AD0 */ swc1 $f2, %lo(D_800E3AD0)($at) /* 1C8EE0 8021AE90 8C4D0000 */ lw $t5, ($v0) -/* 1C8EE4 8021AE94 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C8EE4 8021AE94 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C8EE8 8021AE98 000D7080 */ sll $t6, $t5, 2 /* 1C8EEC 8021AE9C 002E0821 */ addu $at, $at, $t6 -/* 1C8EF0 8021AEA0 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 1C8EF0 8021AEA0 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 1C8EF4 8021AEA4 8C4F0000 */ lw $t7, ($v0) /* 1C8EF8 8021AEA8 000FC080 */ sll $t8, $t7, 2 /* 1C8EFC 8021AEAC 00982021 */ addu $a0, $a0, $t8 @@ -156,10 +156,10 @@ glabel func_8021AD88_ovl9 /* 1C9038 8021AFE8 00290821 */ addu $at, $at, $t1 /* 1C903C 8021AFEC E4223AD0 */ swc1 $f2, %lo(D_800E3AD0)($at) /* 1C9040 8021AFF0 8C4B0000 */ lw $t3, ($v0) -/* 1C9044 8021AFF4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C9044 8021AFF4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C9048 8021AFF8 000B6880 */ sll $t5, $t3, 2 /* 1C904C 8021AFFC 002D0821 */ addu $at, $at, $t5 -/* 1C9050 8021B000 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 1C9050 8021B000 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 1C9054 8021B004 8C4C0000 */ lw $t4, ($v0) /* 1C9058 8021B008 000C7080 */ sll $t6, $t4, 2 /* 1C905C 8021B00C 008E2021 */ addu $a0, $a0, $t6 diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021B0D0_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021B0D0_ovl9.s index 3325d8b6..1b9ef3ef 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021B0D0_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021B0D0_ovl9.s @@ -46,14 +46,14 @@ glabel func_8021B0D0_ovl9 /* 1C91D0 8021B180 E4C80000 */ swc1 $f8, ($a2) /* 1C91D4 8021B184 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1C91D8 8021B188 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1C91DC 8021B18C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C91DC 8021B18C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C91E0 8021B190 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1C91E4 8021B194 8C4F0000 */ lw $t7, ($v0) /* 1C91E8 8021B198 3C058022 */ lui $a1, %hi(D_8021ABB4) # $a1, 0x8022 /* 1C91EC 8021B19C 24A5ABB4 */ addiu $a1, %lo(D_8021ABB4) # addiu $a1, $a1, -0x544c /* 1C91F0 8021B1A0 000FC080 */ sll $t8, $t7, 2 /* 1C91F4 8021B1A4 00380821 */ addu $at, $at, $t8 -/* 1C91F8 8021B1A8 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1C91F8 8021B1A8 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1C91FC 8021B1AC 8C590000 */ lw $t9, ($v0) /* 1C9200 8021B1B0 00194080 */ sll $t0, $t9, 2 /* 1C9204 8021B1B4 00882021 */ addu $a0, $a0, $t0 diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021B3A0_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021B3A0_ovl9.s index b42a9d58..64dfdeda 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021B3A0_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021B3A0_ovl9.s @@ -16,11 +16,11 @@ glabel func_8021B3A0_ovl9 /* 1C9428 8021B3D8 8FBF0014 */ lw $ra, 0x14($sp) /* 1C942C 8021B3DC AC2F9720 */ sw $t7, %lo(D_800E9720)($at) /* 1C9430 8021B3E0 8C580000 */ lw $t8, ($v0) -/* 1C9434 8021B3E4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C9434 8021B3E4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C9438 8021B3E8 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1C943C 8021B3EC 0018C880 */ sll $t9, $t8, 2 /* 1C9440 8021B3F0 00390821 */ addu $at, $at, $t9 -/* 1C9444 8021B3F4 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1C9444 8021B3F4 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1C9448 8021B3F8 8C480000 */ lw $t0, ($v0) /* 1C944C 8021B3FC 3C058022 */ lui $a1, %hi(D_8021ABB4) # $a1, 0x8022 /* 1C9450 8021B400 24A5ABB4 */ addiu $a1, %lo(D_8021ABB4) # addiu $a1, $a1, -0x544c diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021B58C_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021B58C_ovl9.s index 38a87d2c..1afe3fcf 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021B58C_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021B58C_ovl9.s @@ -5,11 +5,11 @@ glabel func_8021B58C_ovl9 /* 1C95E8 8021B598 AFBF0014 */ sw $ra, 0x14($sp) /* 1C95EC 8021B59C AFA40018 */ sw $a0, 0x18($sp) /* 1C95F0 8021B5A0 8DCF0000 */ lw $t7, ($t6) -/* 1C95F4 8021B5A4 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1C95F4 8021B5A4 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1C95F8 8021B5A8 3C068022 */ lui $a2, %hi(D_8021CE44_ovl9) # $a2, 0x8022 /* 1C95FC 8021B5AC 000FC080 */ sll $t8, $t7, 2 /* 1C9600 8021B5B0 00982021 */ addu $a0, $a0, $t8 -/* 1C9604 8021B5B4 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1C9604 8021B5B4 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1C9608 8021B5B8 24C6CE44 */ addiu $a2, %lo(D_8021CE44_ovl9) # addiu $a2, $a2, -0x31bc /* 1C960C 8021B5BC 0C02911F */ jal call_virtual_function /* 1C9610 8021B5C0 24050002 */ li $a1, 2 diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021B5D4_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021B5D4_ovl9.s index 2c537e92..36e3808d 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021B5D4_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021B5D4_ovl9.s @@ -15,11 +15,11 @@ glabel func_8021B5D4_ovl9 /* 1C9658 8021B608 3C02800E */ lui $v0, %hi(D_800E1B50) /* 1C965C 8021B60C 00451021 */ addu $v0, $v0, $a1 /* 1C9660 8021B610 8C421B50 */ lw $v0, %lo(D_800E1B50)($v0) -/* 1C9664 8021B614 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C9664 8021B614 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C9668 8021B618 000FC080 */ sll $t8, $t7, 2 /* 1C966C 8021B61C 00380821 */ addu $at, $at, $t8 /* 1C9670 8021B620 3C08801D */ lui $t0, %hi(D_801CD21C) # $t0, 0x801d -/* 1C9674 8021B624 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 1C9674 8021B624 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 1C9678 8021B628 24190002 */ li $t9, 2 /* 1C967C 8021B62C 2508D21C */ addiu $t0, %lo(D_801CD21C) # addiu $t0, $t0, -0x2de4 /* 1C9680 8021B630 3C048022 */ lui $a0, %hi(D_8021B58C) # $a0, 0x8022 @@ -29,7 +29,7 @@ glabel func_8021B5D4_ovl9 /* 1C9690 8021B640 AC480098 */ sw $t0, 0x98($v0) /* 1C9694 8021B644 3C098005 */ lui $t1, %hi(D_8004A7C4) # $t1, 0x8005 /* 1C9698 8021B648 8D29A7C4 */ lw $t1, %lo(D_8004A7C4)($t1) -/* 1C969C 8021B64C 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 1C969C 8021B64C 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 1C96A0 8021B650 3C068022 */ lui $a2, %hi(D_8021CE44_ovl9) # $a2, 0x8022 /* 1C96A4 8021B654 8D2A0000 */ lw $t2, ($t1) /* 1C96A8 8021B658 24C6CE44 */ addiu $a2, %lo(D_8021CE44_ovl9) # addiu $a2, $a2, -0x31bc @@ -37,7 +37,7 @@ glabel func_8021B5D4_ovl9 /* 1C96B0 8021B660 000A5880 */ sll $t3, $t2, 2 /* 1C96B4 8021B664 008B2021 */ addu $a0, $a0, $t3 /* 1C96B8 8021B668 0C02911F */ jal call_virtual_function -/* 1C96BC 8021B66C 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 1C96BC 8021B66C 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 1C96C0 8021B670 8FBF0014 */ lw $ra, 0x14($sp) /* 1C96C4 8021B674 27BD0018 */ addiu $sp, $sp, 0x18 /* 1C96C8 8021B678 03E00008 */ jr $ra diff --git a/asm/non_matchings/ovl9/ovl9_16/func_8021B71C_ovl9.s b/asm/non_matchings/ovl9/ovl9_16/func_8021B71C_ovl9.s index 93e8cce5..7721f721 100644 --- a/asm/non_matchings/ovl9/ovl9_16/func_8021B71C_ovl9.s +++ b/asm/non_matchings/ovl9/ovl9_16/func_8021B71C_ovl9.s @@ -8,14 +8,14 @@ glabel func_8021B71C_ovl9 /* 1C9784 8021B734 10400010 */ beqz $v0, .L8021B778_ovl9 /* 1C9788 8021B738 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1C978C 8021B73C 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1C9790 8021B740 3C01800E */ lui $at, %hi(D_800DDC50) +/* 1C9790 8021B740 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 1C9794 8021B744 240E0001 */ li $t6, 1 /* 1C9798 8021B748 8C4F0000 */ lw $t7, ($v0) /* 1C979C 8021B74C 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 1C97A0 8021B750 3C058022 */ lui $a1, %hi(D_8021B58C) # $a1, 0x8022 /* 1C97A4 8021B754 000FC080 */ sll $t8, $t7, 2 /* 1C97A8 8021B758 00380821 */ addu $at, $at, $t8 -/* 1C97AC 8021B75C AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 1C97AC 8021B75C AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) /* 1C97B0 8021B760 8C590000 */ lw $t9, ($v0) /* 1C97B4 8021B764 24A5B58C */ addiu $a1, %lo(D_8021B58C) # addiu $a1, $a1, -0x4a74 /* 1C97B8 8021B768 00194080 */ sll $t0, $t9, 2 diff --git a/asm/ovl1/ovl1_bss.s b/asm/ovl1/ovl1_bss.s index 2944f734..f4f664a1 100644 --- a/asm/ovl1/ovl1_bss.s +++ b/asm/ovl1/ovl1_bss.s @@ -22001,7 +22001,7 @@ glabel D_800DDC48 glabel D_800DDC4C .word 0x00000000 -glabel D_800DDC50 +glabel gEntityVtableIndexArray .word 0x00000000 glabel D_800DDC54 diff --git a/asm/ovl12/ovl12.s b/asm/ovl12/ovl12.s index 362c309a..86165d78 100644 --- a/asm/ovl12/ovl12.s +++ b/asm/ovl12/ovl12.s @@ -101,13 +101,13 @@ glabel func_801DB2DC_ovl12 /* 1EB69C 801DB35C 3C07800F */ lui $a3, %hi(D_800E93A0) # $a3, 0x800f /* 1EB6A0 801DB360 8C4F0000 */ lw $t7, ($v0) /* 1EB6A4 801DB364 24E793A0 */ addiu $a3, %lo(D_800E93A0) # addiu $a3, $a3, -0x6c60 -/* 1EB6A8 801DB368 3C08800E */ lui $t0, %hi(D_800DDC50) # $t0, 0x800e +/* 1EB6A8 801DB368 3C08800E */ lui $t0, %hi(gEntityVtableIndexArray) # $t0, 0x800e /* 1EB6AC 801DB36C 000F7080 */ sll $t6, $t7, 2 /* 1EB6B0 801DB370 002E0821 */ addu $at, $at, $t6 /* 1EB6B4 801DB374 AC209C60 */ sw $zero, -0x63a0($at) /* 1EB6B8 801DB378 8C580000 */ lw $t8, ($v0) /* 1EB6BC 801DB37C 3C01800F */ lui $at, 0x800f -/* 1EB6C0 801DB380 2508DC50 */ addiu $t0, %lo(D_800DDC50) # addiu $t0, $t0, -0x23b0 +/* 1EB6C0 801DB380 2508DC50 */ addiu $t0, %lo(gEntityVtableIndexArray) # addiu $t0, $t0, -0x23b0 /* 1EB6C4 801DB384 0018C880 */ sll $t9, $t8, 2 /* 1EB6C8 801DB388 00F94821 */ addu $t1, $a3, $t9 /* 1EB6CC 801DB38C AD200000 */ sw $zero, ($t1) @@ -2113,8 +2113,8 @@ glabel func_801DD02C_ovl12 /* 1ED3BC 801DD07C 34840071 */ ori $a0, (0x00010071 & 0xFFFF) # ori $a0, $a0, 0x71 /* 1ED3C0 801DD080 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 1ED3C4 801DD084 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 1ED3C8 801DD088 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 1ED3CC 801DD08C 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 1ED3C8 801DD088 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 1ED3CC 801DD08C 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 1ED3D0 801DD090 8C4A0000 */ lw $t2, ($v0) /* 1ED3D4 801DD094 3C01800F */ lui $at, 0x800f /* 1ED3D8 801DD098 240E0001 */ li $t6, 1 @@ -2363,10 +2363,10 @@ glabel func_801DD400_ovl12 /* 1ED750 801DD410 AFA40018 */ sw $a0, 0x18($sp) /* 1ED754 801DD414 8C620000 */ lw $v0, ($v1) /* 1ED758 801DD418 3C05800D */ lui $a1, %hi(D_800D7098) # $a1, 0x800d -/* 1ED75C 801DD41C 3C09800E */ lui $t1, %hi(D_800DDC50) # $t1, 0x800e +/* 1ED75C 801DD41C 3C09800E */ lui $t1, %hi(gEntityVtableIndexArray) # $t1, 0x800e /* 1ED760 801DD420 3C0E800F */ lui $t6, %hi(D_800E9560) # $t6, 0x800f /* 1ED764 801DD424 00021080 */ sll $v0, $v0, 2 -/* 1ED768 801DD428 2529DC50 */ addiu $t1, %lo(D_800DDC50) # addiu $t1, $t1, -0x23b0 +/* 1ED768 801DD428 2529DC50 */ addiu $t1, %lo(gEntityVtableIndexArray) # addiu $t1, $t1, -0x23b0 /* 1ED76C 801DD42C 24A57098 */ addiu $a1, %lo(D_800D7098) # addiu $a1, $a1, 0x7098 /* 1ED770 801DD430 25CE9560 */ addiu $t6, %lo(D_800E9560) # addiu $t6, $t6, -0x6aa0 /* 1ED774 801DD434 8CB90008 */ lw $t9, 8($a1) @@ -2755,8 +2755,8 @@ glabel func_801DD96C_ovl12 /* 1EDCF0 801DD9B0 3C01800F */ lui $at, 0x800f /* 1EDCF4 801DD9B4 240A0002 */ li $t2, 2 /* 1EDCF8 801DD9B8 8C480000 */ lw $t0, ($v0) -/* 1EDCFC 801DD9BC 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 1EDD00 801DD9C0 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 1EDCFC 801DD9BC 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 1EDD00 801DD9C0 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 1EDD04 801DD9C4 00084880 */ sll $t1, $t0, 2 /* 1EDD08 801DD9C8 00290821 */ addu $at, $at, $t1 /* 1EDD0C 801DD9CC AC209C60 */ sw $zero, -0x63a0($at) @@ -3034,10 +3034,10 @@ glabel func_801DDDA8_ovl12 /* 1EE0F8 801DDDB8 AFA40018 */ sw $a0, 0x18($sp) /* 1EE0FC 801DDDBC 8CC30000 */ lw $v1, ($a2) /* 1EE100 801DDDC0 3C05800D */ lui $a1, %hi(D_800D7098) # $a1, 0x800d -/* 1EE104 801DDDC4 3C09800E */ lui $t1, %hi(D_800DDC50) # $t1, 0x800e +/* 1EE104 801DDDC4 3C09800E */ lui $t1, %hi(gEntityVtableIndexArray) # $t1, 0x800e /* 1EE108 801DDDC8 3C0E800F */ lui $t6, %hi(D_800E9560) # $t6, 0x800f /* 1EE10C 801DDDCC 00031880 */ sll $v1, $v1, 2 -/* 1EE110 801DDDD0 2529DC50 */ addiu $t1, %lo(D_800DDC50) # addiu $t1, $t1, -0x23b0 +/* 1EE110 801DDDD0 2529DC50 */ addiu $t1, %lo(gEntityVtableIndexArray) # addiu $t1, $t1, -0x23b0 /* 1EE114 801DDDD4 24A57098 */ addiu $a1, %lo(D_800D7098) # addiu $a1, $a1, 0x7098 /* 1EE118 801DDDD8 25CE9560 */ addiu $t6, %lo(D_800E9560) # addiu $t6, $t6, -0x6aa0 /* 1EE11C 801DDDDC 8CB90008 */ lw $t9, 8($a1) @@ -3489,8 +3489,8 @@ glabel func_801DE41C_ovl12 /* 1EE7A0 801DE460 3C01800F */ lui $at, 0x800f /* 1EE7A4 801DE464 240A0003 */ li $t2, 3 /* 1EE7A8 801DE468 8C480000 */ lw $t0, ($v0) -/* 1EE7AC 801DE46C 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 1EE7B0 801DE470 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 1EE7AC 801DE46C 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 1EE7B0 801DE470 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 1EE7B4 801DE474 00084880 */ sll $t1, $t0, 2 /* 1EE7B8 801DE478 00290821 */ addu $at, $at, $t1 /* 1EE7BC 801DE47C AC209C60 */ sw $zero, -0x63a0($at) @@ -3739,10 +3739,10 @@ glabel func_801DE7E8_ovl12 /* 1EEB38 801DE7F8 AFA40018 */ sw $a0, 0x18($sp) /* 1EEB3C 801DE7FC 8C620000 */ lw $v0, ($v1) /* 1EEB40 801DE800 3C04800D */ lui $a0, %hi(D_800D7098) # $a0, 0x800d -/* 1EEB44 801DE804 3C09800E */ lui $t1, %hi(D_800DDC50) # $t1, 0x800e +/* 1EEB44 801DE804 3C09800E */ lui $t1, %hi(gEntityVtableIndexArray) # $t1, 0x800e /* 1EEB48 801DE808 3C0E800F */ lui $t6, %hi(D_800E9560) # $t6, 0x800f /* 1EEB4C 801DE80C 00021080 */ sll $v0, $v0, 2 -/* 1EEB50 801DE810 2529DC50 */ addiu $t1, %lo(D_800DDC50) # addiu $t1, $t1, -0x23b0 +/* 1EEB50 801DE810 2529DC50 */ addiu $t1, %lo(gEntityVtableIndexArray) # addiu $t1, $t1, -0x23b0 /* 1EEB54 801DE814 24847098 */ addiu $a0, %lo(D_800D7098) # addiu $a0, $a0, 0x7098 /* 1EEB58 801DE818 25CE9560 */ addiu $t6, %lo(D_800E9560) # addiu $t6, $t6, -0x6aa0 /* 1EEB5C 801DE81C 8C990008 */ lw $t9, 8($a0) @@ -7022,8 +7022,8 @@ glabel func_801E1688_ovl12 /* 1F1AE8 801E17A8 00230821 */ addu $at, $at, $v1 /* 1F1AEC 801E17AC AC209C60 */ sw $zero, -0x63a0($at) /* 1F1AF0 801E17B0 8C4F0000 */ lw $t7, ($v0) -/* 1F1AF4 801E17B4 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 1F1AF8 801E17B8 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 1F1AF4 801E17B4 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 1F1AF8 801E17B8 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 1F1AFC 801E17BC 000F7080 */ sll $t6, $t7, 2 /* 1F1B00 801E17C0 00EEC021 */ addu $t8, $a3, $t6 /* 1F1B04 801E17C4 240D0001 */ li $t5, 1 @@ -7709,8 +7709,8 @@ glabel func_801E2018_ovl12 /* 1F24C8 801E2188 8C430000 */ lw $v1, ($v0) /* 1F24CC 801E218C 00031880 */ sll $v1, $v1, 2 .L801E2190_ovl12: -/* 1F24D0 801E2190 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 1F24D4 801E2194 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 1F24D0 801E2190 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 1F24D4 801E2194 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 1F24D8 801E2198 00E3C021 */ addu $t8, $a3, $v1 /* 1F24DC 801E219C AF000000 */ sw $zero, ($t8) /* 1F24E0 801E21A0 8C480000 */ lw $t0, ($v0) diff --git a/asm/ovl13/ovl13.s b/asm/ovl13/ovl13.s index 5a66c814..9b7fd0d6 100644 --- a/asm/ovl13/ovl13.s +++ b/asm/ovl13/ovl13.s @@ -47,8 +47,8 @@ /* 1F31FC 801DB27C 0C02911F */ jal call_virtual_function /* 1F3200 801DB280 90847880 */ lbu $a0, 0x7880($a0) /* 1F3204 801DB284 3C12801E */ lui $s2, %hi(D_801E5A98) # $s2, 0x801e -/* 1F3208 801DB288 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 1F320C 801DB28C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 1F3208 801DB288 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 1F320C 801DB28C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 1F3210 801DB290 26525A98 */ addiu $s2, %lo(D_801E5A98) # addiu $s2, $s2, 0x5a98 /* 1F3214 801DB294 8E190000 */ lw $t9, ($s0) .L801DB298_ovl13: @@ -73,14 +73,14 @@ /* 1F325C 801DB2DC AFB20020 */ sw $s2, 0x20($sp) /* 1F3260 801DB2E0 AFB1001C */ sw $s1, 0x1c($sp) /* 1F3264 801DB2E4 AFB00018 */ sw $s0, 0x18($sp) -/* 1F3268 801DB2E8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1F3268 801DB2E8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1F326C 801DB2EC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1F3270 801DB2F0 3C12801E */ lui $s2, %hi(D_801E5A98) # $s2, 0x801e /* 1F3274 801DB2F4 AFBF0024 */ sw $ra, 0x24($sp) /* 1F3278 801DB2F8 AFA40028 */ sw $a0, 0x28($sp) /* 1F327C 801DB2FC 26525A98 */ addiu $s2, %lo(D_801E5A98) # addiu $s2, $s2, 0x5a98 /* 1F3280 801DB300 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1F3284 801DB304 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1F3284 801DB304 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1F3288 801DB308 8E2E0000 */ lw $t6, ($s1) .L801DB30C_ovl13: /* 1F328C 801DB30C 24050010 */ li $a1, 16 @@ -2475,8 +2475,8 @@ /* 1F56A4 801DD724 2610A360 */ addiu $s0, %lo(D_800EA360) # addiu $s0, $s0, -0x5ca0 /* 1F56A8 801DD728 24090001 */ li $t1, 1 /* 1F56AC 801DD72C 3C01800F */ lui $at, 0x800f -/* 1F56B0 801DD730 3C13800E */ lui $s3, %hi(D_800DDC50) # $s3, 0x800e -/* 1F56B4 801DD734 2673DC50 */ addiu $s3, %lo(D_800DDC50) # addiu $s3, $s3, -0x23b0 +/* 1F56B0 801DD730 3C13800E */ lui $s3, %hi(gEntityVtableIndexArray) # $s3, 0x800e +/* 1F56B4 801DD734 2673DC50 */ addiu $s3, %lo(gEntityVtableIndexArray) # addiu $s3, $s3, -0x23b0 /* 1F56B8 801DD738 E58A0000 */ swc1 $f10, ($t4) /* 1F56BC 801DD73C 8C640000 */ lw $a0, ($v1) /* 1F56C0 801DD740 3C160001 */ lui $s6, (0x0001042A >> 16) # lui $s6, 1 @@ -9799,8 +9799,8 @@ /* 1FC4E0 801E4560 0C02911F */ jal call_virtual_function /* 1FC4E4 801E4564 90847880 */ lbu $a0, 0x7880($a0) /* 1FC4E8 801E4568 3C12801E */ lui $s2, %hi(D_801E5C04) # $s2, 0x801e -/* 1FC4EC 801E456C 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 1FC4F0 801E4570 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 1FC4EC 801E456C 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 1FC4F0 801E4570 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 1FC4F4 801E4574 26525C04 */ addiu $s2, %lo(D_801E5C04) # addiu $s2, $s2, 0x5c04 /* 1FC4F8 801E4578 8E190000 */ lw $t9, ($s0) .L801E457C_ovl13: @@ -9824,14 +9824,14 @@ /* 1FC53C 801E45BC AFB20020 */ sw $s2, 0x20($sp) /* 1FC540 801E45C0 AFB1001C */ sw $s1, 0x1c($sp) /* 1FC544 801E45C4 AFB00018 */ sw $s0, 0x18($sp) -/* 1FC548 801E45C8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1FC548 801E45C8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1FC54C 801E45CC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1FC550 801E45D0 3C12801E */ lui $s2, %hi(D_801E5C04) # $s2, 0x801e /* 1FC554 801E45D4 AFBF0024 */ sw $ra, 0x24($sp) /* 1FC558 801E45D8 AFA40028 */ sw $a0, 0x28($sp) /* 1FC55C 801E45DC 26525C04 */ addiu $s2, %lo(D_801E5C04) # addiu $s2, $s2, 0x5c04 /* 1FC560 801E45E0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1FC564 801E45E4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1FC564 801E45E4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1FC568 801E45E8 8E2E0000 */ lw $t6, ($s1) .L801E45EC_ovl13: /* 1FC56C 801E45EC 24050001 */ li $a1, 1 @@ -10368,8 +10368,8 @@ /* 1FCD78 801E4DF8 0C02911F */ jal call_virtual_function /* 1FCD7C 801E4DFC 90847880 */ lbu $a0, 0x7880($a0) /* 1FCD80 801E4E00 3C12801E */ lui $s2, %hi(D_801E5C10) # $s2, 0x801e -/* 1FCD84 801E4E04 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 1FCD88 801E4E08 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 1FCD84 801E4E04 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 1FCD88 801E4E08 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 1FCD8C 801E4E0C 26525C10 */ addiu $s2, %lo(D_801E5C10) # addiu $s2, $s2, 0x5c10 /* 1FCD90 801E4E10 8E190000 */ lw $t9, ($s0) .L801E4E14_ovl13: @@ -10395,14 +10395,14 @@ /* 1FCDDC 801E4E5C AFB20020 */ sw $s2, 0x20($sp) /* 1FCDE0 801E4E60 AFB1001C */ sw $s1, 0x1c($sp) /* 1FCDE4 801E4E64 AFB00018 */ sw $s0, 0x18($sp) -/* 1FCDE8 801E4E68 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1FCDE8 801E4E68 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1FCDEC 801E4E6C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1FCDF0 801E4E70 3C12801E */ lui $s2, %hi(D_801E5C10) # $s2, 0x801e /* 1FCDF4 801E4E74 AFBF0024 */ sw $ra, 0x24($sp) /* 1FCDF8 801E4E78 AFA40028 */ sw $a0, 0x28($sp) /* 1FCDFC 801E4E7C 26525C10 */ addiu $s2, %lo(D_801E5C10) # addiu $s2, $s2, 0x5c10 /* 1FCE00 801E4E80 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1FCE04 801E4E84 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1FCE04 801E4E84 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1FCE08 801E4E88 8E2E0000 */ lw $t6, ($s1) .L801E4E8C_ovl13: /* 1FCE0C 801E4E8C 24050001 */ li $a1, 1 @@ -10729,8 +10729,8 @@ /* 1FD2F4 801E5374 0C02911F */ jal call_virtual_function /* 1FD2F8 801E5378 90847880 */ lbu $a0, 0x7880($a0) /* 1FD2FC 801E537C 3C12801E */ lui $s2, %hi(D_801E5C1C) # $s2, 0x801e -/* 1FD300 801E5380 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 1FD304 801E5384 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 1FD300 801E5380 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 1FD304 801E5384 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 1FD308 801E5388 26525C1C */ addiu $s2, %lo(D_801E5C1C) # addiu $s2, $s2, 0x5c1c /* 1FD30C 801E538C 8E190000 */ lw $t9, ($s0) .L801E5390_ovl13: @@ -10757,14 +10757,14 @@ /* 1FD35C 801E53DC AFB20020 */ sw $s2, 0x20($sp) /* 1FD360 801E53E0 AFB1001C */ sw $s1, 0x1c($sp) /* 1FD364 801E53E4 AFB00018 */ sw $s0, 0x18($sp) -/* 1FD368 801E53E8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1FD368 801E53E8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1FD36C 801E53EC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1FD370 801E53F0 3C12801E */ lui $s2, %hi(D_801E5C1C) # $s2, 0x801e /* 1FD374 801E53F4 AFBF0024 */ sw $ra, 0x24($sp) /* 1FD378 801E53F8 AFA40028 */ sw $a0, 0x28($sp) /* 1FD37C 801E53FC 26525C1C */ addiu $s2, %lo(D_801E5C1C) # addiu $s2, $s2, 0x5c1c /* 1FD380 801E5400 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1FD384 801E5404 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1FD384 801E5404 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1FD388 801E5408 8E2E0000 */ lw $t6, ($s1) .L801E540C_ovl13: /* 1FD38C 801E540C 24050001 */ li $a1, 1 diff --git a/asm/ovl14/ovl14.s b/asm/ovl14/ovl14.s index cc520a15..86957b2c 100644 --- a/asm/ovl14/ovl14.s +++ b/asm/ovl14/ovl14.s @@ -132,12 +132,12 @@ /* 1FDFB8 801DB3C8 3C10801E */ lui $s0, %hi(D_801DB460) # $s0, 0x801e /* 1FDFBC 801DB3CC 3C11800E */ lui $s1, %hi(D_800DF150) # $s1, 0x800e /* 1FDFC0 801DB3D0 3C128005 */ lui $s2, %hi(D_8004A7C4) # $s2, 0x8005 -/* 1FDFC4 801DB3D4 3C13800E */ lui $s3, %hi(D_800DDC50) # $s3, 0x800e +/* 1FDFC4 801DB3D4 3C13800E */ lui $s3, %hi(gEntityVtableIndexArray) # $s3, 0x800e /* 1FDFC8 801DB3D8 3C14801E */ lui $s4, %hi(D_801E2EAC) # $s4, 0x801e /* 1FDFCC 801DB3DC AFBF002C */ sw $ra, 0x2c($sp) /* 1FDFD0 801DB3E0 AFA40030 */ sw $a0, 0x30($sp) /* 1FDFD4 801DB3E4 26942EAC */ addiu $s4, %lo(D_801E2EAC) # addiu $s4, $s4, 0x2eac -/* 1FDFD8 801DB3E8 2673DC50 */ addiu $s3, %lo(D_800DDC50) # addiu $s3, $s3, -0x23b0 +/* 1FDFD8 801DB3E8 2673DC50 */ addiu $s3, %lo(gEntityVtableIndexArray) # addiu $s3, $s3, -0x23b0 /* 1FDFDC 801DB3EC 2652A7C4 */ addiu $s2, %lo(D_8004A7C4) # addiu $s2, $s2, -0x583c /* 1FDFE0 801DB3F0 2631F150 */ addiu $s1, %lo(D_800DF150) # addiu $s1, $s1, -0xeb0 /* 1FDFE4 801DB3F4 2610B460 */ addiu $s0, %lo(D_801DB460) # addiu $s0, $s0, -0x4ba0 @@ -1902,12 +1902,12 @@ /* 1FFA24 801DCE34 3C10801E */ lui $s0, %hi(D_801DCEC0) # $s0, 0x801e /* 1FFA28 801DCE38 3C11800E */ lui $s1, %hi(D_800DF150) # $s1, 0x800e /* 1FFA2C 801DCE3C 3C128005 */ lui $s2, %hi(D_8004A7C4) # $s2, 0x8005 -/* 1FFA30 801DCE40 3C13800E */ lui $s3, %hi(D_800DDC50) # $s3, 0x800e +/* 1FFA30 801DCE40 3C13800E */ lui $s3, %hi(gEntityVtableIndexArray) # $s3, 0x800e /* 1FFA34 801DCE44 3C14801E */ lui $s4, %hi(D_801E2EE4) # $s4, 0x801e /* 1FFA38 801DCE48 AFBF002C */ sw $ra, 0x2c($sp) /* 1FFA3C 801DCE4C AFA40030 */ sw $a0, 0x30($sp) /* 1FFA40 801DCE50 26942EE4 */ addiu $s4, %lo(D_801E2EE4) # addiu $s4, $s4, 0x2ee4 -/* 1FFA44 801DCE54 2673DC50 */ addiu $s3, %lo(D_800DDC50) # addiu $s3, $s3, -0x23b0 +/* 1FFA44 801DCE54 2673DC50 */ addiu $s3, %lo(gEntityVtableIndexArray) # addiu $s3, $s3, -0x23b0 /* 1FFA48 801DCE58 2652A7C4 */ addiu $s2, %lo(D_8004A7C4) # addiu $s2, $s2, -0x583c /* 1FFA4C 801DCE5C 2631F150 */ addiu $s1, %lo(D_800DF150) # addiu $s1, $s1, -0xeb0 /* 1FFA50 801DCE60 2610CEC0 */ addiu $s0, %lo(D_801DCEC0) # addiu $s0, $s0, -0x3140 @@ -4883,12 +4883,12 @@ /* 202664 801DFA74 3C10801E */ lui $s0, %hi(D_801DFB00) # $s0, 0x801e /* 202668 801DFA78 3C11800E */ lui $s1, %hi(D_800DF150) # $s1, 0x800e /* 20266C 801DFA7C 3C128005 */ lui $s2, %hi(D_8004A7C4) # $s2, 0x8005 -/* 202670 801DFA80 3C13800E */ lui $s3, %hi(D_800DDC50) # $s3, 0x800e +/* 202670 801DFA80 3C13800E */ lui $s3, %hi(gEntityVtableIndexArray) # $s3, 0x800e /* 202674 801DFA84 3C14801E */ lui $s4, %hi(D_801E2F14) # $s4, 0x801e /* 202678 801DFA88 AFBF002C */ sw $ra, 0x2c($sp) /* 20267C 801DFA8C AFA40030 */ sw $a0, 0x30($sp) /* 202680 801DFA90 26942F14 */ addiu $s4, %lo(D_801E2F14) # addiu $s4, $s4, 0x2f14 -/* 202684 801DFA94 2673DC50 */ addiu $s3, %lo(D_800DDC50) # addiu $s3, $s3, -0x23b0 +/* 202684 801DFA94 2673DC50 */ addiu $s3, %lo(gEntityVtableIndexArray) # addiu $s3, $s3, -0x23b0 /* 202688 801DFA98 2652A7C4 */ addiu $s2, %lo(D_8004A7C4) # addiu $s2, $s2, -0x583c /* 20268C 801DFA9C 2631F150 */ addiu $s1, %lo(D_800DF150) # addiu $s1, $s1, -0xeb0 /* 202690 801DFAA0 2610FB00 */ addiu $s0, %lo(D_801DFB00) # addiu $s0, $s0, -0x500 @@ -5240,14 +5240,14 @@ /* 202BCC 801DFFDC AFB20020 */ sw $s2, 0x20($sp) /* 202BD0 801DFFE0 AFB1001C */ sw $s1, 0x1c($sp) /* 202BD4 801DFFE4 AFB00018 */ sw $s0, 0x18($sp) -/* 202BD8 801DFFE8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 202BD8 801DFFE8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 202BDC 801DFFEC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 202BE0 801DFFF0 3C12801E */ lui $s2, %hi(D_801E2F3C) # $s2, 0x801e /* 202BE4 801DFFF4 AFBF0024 */ sw $ra, 0x24($sp) /* 202BE8 801DFFF8 AFA40028 */ sw $a0, 0x28($sp) /* 202BEC 801DFFFC 26522F3C */ addiu $s2, %lo(D_801E2F3C) # addiu $s2, $s2, 0x2f3c /* 202BF0 801E0000 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 202BF4 801E0004 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 202BF4 801E0004 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 202BF8 801E0008 8E2E0000 */ lw $t6, ($s1) .L801E000C_ovl14: /* 202BFC 801E000C 24050003 */ li $a1, 3 @@ -5275,8 +5275,8 @@ /* 202C50 801E0060 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 202C54 801E0064 AFBF0014 */ sw $ra, 0x14($sp) /* 202C58 801E0068 8CC20000 */ lw $v0, ($a2) -/* 202C5C 801E006C 3C05800E */ lui $a1, %hi(D_800DDC50) # $a1, 0x800e -/* 202C60 801E0070 24A5DC50 */ addiu $a1, %lo(D_800DDC50) # addiu $a1, $a1, -0x23b0 +/* 202C5C 801E006C 3C05800E */ lui $a1, %hi(gEntityVtableIndexArray) # $a1, 0x800e +/* 202C60 801E0070 24A5DC50 */ addiu $a1, %lo(gEntityVtableIndexArray) # addiu $a1, $a1, -0x23b0 /* 202C64 801E0074 00021080 */ sll $v0, $v0, 2 /* 202C68 801E0078 00A21821 */ addu $v1, $a1, $v0 /* 202C6C 801E007C 8C6E0000 */ lw $t6, ($v1) @@ -5868,14 +5868,14 @@ /* 20354C 801E095C AFB20020 */ sw $s2, 0x20($sp) /* 203550 801E0960 AFB1001C */ sw $s1, 0x1c($sp) /* 203554 801E0964 AFB00018 */ sw $s0, 0x18($sp) -/* 203558 801E0968 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 203558 801E0968 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 20355C 801E096C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 203560 801E0970 3C12801E */ lui $s2, %hi(D_801E2F54) # $s2, 0x801e /* 203564 801E0974 AFBF0024 */ sw $ra, 0x24($sp) /* 203568 801E0978 AFA40028 */ sw $a0, 0x28($sp) /* 20356C 801E097C 26522F54 */ addiu $s2, %lo(D_801E2F54) # addiu $s2, $s2, 0x2f54 /* 203570 801E0980 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 203574 801E0984 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 203574 801E0984 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 203578 801E0988 8E2E0000 */ lw $t6, ($s1) .L801E098C_ovl14: /* 20357C 801E098C 24050003 */ li $a1, 3 @@ -5903,8 +5903,8 @@ /* 2035D0 801E09E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 2035D4 801E09E4 AFBF0014 */ sw $ra, 0x14($sp) /* 2035D8 801E09E8 8CC20000 */ lw $v0, ($a2) -/* 2035DC 801E09EC 3C05800E */ lui $a1, %hi(D_800DDC50) # $a1, 0x800e -/* 2035E0 801E09F0 24A5DC50 */ addiu $a1, %lo(D_800DDC50) # addiu $a1, $a1, -0x23b0 +/* 2035DC 801E09EC 3C05800E */ lui $a1, %hi(gEntityVtableIndexArray) # $a1, 0x800e +/* 2035E0 801E09F0 24A5DC50 */ addiu $a1, %lo(gEntityVtableIndexArray) # addiu $a1, $a1, -0x23b0 /* 2035E4 801E09F4 00021080 */ sll $v0, $v0, 2 /* 2035E8 801E09F8 00A21821 */ addu $v1, $a1, $v0 /* 2035EC 801E09FC 8C6E0000 */ lw $t6, ($v1) @@ -6379,14 +6379,14 @@ /* 203D0C 801E111C AFB20020 */ sw $s2, 0x20($sp) /* 203D10 801E1120 AFB1001C */ sw $s1, 0x1c($sp) /* 203D14 801E1124 AFB00018 */ sw $s0, 0x18($sp) -/* 203D18 801E1128 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 203D18 801E1128 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 203D1C 801E112C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 203D20 801E1130 3C12801E */ lui $s2, %hi(D_801E2F6C) # $s2, 0x801e /* 203D24 801E1134 AFBF0024 */ sw $ra, 0x24($sp) /* 203D28 801E1138 AFA40028 */ sw $a0, 0x28($sp) /* 203D2C 801E113C 26522F6C */ addiu $s2, %lo(D_801E2F6C) # addiu $s2, $s2, 0x2f6c /* 203D30 801E1140 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 203D34 801E1144 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 203D34 801E1144 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 203D38 801E1148 8E2E0000 */ lw $t6, ($s1) .L801E114C_ovl14: /* 203D3C 801E114C 24050003 */ li $a1, 3 @@ -6414,8 +6414,8 @@ /* 203D90 801E11A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 203D94 801E11A4 AFBF0014 */ sw $ra, 0x14($sp) /* 203D98 801E11A8 8CC20000 */ lw $v0, ($a2) -/* 203D9C 801E11AC 3C05800E */ lui $a1, %hi(D_800DDC50) # $a1, 0x800e -/* 203DA0 801E11B0 24A5DC50 */ addiu $a1, %lo(D_800DDC50) # addiu $a1, $a1, -0x23b0 +/* 203D9C 801E11AC 3C05800E */ lui $a1, %hi(gEntityVtableIndexArray) # $a1, 0x800e +/* 203DA0 801E11B0 24A5DC50 */ addiu $a1, %lo(gEntityVtableIndexArray) # addiu $a1, $a1, -0x23b0 /* 203DA4 801E11B4 00021080 */ sll $v0, $v0, 2 /* 203DA8 801E11B8 00A21821 */ addu $v1, $a1, $v0 /* 203DAC 801E11BC 8C6E0000 */ lw $t6, ($v1) @@ -8046,14 +8046,14 @@ /* 205648 801E2A58 AFB20020 */ sw $s2, 0x20($sp) /* 20564C 801E2A5C AFB1001C */ sw $s1, 0x1c($sp) /* 205650 801E2A60 AFB00018 */ sw $s0, 0x18($sp) -/* 205654 801E2A64 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 205654 801E2A64 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 205658 801E2A68 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 20565C 801E2A6C 3C12801E */ lui $s2, %hi(D_801E2F84) # $s2, 0x801e /* 205660 801E2A70 AFBF0024 */ sw $ra, 0x24($sp) /* 205664 801E2A74 AFA40028 */ sw $a0, 0x28($sp) /* 205668 801E2A78 26522F84 */ addiu $s2, %lo(D_801E2F84) # addiu $s2, $s2, 0x2f84 /* 20566C 801E2A7C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 205670 801E2A80 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 205670 801E2A80 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 205674 801E2A84 8E2E0000 */ lw $t6, ($s1) .L801E2A88_ovl14: /* 205678 801E2A88 24050003 */ li $a1, 3 diff --git a/asm/ovl15/ovl15.s b/asm/ovl15/ovl15.s index c59887b6..4e257bcc 100644 --- a/asm/ovl15/ovl15.s +++ b/asm/ovl15/ovl15.s @@ -55,8 +55,8 @@ /* 205DFC 801DB29C 0C02911F */ jal call_virtual_function /* 205E00 801DB2A0 90847880 */ lbu $a0, 0x7880($a0) /* 205E04 801DB2A4 3C11801E */ lui $s1, %hi(D_801E647C) # $s1, 0x801e -/* 205E08 801DB2A8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 205E0C 801DB2AC 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 205E08 801DB2A8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 205E0C 801DB2AC 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 205E10 801DB2B0 2631647C */ addiu $s1, %lo(D_801E647C) # addiu $s1, $s1, 0x647c /* 205E14 801DB2B4 8E490000 */ lw $t1, ($s2) .L801DB2B8_ovl15: @@ -81,14 +81,14 @@ /* 205E5C 801DB2FC AFB20020 */ sw $s2, 0x20($sp) /* 205E60 801DB300 AFB1001C */ sw $s1, 0x1c($sp) /* 205E64 801DB304 AFB00018 */ sw $s0, 0x18($sp) -/* 205E68 801DB308 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 205E68 801DB308 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 205E6C 801DB30C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 205E70 801DB310 3C12801E */ lui $s2, %hi(D_801E647C) # $s2, 0x801e /* 205E74 801DB314 AFBF0024 */ sw $ra, 0x24($sp) /* 205E78 801DB318 AFA40028 */ sw $a0, 0x28($sp) /* 205E7C 801DB31C 2652647C */ addiu $s2, %lo(D_801E647C) # addiu $s2, $s2, 0x647c /* 205E80 801DB320 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 205E84 801DB324 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 205E84 801DB324 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 205E88 801DB328 8E2E0000 */ lw $t6, ($s1) .L801DB32C_ovl15: /* 205E8C 801DB32C 24050011 */ li $a1, 17 @@ -4583,8 +4583,8 @@ /* 20A1F0 801DF690 00380821 */ addu $at, $at, $t8 /* 20A1F4 801DF694 AC2EDFD0 */ sw $t6, -0x2030($at) /* 20A1F8 801DF698 8C790000 */ lw $t9, ($v1) -/* 20A1FC 801DF69C 3C13800E */ lui $s3, %hi(D_800DDC50) # $s3, 0x800e -/* 20A200 801DF6A0 2673DC50 */ addiu $s3, %lo(D_800DDC50) # addiu $s3, $s3, -0x23b0 +/* 20A1FC 801DF69C 3C13800E */ lui $s3, %hi(gEntityVtableIndexArray) # $s3, 0x800e +/* 20A200 801DF6A0 2673DC50 */ addiu $s3, %lo(gEntityVtableIndexArray) # addiu $s3, $s3, -0x23b0 /* 20A204 801DF6A4 00194080 */ sll $t0, $t9, 2 /* 20A208 801DF6A8 24140009 */ li $s4, 9 /* 20A20C 801DF6AC 02684821 */ addu $t1, $s3, $t0 @@ -8386,8 +8386,8 @@ /* 20DB00 801E2FA0 0C02911F */ jal call_virtual_function /* 20DB04 801E2FA4 90847880 */ lbu $a0, 0x7880($a0) /* 20DB08 801E2FA8 3C12801E */ lui $s2, %hi(D_801E66C0) # $s2, 0x801e -/* 20DB0C 801E2FAC 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 20DB10 801E2FB0 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 20DB0C 801E2FAC 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 20DB10 801E2FB0 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 20DB14 801E2FB4 265266C0 */ addiu $s2, %lo(D_801E66C0) # addiu $s2, $s2, 0x66c0 /* 20DB18 801E2FB8 8E180000 */ lw $t8, ($s0) .L801E2FBC_ovl15: @@ -8766,8 +8766,8 @@ /* 20E0AC 801E354C 0C02911F */ jal call_virtual_function /* 20E0B0 801E3550 24050004 */ li $a1, 4 /* 20E0B4 801E3554 3C12801E */ lui $s2, %hi(D_801E66E4) # $s2, 0x801e -/* 20E0B8 801E3558 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 20E0BC 801E355C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 20E0B8 801E3558 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 20E0BC 801E355C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 20E0C0 801E3560 265266E4 */ addiu $s2, %lo(D_801E66E4) # addiu $s2, $s2, 0x66e4 /* 20E0C4 801E3564 8E190000 */ lw $t9, ($s0) .L801E3568_ovl15: @@ -8815,8 +8815,8 @@ /* 20E168 801E3608 0C02911F */ jal call_virtual_function /* 20E16C 801E360C 24050004 */ li $a1, 4 /* 20E170 801E3610 3C12801E */ lui $s2, %hi(D_801E66E4) # $s2, 0x801e -/* 20E174 801E3614 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 20E178 801E3618 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 20E174 801E3614 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 20E178 801E3618 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 20E17C 801E361C 265266E4 */ addiu $s2, %lo(D_801E66E4) # addiu $s2, $s2, 0x66e4 /* 20E180 801E3620 8E190000 */ lw $t9, ($s0) .L801E3624_ovl15: diff --git a/asm/ovl16/ovl16_2.s b/asm/ovl16/ovl16_2.s index d62f4e2e..6ba12685 100644 --- a/asm/ovl16/ovl16_2.s +++ b/asm/ovl16/ovl16_2.s @@ -293,8 +293,8 @@ glabel func_801E8318_ovl16 /* 21E610 801E8360 0C02911F */ jal call_virtual_function /* 21E614 801E8364 90847880 */ lbu $a0, %lo(D_800E7880)($a0) /* 21E618 801E8368 3C12801F */ lui $s2, %hi(D_801EFC68_ovl16) # $s2, 0x801f -/* 21E61C 801E836C 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 21E620 801E8370 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 21E61C 801E836C 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 21E620 801E8370 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 21E624 801E8374 2652FC68 */ addiu $s2, %lo(D_801EFC68_ovl16) # addiu $s2, $s2, -0x398 /* 21E628 801E8378 8E180000 */ lw $t8, ($s0) .L801E837C_ovl16: @@ -335,13 +335,13 @@ glabel func_801E83B8_ovl16 /* 21E6AC 801E83FC 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 21E6B0 801E8400 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 21E6B4 801E8404 8FBF0014 */ lw $ra, 0x14($sp) -/* 21E6B8 801E8408 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21E6B8 801E8408 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21E6BC 801E840C 8F280000 */ lw $t0, ($t9) /* 21E6C0 801E8410 27BD0018 */ addiu $sp, $sp, 0x18 /* 21E6C4 801E8414 00084880 */ sll $t1, $t0, 2 /* 21E6C8 801E8418 00290821 */ addu $at, $at, $t1 /* 21E6CC 801E841C 03E00008 */ jr $ra -/* 21E6D0 801E8420 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 21E6D0 801E8420 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801E8424_ovl16 /* 21E6D4 801E8424 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 @@ -364,13 +364,13 @@ glabel func_801E8424_ovl16 /* 21E718 801E8468 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 21E71C 801E846C 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 21E720 801E8470 8FBF0014 */ lw $ra, 0x14($sp) -/* 21E724 801E8474 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21E724 801E8474 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21E728 801E8478 8F280000 */ lw $t0, ($t9) /* 21E72C 801E847C 27BD0018 */ addiu $sp, $sp, 0x18 /* 21E730 801E8480 00084880 */ sll $t1, $t0, 2 /* 21E734 801E8484 00290821 */ addu $at, $at, $t1 /* 21E738 801E8488 03E00008 */ jr $ra -/* 21E73C 801E848C AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 21E73C 801E848C AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801E8490_ovl16 /* 21E740 801E8490 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -942,8 +942,8 @@ glabel func_801E8CAC_ovl16 /* 21EFA4 801E8CF4 0C02911F */ jal call_virtual_function /* 21EFA8 801E8CF8 90847880 */ lbu $a0, %lo(D_800E7880)($a0) /* 21EFAC 801E8CFC 3C12801F */ lui $s2, %hi(D_801EFD48_ovl16) # $s2, 0x801f -/* 21EFB0 801E8D00 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 21EFB4 801E8D04 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 21EFB0 801E8D00 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 21EFB4 801E8D04 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 21EFB8 801E8D08 2652FD48 */ addiu $s2, %lo(D_801EFD48_ovl16) # addiu $s2, $s2, -0x2b8 /* 21EFBC 801E8D0C 8E180000 */ lw $t8, ($s0) .L801E8D10_ovl16: @@ -971,14 +971,14 @@ glabel func_801E8D58_ovl16 /* 21F00C 801E8D5C AFB20020 */ sw $s2, 0x20($sp) /* 21F010 801E8D60 AFB1001C */ sw $s1, 0x1c($sp) /* 21F014 801E8D64 AFB00018 */ sw $s0, 0x18($sp) -/* 21F018 801E8D68 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 21F018 801E8D68 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 21F01C 801E8D6C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 21F020 801E8D70 3C12801F */ lui $s2, %hi(D_801EFD48_ovl16) # $s2, 0x801f /* 21F024 801E8D74 AFBF0024 */ sw $ra, 0x24($sp) /* 21F028 801E8D78 AFA40028 */ sw $a0, 0x28($sp) /* 21F02C 801E8D7C 2652FD48 */ addiu $s2, %lo(D_801EFD48_ovl16) # addiu $s2, $s2, -0x2b8 /* 21F030 801E8D80 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 21F034 801E8D84 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 21F034 801E8D84 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 21F038 801E8D88 8E2E0000 */ lw $t6, ($s1) .L801E8D8C_ovl16: /* 21F03C 801E8D8C 24050005 */ li $a1, 5 @@ -1047,12 +1047,12 @@ glabel func_801E8DD8_ovl16 /* 21F130 801E8E80 002C0821 */ addu $at, $at, $t4 /* 21F134 801E8E84 AC229E20 */ sw $v0, %lo(D_800E9E20)($at) /* 21F138 801E8E88 8C6D0000 */ lw $t5, ($v1) -/* 21F13C 801E8E8C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21F13C 801E8E8C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21F140 801E8E90 27BD0018 */ addiu $sp, $sp, 0x18 /* 21F144 801E8E94 000D7080 */ sll $t6, $t5, 2 /* 21F148 801E8E98 002E0821 */ addu $at, $at, $t6 /* 21F14C 801E8E9C 03E00008 */ jr $ra -/* 21F150 801E8EA0 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 21F150 801E8EA0 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801E8EA4_ovl16 /* 21F154 801E8EA4 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -1384,14 +1384,14 @@ glabel func_801E9178_ovl16 /* 21F648 801E9398 8FBF0014 */ lw $ra, 0x14($sp) /* 21F64C 801E939C 8CE60000 */ lw $a2, ($a3) .L801E93A0_ovl16: -/* 21F650 801E93A0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21F650 801E93A0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21F654 801E93A4 240D0004 */ li $t5, 4 /* 21F658 801E93A8 8CCE0000 */ lw $t6, ($a2) /* 21F65C 801E93AC 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 21F660 801E93B0 3C05801F */ lui $a1, %hi(func_801E8D58_ovl16) # $a1, 0x801f /* 21F664 801E93B4 000E7880 */ sll $t7, $t6, 2 /* 21F668 801E93B8 002F0821 */ addu $at, $at, $t7 -/* 21F66C 801E93BC AC2DDC50 */ sw $t5, %lo(D_800DDC50)($at) +/* 21F66C 801E93BC AC2DDC50 */ sw $t5, %lo(gEntityVtableIndexArray)($at) /* 21F670 801E93C0 8CD80000 */ lw $t8, ($a2) /* 21F674 801E93C4 24A58D58 */ addiu $a1, %lo(func_801E8D58_ovl16) # addiu $a1, $a1, -0x72a8 /* 21F678 801E93C8 0018C880 */ sll $t9, $t8, 2 @@ -1636,14 +1636,14 @@ glabel func_801E9590_ovl16 /* 21FA0C 801E975C 8FBF0014 */ lw $ra, 0x14($sp) /* 21FA10 801E9760 8CE60000 */ lw $a2, ($a3) .L801E9764_ovl16: -/* 21FA14 801E9764 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21FA14 801E9764 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21FA18 801E9768 240A0004 */ li $t2, 4 /* 21FA1C 801E976C 8CCB0000 */ lw $t3, ($a2) /* 21FA20 801E9770 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 21FA24 801E9774 3C05801F */ lui $a1, %hi(func_801E8D58_ovl16) # $a1, 0x801f /* 21FA28 801E9778 000B6080 */ sll $t4, $t3, 2 /* 21FA2C 801E977C 002C0821 */ addu $at, $at, $t4 -/* 21FA30 801E9780 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 21FA30 801E9780 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 21FA34 801E9784 8CC90000 */ lw $t1, ($a2) /* 21FA38 801E9788 24A58D58 */ addiu $a1, %lo(func_801E8D58_ovl16) # addiu $a1, $a1, -0x72a8 /* 21FA3C 801E978C 00096880 */ sll $t5, $t1, 2 @@ -1928,7 +1928,7 @@ glabel func_801E9858_ovl16 /* 21FE7C 801E9BCC 2A210006 */ slti $at, $s1, 6 .L801E9BD0_ovl16: /* 21FE80 801E9BD0 8FBF003C */ lw $ra, 0x3c($sp) -/* 21FE84 801E9BD4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 21FE84 801E9BD4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 21FE88 801E9BD8 00300821 */ addu $at, $at, $s0 /* 21FE8C 801E9BDC 24090001 */ li $t1, 1 /* 21FE90 801E9BE0 8FB00018 */ lw $s0, 0x18($sp) @@ -1940,7 +1940,7 @@ glabel func_801E9858_ovl16 /* 21FEA8 801E9BF8 8FB60030 */ lw $s6, 0x30($sp) /* 21FEAC 801E9BFC 8FB70034 */ lw $s7, 0x34($sp) /* 21FEB0 801E9C00 8FBE0038 */ lw $fp, 0x38($sp) -/* 21FEB4 801E9C04 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 21FEB4 801E9C04 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 21FEB8 801E9C08 03E00008 */ jr $ra /* 21FEBC 801E9C0C 27BD0040 */ addiu $sp, $sp, 0x40 @@ -2063,7 +2063,7 @@ glabel func_801E9C10_ovl16 /* 22007C 801E9DCC 10400018 */ beqz $v0, .L801E9E30_ovl16 /* 220080 801E9DD0 24C6A7C4 */ addiu $a2, %lo(D_8004A7C4) # addiu $a2, $a2, -0x583c /* 220084 801E9DD4 8CC30000 */ lw $v1, ($a2) -/* 220088 801E9DD8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 220088 801E9DD8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22008C 801E9DDC 240A0001 */ li $t2, 1 /* 220090 801E9DE0 8C620000 */ lw $v0, ($v1) /* 220094 801E9DE4 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) @@ -2077,7 +2077,7 @@ glabel func_801E9C10_ovl16 /* 2200B4 801E9E04 8C6C0000 */ lw $t4, ($v1) /* 2200B8 801E9E08 000C5880 */ sll $t3, $t4, 2 /* 2200BC 801E9E0C 002B0821 */ addu $at, $at, $t3 -/* 2200C0 801E9E10 AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 2200C0 801E9E10 AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 2200C4 801E9E14 8C6D0000 */ lw $t5, ($v1) /* 2200C8 801E9E18 000D7080 */ sll $t6, $t5, 2 /* 2200CC 801E9E1C 008E2021 */ addu $a0, $a0, $t6 @@ -2121,14 +2121,14 @@ glabel func_801E9C10_ovl16 /* 220158 801E9EA8 8FBF0014 */ lw $ra, 0x14($sp) /* 22015C 801E9EAC 8CC30000 */ lw $v1, ($a2) .L801E9EB0_ovl16: -/* 220160 801E9EB0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 220160 801E9EB0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 220164 801E9EB4 24190004 */ li $t9, 4 /* 220168 801E9EB8 8C6C0000 */ lw $t4, ($v1) /* 22016C 801E9EBC 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 220170 801E9EC0 3C05801F */ lui $a1, %hi(func_801E8D58_ovl16) # $a1, 0x801f /* 220174 801E9EC4 000C5080 */ sll $t2, $t4, 2 /* 220178 801E9EC8 002A0821 */ addu $at, $at, $t2 -/* 22017C 801E9ECC AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 22017C 801E9ECC AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 220180 801E9ED0 8C6B0000 */ lw $t3, ($v1) /* 220184 801E9ED4 24A58D58 */ addiu $a1, %lo(func_801E8D58_ovl16) # addiu $a1, $a1, -0x72a8 /* 220188 801E9ED8 000B6880 */ sll $t5, $t3, 2 @@ -2224,7 +2224,7 @@ glabel func_801E9EF8_ovl16 /* 2202E0 801EA030 02505021 */ addu $t2, $s2, $s0 .L801EA034_ovl16: /* 2202E4 801EA034 8FBF003C */ lw $ra, 0x3c($sp) -/* 2202E8 801EA038 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2202E8 801EA038 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2202EC 801EA03C 00300821 */ addu $at, $at, $s0 /* 2202F0 801EA040 240B0002 */ li $t3, 2 /* 2202F4 801EA044 8FB00020 */ lw $s0, 0x20($sp) @@ -2235,7 +2235,7 @@ glabel func_801E9EF8_ovl16 /* 220308 801EA058 8FB40030 */ lw $s4, 0x30($sp) /* 22030C 801EA05C 8FB50034 */ lw $s5, 0x34($sp) /* 220310 801EA060 8FB60038 */ lw $s6, 0x38($sp) -/* 220314 801EA064 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 220314 801EA064 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 220318 801EA068 03E00008 */ jr $ra /* 22031C 801EA06C 27BD0040 */ addiu $sp, $sp, 0x40 @@ -2360,14 +2360,14 @@ glabel func_801EA070_ovl16 /* 2204E0 801EA230 10400012 */ beqz $v0, .L801EA27C_ovl16 /* 2204E4 801EA234 24C6A7C4 */ addiu $a2, %lo(D_8004A7C4) # addiu $a2, $a2, -0x583c /* 2204E8 801EA238 8CC30000 */ lw $v1, ($a2) -/* 2204EC 801EA23C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2204EC 801EA23C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2204F0 801EA240 240C0003 */ li $t4, 3 /* 2204F4 801EA244 8C6D0000 */ lw $t5, ($v1) /* 2204F8 801EA248 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 2204FC 801EA24C 3C05801F */ lui $a1, %hi(func_801E8D58_ovl16) # $a1, 0x801f /* 220500 801EA250 000D7080 */ sll $t6, $t5, 2 /* 220504 801EA254 002E0821 */ addu $at, $at, $t6 -/* 220508 801EA258 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 220508 801EA258 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 22050C 801EA25C 8C6F0000 */ lw $t7, ($v1) /* 220510 801EA260 24A58D58 */ addiu $a1, %lo(func_801E8D58_ovl16) # addiu $a1, $a1, -0x72a8 /* 220514 801EA264 000FC080 */ sll $t8, $t7, 2 @@ -2412,14 +2412,14 @@ glabel func_801EA070_ovl16 /* 2205A4 801EA2F4 8FBF0014 */ lw $ra, 0x14($sp) /* 2205A8 801EA2F8 8CC30000 */ lw $v1, ($a2) .L801EA2FC_ovl16: -/* 2205AC 801EA2FC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2205AC 801EA2FC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2205B0 801EA300 24190004 */ li $t9, 4 /* 2205B4 801EA304 8C690000 */ lw $t1, ($v1) /* 2205B8 801EA308 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 2205BC 801EA30C 3C05801F */ lui $a1, %hi(func_801E8D58_ovl16) # $a1, 0x801f /* 2205C0 801EA310 00094080 */ sll $t0, $t1, 2 /* 2205C4 801EA314 00280821 */ addu $at, $at, $t0 -/* 2205C8 801EA318 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 2205C8 801EA318 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) /* 2205CC 801EA31C 8C6A0000 */ lw $t2, ($v1) /* 2205D0 801EA320 24A58D58 */ addiu $a1, %lo(func_801E8D58_ovl16) # addiu $a1, $a1, -0x72a8 /* 2205D4 801EA324 000A5880 */ sll $t3, $t2, 2 @@ -3211,7 +3211,7 @@ glabel func_801EACF4_ovl16 /* 221170 801EAEC0 02305021 */ addu $t2, $s1, $s0 .L801EAEC4_ovl16: /* 221174 801EAEC4 8FBF0034 */ lw $ra, 0x34($sp) -/* 221178 801EAEC8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 221178 801EAEC8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22117C 801EAECC 00300821 */ addu $at, $at, $s0 /* 221180 801EAED0 240C0001 */ li $t4, 1 /* 221184 801EAED4 8FB00014 */ lw $s0, 0x14($sp) @@ -3222,7 +3222,7 @@ glabel func_801EACF4_ovl16 /* 221198 801EAEE8 8FB50028 */ lw $s5, 0x28($sp) /* 22119C 801EAEEC 8FB6002C */ lw $s6, 0x2c($sp) /* 2211A0 801EAEF0 8FB70030 */ lw $s7, 0x30($sp) -/* 2211A4 801EAEF4 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 2211A4 801EAEF4 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 2211A8 801EAEF8 03E00008 */ jr $ra /* 2211AC 801EAEFC 27BD0038 */ addiu $sp, $sp, 0x38 @@ -3375,14 +3375,14 @@ glabel func_801EAF00_ovl16 /* 2213DC 801EB12C 8FBF0014 */ lw $ra, 0x14($sp) /* 2213E0 801EB130 8CC30000 */ lw $v1, ($a2) .L801EB134_ovl16: -/* 2213E4 801EB134 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2213E4 801EB134 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2213E8 801EB138 240C0004 */ li $t4, 4 /* 2213EC 801EB13C 8C6B0000 */ lw $t3, ($v1) /* 2213F0 801EB140 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 2213F4 801EB144 3C05801F */ lui $a1, %hi(func_801E8D58_ovl16) # $a1, 0x801f /* 2213F8 801EB148 000B6880 */ sll $t5, $t3, 2 /* 2213FC 801EB14C 002D0821 */ addu $at, $at, $t5 -/* 221400 801EB150 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 221400 801EB150 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 221404 801EB154 8C6E0000 */ lw $t6, ($v1) /* 221408 801EB158 24A58D58 */ addiu $a1, %lo(func_801E8D58_ovl16) # addiu $a1, $a1, -0x72a8 /* 22140C 801EB15C 000E7880 */ sll $t7, $t6, 2 @@ -4598,8 +4598,8 @@ glabel func_801EC320_ovl16 /* 222618 801EC368 0C02911F */ jal call_virtual_function /* 22261C 801EC36C 90847880 */ lbu $a0, %lo(D_800E7880)($a0) /* 222620 801EC370 3C12801F */ lui $s2, %hi(D_801EFD64_ovl16) # $s2, 0x801f -/* 222624 801EC374 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 222628 801EC378 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 222624 801EC374 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 222628 801EC378 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 22262C 801EC37C 2652FD64 */ addiu $s2, %lo(D_801EFD64_ovl16) # addiu $s2, $s2, -0x29c /* 222630 801EC380 8E180000 */ lw $t8, ($s0) .L801EC384_ovl16: @@ -4646,13 +4646,13 @@ glabel func_801EC3D8_ovl16 /* 2226CC 801EC41C 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 2226D0 801EC420 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 2226D4 801EC424 8FBF0014 */ lw $ra, 0x14($sp) -/* 2226D8 801EC428 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2226D8 801EC428 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2226DC 801EC42C 8F280000 */ lw $t0, ($t9) /* 2226E0 801EC430 27BD0018 */ addiu $sp, $sp, 0x18 /* 2226E4 801EC434 00084880 */ sll $t1, $t0, 2 /* 2226E8 801EC438 00290821 */ addu $at, $at, $t1 /* 2226EC 801EC43C 03E00008 */ jr $ra -/* 2226F0 801EC440 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 2226F0 801EC440 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801EC444_ovl16 /* 2226F4 801EC444 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 @@ -4675,14 +4675,14 @@ glabel func_801EC444_ovl16 /* 222738 801EC488 3C088005 */ lui $t0, %hi(D_8004A7C4) # $t0, 0x8005 /* 22273C 801EC48C 8D08A7C4 */ lw $t0, %lo(D_8004A7C4)($t0) /* 222740 801EC490 8FBF0014 */ lw $ra, 0x14($sp) -/* 222744 801EC494 3C01800E */ lui $at, %hi(D_800DDC50) +/* 222744 801EC494 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 222748 801EC498 8D090000 */ lw $t1, ($t0) /* 22274C 801EC49C 24190001 */ li $t9, 1 /* 222750 801EC4A0 27BD0018 */ addiu $sp, $sp, 0x18 /* 222754 801EC4A4 00095080 */ sll $t2, $t1, 2 /* 222758 801EC4A8 002A0821 */ addu $at, $at, $t2 /* 22275C 801EC4AC 03E00008 */ jr $ra -/* 222760 801EC4B0 AC39DC50 */ sw $t9, %lo(D_800DDC50)($at) +/* 222760 801EC4B0 AC39DC50 */ sw $t9, %lo(gEntityVtableIndexArray)($at) glabel func_801EC4B4_ovl16 /* 222764 801EC4B4 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -5280,8 +5280,8 @@ glabel func_801ECD28_ovl16 /* 223038 801ECD88 0C02911F */ jal call_virtual_function /* 22303C 801ECD8C 90847880 */ lbu $a0, %lo(D_800E7880)($a0) /* 223040 801ECD90 3C12801F */ lui $s2, %hi(D_801EFD80_ovl16) # $s2, 0x801f -/* 223044 801ECD94 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 223048 801ECD98 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 223044 801ECD94 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 223048 801ECD98 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 22304C 801ECD9C 2652FD80 */ addiu $s2, %lo(D_801EFD80_ovl16) # addiu $s2, $s2, -0x280 /* 223050 801ECDA0 8E0A0000 */ lw $t2, ($s0) .L801ECDA4_ovl16: @@ -5328,13 +5328,13 @@ glabel func_801ECDF8_ovl16 /* 2230EC 801ECE3C 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 2230F0 801ECE40 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 2230F4 801ECE44 8FBF0014 */ lw $ra, 0x14($sp) -/* 2230F8 801ECE48 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2230F8 801ECE48 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2230FC 801ECE4C 8F280000 */ lw $t0, ($t9) /* 223100 801ECE50 27BD0018 */ addiu $sp, $sp, 0x18 /* 223104 801ECE54 00084880 */ sll $t1, $t0, 2 /* 223108 801ECE58 00290821 */ addu $at, $at, $t1 /* 22310C 801ECE5C 03E00008 */ jr $ra -/* 223110 801ECE60 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 223110 801ECE60 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801ECE64_ovl16 /* 223114 801ECE64 3C0A8005 */ lui $t2, %hi(D_8004A7C4) # $t2, 0x8005 @@ -5636,8 +5636,8 @@ glabel func_801ED290_ovl16 /* 223588 801ED2D8 0C02911F */ jal call_virtual_function /* 22358C 801ED2DC 90847880 */ lbu $a0, %lo(D_800E7880)($a0) /* 223590 801ED2E0 3C12801F */ lui $s2, %hi(D_801EFD94_ovl16) # $s2, 0x801f -/* 223594 801ED2E4 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 223598 801ED2E8 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 223594 801ED2E4 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 223598 801ED2E8 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 22359C 801ED2EC 2652FD94 */ addiu $s2, %lo(D_801EFD94_ovl16) # addiu $s2, $s2, -0x26c /* 2235A0 801ED2F0 8E180000 */ lw $t8, ($s0) .L801ED2F4_ovl16: @@ -5686,13 +5686,13 @@ glabel func_801ED338_ovl16 /* 223644 801ED394 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 223648 801ED398 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 22364C 801ED39C 8FBF0014 */ lw $ra, 0x14($sp) -/* 223650 801ED3A0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 223650 801ED3A0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 223654 801ED3A4 8F280000 */ lw $t0, ($t9) /* 223658 801ED3A8 27BD0018 */ addiu $sp, $sp, 0x18 /* 22365C 801ED3AC 00084880 */ sll $t1, $t0, 2 /* 223660 801ED3B0 00290821 */ addu $at, $at, $t1 /* 223664 801ED3B4 03E00008 */ jr $ra -/* 223668 801ED3B8 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 223668 801ED3B8 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801ED3BC_ovl16 /* 22366C 801ED3BC 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 @@ -5706,12 +5706,12 @@ glabel func_801ED3BC_ovl16 /* 22368C 801ED3DC 002F0821 */ addu $at, $at, $t7 /* 223690 801ED3E0 E4246A10 */ swc1 $f4, %lo(D_800E6A10)($at) /* 223694 801ED3E4 8C590000 */ lw $t9, ($v0) -/* 223698 801ED3E8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 223698 801ED3E8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22369C 801ED3EC 24180001 */ li $t8, 1 /* 2236A0 801ED3F0 00194080 */ sll $t0, $t9, 2 /* 2236A4 801ED3F4 00280821 */ addu $at, $at, $t0 /* 2236A8 801ED3F8 03E00008 */ jr $ra -/* 2236AC 801ED3FC AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 2236AC 801ED3FC AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) glabel func_801ED400_ovl16 /* 2236B0 801ED400 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 @@ -5725,12 +5725,12 @@ glabel func_801ED400_ovl16 /* 2236D0 801ED420 002F0821 */ addu $at, $at, $t7 /* 2236D4 801ED424 E4246A10 */ swc1 $f4, %lo(D_800E6A10)($at) /* 2236D8 801ED428 8C590000 */ lw $t9, ($v0) -/* 2236DC 801ED42C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2236DC 801ED42C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2236E0 801ED430 24180002 */ li $t8, 2 /* 2236E4 801ED434 00194080 */ sll $t0, $t9, 2 /* 2236E8 801ED438 00280821 */ addu $at, $at, $t0 /* 2236EC 801ED43C 03E00008 */ jr $ra -/* 2236F0 801ED440 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 2236F0 801ED440 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) glabel func_801ED444_ovl16 /* 2236F4 801ED444 3C0E800D */ lui $t6, %hi(D_800D70CC) # $t6, 0x800d @@ -7101,13 +7101,13 @@ glabel func_801EE558_ovl16 /* 224B3C 801EE88C 3C10800E */ lui $s0, %hi(gEntitiesPosXArray) # $s0, 0x800e /* 224B40 801EE890 3C0F8005 */ lui $t7, %hi(D_8004A7C4) # $t7, 0x8005 /* 224B44 801EE894 8DEFA7C4 */ lw $t7, %lo(D_8004A7C4)($t7) -/* 224B48 801EE898 3C01800E */ lui $at, %hi(D_800DDC50) +/* 224B48 801EE898 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 224B4C 801EE89C 240D0002 */ li $t5, 2 /* 224B50 801EE8A0 8DF90000 */ lw $t9, ($t7) /* 224B54 801EE8A4 0019C080 */ sll $t8, $t9, 2 /* 224B58 801EE8A8 00380821 */ addu $at, $at, $t8 /* 224B5C 801EE8AC 1000002B */ b .L801EE95C_ovl16 -/* 224B60 801EE8B0 AC2DDC50 */ sw $t5, %lo(D_800DDC50)($at) +/* 224B60 801EE8B0 AC2DDC50 */ sw $t5, %lo(gEntityVtableIndexArray)($at) .L801EE8B4_ovl16: /* 224B64 801EE8B4 3C098005 */ lui $t1, %hi(D_8004A7C4) # $t1, 0x8005 /* 224B68 801EE8B8 8D29A7C4 */ lw $t1, %lo(D_8004A7C4)($t1) diff --git a/asm/ovl17/ovl17_2.s b/asm/ovl17/ovl17_2.s index 33287bec..6d034c31 100644 --- a/asm/ovl17/ovl17_2.s +++ b/asm/ovl17/ovl17_2.s @@ -155,11 +155,11 @@ glabel func_801DD964_ovl17 /* 228D4C 801DDB5C 00390821 */ addu $at, $at, $t9 /* 228D50 801DDB60 AC380D50 */ sw $t8, %lo(D_800E0D50)($at) /* 228D54 801DDB64 8C490000 */ lw $t1, ($v0) -/* 228D58 801DDB68 3C01800E */ lui $at, %hi(D_800DDC50) +/* 228D58 801DDB68 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 228D5C 801DDB6C 00095080 */ sll $t2, $t1, 2 /* 228D60 801DDB70 002A0821 */ addu $at, $at, $t2 /* 228D64 801DDB74 0C0776E3 */ jal func_801DDB8C_ovl17 -/* 228D68 801DDB78 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 228D68 801DDB78 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 228D6C 801DDB7C 8FBF0014 */ lw $ra, 0x14($sp) /* 228D70 801DDB80 27BD0018 */ addiu $sp, $sp, 0x18 /* 228D74 801DDB84 03E00008 */ jr $ra @@ -175,12 +175,12 @@ glabel func_801DDB8C_ovl17 /* 228D94 801DDBA4 3C10801E */ lui $s0, %hi(D_801DDC40) # $s0, 0x801e /* 228D98 801DDBA8 3C11800E */ lui $s1, %hi(D_800DF150) # $s1, 0x800e /* 228D9C 801DDBAC 3C128005 */ lui $s2, %hi(D_8004A7C4) # $s2, 0x8005 -/* 228DA0 801DDBB0 3C13800E */ lui $s3, %hi(D_800DDC50) # $s3, 0x800e +/* 228DA0 801DDBB0 3C13800E */ lui $s3, %hi(gEntityVtableIndexArray) # $s3, 0x800e /* 228DA4 801DDBB4 3C14801E */ lui $s4, %hi(D_801E5404) # $s4, 0x801e /* 228DA8 801DDBB8 AFBF002C */ sw $ra, 0x2c($sp) /* 228DAC 801DDBBC AFA40030 */ sw $a0, 0x30($sp) /* 228DB0 801DDBC0 26945404 */ addiu $s4, %lo(D_801E5404) # addiu $s4, $s4, 0x5404 -/* 228DB4 801DDBC4 2673DC50 */ addiu $s3, %lo(D_800DDC50) # addiu $s3, $s3, -0x23b0 +/* 228DB4 801DDBC4 2673DC50 */ addiu $s3, %lo(gEntityVtableIndexArray) # addiu $s3, $s3, -0x23b0 /* 228DB8 801DDBC8 2652A7C4 */ addiu $s2, %lo(D_8004A7C4) # addiu $s2, $s2, -0x583c /* 228DBC 801DDBCC 2631F150 */ addiu $s1, %lo(D_800DF150) # addiu $s1, $s1, -0xeb0 /* 228DC0 801DDBD0 2610DC40 */ addiu $s0, %lo(D_801DDC40) # addiu $s0, $s0, -0x23c0 @@ -259,11 +259,11 @@ glabel func_801DDC40_ovl17 /* 228ED8 801DDCE8 002E0821 */ addu $at, $at, $t6 /* 228EDC 801DDCEC AC2CA1A0 */ sw $t4, %lo(D_800EA1A0)($at) /* 228EE0 801DDCF0 8C580000 */ lw $t8, ($v0) -/* 228EE4 801DDCF4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 228EE4 801DDCF4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 228EE8 801DDCF8 3C05801E */ lui $a1, %hi(func_801DDB8C) # $a1, 0x801e /* 228EEC 801DDCFC 0018C880 */ sll $t9, $t8, 2 /* 228EF0 801DDD00 00390821 */ addu $at, $at, $t9 -/* 228EF4 801DDD04 AC2FDC50 */ sw $t7, %lo(D_800DDC50)($at) +/* 228EF4 801DDD04 AC2FDC50 */ sw $t7, %lo(gEntityVtableIndexArray)($at) /* 228EF8 801DDD08 8C480000 */ lw $t0, ($v0) /* 228EFC 801DDD0C 24A5DB8C */ addiu $a1, %lo(func_801DDB8C) # addiu $a1, $a1, -0x2474 /* 228F00 801DDD10 00084880 */ sll $t1, $t0, 2 @@ -398,12 +398,12 @@ glabel func_801DDD38_ovl17 /* 2290F0 801DDF00 002D0821 */ addu $at, $at, $t5 /* 2290F4 801DDF04 AC22C120 */ sw $v0, %lo(D_800EC120)($at) /* 2290F8 801DDF08 8C6F0000 */ lw $t7, ($v1) -/* 2290FC 801DDF0C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2290FC 801DDF0C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 229100 801DDF10 27BD0018 */ addiu $sp, $sp, 0x18 /* 229104 801DDF14 000FC080 */ sll $t8, $t7, 2 /* 229108 801DDF18 00380821 */ addu $at, $at, $t8 /* 22910C 801DDF1C 03E00008 */ jr $ra -/* 229110 801DDF20 AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 229110 801DDF20 AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) glabel func_801DDF24_ovl17 /* 229114 801DDF24 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 @@ -564,7 +564,7 @@ glabel func_801DE104_ovl17 /* 22935C 801DE16C 10610011 */ beq $v1, $at, .L801DE1B4_ovl17 /* 229360 801DE170 24080002 */ li $t0, 2 /* 229364 801DE174 10680013 */ beq $v1, $t0, .L801DE1C4_ovl17 -/* 229368 801DE178 3C01800E */ lui $at, %hi(D_800DDC50) +/* 229368 801DE178 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22936C 801DE17C 10000022 */ b .L801DE208_ovl17 /* 229370 801DE180 8FBF0014 */ lw $ra, 0x14($sp) .L801DE184_ovl17: @@ -596,7 +596,7 @@ glabel func_801DE104_ovl17 /* 2293CC 801DE1DC 00073880 */ sll $a3, $a3, 2 .L801DE1E0_ovl17: /* 2293D0 801DE1E0 00270821 */ addu $at, $at, $a3 -/* 2293D4 801DE1E4 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 2293D4 801DE1E4 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 2293D8 801DE1E8 8CCC0000 */ lw $t4, ($a2) /* 2293DC 801DE1EC 3C05801E */ lui $a1, %hi(func_801DDB8C) # $a1, 0x801e /* 2293E0 801DE1F0 24A5DB8C */ addiu $a1, %lo(func_801DDB8C) # addiu $a1, $a1, -0x2474 @@ -716,14 +716,14 @@ glabel func_801DE214_ovl17 /* 229590 801DE3A0 00280821 */ addu $at, $at, $t0 /* 229594 801DE3A4 AC2EA520 */ sw $t6, %lo(D_800EA520)($at) /* 229598 801DE3A8 8C6A0000 */ lw $t2, ($v1) -/* 22959C 801DE3AC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22959C 801DE3AC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2295A0 801DE3B0 D7B40020 */ ldc1 $f20, 0x20($sp) /* 2295A4 801DE3B4 000A5880 */ sll $t3, $t2, 2 /* 2295A8 801DE3B8 002B0821 */ addu $at, $at, $t3 /* 2295AC 801DE3BC D7B60028 */ ldc1 $f22, 0x28($sp) /* 2295B0 801DE3C0 8FB00030 */ lw $s0, 0x30($sp) /* 2295B4 801DE3C4 8FB10034 */ lw $s1, 0x34($sp) -/* 2295B8 801DE3C8 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 2295B8 801DE3C8 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 2295BC 801DE3CC 03E00008 */ jr $ra /* 2295C0 801DE3D0 27BD0040 */ addiu $sp, $sp, 0x40 @@ -948,7 +948,7 @@ glabel func_801DE40C_ovl17 /* 229904 801DE714 002D0821 */ addu $at, $at, $t5 /* 229908 801DE718 AC29A520 */ sw $t1, %lo(D_800EA520)($at) /* 22990C 801DE71C 8C6F0000 */ lw $t7, ($v1) -/* 229910 801DE720 3C01800E */ lui $at, %hi(D_800DDC50) +/* 229910 801DE720 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 229914 801DE724 8FB0001C */ lw $s0, 0x1c($sp) /* 229918 801DE728 000FC080 */ sll $t8, $t7, 2 /* 22991C 801DE72C 00380821 */ addu $at, $at, $t8 @@ -956,7 +956,7 @@ glabel func_801DE40C_ovl17 /* 229924 801DE734 8FB20024 */ lw $s2, 0x24($sp) /* 229928 801DE738 8FB30028 */ lw $s3, 0x28($sp) /* 22992C 801DE73C 8FB50030 */ lw $s5, 0x30($sp) -/* 229930 801DE740 AC2EDC50 */ sw $t6, %lo(D_800DDC50)($at) +/* 229930 801DE740 AC2EDC50 */ sw $t6, %lo(gEntityVtableIndexArray)($at) /* 229934 801DE744 03E00008 */ jr $ra /* 229938 801DE748 27BD0068 */ addiu $sp, $sp, 0x68 @@ -2951,11 +2951,11 @@ glabel func_801DFABC_ovl17 /* 22B6BC 801E04CC E56A0000 */ swc1 $f10, ($t3) .L801E04D0_ovl17: /* 22B6C0 801E04D0 8CC40000 */ lw $a0, ($a2) -/* 22B6C4 801E04D4 3C02800E */ lui $v0, %hi(D_800DDC50) +/* 22B6C4 801E04D4 3C02800E */ lui $v0, %hi(gEntityVtableIndexArray) /* 22B6C8 801E04D8 3C05800F */ lui $a1, %hi(D_800EA520) # $a1, 0x800f /* 22B6CC 801E04DC 00042080 */ sll $a0, $a0, 2 /* 22B6D0 801E04E0 00441021 */ addu $v0, $v0, $a0 -/* 22B6D4 801E04E4 8C42DC50 */ lw $v0, %lo(D_800DDC50)($v0) +/* 22B6D4 801E04E4 8C42DC50 */ lw $v0, %lo(gEntityVtableIndexArray)($v0) /* 22B6D8 801E04E8 24A5A520 */ addiu $a1, %lo(D_800EA520) # addiu $a1, $a1, -0x5ae0 /* 22B6DC 801E04EC 24010003 */ li $at, 3 /* 22B6E0 801E04F0 10410004 */ beq $v0, $at, .L801E0504_ovl17 @@ -3276,7 +3276,7 @@ glabel func_801E073C_ovl17 /* 22BB74 801E0984 3C04800F */ lui $a0, %hi(D_800E83E0) /* 22BB78 801E0988 24060001 */ li $a2, 1 /* 22BB7C 801E098C 8C620000 */ lw $v0, ($v1) -/* 22BB80 801E0990 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22BB80 801E0990 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22BB84 801E0994 240B0004 */ li $t3, 4 /* 22BB88 801E0998 00021080 */ sll $v0, $v0, 2 /* 22BB8C 801E099C 00822021 */ addu $a0, $a0, $v0 @@ -3291,7 +3291,7 @@ glabel func_801E073C_ovl17 /* 22BBB0 801E09C0 10000028 */ b .L801E0A64_ovl17 /* 22BBB4 801E09C4 00001025 */ move $v0, $zero .L801E09C8_ovl17: -/* 22BBB8 801E09C8 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 22BBB8 801E09C8 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 22BBBC 801E09CC 8C6C0000 */ lw $t4, ($v1) /* 22BBC0 801E09D0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 22BBC4 801E09D4 24A5DB8C */ addiu $a1, %lo(func_801DDB8C_ovl17) # addiu $a1, $a1, -0x2474 @@ -3422,9 +3422,9 @@ glabel func_801E0B38_ovl17 /* 22BD94 801E0BA4 1000004C */ b .L801E0CD8_ovl17 /* 22BD98 801E0BA8 00001025 */ move $v0, $zero .L801E0BAC_ovl17: -/* 22BD9C 801E0BAC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22BD9C 801E0BAC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22BDA0 801E0BB0 00230821 */ addu $at, $at, $v1 -/* 22BDA4 801E0BB4 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 22BDA4 801E0BB4 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 22BDA8 801E0BB8 3C01800E */ lui $at, %hi(D_800E76C0) /* 22BDAC 801E0BBC 00250821 */ addu $at, $at, $a1 /* 22BDB0 801E0BC0 240E00FF */ li $t6, 255 diff --git a/asm/ovl17/ovl17_3.s b/asm/ovl17/ovl17_3.s index f5e869fc..d3fd41d3 100644 --- a/asm/ovl17/ovl17_3.s +++ b/asm/ovl17/ovl17_3.s @@ -1393,7 +1393,7 @@ glabel func_801E2170_ovl17 /* 22D374 801E2184 AFA40018 */ sw $a0, 0x18($sp) /* 22D378 801E2188 8DC20000 */ lw $v0, ($t6) /* 22D37C 801E218C 3C0F800E */ lui $t7, %hi(D_800E0D50) -/* 22D380 801E2190 3C19800E */ lui $t9, %hi(D_800DDC50) +/* 22D380 801E2190 3C19800E */ lui $t9, %hi(gEntityVtableIndexArray) /* 22D384 801E2194 00021080 */ sll $v0, $v0, 2 /* 22D388 801E2198 01E27821 */ addu $t7, $t7, $v0 /* 22D38C 801E219C 8DEF0D50 */ lw $t7, %lo(D_800E0D50)($t7) @@ -1401,7 +1401,7 @@ glabel func_801E2170_ovl17 /* 22D394 801E21A4 00621821 */ addu $v1, $v1, $v0 /* 22D398 801E21A8 000FC080 */ sll $t8, $t7, 2 /* 22D39C 801E21AC 0338C821 */ addu $t9, $t9, $t8 -/* 22D3A0 801E21B0 8F39DC50 */ lw $t9, %lo(D_800DDC50)($t9) +/* 22D3A0 801E21B0 8F39DC50 */ lw $t9, %lo(gEntityVtableIndexArray)($t9) /* 22D3A4 801E21B4 24010004 */ li $at, 4 /* 22D3A8 801E21B8 8C631B50 */ lw $v1, %lo(D_800E1B50)($v1) /* 22D3AC 801E21BC 1721000D */ bne $t9, $at, .L801E21F4_ovl17 @@ -2011,13 +2011,13 @@ glabel func_801E2A2C_ovl17 /* 22DCA8 801E2AB8 E4247B20 */ swc1 $f4, %lo(D_800E7B20)($at) /* 22DCAC 801E2ABC 3C0F8005 */ lui $t7, %hi(D_8004A7C4) # $t7, 0x8005 /* 22DCB0 801E2AC0 8DEFA7C4 */ lw $t7, %lo(D_8004A7C4)($t7) -/* 22DCB4 801E2AC4 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22DCB4 801E2AC4 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22DCB8 801E2AC8 8FA40018 */ lw $a0, 0x18($sp) /* 22DCBC 801E2ACC 8DEE0000 */ lw $t6, ($t7) /* 22DCC0 801E2AD0 000EC080 */ sll $t8, $t6, 2 /* 22DCC4 801E2AD4 00380821 */ addu $at, $at, $t8 /* 22DCC8 801E2AD8 0C078ABC */ jal func_801E2AF0_ovl17 -/* 22DCCC 801E2ADC AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22DCCC 801E2ADC AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 22DCD0 801E2AE0 8FBF0014 */ lw $ra, 0x14($sp) /* 22DCD4 801E2AE4 27BD0018 */ addiu $sp, $sp, 0x18 /* 22DCD8 801E2AE8 03E00008 */ jr $ra @@ -2028,14 +2028,14 @@ glabel func_801E2AF0_ovl17 /* 22DCE4 801E2AF4 AFB20020 */ sw $s2, 0x20($sp) /* 22DCE8 801E2AF8 AFB1001C */ sw $s1, 0x1c($sp) /* 22DCEC 801E2AFC AFB00018 */ sw $s0, 0x18($sp) -/* 22DCF0 801E2B00 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 22DCF0 801E2B00 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 22DCF4 801E2B04 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 22DCF8 801E2B08 3C12801E */ lui $s2, %hi(D_801E549C) # $s2, 0x801e /* 22DCFC 801E2B0C AFBF0024 */ sw $ra, 0x24($sp) /* 22DD00 801E2B10 AFA40028 */ sw $a0, 0x28($sp) /* 22DD04 801E2B14 2652549C */ addiu $s2, %lo(D_801E549C) # addiu $s2, $s2, 0x549c /* 22DD08 801E2B18 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 22DD0C 801E2B1C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 22DD0C 801E2B1C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 22DD10 801E2B20 8E2E0000 */ lw $t6, ($s1) .L801E2B24_ovl17: /* 22DD14 801E2B24 24050005 */ li $a1, 5 @@ -2067,8 +2067,8 @@ glabel func_801E2B78_ovl17 /* 22DD74 801E2B84 AFBF0014 */ sw $ra, 0x14($sp) /* 22DD78 801E2B88 AFA40018 */ sw $a0, 0x18($sp) /* 22DD7C 801E2B8C 8C620000 */ lw $v0, ($v1) -/* 22DD80 801E2B90 3C0E800E */ lui $t6, %hi(D_800DDC50) # $t6, 0x800e -/* 22DD84 801E2B94 25CEDC50 */ addiu $t6, %lo(D_800DDC50) # addiu $t6, $t6, -0x23b0 +/* 22DD80 801E2B90 3C0E800E */ lui $t6, %hi(gEntityVtableIndexArray) # $t6, 0x800e +/* 22DD84 801E2B94 25CEDC50 */ addiu $t6, %lo(gEntityVtableIndexArray) # addiu $t6, $t6, -0x23b0 /* 22DD88 801E2B98 00021080 */ sll $v0, $v0, 2 /* 22DD8C 801E2B9C 004E3021 */ addu $a2, $v0, $t6 /* 22DD90 801E2BA0 8CCF0000 */ lw $t7, ($a2) @@ -2143,13 +2143,13 @@ glabel func_801E2C28_ovl17 /* 22DE90 801E2CA0 1140FFF3 */ beqz $t2, .L801E2C70_ovl17 /* 22DE94 801E2CA4 00000000 */ nop /* 22DE98 801E2CA8 8FBF0024 */ lw $ra, 0x24($sp) -/* 22DE9C 801E2CAC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22DE9C 801E2CAC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22DEA0 801E2CB0 00220821 */ addu $at, $at, $v0 /* 22DEA4 801E2CB4 240B0001 */ li $t3, 1 /* 22DEA8 801E2CB8 8FB00018 */ lw $s0, 0x18($sp) /* 22DEAC 801E2CBC 8FB1001C */ lw $s1, 0x1c($sp) /* 22DEB0 801E2CC0 8FB20020 */ lw $s2, 0x20($sp) -/* 22DEB4 801E2CC4 AC2BDC50 */ sw $t3, %lo(D_800DDC50)($at) +/* 22DEB4 801E2CC4 AC2BDC50 */ sw $t3, %lo(gEntityVtableIndexArray)($at) /* 22DEB8 801E2CC8 03E00008 */ jr $ra /* 22DEBC 801E2CCC 27BD0028 */ addiu $sp, $sp, 0x28 @@ -2201,13 +2201,13 @@ glabel func_801E2CF0_ovl17 /* 22DF68 801E2D78 3C0B8005 */ lui $t3, %hi(D_8004A7C4) # $t3, 0x8005 /* 22DF6C 801E2D7C 8D6BA7C4 */ lw $t3, %lo(D_8004A7C4)($t3) /* 22DF70 801E2D80 8FBF0014 */ lw $ra, 0x14($sp) -/* 22DF74 801E2D84 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22DF74 801E2D84 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22DF78 801E2D88 8D6C0000 */ lw $t4, ($t3) /* 22DF7C 801E2D8C 27BD0028 */ addiu $sp, $sp, 0x28 /* 22DF80 801E2D90 000C6880 */ sll $t5, $t4, 2 /* 22DF84 801E2D94 002D0821 */ addu $at, $at, $t5 /* 22DF88 801E2D98 03E00008 */ jr $ra -/* 22DF8C 801E2D9C AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22DF8C 801E2D9C AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801E2DA0_ovl17 /* 22DF90 801E2DA0 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 @@ -2221,7 +2221,7 @@ glabel func_801E2DA0_ovl17 /* 22DFB0 801E2DC0 00031880 */ sll $v1, $v1, 2 /* 22DFB4 801E2DC4 01C37021 */ addu $t6, $t6, $v1 /* 22DFB8 801E2DC8 8DCE0D50 */ lw $t6, %lo(D_800E0D50)($t6) -/* 22DFBC 801E2DCC 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22DFBC 801E2DCC 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22DFC0 801E2DD0 00230821 */ addu $at, $at, $v1 /* 22DFC4 801E2DD4 000E7880 */ sll $t7, $t6, 2 /* 22DFC8 801E2DD8 030FC021 */ addu $t8, $t8, $t7 @@ -2229,7 +2229,7 @@ glabel func_801E2DA0_ovl17 /* 22DFD0 801E2DE0 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 22DFD4 801E2DE4 17000009 */ bnez $t8, .L801E2E0C_ovl17 /* 22DFD8 801E2DE8 00000000 */ nop -/* 22DFDC 801E2DEC AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22DFDC 801E2DEC AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 22DFE0 801E2DF0 8C590000 */ lw $t9, ($v0) /* 22DFE4 801E2DF4 3C05801E */ lui $a1, %hi(func_801E2AF0) # $a1, 0x801e /* 22DFE8 801E2DF8 24A52AF0 */ addiu $a1, %lo(func_801E2AF0) # addiu $a1, $a1, 0x2af0 @@ -2289,12 +2289,12 @@ glabel func_801E2E24_ovl17 /* 22E0B4 801E2EC4 002E0821 */ addu $at, $at, $t6 /* 22E0B8 801E2EC8 AC2098E0 */ sw $zero, %lo(D_800E98E0)($at) /* 22E0BC 801E2ECC 8CB90000 */ lw $t9, ($a1) -/* 22E0C0 801E2ED0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22E0C0 801E2ED0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22E0C4 801E2ED4 27BD0018 */ addiu $sp, $sp, 0x18 /* 22E0C8 801E2ED8 00194880 */ sll $t1, $t9, 2 /* 22E0CC 801E2EDC 00290821 */ addu $at, $at, $t1 /* 22E0D0 801E2EE0 03E00008 */ jr $ra -/* 22E0D4 801E2EE4 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22E0D4 801E2EE4 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801E2EE8_ovl17 /* 22E0D8 801E2EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2345,12 +2345,12 @@ glabel func_801E2F08_ovl17 /* 22E184 801E2F94 002E0821 */ addu $at, $at, $t6 /* 22E188 801E2F98 AC2098E0 */ sw $zero, %lo(D_800E98E0)($at) /* 22E18C 801E2F9C 8CB80000 */ lw $t8, ($a1) -/* 22E190 801E2FA0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22E190 801E2FA0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22E194 801E2FA4 27BD0018 */ addiu $sp, $sp, 0x18 /* 22E198 801E2FA8 00184080 */ sll $t0, $t8, 2 /* 22E19C 801E2FAC 00280821 */ addu $at, $at, $t0 /* 22E1A0 801E2FB0 03E00008 */ jr $ra -/* 22E1A4 801E2FB4 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22E1A4 801E2FB4 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) glabel func_801E2FB8_ovl17 /* 22E1A8 801E2FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2404,13 +2404,13 @@ glabel func_801E3024_ovl17 /* 22E258 801E3068 8FBF0014 */ lw $ra, 0x14($sp) /* 22E25C 801E306C 44802000 */ mtc1 $zero, $f4 /* 22E260 801E3070 C4267B20 */ lwc1 $f6, %lo(D_800E7B20)($at) -/* 22E264 801E3074 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22E264 801E3074 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22E268 801E3078 00230821 */ addu $at, $at, $v1 /* 22E26C 801E307C 4606203C */ c.lt.s $f4, $f6 /* 22E270 801E3080 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 22E274 801E3084 4502000A */ bc1fl .L801E30B0_ovl17 /* 22E278 801E3088 8FBF0014 */ lw $ra, 0x14($sp) -/* 22E27C 801E308C AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22E27C 801E308C AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 22E280 801E3090 8C4F0000 */ lw $t7, ($v0) /* 22E284 801E3094 3C05801E */ lui $a1, %hi(func_801E2AF0) # $a1, 0x801e /* 22E288 801E3098 24A52AF0 */ addiu $a1, %lo(func_801E2AF0) # addiu $a1, $a1, 0x2af0 @@ -2526,11 +2526,11 @@ glabel func_801E30BC_ovl17 /* 22E420 801E3230 002D0821 */ addu $at, $at, $t5 /* 22E424 801E3234 E4247B20 */ swc1 $f4, %lo(D_800E7B20)($at) /* 22E428 801E3238 8C4F0000 */ lw $t7, ($v0) -/* 22E42C 801E323C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22E42C 801E323C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22E430 801E3240 3C04800E */ lui $a0, %hi(gEntityGObjProcessArray) /* 22E434 801E3244 000FC080 */ sll $t8, $t7, 2 /* 22E438 801E3248 00380821 */ addu $at, $at, $t8 -/* 22E43C 801E324C AC2ADC50 */ sw $t2, %lo(D_800DDC50)($at) +/* 22E43C 801E324C AC2ADC50 */ sw $t2, %lo(gEntityVtableIndexArray)($at) /* 22E440 801E3250 8C4E0000 */ lw $t6, ($v0) /* 22E444 801E3254 3C05801E */ lui $a1, %hi(func_801E2AF0) # $a1, 0x801e /* 22E448 801E3258 24A52AF0 */ addiu $a1, %lo(func_801E2AF0) # addiu $a1, $a1, 0x2af0 @@ -3513,13 +3513,13 @@ glabel func_801E4030_ovl17 /* 22F2AC 801E40BC E4247B20 */ swc1 $f4, %lo(D_800E7B20)($at) /* 22F2B0 801E40C0 3C0F8005 */ lui $t7, %hi(D_8004A7C4) # $t7, 0x8005 /* 22F2B4 801E40C4 8DEFA7C4 */ lw $t7, %lo(D_8004A7C4)($t7) -/* 22F2B8 801E40C8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22F2B8 801E40C8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22F2BC 801E40CC 8FA40018 */ lw $a0, 0x18($sp) /* 22F2C0 801E40D0 8DEE0000 */ lw $t6, ($t7) /* 22F2C4 801E40D4 000EC080 */ sll $t8, $t6, 2 /* 22F2C8 801E40D8 00380821 */ addu $at, $at, $t8 /* 22F2CC 801E40DC 0C07903D */ jal func_801E40F4_ovl17 -/* 22F2D0 801E40E0 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22F2D0 801E40E0 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 22F2D4 801E40E4 8FBF0014 */ lw $ra, 0x14($sp) /* 22F2D8 801E40E8 27BD0018 */ addiu $sp, $sp, 0x18 /* 22F2DC 801E40EC 03E00008 */ jr $ra @@ -3530,14 +3530,14 @@ glabel func_801E40F4_ovl17 /* 22F2E8 801E40F8 AFB20020 */ sw $s2, 0x20($sp) /* 22F2EC 801E40FC AFB1001C */ sw $s1, 0x1c($sp) /* 22F2F0 801E4100 AFB00018 */ sw $s0, 0x18($sp) -/* 22F2F4 801E4104 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 22F2F4 801E4104 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 22F2F8 801E4108 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 22F2FC 801E410C 3C12801E */ lui $s2, %hi(D_801E54C4) # $s2, 0x801e /* 22F300 801E4110 AFBF0024 */ sw $ra, 0x24($sp) /* 22F304 801E4114 AFA40028 */ sw $a0, 0x28($sp) /* 22F308 801E4118 265254C4 */ addiu $s2, %lo(D_801E54C4) # addiu $s2, $s2, 0x54c4 /* 22F30C 801E411C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 22F310 801E4120 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 22F310 801E4120 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 22F314 801E4124 8E2E0000 */ lw $t6, ($s1) .L801E4128_ovl17: /* 22F318 801E4128 24050004 */ li $a1, 4 @@ -3601,7 +3601,7 @@ glabel func_801E41C4_ovl17 /* 22F3F0 801E4200 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 /* 22F3F4 801E4204 8F39A7C4 */ lw $t9, %lo(D_8004A7C4)($t9) /* 22F3F8 801E4208 3C08800E */ lui $t0, %hi(D_800E0D50) -/* 22F3FC 801E420C 3C0A800E */ lui $t2, %hi(D_800DDC50) +/* 22F3FC 801E420C 3C0A800E */ lui $t2, %hi(gEntityVtableIndexArray) /* 22F400 801E4210 8F220000 */ lw $v0, ($t9) /* 22F404 801E4214 3C040001 */ lui $a0, (0x00010514 >> 16) # lui $a0, 1 /* 22F408 801E4218 00021080 */ sll $v0, $v0, 2 @@ -3609,7 +3609,7 @@ glabel func_801E41C4_ovl17 /* 22F410 801E4220 8D080D50 */ lw $t0, %lo(D_800E0D50)($t0) /* 22F414 801E4224 00084880 */ sll $t1, $t0, 2 /* 22F418 801E4228 01495021 */ addu $t2, $t2, $t1 -/* 22F41C 801E422C 8D4ADC50 */ lw $t2, %lo(D_800DDC50)($t2) +/* 22F41C 801E422C 8D4ADC50 */ lw $t2, %lo(gEntityVtableIndexArray)($t2) /* 22F420 801E4230 5540000A */ bnezl $t2, .L801E425C_ovl17 /* 22F424 801E4234 8FBF0014 */ lw $ra, 0x14($sp) /* 22F428 801E4238 0C02A806 */ jal func_800AA018 @@ -3622,10 +3622,10 @@ glabel func_801E41C4_ovl17 /* 22F444 801E4254 00021080 */ sll $v0, $v0, 2 /* 22F448 801E4258 8FBF0014 */ lw $ra, 0x14($sp) .L801E425C_ovl17: -/* 22F44C 801E425C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22F44C 801E425C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22F450 801E4260 00220821 */ addu $at, $at, $v0 /* 22F454 801E4264 240C0001 */ li $t4, 1 -/* 22F458 801E4268 AC2CDC50 */ sw $t4, %lo(D_800DDC50)($at) +/* 22F458 801E4268 AC2CDC50 */ sw $t4, %lo(gEntityVtableIndexArray)($at) /* 22F45C 801E426C 03E00008 */ jr $ra /* 22F460 801E4270 27BD0018 */ addiu $sp, $sp, 0x18 @@ -3685,14 +3685,14 @@ glabel func_801E42EC_ovl17 /* 22F51C 801E432C 3C098005 */ lui $t1, %hi(D_8004A7C4) # $t1, 0x8005 /* 22F520 801E4330 8D29A7C4 */ lw $t1, %lo(D_8004A7C4)($t1) /* 22F524 801E4334 8FBF0014 */ lw $ra, 0x14($sp) -/* 22F528 801E4338 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22F528 801E4338 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22F52C 801E433C 8D2A0000 */ lw $t2, ($t1) /* 22F530 801E4340 24080001 */ li $t0, 1 /* 22F534 801E4344 27BD0018 */ addiu $sp, $sp, 0x18 /* 22F538 801E4348 000A5880 */ sll $t3, $t2, 2 /* 22F53C 801E434C 002B0821 */ addu $at, $at, $t3 /* 22F540 801E4350 03E00008 */ jr $ra -/* 22F544 801E4354 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 22F544 801E4354 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) glabel func_801E4358_ovl17 /* 22F548 801E4358 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3765,11 +3765,11 @@ glabel func_801E4378_ovl17 /* 22F648 801E4458 3C0C8005 */ lui $t4, %hi(D_8004A7C4) # $t4, 0x8005 /* 22F64C 801E445C 8D8CA7C4 */ lw $t4, %lo(D_8004A7C4)($t4) /* 22F650 801E4460 8FBF0014 */ lw $ra, 0x14($sp) -/* 22F654 801E4464 3C01800E */ lui $at, %hi(D_800DDC50) +/* 22F654 801E4464 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 22F658 801E4468 8D8D0000 */ lw $t5, ($t4) /* 22F65C 801E446C 27BD0018 */ addiu $sp, $sp, 0x18 /* 22F660 801E4470 000D7880 */ sll $t7, $t5, 2 /* 22F664 801E4474 002F0821 */ addu $at, $at, $t7 /* 22F668 801E4478 03E00008 */ jr $ra -/* 22F66C 801E447C AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 22F66C 801E447C AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) diff --git a/asm/ovl18/ovl18_6.s b/asm/ovl18/ovl18_6.s index c6500828..6607f8bc 100644 --- a/asm/ovl18/ovl18_6.s +++ b/asm/ovl18/ovl18_6.s @@ -159,14 +159,14 @@ glabel func_80225E40_ovl18 /* 2387E4 80225E44 AFB20020 */ sw $s2, 0x20($sp) /* 2387E8 80225E48 AFB1001C */ sw $s1, 0x1c($sp) /* 2387EC 80225E4C AFB00018 */ sw $s0, 0x18($sp) -/* 2387F0 80225E50 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 2387F0 80225E50 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 2387F4 80225E54 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 2387F8 80225E58 3C128023 */ lui $s2, %hi(D_8022AD08) # $s2, 0x8023 /* 2387FC 80225E5C AFBF0024 */ sw $ra, 0x24($sp) /* 238800 80225E60 AFA40028 */ sw $a0, 0x28($sp) /* 238804 80225E64 2652AD08 */ addiu $s2, %lo(D_8022AD08) # addiu $s2, $s2, -0x52f8 /* 238808 80225E68 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 23880C 80225E6C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 23880C 80225E6C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 238810 80225E70 8E2E0000 */ lw $t6, ($s1) .L80225E74_ovl18: /* 238814 80225E74 24050002 */ li $a1, 2 @@ -236,14 +236,14 @@ glabel func_80225EB8_ovl18 /* 23890C 80225F6C AC2EF150 */ sw $t6, %lo(D_800DF150)($at) /* 238910 80225F70 3C098005 */ lui $t1, %hi(D_8004A7C4) # $t1, 0x8005 /* 238914 80225F74 8D29A7C4 */ lw $t1, %lo(D_8004A7C4)($t1) -/* 238918 80225F78 3C01800E */ lui $at, %hi(D_800DDC50) +/* 238918 80225F78 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 23891C 80225F7C 24080001 */ li $t0, 1 /* 238920 80225F80 8D2B0000 */ lw $t3, ($t1) /* 238924 80225F84 8FA40018 */ lw $a0, 0x18($sp) /* 238928 80225F88 000B6080 */ sll $t4, $t3, 2 /* 23892C 80225F8C 002C0821 */ addu $at, $at, $t4 /* 238930 80225F90 0C089790 */ jal func_80225E40_ovl18 -/* 238934 80225F94 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 238934 80225F94 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 238938 80225F98 8FBF0014 */ lw $ra, 0x14($sp) /* 23893C 80225F9C 27BD0018 */ addiu $sp, $sp, 0x18 /* 238940 80225FA0 03E00008 */ jr $ra @@ -541,9 +541,9 @@ glabel func_8022629C_ovl18 /* 238D98 802263F8 00031880 */ sll $v1, $v1, 2 /* 238D9C 802263FC 8FBF0014 */ lw $ra, 0x14($sp) .L80226400_ovl18: -/* 238DA0 80226400 3C01800E */ lui $at, %hi(D_800DDC50) +/* 238DA0 80226400 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 238DA4 80226404 00230821 */ addu $at, $at, $v1 -/* 238DA8 80226408 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 238DA8 80226408 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 238DAC 8022640C 03E00008 */ jr $ra /* 238DB0 80226410 27BD0018 */ addiu $sp, $sp, 0x18 @@ -584,11 +584,11 @@ glabel func_8022647C_ovl18 /* 238E28 80226488 AFBF0014 */ sw $ra, 0x14($sp) /* 238E2C 8022648C AFA40018 */ sw $a0, 0x18($sp) /* 238E30 80226490 8DCF0000 */ lw $t7, ($t6) -/* 238E34 80226494 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 238E34 80226494 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 238E38 80226498 3C068023 */ lui $a2, %hi(D_8022AD1C) # $a2, 0x8023 /* 238E3C 8022649C 000FC080 */ sll $t8, $t7, 2 /* 238E40 802264A0 00982021 */ addu $a0, $a0, $t8 -/* 238E44 802264A4 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 238E44 802264A4 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 238E48 802264A8 24C6AD1C */ addiu $a2, %lo(D_8022AD1C) # addiu $a2, $a2, -0x52e4 /* 238E4C 802264AC 0C02911F */ jal call_virtual_function /* 238E50 802264B0 24050001 */ li $a1, 1 @@ -634,14 +634,14 @@ glabel func_802264C4_ovl18 /* 238EE8 80226548 002C0821 */ addu $at, $at, $t4 /* 238EEC 8022654C E4204550 */ swc1 $f0, %lo(D_800E4550)($at) /* 238EF0 80226550 8C4D0000 */ lw $t5, ($v0) -/* 238EF4 80226554 3C01800E */ lui $at, %hi(D_800DDC50) +/* 238EF4 80226554 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 238EF8 80226558 000D7880 */ sll $t7, $t5, 2 /* 238EFC 8022655C 002F0821 */ addu $at, $at, $t7 /* 238F00 80226560 0C068354 */ jal func_801A0D50_ovl18 -/* 238F04 80226564 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 238F04 80226564 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 238F08 80226568 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005 /* 238F0C 8022656C 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6) -/* 238F10 80226570 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 238F10 80226570 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 238F14 80226574 3C068023 */ lui $a2, %hi(D_8022AD1C) # $a2, 0x8023 /* 238F18 80226578 8DD80000 */ lw $t8, ($t6) /* 238F1C 8022657C 24C6AD1C */ addiu $a2, %lo(D_8022AD1C) # addiu $a2, $a2, -0x52e4 @@ -649,7 +649,7 @@ glabel func_802264C4_ovl18 /* 238F24 80226584 0018C880 */ sll $t9, $t8, 2 /* 238F28 80226588 00992021 */ addu $a0, $a0, $t9 /* 238F2C 8022658C 0C02911F */ jal call_virtual_function -/* 238F30 80226590 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 238F30 80226590 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 238F34 80226594 8FBF0014 */ lw $ra, 0x14($sp) /* 238F38 80226598 27BD0018 */ addiu $sp, $sp, 0x18 /* 238F3C 8022659C 03E00008 */ jr $ra diff --git a/asm/ovl19/ovl19_3.s b/asm/ovl19/ovl19_3.s index f167708f..24d4f1e5 100644 --- a/asm/ovl19/ovl19_3.s +++ b/asm/ovl19/ovl19_3.s @@ -77,9 +77,9 @@ glabel func_80223200_ovl19 /* 243A1C 8022330C 0C02BB02 */ jal func_800AEC08 /* 243A20 80223310 24060002 */ li $a2, 2 /* 243A24 80223314 3C01800F */ lui $at, %hi(D_800E98E4) # $at, 0x800f -/* 243A28 80223318 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 243A28 80223318 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 243A2C 8022331C AC2098E4 */ sw $zero, %lo(D_800E98E4)($at) -/* 243A30 80223320 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 243A30 80223320 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 243A34 80223324 24080001 */ li $t0, 1 /* 243A38 80223328 AE080004 */ sw $t0, 4($s0) /* 243A3C 8022332C 3C01800F */ lui $at, %hi(D_800E8224) # $at, 0x800f @@ -1703,11 +1703,11 @@ glabel L80224B14_ovl19 /* 245234 80224B24 3C03800D */ lui $v1, %hi(D_800D71F8) # $v1, 0x800d /* 245238 80224B28 246371F8 */ addiu $v1, %lo(D_800D71F8) # addiu $v1, $v1, 0x71f8 /* 24523C 80224B2C 00025080 */ sll $t2, $v0, 2 -/* 245240 80224B30 3C01800E */ lui $at, %hi(D_800DDC50) +/* 245240 80224B30 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 245244 80224B34 AC620000 */ sw $v0, ($v1) /* 245248 80224B38 002A0821 */ addu $at, $at, $t2 /* 24524C 80224B3C 24080005 */ li $t0, 5 -/* 245250 80224B40 AC28DC50 */ sw $t0, %lo(D_800DDC50)($at) +/* 245250 80224B40 AC28DC50 */ sw $t0, %lo(gEntityVtableIndexArray)($at) /* 245254 80224B44 0C029D9E */ jal play_sound /* 245258 80224B48 240401F3 */ li $a0, 499 /* 24525C 80224B4C 00006880 */ sll $t5, $zero, 2 @@ -2321,10 +2321,10 @@ glabel L802253C4_ovl19 /* 245B80 80225470 0C02BB02 */ jal func_800AEC08 /* 245B84 80225474 2406004A */ li $a2, 74 /* 245B88 80225478 00021880 */ sll $v1, $v0, 2 -/* 245B8C 8022547C 3C01800E */ lui $at, %hi(D_800DDC50) +/* 245B8C 8022547C 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 245B90 80225480 00230821 */ addu $at, $at, $v1 /* 245B94 80225484 24090006 */ li $t1, 6 -/* 245B98 80225488 AC29DC50 */ sw $t1, %lo(D_800DDC50)($at) +/* 245B98 80225488 AC29DC50 */ sw $t1, %lo(gEntityVtableIndexArray)($at) /* 245B9C 8022548C 8E480000 */ lw $t0, ($s2) /* 245BA0 80225490 3C05800E */ lui $a1, %hi(gEntitiesPosYArray) # $a1, 0x800e /* 245BA4 80225494 24A52790 */ addiu $a1, %lo(gEntitiesPosYArray) # addiu $a1, $a1, 0x2790 @@ -3275,9 +3275,9 @@ glabel func_802260FC_ovl19 /* 246978 80226268 0C02BB02 */ jal func_800AEC08 /* 24697C 8022626C 24060002 */ li $a2, 2 /* 246980 80226270 3C01800F */ lui $at, %hi(D_800E98E4) # $at, 0x800f -/* 246984 80226274 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 246984 80226274 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 246988 80226278 AC2098E4 */ sw $zero, %lo(D_800E98E4)($at) -/* 24698C 8022627C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 24698C 8022627C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 246990 80226280 24190001 */ li $t9, 1 /* 246994 80226284 AE190004 */ sw $t9, 4($s0) /* 246998 80226288 3C01800F */ lui $at, %hi(D_800E8224) # $at, 0x800f @@ -4786,14 +4786,14 @@ glabel func_8022785C_ovl19 /* 247FDC 802278CC E5860014 */ swc1 $f6, 0x14($t4) /* 247FE0 802278D0 8CED0000 */ lw $t5, ($a3) /* 247FE4 802278D4 3C0E800D */ lui $t6, %hi(D_800D6FB0) # $t6, 0x800d -/* 247FE8 802278D8 3C09800E */ lui $t1, %hi(D_800DDC50) # $t1, 0x800e +/* 247FE8 802278D8 3C09800E */ lui $t1, %hi(gEntityVtableIndexArray) # $t1, 0x800e /* 247FEC 802278DC E5A80018 */ swc1 $f8, 0x18($t5) /* 247FF0 802278E0 8D020000 */ lw $v0, ($t0) /* 247FF4 802278E4 AC600024 */ sw $zero, 0x24($v1) /* 247FF8 802278E8 A4600068 */ sh $zero, 0x68($v1) /* 247FFC 802278EC 8C590000 */ lw $t9, ($v0) /* 248000 802278F0 95CE6FB0 */ lhu $t6, %lo(D_800D6FB0)($t6) -/* 248004 802278F4 2529DC50 */ addiu $t1, %lo(D_800DDC50) # addiu $t1, $t1, -0x23b0 +/* 248004 802278F4 2529DC50 */ addiu $t1, %lo(gEntityVtableIndexArray) # addiu $t1, $t1, -0x23b0 /* 248008 802278F8 00197880 */ sll $t7, $t9, 2 /* 24800C 802278FC 012F5021 */ addu $t2, $t1, $t7 /* 248010 80227900 31D800FF */ andi $t8, $t6, 0xff @@ -5381,11 +5381,11 @@ glabel func_80227F90_ovl19 /* 2488A4 80228194 2406004A */ li $a2, 74 /* 2488A8 80228198 00024080 */ sll $t0, $v0, 2 /* 2488AC 8022819C 02087021 */ addu $t6, $s0, $t0 -/* 2488B0 802281A0 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2488B0 802281A0 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2488B4 802281A4 ADC00000 */ sw $zero, ($t6) /* 2488B8 802281A8 00280821 */ addu $at, $at, $t0 /* 2488BC 802281AC 24180001 */ li $t8, 1 -/* 2488C0 802281B0 AC38DC50 */ sw $t8, %lo(D_800DDC50)($at) +/* 2488C0 802281B0 AC38DC50 */ sw $t8, %lo(gEntityVtableIndexArray)($at) /* 2488C4 802281B4 3C01800F */ lui $at, %hi(D_800E8220) /* 2488C8 802281B8 00280821 */ addu $at, $at, $t0 /* 2488CC 802281BC AFA20024 */ sw $v0, 0x24($sp) @@ -5395,9 +5395,9 @@ glabel func_80227F90_ovl19 /* 2488DC 802281CC 0C02BB02 */ jal func_800AEC08 /* 2488E0 802281D0 2406004A */ li $a2, 74 /* 2488E4 802281D4 00024080 */ sll $t0, $v0, 2 -/* 2488E8 802281D8 3C01800E */ lui $at, %hi(D_800DDC50) +/* 2488E8 802281D8 3C01800E */ lui $at, %hi(gEntityVtableIndexArray) /* 2488EC 802281DC 00280821 */ addu $at, $at, $t0 -/* 2488F0 802281E0 AC20DC50 */ sw $zero, %lo(D_800DDC50)($at) +/* 2488F0 802281E0 AC20DC50 */ sw $zero, %lo(gEntityVtableIndexArray)($at) /* 2488F4 802281E4 3C01800F */ lui $at, %hi(D_800E8220) /* 2488F8 802281E8 00280821 */ addu $at, $at, $t0 /* 2488FC 802281EC AC208220 */ sw $zero, %lo(D_800E8220)($at) @@ -5921,9 +5921,9 @@ glabel func_8022889C_ovl19 /* 2490D0 802289C0 2405003C */ li $a1, 60 /* 2490D4 802289C4 0C02BB02 */ jal func_800AEC08 /* 2490D8 802289C8 2406004A */ li $a2, 74 -/* 2490DC 802289CC 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 2490DC 802289CC 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 2490E0 802289D0 00023880 */ sll $a3, $v0, 2 -/* 2490E4 802289D4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 2490E4 802289D4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 2490E8 802289D8 02277821 */ addu $t7, $s1, $a3 /* 2490EC 802289DC ADE00000 */ sw $zero, ($t7) /* 2490F0 802289E0 02077021 */ addu $t6, $s0, $a3 diff --git a/asm/ovl19/ovl19_4.s b/asm/ovl19/ovl19_4.s index 188633aa..883bbbfd 100644 --- a/asm/ovl19/ovl19_4.s +++ b/asm/ovl19/ovl19_4.s @@ -215,8 +215,8 @@ glabel func_80229100_ovl19 /* 249B2C 8022941C 44818000 */ mtc1 $at, $f16 /* 249B30 80229420 E5CA0014 */ swc1 $f10, 0x14($t6) /* 249B34 80229424 8C780000 */ lw $t8, ($v1) -/* 249B38 80229428 3C02800E */ lui $v0, %hi(D_800DDC50) # $v0, 0x800e -/* 249B3C 8022942C 2442DC50 */ addiu $v0, %lo(D_800DDC50) # addiu $v0, $v0, -0x23b0 +/* 249B38 80229428 3C02800E */ lui $v0, %hi(gEntityVtableIndexArray) # $v0, 0x800e +/* 249B3C 8022942C 2442DC50 */ addiu $v0, %lo(gEntityVtableIndexArray) # addiu $v0, $v0, -0x23b0 /* 249B40 80229430 E7100018 */ swc1 $f16, 0x18($t8) /* 249B44 80229434 8E270000 */ lw $a3, ($s1) /* 249B48 80229438 3C068023 */ lui $a2, %hi(D_8022F5B0) # $a2, 0x8023 @@ -244,11 +244,11 @@ glabel func_8022947C_ovl19 /* 249B98 80229488 AFBF0014 */ sw $ra, 0x14($sp) /* 249B9C 8022948C AFA40018 */ sw $a0, 0x18($sp) /* 249BA0 80229490 8DCF0000 */ lw $t7, ($t6) -/* 249BA4 80229494 3C04800E */ lui $a0, %hi(D_800DDC50) +/* 249BA4 80229494 3C04800E */ lui $a0, %hi(gEntityVtableIndexArray) /* 249BA8 80229498 3C068023 */ lui $a2, %hi(D_8022F5B0) # $a2, 0x8023 /* 249BAC 8022949C 000FC080 */ sll $t8, $t7, 2 /* 249BB0 802294A0 00982021 */ addu $a0, $a0, $t8 -/* 249BB4 802294A4 8C84DC50 */ lw $a0, %lo(D_800DDC50)($a0) +/* 249BB4 802294A4 8C84DC50 */ lw $a0, %lo(gEntityVtableIndexArray)($a0) /* 249BB8 802294A8 24C6F5B0 */ addiu $a2, %lo(D_8022F5B0) # addiu $a2, $a2, -0xa50 /* 249BBC 802294AC 0C02911F */ jal call_virtual_function /* 249BC0 802294B0 2405001A */ li $a1, 26 @@ -4675,11 +4675,11 @@ glabel func_8022D584_ovl19 /* 24DCA0 8022D590 AFBF0014 */ sw $ra, 0x14($sp) /* 24DCA4 8022D594 AFA40018 */ sw $a0, 0x18($sp) /* 24DCA8 8022D598 8DCF0000 */ lw $t7, ($t6) -/* 24DCAC 8022D59C 3C05800E */ lui $a1, %hi(D_800DDC50) +/* 24DCAC 8022D59C 3C05800E */ lui $a1, %hi(gEntityVtableIndexArray) /* 24DCB0 8022D5A0 3C048023 */ lui $a0, %hi(D_8022F970) # $a0, 0x8023 /* 24DCB4 8022D5A4 000FC080 */ sll $t8, $t7, 2 /* 24DCB8 8022D5A8 00B82821 */ addu $a1, $a1, $t8 -/* 24DCBC 8022D5AC 8CA5DC50 */ lw $a1, %lo(D_800DDC50)($a1) +/* 24DCBC 8022D5AC 8CA5DC50 */ lw $a1, %lo(gEntityVtableIndexArray)($a1) /* 24DCC0 8022D5B0 0C02909C */ jal print_error_stub /* 24DCC4 8022D5B4 2484F970 */ addiu $a0, %lo(D_8022F970) # addiu $a0, $a0, -0x690 /* 24DCC8 8022D5B8 3C198005 */ lui $t9, %hi(D_8004A7C4) # $t9, 0x8005 diff --git a/asm/ovl7/ovl7_1.s b/asm/ovl7/ovl7_1.s index 74aeed64..4b7cc431 100644 --- a/asm/ovl7/ovl7_1.s +++ b/asm/ovl7/ovl7_1.s @@ -5786,7 +5786,7 @@ glabel func_8019DB7C_ovl7 /* 143C18 8019DBA8 00403025 */ move $a2, $v0 /* 143C1C 8019DBAC 2401FFFF */ li $at, -1 /* 143C20 8019DBB0 1441000A */ bne $v0, $at, .L8019DBDC_ovl7 -/* 143C24 8019DBB4 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e +/* 143C24 8019DBB4 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e .L8019DBB8_ovl7: /* 143C28 8019DBB8 3C04801D */ lui $a0, %hi(D_801CDAB0) # $a0, 0x801d /* 143C2C 8019DBBC 2484DAB0 */ addiu $a0, %lo(D_801CDAB0) # addiu $a0, $a0, -0x2550 @@ -5800,7 +5800,7 @@ glabel func_8019DB7C_ovl7 .L8019DBDC_ovl7: /* 143C4C 8019DBDC 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005 /* 143C50 8019DBE0 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0) -/* 143C54 8019DBE4 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 143C54 8019DBE4 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 143C58 8019DBE8 00021880 */ sll $v1, $v0, 2 /* 143C5C 8019DBEC 8C8E0000 */ lw $t6, ($a0) /* 143C60 8019DBF0 3C01800E */ lui $at, 0x800e diff --git a/asm/ovl7/ovl7_13.s b/asm/ovl7/ovl7_13.s index e3fc8c9d..645c6556 100644 --- a/asm/ovl7/ovl7_13.s +++ b/asm/ovl7/ovl7_13.s @@ -356,14 +356,14 @@ glabel func_801B9424_ovl7 /* 15F498 801B9428 AFB20020 */ sw $s2, 0x20($sp) /* 15F49C 801B942C AFB1001C */ sw $s1, 0x1c($sp) /* 15F4A0 801B9430 AFB00018 */ sw $s0, 0x18($sp) -/* 15F4A4 801B9434 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 15F4A4 801B9434 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 15F4A8 801B9438 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 15F4AC 801B943C 3C12801D */ lui $s2, %hi(D_801CD73C) # $s2, 0x801d /* 15F4B0 801B9440 AFBF0024 */ sw $ra, 0x24($sp) /* 15F4B4 801B9444 AFA40028 */ sw $a0, 0x28($sp) /* 15F4B8 801B9448 2652D73C */ addiu $s2, %lo(D_801CD73C) # addiu $s2, $s2, -0x28c4 /* 15F4BC 801B944C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 15F4C0 801B9450 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 15F4C0 801B9450 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 15F4C4 801B9454 8E2E0000 */ lw $t6, ($s1) .L801B9458_ovl7: /* 15F4C8 801B9458 24050006 */ li $a1, 6 @@ -1399,7 +1399,7 @@ glabel func_801BA32C_ovl7 /* 1603BC 801BA34C 00403025 */ move $a2, $v0 /* 1603C0 801BA350 2401FFFF */ li $at, -1 /* 1603C4 801BA354 1441000B */ bne $v0, $at, .L801BA384_ovl7 -/* 1603C8 801BA358 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e +/* 1603C8 801BA358 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e .L801BA35C_ovl7: /* 1603CC 801BA35C 3C04801D */ lui $a0, %hi(D_801CE380) # $a0, 0x801d /* 1603D0 801BA360 2484E380 */ addiu $a0, %lo(D_801CE380) # addiu $a0, $a0, -0x1c80 @@ -1414,7 +1414,7 @@ glabel func_801BA32C_ovl7 .L801BA384_ovl7: /* 1603F4 801BA384 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005 /* 1603F8 801BA388 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0) -/* 1603FC 801BA38C 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 1603FC 801BA38C 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 160400 801BA390 00021880 */ sll $v1, $v0, 2 /* 160404 801BA394 8C8E0000 */ lw $t6, ($a0) /* 160408 801BA398 3C01800E */ lui $at, 0x800e @@ -1600,14 +1600,14 @@ glabel func_801BA648_ovl7 /* 1606BC 801BA64C AFB20020 */ sw $s2, 0x20($sp) /* 1606C0 801BA650 AFB1001C */ sw $s1, 0x1c($sp) /* 1606C4 801BA654 AFB00018 */ sw $s0, 0x18($sp) -/* 1606C8 801BA658 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1606C8 801BA658 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1606CC 801BA65C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1606D0 801BA660 3C12801D */ lui $s2, %hi(D_801CD780) # $s2, 0x801d /* 1606D4 801BA664 AFBF0024 */ sw $ra, 0x24($sp) /* 1606D8 801BA668 AFA40028 */ sw $a0, 0x28($sp) /* 1606DC 801BA66C 2652D780 */ addiu $s2, %lo(D_801CD780) # addiu $s2, $s2, -0x2880 /* 1606E0 801BA670 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1606E4 801BA674 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1606E4 801BA674 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1606E8 801BA678 8E2E0000 */ lw $t6, ($s1) .L801BA67C_ovl7: /* 1606EC 801BA67C 24050003 */ li $a1, 3 @@ -1927,14 +1927,14 @@ glabel func_801BAB0C_ovl7 /* 160B80 801BAB10 AFB20020 */ sw $s2, 0x20($sp) /* 160B84 801BAB14 AFB1001C */ sw $s1, 0x1c($sp) /* 160B88 801BAB18 AFB00018 */ sw $s0, 0x18($sp) -/* 160B8C 801BAB1C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 160B8C 801BAB1C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 160B90 801BAB20 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 160B94 801BAB24 3C12801D */ lui $s2, %hi(D_801CD798) # $s2, 0x801d /* 160B98 801BAB28 AFBF0024 */ sw $ra, 0x24($sp) /* 160B9C 801BAB2C AFA40028 */ sw $a0, 0x28($sp) /* 160BA0 801BAB30 2652D798 */ addiu $s2, %lo(D_801CD798) # addiu $s2, $s2, -0x2868 /* 160BA4 801BAB34 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 160BA8 801BAB38 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 160BA8 801BAB38 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 160BAC 801BAB3C 8E2E0000 */ lw $t6, ($s1) .L801BAB40_ovl7: /* 160BB0 801BAB40 24050004 */ li $a1, 4 @@ -2084,14 +2084,14 @@ glabel func_801BAD50_ovl7 /* 160DC4 801BAD54 AFB20020 */ sw $s2, 0x20($sp) /* 160DC8 801BAD58 AFB1001C */ sw $s1, 0x1c($sp) /* 160DCC 801BAD5C AFB00018 */ sw $s0, 0x18($sp) -/* 160DD0 801BAD60 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 160DD0 801BAD60 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 160DD4 801BAD64 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 160DD8 801BAD68 3C12801D */ lui $s2, %hi(D_801CD7B8) # $s2, 0x801d /* 160DDC 801BAD6C AFBF0024 */ sw $ra, 0x24($sp) /* 160DE0 801BAD70 AFA40028 */ sw $a0, 0x28($sp) /* 160DE4 801BAD74 2652D7B8 */ addiu $s2, %lo(D_801CD7B8) # addiu $s2, $s2, -0x2848 /* 160DE8 801BAD78 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 160DEC 801BAD7C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 160DEC 801BAD7C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 160DF0 801BAD80 8E2E0000 */ lw $t6, ($s1) .L801BAD84_ovl7: /* 160DF4 801BAD84 24050006 */ li $a1, 6 @@ -2756,14 +2756,14 @@ glabel func_801BB738_ovl7 /* 1617AC 801BB73C AFB20020 */ sw $s2, 0x20($sp) /* 1617B0 801BB740 AFB1001C */ sw $s1, 0x1c($sp) /* 1617B4 801BB744 AFB00018 */ sw $s0, 0x18($sp) -/* 1617B8 801BB748 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1617B8 801BB748 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1617BC 801BB74C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1617C0 801BB750 3C12801D */ lui $s2, %hi(D_801CD7E8) # $s2, 0x801d /* 1617C4 801BB754 AFBF0024 */ sw $ra, 0x24($sp) /* 1617C8 801BB758 AFA40028 */ sw $a0, 0x28($sp) /* 1617CC 801BB75C 2652D7E8 */ addiu $s2, %lo(D_801CD7E8) # addiu $s2, $s2, -0x2818 /* 1617D0 801BB760 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1617D4 801BB764 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1617D4 801BB764 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1617D8 801BB768 8E2E0000 */ lw $t6, ($s1) .L801BB76C_ovl7: /* 1617DC 801BB76C 24050007 */ li $a1, 7 diff --git a/asm/ovl7/ovl7_17.s b/asm/ovl7/ovl7_17.s index b3171baf..f2f25aa9 100644 --- a/asm/ovl7/ovl7_17.s +++ b/asm/ovl7/ovl7_17.s @@ -243,14 +243,14 @@ glabel func_801BF598_ovl7 /* 16560C 801BF59C AFB20020 */ sw $s2, 0x20($sp) /* 165610 801BF5A0 AFB1001C */ sw $s1, 0x1c($sp) /* 165614 801BF5A4 AFB00018 */ sw $s0, 0x18($sp) -/* 165618 801BF5A8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 165618 801BF5A8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 16561C 801BF5AC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 165620 801BF5B0 3C12801D */ lui $s2, %hi(D_801CD8F4) # $s2, 0x801d /* 165624 801BF5B4 AFBF0024 */ sw $ra, 0x24($sp) /* 165628 801BF5B8 AFA40028 */ sw $a0, 0x28($sp) /* 16562C 801BF5BC 2652D8F4 */ addiu $s2, %lo(D_801CD8F4) # addiu $s2, $s2, -0x270c /* 165630 801BF5C0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 165634 801BF5C4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 165634 801BF5C4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 165638 801BF5C8 8E2E0000 */ lw $t6, ($s1) .L801BF5CC_ovl7: /* 16563C 801BF5CC 24050004 */ li $a1, 4 @@ -1572,14 +1572,14 @@ glabel func_801C08E8_ovl7 /* 16695C 801C08EC AFB20020 */ sw $s2, 0x20($sp) /* 166960 801C08F0 AFB1001C */ sw $s1, 0x1c($sp) /* 166964 801C08F4 AFB00018 */ sw $s0, 0x18($sp) -/* 166968 801C08F8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 166968 801C08F8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 16696C 801C08FC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 166970 801C0900 3C12801D */ lui $s2, %hi(D_801CD938) # $s2, 0x801d /* 166974 801C0904 AFBF0024 */ sw $ra, 0x24($sp) /* 166978 801C0908 AFA40028 */ sw $a0, 0x28($sp) /* 16697C 801C090C 2652D938 */ addiu $s2, %lo(D_801CD938) # addiu $s2, $s2, -0x26c8 /* 166980 801C0910 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 166984 801C0914 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 166984 801C0914 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 166988 801C0918 8E2E0000 */ lw $t6, ($s1) .L801C091C_ovl7: /* 16698C 801C091C 24050004 */ li $a1, 4 @@ -2507,14 +2507,14 @@ glabel func_801C1698_ovl7 /* 16770C 801C169C AFB20020 */ sw $s2, 0x20($sp) /* 167710 801C16A0 AFB1001C */ sw $s1, 0x1c($sp) /* 167714 801C16A4 AFB00018 */ sw $s0, 0x18($sp) -/* 167718 801C16A8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 167718 801C16A8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 16771C 801C16AC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 167720 801C16B0 3C12801D */ lui $s2, %hi(D_801CD958) # $s2, 0x801d /* 167724 801C16B4 AFBF0024 */ sw $ra, 0x24($sp) /* 167728 801C16B8 AFA40028 */ sw $a0, 0x28($sp) /* 16772C 801C16BC 2652D958 */ addiu $s2, %lo(D_801CD958) # addiu $s2, $s2, -0x26a8 /* 167730 801C16C0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 167734 801C16C4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 167734 801C16C4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 167738 801C16C8 8E2E0000 */ lw $t6, ($s1) .L801C16CC_ovl7: /* 16773C 801C16CC 24050004 */ li $a1, 4 @@ -3159,14 +3159,14 @@ glabel func_801C2020_ovl7 /* 168094 801C2024 AFB20020 */ sw $s2, 0x20($sp) /* 168098 801C2028 AFB1001C */ sw $s1, 0x1c($sp) /* 16809C 801C202C AFB00018 */ sw $s0, 0x18($sp) -/* 1680A0 801C2030 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1680A0 801C2030 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1680A4 801C2034 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1680A8 801C2038 3C12801D */ lui $s2, %hi(D_801CDA5C) # $s2, 0x801d /* 1680AC 801C203C AFBF0024 */ sw $ra, 0x24($sp) /* 1680B0 801C2040 AFA40028 */ sw $a0, 0x28($sp) /* 1680B4 801C2044 2652DA5C */ addiu $s2, %lo(D_801CDA5C) # addiu $s2, $s2, -0x25a4 /* 1680B8 801C2048 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1680BC 801C204C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1680BC 801C204C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1680C0 801C2050 8E2E0000 */ lw $t6, ($s1) .L801C2054_ovl7: /* 1680C4 801C2054 24050001 */ li $a1, 1 diff --git a/asm/ovl7/ovl7_4.s b/asm/ovl7/ovl7_4.s index 506282d6..4bdb09c2 100644 --- a/asm/ovl7/ovl7_4.s +++ b/asm/ovl7/ovl7_4.s @@ -148,8 +148,8 @@ glabel func_801A3E80 /* 14A110 801A40A0 00000000 */ nop /* 14A114 801A40A4 3C038005 */ lui $v1, %hi(D_8004A7C4) # $v1, 0x8005 /* 14A118 801A40A8 8C63A7C4 */ lw $v1, %lo(D_8004A7C4)($v1) -/* 14A11C 801A40AC 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 14A120 801A40B0 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 14A11C 801A40AC 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 14A120 801A40B0 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 14A124 801A40B4 8C6A0000 */ lw $t2, ($v1) /* 14A128 801A40B8 3C06801C */ lui $a2, %hi(D_801C2970) # $a2, 0x801c /* 14A12C 801A40BC 24C62970 */ addiu $a2, %lo(D_801C2970) # addiu $a2, $a2, 0x2970 @@ -3047,8 +3047,8 @@ glabel func_801A69B0_ovl7 .L801A6BA8_ovl7: /* 14CC18 801A6BA8 3C028005 */ lui $v0, %hi(D_8004A7C4) # $v0, 0x8005 /* 14CC1C 801A6BAC 8C42A7C4 */ lw $v0, %lo(D_8004A7C4)($v0) -/* 14CC20 801A6BB0 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 14CC24 801A6BB4 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 14CC20 801A6BB0 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 14CC24 801A6BB4 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 14CC28 801A6BB8 8C4F0000 */ lw $t7, ($v0) /* 14CC2C 801A6BBC 262DFFFF */ addiu $t5, $s1, -1 /* 14CC30 801A6BC0 3C06801C */ lui $a2, %hi(D_801C2994) # $a2, 0x801c diff --git a/asm/ovl7/ovl7_7.s b/asm/ovl7/ovl7_7.s index 11e60323..9e3a54fd 100644 --- a/asm/ovl7/ovl7_7.s +++ b/asm/ovl7/ovl7_7.s @@ -620,14 +620,14 @@ glabel func_801AF314_ovl7 /* 155388 801AF318 AFB20020 */ sw $s2, 0x20($sp) /* 15538C 801AF31C AFB1001C */ sw $s1, 0x1c($sp) /* 155390 801AF320 AFB00018 */ sw $s0, 0x18($sp) -/* 155394 801AF324 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 155394 801AF324 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 155398 801AF328 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 15539C 801AF32C 3C12801D */ lui $s2, %hi(D_801CD594) # $s2, 0x801d /* 1553A0 801AF330 AFBF0024 */ sw $ra, 0x24($sp) /* 1553A4 801AF334 AFA40028 */ sw $a0, 0x28($sp) /* 1553A8 801AF338 2652D594 */ addiu $s2, %lo(D_801CD594) # addiu $s2, $s2, -0x2a6c /* 1553AC 801AF33C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1553B0 801AF340 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1553B0 801AF340 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1553B4 801AF344 8E2E0000 */ lw $t6, ($s1) .L801AF348_ovl7: /* 1553B8 801AF348 24050004 */ li $a1, 4 diff --git a/asm/ovl7/ovl7_9.s b/asm/ovl7/ovl7_9.s index fb869043..f4f92880 100644 --- a/asm/ovl7/ovl7_9.s +++ b/asm/ovl7/ovl7_9.s @@ -35,9 +35,9 @@ glabel func_801B1E60 /* 157F34 801B1EC4 24841FD8 */ addiu $a0, %lo(D_801B1FD8) # addiu $a0, $a0, 0x1fd8 /* 157F38 801B1EC8 8E230000 */ lw $v1, ($s1) /* 157F3C 801B1ECC 3C0A800F */ lui $t2, 0x800f -/* 157F40 801B1ED0 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 157F40 801B1ED0 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 157F44 801B1ED4 8C620000 */ lw $v0, ($v1) -/* 157F48 801B1ED8 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 157F48 801B1ED8 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 157F4C 801B1EDC 240BFFFF */ li $t3, -1 /* 157F50 801B1EE0 00021080 */ sll $v0, $v0, 2 /* 157F54 801B1EE4 01425021 */ addu $t2, $t2, $v0 @@ -69,7 +69,7 @@ glabel func_801B1E60 /* 157FB8 801B1F48 E424A6E0 */ swc1 $f4, -0x5920($at) /* 157FBC 801B1F4C 8C620000 */ lw $v0, ($v1) /* 157FC0 801B1F50 3C01800E */ lui $at, 0x800e -/* 157FC4 801B1F54 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 157FC4 801B1F54 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 157FC8 801B1F58 00021080 */ sll $v0, $v0, 2 /* 157FCC 801B1F5C 00220821 */ addu $at, $at, $v0 /* 157FD0 801B1F60 C4262790 */ lwc1 $f6, 0x2790($at) @@ -78,7 +78,7 @@ glabel func_801B1E60 /* 157FDC 801B1F6C E426A8A0 */ swc1 $f6, -0x5760($at) /* 157FE0 801B1F70 8C6F0000 */ lw $t7, ($v1) /* 157FE4 801B1F74 3C06801D */ lui $a2, %hi(D_801CD5D0) # $a2, 0x801d -/* 157FE8 801B1F78 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 157FE8 801B1F78 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 157FEC 801B1F7C 008F2021 */ addu $a0, $a0, $t7 /* 157FF0 801B1F80 90847880 */ lbu $a0, 0x7880($a0) /* 157FF4 801B1F84 24C6D5D0 */ addiu $a2, %lo(D_801CD5D0) # addiu $a2, $a2, -0x2a30 @@ -109,14 +109,14 @@ glabel func_801B1FD8_ovl7 /* 15804C 801B1FDC AFB20020 */ sw $s2, 0x20($sp) /* 158050 801B1FE0 AFB1001C */ sw $s1, 0x1c($sp) /* 158054 801B1FE4 AFB00018 */ sw $s0, 0x18($sp) -/* 158058 801B1FE8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 158058 801B1FE8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 15805C 801B1FEC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 158060 801B1FF0 3C12801D */ lui $s2, %hi(D_801CD5D8) # $s2, 0x801d /* 158064 801B1FF4 AFBF0024 */ sw $ra, 0x24($sp) /* 158068 801B1FF8 AFA40028 */ sw $a0, 0x28($sp) /* 15806C 801B1FFC 2652D5D8 */ addiu $s2, %lo(D_801CD5D8) # addiu $s2, $s2, -0x2a28 /* 158070 801B2000 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 158074 801B2004 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 158074 801B2004 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 158078 801B2008 8E2E0000 */ lw $t6, ($s1) .L801B200C_ovl7: /* 15807C 801B200C 24050005 */ li $a1, 5 @@ -938,8 +938,8 @@ glabel func_801B2AE0_ovl7 /* 158C90 801B2C20 0C02911F */ jal call_virtual_function /* 158C94 801B2C24 90847880 */ lbu $a0, 0x7880($a0) /* 158C98 801B2C28 3C12801D */ lui $s2, %hi(D_801CD600) # $s2, 0x801d -/* 158C9C 801B2C2C 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 158CA0 801B2C30 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 158C9C 801B2C2C 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 158CA0 801B2C30 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 158CA4 801B2C34 2652D600 */ addiu $s2, %lo(D_801CD600) # addiu $s2, $s2, -0x2a00 /* 158CA8 801B2C38 8E0A0000 */ lw $t2, ($s0) .L801B2C3C_ovl7: @@ -964,14 +964,14 @@ glabel func_801B2C78_ovl7 /* 158CEC 801B2C7C AFB20020 */ sw $s2, 0x20($sp) /* 158CF0 801B2C80 AFB1001C */ sw $s1, 0x1c($sp) /* 158CF4 801B2C84 AFB00018 */ sw $s0, 0x18($sp) -/* 158CF8 801B2C88 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 158CF8 801B2C88 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 158CFC 801B2C8C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 158D00 801B2C90 3C12801D */ lui $s2, %hi(D_801CD600) # $s2, 0x801d /* 158D04 801B2C94 AFBF0024 */ sw $ra, 0x24($sp) /* 158D08 801B2C98 AFA40028 */ sw $a0, 0x28($sp) /* 158D0C 801B2C9C 2652D600 */ addiu $s2, %lo(D_801CD600) # addiu $s2, $s2, -0x2a00 /* 158D10 801B2CA0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 158D14 801B2CA4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 158D14 801B2CA4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 158D18 801B2CA8 8E2E0000 */ lw $t6, ($s1) .L801B2CAC_ovl7: /* 158D1C 801B2CAC 24050003 */ li $a1, 3 diff --git a/asm/ovl8/ovl8_4.s b/asm/ovl8/ovl8_4.s index f0b481c1..9746db1c 100644 --- a/asm/ovl8/ovl8_4.s +++ b/asm/ovl8/ovl8_4.s @@ -1677,7 +1677,7 @@ glabel func_801D5E90_ovl8 /* 179980 801D5EA0 AFA40018 */ sw $a0, 0x18($sp) /* 179984 801D5EA4 8DC30000 */ lw $v1, ($t6) /* 179988 801D5EA8 3C0F800E */ lui $t7, %hi(D_800E0D50) -/* 17998C 801D5EAC 3C19800E */ lui $t9, %hi(D_800DDC50) +/* 17998C 801D5EAC 3C19800E */ lui $t9, %hi(gEntityVtableIndexArray) /* 179990 801D5EB0 00031880 */ sll $v1, $v1, 2 /* 179994 801D5EB4 01E37821 */ addu $t7, $t7, $v1 /* 179998 801D5EB8 8DEF0D50 */ lw $t7, %lo(D_800E0D50)($t7) @@ -1685,7 +1685,7 @@ glabel func_801D5E90_ovl8 /* 1799A0 801D5EC0 3C08800F */ lui $t0, %hi(D_800E8920) /* 1799A4 801D5EC4 000FC080 */ sll $t8, $t7, 2 /* 1799A8 801D5EC8 0338C821 */ addu $t9, $t9, $t8 -/* 1799AC 801D5ECC 8F39DC50 */ lw $t9, %lo(D_800DDC50)($t9) +/* 1799AC 801D5ECC 8F39DC50 */ lw $t9, %lo(gEntityVtableIndexArray)($t9) /* 1799B0 801D5ED0 3C02800F */ lui $v0, %hi(D_800E98E0) /* 1799B4 801D5ED4 01034021 */ addu $t0, $t0, $v1 /* 1799B8 801D5ED8 1721000C */ bne $t9, $at, .L801D5F0C_ovl8 @@ -1904,7 +1904,7 @@ glabel func_801D5F88_ovl8 /* 179CE0 801D6200 240D0001 */ li $t5, 1 /* 179CE4 801D6204 8C6E0000 */ lw $t6, ($v1) /* 179CE8 801D6208 3C13800E */ lui $s3, %hi(D_800E0D50) # $s3, 0x800e -/* 179CEC 801D620C 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e +/* 179CEC 801D620C 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e /* 179CF0 801D6210 000E7880 */ sll $t7, $t6, 2 /* 179CF4 801D6214 002F0821 */ addu $at, $at, $t7 /* 179CF8 801D6218 AC2D98E0 */ sw $t5, %lo(D_800E98E0)($at) @@ -1916,7 +1916,7 @@ glabel func_801D5F88_ovl8 /* 179D10 801D6230 00220821 */ addu $at, $at, $v0 /* 179D14 801D6234 C4246A10 */ lwc1 $f4, %lo(D_800E6A10)($at) /* 179D18 801D6238 3C01801E */ lui $at, %hi(D_801D98E0_ovl8) -/* 179D1C 801D623C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 179D1C 801D623C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 179D20 801D6240 46049032 */ c.eq.s $f18, $f4 /* 179D24 801D6244 26730D50 */ addiu $s3, %lo(D_800E0D50) # addiu $s3, $s3, 0x0d50 /* 179D28 801D6248 24120002 */ li $s2, 2 @@ -2121,7 +2121,7 @@ glabel func_801D6534_ovl8 /* 17A024 801D6544 AFA40048 */ sw $a0, 0x48($sp) /* 17A028 801D6548 8DC30000 */ lw $v1, ($t6) /* 17A02C 801D654C 3C06800E */ lui $a2, %hi(D_800E0D50) -/* 17A030 801D6550 3C18800E */ lui $t8, %hi(D_800DDC50) +/* 17A030 801D6550 3C18800E */ lui $t8, %hi(gEntityVtableIndexArray) /* 17A034 801D6554 00031880 */ sll $v1, $v1, 2 /* 17A038 801D6558 00C33021 */ addu $a2, $a2, $v1 /* 17A03C 801D655C 8CC60D50 */ lw $a2, %lo(D_800E0D50)($a2) @@ -2129,7 +2129,7 @@ glabel func_801D6534_ovl8 /* 17A044 801D6564 2401000E */ li $at, 14 /* 17A048 801D6568 00061080 */ sll $v0, $a2, 2 /* 17A04C 801D656C 0302C021 */ addu $t8, $t8, $v0 -/* 17A050 801D6570 8F18DC50 */ lw $t8, %lo(D_800DDC50)($t8) +/* 17A050 801D6570 8F18DC50 */ lw $t8, %lo(gEntityVtableIndexArray)($t8) /* 17A054 801D6574 01E27821 */ addu $t7, $t7, $v0 /* 17A058 801D6578 8DEFFBD0 */ lw $t7, %lo(D_800DFBD0)($t7) /* 17A05C 801D657C 3C02800F */ lui $v0, %hi(D_800E98E0) @@ -2519,7 +2519,7 @@ glabel func_801D6B20_ovl8 /* 17A610 801D6B30 AFA40018 */ sw $a0, 0x18($sp) /* 17A614 801D6B34 8C620000 */ lw $v0, ($v1) /* 17A618 801D6B38 3C0E800E */ lui $t6, %hi(D_800E0D50) -/* 17A61C 801D6B3C 3C18800E */ lui $t8, %hi(D_800DDC50) +/* 17A61C 801D6B3C 3C18800E */ lui $t8, %hi(gEntityVtableIndexArray) /* 17A620 801D6B40 00021080 */ sll $v0, $v0, 2 /* 17A624 801D6B44 01C27021 */ addu $t6, $t6, $v0 /* 17A628 801D6B48 8DCE0D50 */ lw $t6, %lo(D_800E0D50)($t6) @@ -2527,7 +2527,7 @@ glabel func_801D6B20_ovl8 /* 17A630 801D6B50 3C19800F */ lui $t9, %hi(D_800E8920) /* 17A634 801D6B54 000E7880 */ sll $t7, $t6, 2 /* 17A638 801D6B58 030FC021 */ addu $t8, $t8, $t7 -/* 17A63C 801D6B5C 8F18DC50 */ lw $t8, %lo(D_800DDC50)($t8) +/* 17A63C 801D6B5C 8F18DC50 */ lw $t8, %lo(gEntityVtableIndexArray)($t8) /* 17A640 801D6B60 3C04800F */ lui $a0, %hi(D_800E98E0) /* 17A644 801D6B64 0322C821 */ addu $t9, $t9, $v0 /* 17A648 801D6B68 1701000C */ bne $t8, $at, .L801D6B9C_ovl8 @@ -2788,7 +2788,7 @@ glabel func_801D6F1C_ovl8 /* 17AA0C 801D6F2C AFA40020 */ sw $a0, 0x20($sp) /* 17AA10 801D6F30 8CA30000 */ lw $v1, ($a1) /* 17AA14 801D6F34 3C0E800E */ lui $t6, %hi(D_800E0D50) -/* 17AA18 801D6F38 3C18800E */ lui $t8, %hi(D_800DDC50) +/* 17AA18 801D6F38 3C18800E */ lui $t8, %hi(gEntityVtableIndexArray) /* 17AA1C 801D6F3C 00031880 */ sll $v1, $v1, 2 /* 17AA20 801D6F40 01C37021 */ addu $t6, $t6, $v1 /* 17AA24 801D6F44 8DCE0D50 */ lw $t6, %lo(D_800E0D50)($t6) @@ -2796,7 +2796,7 @@ glabel func_801D6F1C_ovl8 /* 17AA2C 801D6F4C 3C19800F */ lui $t9, %hi(D_800E8920) /* 17AA30 801D6F50 000E7880 */ sll $t7, $t6, 2 /* 17AA34 801D6F54 030FC021 */ addu $t8, $t8, $t7 -/* 17AA38 801D6F58 8F18DC50 */ lw $t8, %lo(D_800DDC50)($t8) +/* 17AA38 801D6F58 8F18DC50 */ lw $t8, %lo(gEntityVtableIndexArray)($t8) /* 17AA3C 801D6F5C 3C02800F */ lui $v0, %hi(D_800E98E0) /* 17AA40 801D6F60 0323C821 */ addu $t9, $t9, $v1 /* 17AA44 801D6F64 1701000C */ bne $t8, $at, .L801D6F98_ovl8 @@ -3227,7 +3227,7 @@ glabel func_801D75A8_ovl8 /* 17B098 801D75B8 AFA40030 */ sw $a0, 0x30($sp) /* 17B09C 801D75BC 8DC30000 */ lw $v1, ($t6) /* 17B0A0 801D75C0 3C0F800E */ lui $t7, %hi(D_800E0D50) -/* 17B0A4 801D75C4 3C19800E */ lui $t9, %hi(D_800DDC50) +/* 17B0A4 801D75C4 3C19800E */ lui $t9, %hi(gEntityVtableIndexArray) /* 17B0A8 801D75C8 00031880 */ sll $v1, $v1, 2 /* 17B0AC 801D75CC 01E37821 */ addu $t7, $t7, $v1 /* 17B0B0 801D75D0 8DEF0D50 */ lw $t7, %lo(D_800E0D50)($t7) @@ -3235,7 +3235,7 @@ glabel func_801D75A8_ovl8 /* 17B0B8 801D75D8 3C09800F */ lui $t1, %hi(D_800E8920) /* 17B0BC 801D75DC 000FC080 */ sll $t8, $t7, 2 /* 17B0C0 801D75E0 0338C821 */ addu $t9, $t9, $t8 -/* 17B0C4 801D75E4 8F39DC50 */ lw $t9, %lo(D_800DDC50)($t9) +/* 17B0C4 801D75E4 8F39DC50 */ lw $t9, %lo(gEntityVtableIndexArray)($t9) /* 17B0C8 801D75E8 3C02800F */ lui $v0, %hi(D_800E98E0) /* 17B0CC 801D75EC 01234821 */ addu $t1, $t1, $v1 /* 17B0D0 801D75F0 1721000C */ bne $t9, $at, .L801D7624_ovl8 diff --git a/asm/ovl9/ovl9.s b/asm/ovl9/ovl9.s index d76a2fd6..afb24537 100644 --- a/asm/ovl9/ovl9.s +++ b/asm/ovl9/ovl9.s @@ -57,8 +57,8 @@ glabel func_801D0C60_ovl9 /* 17ED6C 801D0D1C 0C02911F */ jal call_virtual_function /* 17ED70 801D0D20 90847880 */ lbu $a0, 0x7880($a0) /* 17ED74 801D0D24 3C128022 */ lui $s2, %hi(D_8021BABC) # $s2, 0x8022 -/* 17ED78 801D0D28 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 17ED7C 801D0D2C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 17ED78 801D0D28 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 17ED7C 801D0D2C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 17ED80 801D0D30 2652BABC */ addiu $s2, %lo(D_8021BABC) # addiu $s2, $s2, -0x4544 /* 17ED84 801D0D34 8E190000 */ lw $t9, ($s0) .L801D0D38_ovl9: @@ -84,14 +84,14 @@ glabel func_801D0D78_ovl9 /* 17EDCC 801D0D7C AFB20020 */ sw $s2, 0x20($sp) /* 17EDD0 801D0D80 AFB1001C */ sw $s1, 0x1c($sp) /* 17EDD4 801D0D84 AFB00018 */ sw $s0, 0x18($sp) -/* 17EDD8 801D0D88 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 17EDD8 801D0D88 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 17EDDC 801D0D8C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 17EDE0 801D0D90 3C128022 */ lui $s2, %hi(D_8021BABC) # $s2, 0x8022 /* 17EDE4 801D0D94 AFBF0024 */ sw $ra, 0x24($sp) /* 17EDE8 801D0D98 AFA40028 */ sw $a0, 0x28($sp) /* 17EDEC 801D0D9C 2652BABC */ addiu $s2, %lo(D_8021BABC) # addiu $s2, $s2, -0x4544 /* 17EDF0 801D0DA0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 17EDF4 801D0DA4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 17EDF4 801D0DA4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 17EDF8 801D0DA8 8E2E0000 */ lw $t6, ($s1) .L801D0DAC_ovl9: /* 17EDFC 801D0DAC 2405000B */ li $a1, 11 @@ -545,10 +545,10 @@ glabel func_801D12DC_ovl9 /* 17F48C 801D143C 3C0142F0 */ li $at, 0x42F00000 # 120.000000 /* 17F490 801D1440 3C14800E */ lui $s4, %hi(D_800E6A10) # $s4, 0x800e /* 17F494 801D1444 3C12800E */ lui $s2, %hi(gEntitiesPosYArray) # $s2, 0x800e -/* 17F498 801D1448 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 17F498 801D1448 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 17F49C 801D144C 4481A000 */ mtc1 $at, $f20 /* 17F4A0 801D1450 4480B000 */ mtc1 $zero, $f22 -/* 17F4A4 801D1454 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 17F4A4 801D1454 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 17F4A8 801D1458 26522790 */ addiu $s2, %lo(gEntitiesPosYArray) # addiu $s2, $s2, 0x2790 /* 17F4AC 801D145C 26946A10 */ addiu $s4, %lo(D_800E6A10) # addiu $s4, $s4, 0x6a10 /* 17F4B0 801D1460 24130007 */ li $s3, 7 @@ -856,9 +856,9 @@ glabel func_801D1718_ovl9 /* 17F920 801D18D0 4481B000 */ mtc1 $at, $f22 /* 17F924 801D18D4 3C0142F0 */ li $at, 0x42F00000 # 120.000000 /* 17F928 801D18D8 3C11800E */ lui $s1, %hi(D_800E2CD0) # $s1, 0x800e -/* 17F92C 801D18DC 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 17F92C 801D18DC 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 17F930 801D18E0 4481A000 */ mtc1 $at, $f20 -/* 17F934 801D18E4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 17F934 801D18E4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 17F938 801D18E8 26312CD0 */ addiu $s1, %lo(D_800E2CD0) # addiu $s1, $s1, 0x2cd0 /* 17F93C 801D18EC 26522790 */ addiu $s2, %lo(gEntitiesPosYArray) # addiu $s2, $s2, 0x2790 /* 17F940 801D18F0 26947880 */ addiu $s4, %lo(D_800E7880) # addiu $s4, $s4, 0x7880 @@ -1421,11 +1421,11 @@ glabel func_801D1F30_ovl9 /* 180180 801D2130 3C13800F */ lui $s3, %hi(D_800E98E0) # $s3, 0x800f /* 180184 801D2134 3C12800E */ lui $s2, %hi(gEntitiesPosYArray) # $s2, 0x800e /* 180188 801D2138 3C11800E */ lui $s1, %hi(D_800E2CD0) # $s1, 0x800e -/* 18018C 801D213C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 18018C 801D213C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 180190 801D2140 E42A64D0 */ swc1 $f10, 0x64d0($at) /* 180194 801D2144 8CB90000 */ lw $t9, ($a1) /* 180198 801D2148 3C01800E */ lui $at, 0x800e -/* 18019C 801D214C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 18019C 801D214C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1801A0 801D2150 00194880 */ sll $t1, $t9, 2 /* 1801A4 801D2154 00290821 */ addu $at, $at, $t1 /* 1801A8 801D2158 26312CD0 */ addiu $s1, %lo(D_800E2CD0) # addiu $s1, $s1, 0x2cd0 @@ -2805,8 +2805,8 @@ glabel func_801D3414_ovl9 /* 1815FC 801D35AC 0C02911F */ jal call_virtual_function /* 181600 801D35B0 90847880 */ lbu $a0, 0x7880($a0) /* 181604 801D35B4 3C118022 */ lui $s1, %hi(D_8021BB30) # $s1, 0x8022 -/* 181608 801D35B8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 18160C 801D35BC 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 181608 801D35B8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 18160C 801D35BC 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 181610 801D35C0 2631BB30 */ addiu $s1, %lo(D_8021BB30) # addiu $s1, $s1, -0x44d0 /* 181614 801D35C4 8E580000 */ lw $t8, ($s2) .L801D35C8_ovl9: @@ -2836,14 +2836,14 @@ glabel func_801D3618_ovl9 /* 18166C 801D361C AFB20020 */ sw $s2, 0x20($sp) /* 181670 801D3620 AFB1001C */ sw $s1, 0x1c($sp) /* 181674 801D3624 AFB00018 */ sw $s0, 0x18($sp) -/* 181678 801D3628 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 181678 801D3628 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18167C 801D362C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 181680 801D3630 3C128022 */ lui $s2, %hi(D_8021BB30) # $s2, 0x8022 /* 181684 801D3634 AFBF0024 */ sw $ra, 0x24($sp) /* 181688 801D3638 AFA40028 */ sw $a0, 0x28($sp) /* 18168C 801D363C 2652BB30 */ addiu $s2, %lo(D_8021BB30) # addiu $s2, $s2, -0x44d0 /* 181690 801D3640 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 181694 801D3644 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 181694 801D3644 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 181698 801D3648 8E2E0000 */ lw $t6, ($s1) .L801D364C_ovl9: /* 18169C 801D364C 24050004 */ li $a1, 4 @@ -4511,8 +4511,8 @@ glabel func_801D4DFC_ovl9 /* 182EEC 801D4E9C A2430038 */ sb $v1, 0x38($s2) /* 182EF0 801D4EA0 A2430039 */ sb $v1, 0x39($s2) /* 182EF4 801D4EA4 8E2D0000 */ lw $t5, ($s1) -/* 182EF8 801D4EA8 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e -/* 182EFC 801D4EAC 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 182EF8 801D4EA8 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e +/* 182EFC 801D4EAC 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 182F00 801D4EB0 8DA20000 */ lw $v0, ($t5) /* 182F04 801D4EB4 00028080 */ sll $s0, $v0, 2 /* 182F08 801D4EB8 01D07021 */ addu $t6, $t6, $s0 @@ -4528,10 +4528,10 @@ glabel func_801D4DFC_ovl9 /* 182F30 801D4EE0 8D020000 */ lw $v0, ($t0) .L801D4EE4_ovl9: /* 182F34 801D4EE4 3C04800E */ lui $a0, 0x800e -/* 182F38 801D4EE8 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 182F38 801D4EE8 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 182F3C 801D4EEC 00822021 */ addu $a0, $a0, $v0 /* 182F40 801D4EF0 3C068022 */ lui $a2, %hi(D_8021BB4C) # $a2, 0x8022 -/* 182F44 801D4EF4 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 182F44 801D4EF4 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 182F48 801D4EF8 24C6BB4C */ addiu $a2, %lo(D_8021BB4C) # addiu $a2, $a2, -0x44b4 /* 182F4C 801D4EFC 90847880 */ lbu $a0, 0x7880($a0) /* 182F50 801D4F00 0C02911F */ jal call_virtual_function @@ -4563,14 +4563,14 @@ glabel func_801D4F58_ovl9 /* 182FAC 801D4F5C AFB20020 */ sw $s2, 0x20($sp) /* 182FB0 801D4F60 AFB1001C */ sw $s1, 0x1c($sp) /* 182FB4 801D4F64 AFB00018 */ sw $s0, 0x18($sp) -/* 182FB8 801D4F68 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 182FB8 801D4F68 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 182FBC 801D4F6C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 182FC0 801D4F70 3C128022 */ lui $s2, %hi(D_8021BB54) # $s2, 0x8022 /* 182FC4 801D4F74 AFBF0024 */ sw $ra, 0x24($sp) /* 182FC8 801D4F78 AFA40028 */ sw $a0, 0x28($sp) /* 182FCC 801D4F7C 2652BB54 */ addiu $s2, %lo(D_8021BB54) # addiu $s2, $s2, -0x44ac /* 182FD0 801D4F80 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 182FD4 801D4F84 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 182FD4 801D4F84 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 182FD8 801D4F88 8E2E0000 */ lw $t6, ($s1) .L801D4F8C_ovl9: /* 182FDC 801D4F8C 24050005 */ li $a1, 5 @@ -4718,7 +4718,7 @@ glabel func_801D50E4_ovl9 /* 1831F4 801D51A4 02A2C021 */ addu $t8, $s5, $v0 /* 1831F8 801D51A8 8F030000 */ lw $v1, ($t8) /* 1831FC 801D51AC 2631BB80 */ addiu $s1, %lo(D_8021BB80) # addiu $s1, $s1, -0x4480 -/* 183200 801D51B0 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 183200 801D51B0 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 183204 801D51B4 1060000A */ beqz $v1, .L801D51E0_ovl9 /* 183208 801D51B8 00602025 */ move $a0, $v1 /* 18320C 801D51BC 24010001 */ li $at, 1 @@ -4768,7 +4768,7 @@ glabel func_801D50E4_ovl9 /* 1832B0 801D5260 8CA20000 */ lw $v0, ($a1) /* 1832B4 801D5264 00021080 */ sll $v0, $v0, 2 .L801D5268_ovl9: -/* 1832B8 801D5268 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1832B8 801D5268 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1832BC 801D526C 02A27021 */ addu $t6, $s5, $v0 .L801D5270_ovl9: /* 1832C0 801D5270 8DCC0000 */ lw $t4, ($t6) @@ -5221,7 +5221,7 @@ glabel func_801D5850_ovl9 /* 183934 801D58E4 E4206850 */ swc1 $f0, 0x6850($at) /* 183938 801D58E8 8CAD0000 */ lw $t5, ($a1) /* 18393C 801D58EC 3C01800E */ lui $at, 0x800e -/* 183940 801D58F0 3C1E800E */ lui $fp, %hi(D_800DDC50) # $fp, 0x800e +/* 183940 801D58F0 3C1E800E */ lui $fp, %hi(gEntityVtableIndexArray) # $fp, 0x800e /* 183944 801D58F4 000D7880 */ sll $t7, $t5, 2 /* 183948 801D58F8 002F0821 */ addu $at, $at, $t7 /* 18394C 801D58FC E4203C90 */ swc1 $f0, 0x3c90($at) @@ -5234,14 +5234,14 @@ glabel func_801D5850_ovl9 /* 183968 801D5918 02031021 */ addu $v0, $s0, $v1 /* 18396C 801D591C 26F7BBA0 */ addiu $s7, %lo(D_8021BBA0) # addiu $s7, $s7, -0x4460 /* 183970 801D5920 1080000A */ beqz $a0, .L801D594C_ovl9 -/* 183974 801D5924 27DEDC50 */ addiu $fp, %lo(D_800DDC50) # addiu $fp, $fp, -0x23b0 +/* 183974 801D5924 27DEDC50 */ addiu $fp, %lo(gEntityVtableIndexArray) # addiu $fp, $fp, -0x23b0 /* 183978 801D5928 10810008 */ beq $a0, $at, .L801D594C_ovl9 /* 18397C 801D592C 24010002 */ li $at, 2 /* 183980 801D5930 1081008E */ beq $a0, $at, .L801D5B6C_ovl9 /* 183984 801D5934 24010003 */ li $at, 3 /* 183988 801D5938 1081008C */ beq $a0, $at, .L801D5B6C_ovl9 -/* 18398C 801D593C 3C18800E */ lui $t8, %hi(D_800DDC50) # $t8, 0x800e -/* 183990 801D5940 2718DC50 */ addiu $t8, %lo(D_800DDC50) # addiu $t8, $t8, -0x23b0 +/* 18398C 801D593C 3C18800E */ lui $t8, %hi(gEntityVtableIndexArray) # $t8, 0x800e +/* 183990 801D5940 2718DC50 */ addiu $t8, %lo(gEntityVtableIndexArray) # addiu $t8, $t8, -0x23b0 /* 183994 801D5944 1000010E */ b .L801D5D80_ovl9 /* 183998 801D5948 00781021 */ addu $v0, $v1, $t8 .L801D594C_ovl9: @@ -5383,7 +5383,7 @@ glabel func_801D5850_ovl9 /* 183BB4 801D5B64 10000087 */ b .L801D5D84_ovl9 /* 183BB8 801D5B68 8FBF003C */ lw $ra, 0x3c($sp) .L801D5B6C_ovl9: -/* 183BBC 801D5B6C 3C1E800E */ lui $fp, %hi(D_800DDC50) # $fp, 0x800e +/* 183BBC 801D5B6C 3C1E800E */ lui $fp, %hi(gEntityVtableIndexArray) # $fp, 0x800e /* 183BC0 801D5B70 3C178022 */ lui $s7, %hi(D_8021BBA0) # $s7, 0x8022 /* 183BC4 801D5B74 3C16800E */ lui $s6, %hi(D_800E3750) # $s6, 0x800e /* 183BC8 801D5B78 3C158022 */ lui $s5, %hi(D_8021BB90) # $s5, 0x8022 @@ -5396,7 +5396,7 @@ glabel func_801D5850_ovl9 /* 183BE4 801D5B94 26B5BB90 */ addiu $s5, %lo(D_8021BB90) # addiu $s5, $s5, -0x4470 /* 183BE8 801D5B98 26D63750 */ addiu $s6, %lo(D_800E3750) # addiu $s6, $s6, 0x3750 /* 183BEC 801D5B9C 26F7BBA0 */ addiu $s7, %lo(D_8021BBA0) # addiu $s7, $s7, -0x4460 -/* 183BF0 801D5BA0 27DEDC50 */ addiu $fp, %lo(D_800DDC50) # addiu $fp, $fp, -0x23b0 +/* 183BF0 801D5BA0 27DEDC50 */ addiu $fp, %lo(gEntityVtableIndexArray) # addiu $fp, $fp, -0x23b0 /* 183BF4 801D5BA4 0203C821 */ addu $t9, $s0, $v1 .L801D5BA8_ovl9: /* 183BF8 801D5BA8 8F280000 */ lw $t0, ($t9) @@ -5545,9 +5545,9 @@ glabel func_801D5DB8_ovl9 /* 183E24 801D5DD4 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005 /* 183E28 801D5DD8 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0) /* 183E2C 801D5DDC 3C0E800F */ lui $t6, 0x800f -/* 183E30 801D5DE0 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e +/* 183E30 801D5DE0 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e /* 183E34 801D5DE4 8C830000 */ lw $v1, ($a0) -/* 183E38 801D5DE8 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 183E38 801D5DE8 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 183E3C 801D5DEC 240F0004 */ li $t7, 4 /* 183E40 801D5DF0 00031880 */ sll $v1, $v1, 2 /* 183E44 801D5DF4 01C37021 */ addu $t6, $t6, $v1 @@ -5559,9 +5559,9 @@ glabel func_801D5DB8_ovl9 /* 183E5C 801D5E0C 8C830000 */ lw $v1, ($a0) /* 183E60 801D5E10 00031880 */ sll $v1, $v1, 2 .L801D5E14_ovl9: -/* 183E64 801D5E14 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e +/* 183E64 801D5E14 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e /* 183E68 801D5E18 1000004B */ b .L801D5F48_ovl9 -/* 183E6C 801D5E1C 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 183E6C 801D5E1C 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 .L801D5E20_ovl9: /* 183E70 801D5E20 0C0755B4 */ jal func_801D56D0_ovl9 /* 183E74 801D5E24 00000000 */ nop @@ -5573,8 +5573,8 @@ glabel func_801D5DB8_ovl9 /* 183E8C 801D5E3C 00A32821 */ addu $a1, $a1, $v1 /* 183E90 801D5E40 8CA59AA0 */ lw $a1, -0x6560($a1) /* 183E94 801D5E44 1045000A */ beq $v0, $a1, .L801D5E70_ovl9 -/* 183E98 801D5E48 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 183E9C 801D5E4C 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 183E98 801D5E48 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 183E9C 801D5E4C 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 183EA0 801D5E50 00E3C821 */ addu $t9, $a3, $v1 /* 183EA4 801D5E54 24060002 */ li $a2, 2 /* 183EA8 801D5E58 AF260000 */ sw $a2, ($t9) @@ -5584,8 +5584,8 @@ glabel func_801D5DB8_ovl9 /* 183EB8 801D5E68 00A32821 */ addu $a1, $a1, $v1 /* 183EBC 801D5E6C 8CA59AA0 */ lw $a1, -0x6560($a1) .L801D5E70_ovl9: -/* 183EC0 801D5E70 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 183EC4 801D5E74 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 183EC0 801D5E70 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 183EC4 801D5E74 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 183EC8 801D5E78 10A0000B */ beqz $a1, .L801D5EA8_ovl9 /* 183ECC 801D5E7C 24060002 */ li $a2, 2 /* 183ED0 801D5E80 24010001 */ li $at, 1 @@ -5822,8 +5822,8 @@ glabel func_801D6100_ovl9 /* 18422C 801D61DC 0C02A7A9 */ jal func_800A9EA4 /* 184230 801D61E0 34840028 */ ori $a0, (0x00010028 & 0xFFFF) # ori $a0, $a0, 0x28 /* 184234 801D61E4 8E580000 */ lw $t8, ($s2) -/* 184238 801D61E8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 18423C 801D61EC 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 184238 801D61E8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 18423C 801D61EC 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 184240 801D61F0 8F190000 */ lw $t9, ($t8) /* 184244 801D61F4 00194080 */ sll $t0, $t9, 2 /* 184248 801D61F8 02085021 */ addu $t2, $s0, $t0 @@ -6343,8 +6343,8 @@ glabel func_801D66A0_ovl9 /* 1849CC 801D697C 0C02911F */ jal call_virtual_function /* 1849D0 801D6980 90847880 */ lbu $a0, 0x7880($a0) /* 1849D4 801D6984 3C118022 */ lui $s1, %hi(D_8021BBF4) # $s1, 0x8022 -/* 1849D8 801D6988 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 1849DC 801D698C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1849D8 801D6988 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 1849DC 801D698C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1849E0 801D6990 2631BBF4 */ addiu $s1, %lo(D_8021BBF4) # addiu $s1, $s1, -0x440c /* 1849E4 801D6994 8E4E0000 */ lw $t6, ($s2) .L801D6998_ovl9: @@ -6370,14 +6370,14 @@ glabel func_801D69D8_ovl9 /* 184A2C 801D69DC AFB20020 */ sw $s2, 0x20($sp) /* 184A30 801D69E0 AFB1001C */ sw $s1, 0x1c($sp) /* 184A34 801D69E4 AFB00018 */ sw $s0, 0x18($sp) -/* 184A38 801D69E8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 184A38 801D69E8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 184A3C 801D69EC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 184A40 801D69F0 3C128022 */ lui $s2, %hi(D_8021BBF4) # $s2, 0x8022 /* 184A44 801D69F4 AFBF0024 */ sw $ra, 0x24($sp) /* 184A48 801D69F8 AFA40028 */ sw $a0, 0x28($sp) /* 184A4C 801D69FC 2652BBF4 */ addiu $s2, %lo(D_8021BBF4) # addiu $s2, $s2, -0x440c /* 184A50 801D6A00 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 184A54 801D6A04 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 184A54 801D6A04 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 184A58 801D6A08 8E2E0000 */ lw $t6, ($s1) .L801D6A0C_ovl9: /* 184A5C 801D6A0C 24050003 */ li $a1, 3 @@ -6465,8 +6465,8 @@ glabel func_801D6ADC_ovl9 /* 184B8C 801D6B3C 0C02A806 */ jal func_800AA018 /* 184B90 801D6B40 3484004B */ ori $a0, (0x0001004B & 0xFFFF) # ori $a0, $a0, 0x4b /* 184B94 801D6B44 8E190000 */ lw $t9, ($s0) -/* 184B98 801D6B48 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 184B9C 801D6B4C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 184B98 801D6B48 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 184B9C 801D6B4C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 184BA0 801D6B50 8F280000 */ lw $t0, ($t9) /* 184BA4 801D6B54 3C13800F */ lui $s3, %hi(D_800E98E0) # $s3, 0x800f /* 184BA8 801D6B58 267398E0 */ addiu $s3, %lo(D_800E98E0) # addiu $s3, $s3, -0x6720 @@ -6623,9 +6623,9 @@ glabel func_801D6CFC_ovl9 /* 184DD8 801D6D88 3C0142F0 */ li $at, 0x42F00000 # 120.000000 /* 184DDC 801D6D8C 4481B000 */ mtc1 $at, $f22 /* 184DE0 801D6D90 3C014370 */ li $at, 0x43700000 # 240.000000 -/* 184DE4 801D6D94 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 184DE4 801D6D94 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 184DE8 801D6D98 4481A000 */ mtc1 $at, $f20 -/* 184DEC 801D6D9C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 184DEC 801D6D9C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 184DF0 801D6DA0 265298E0 */ addiu $s2, %lo(D_800E98E0) # addiu $s2, $s2, -0x6720 /* 184DF4 801D6DA4 24130002 */ li $s3, 2 .L801D6DA8_ovl9: @@ -7320,8 +7320,8 @@ glabel func_801D74EC_ovl9 /* 18581C 801D77CC 0C02911F */ jal call_virtual_function /* 185820 801D77D0 90847880 */ lbu $a0, 0x7880($a0) /* 185824 801D77D4 3C118022 */ lui $s1, %hi(D_8021BC0C) # $s1, 0x8022 -/* 185828 801D77D8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 18582C 801D77DC 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 185828 801D77D8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 18582C 801D77DC 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 185830 801D77E0 2631BC0C */ addiu $s1, %lo(D_8021BC0C) # addiu $s1, $s1, -0x43f4 /* 185834 801D77E4 8E4E0000 */ lw $t6, ($s2) .L801D77E8_ovl9: @@ -7351,14 +7351,14 @@ glabel func_801D7838_ovl9 /* 18588C 801D783C AFB20020 */ sw $s2, 0x20($sp) /* 185890 801D7840 AFB1001C */ sw $s1, 0x1c($sp) /* 185894 801D7844 AFB00018 */ sw $s0, 0x18($sp) -/* 185898 801D7848 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 185898 801D7848 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18589C 801D784C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1858A0 801D7850 3C128022 */ lui $s2, %hi(D_8021BC0C) # $s2, 0x8022 /* 1858A4 801D7854 AFBF0024 */ sw $ra, 0x24($sp) /* 1858A8 801D7858 AFA40028 */ sw $a0, 0x28($sp) /* 1858AC 801D785C 2652BC0C */ addiu $s2, %lo(D_8021BC0C) # addiu $s2, $s2, -0x43f4 /* 1858B0 801D7860 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1858B4 801D7864 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1858B4 801D7864 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1858B8 801D7868 8E2E0000 */ lw $t6, ($s1) .L801D786C_ovl9: /* 1858BC 801D786C 24050005 */ li $a1, 5 @@ -7452,8 +7452,8 @@ glabel func_801D7968_ovl9 /* 1859FC 801D79AC 0C02A806 */ jal func_800AA018 /* 185A00 801D79B0 348400F8 */ ori $a0, (0x000100F8 & 0xFFFF) # ori $a0, $a0, 0xf8 /* 185A04 801D79B4 8E190000 */ lw $t9, ($s0) -/* 185A08 801D79B8 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 185A0C 801D79BC 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 185A08 801D79B8 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 185A0C 801D79BC 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 185A10 801D79C0 8F220000 */ lw $v0, ($t9) /* 185A14 801D79C4 3C01438C */ li $at, 0x438C0000 # 280.000000 /* 185A18 801D79C8 24130001 */ li $s3, 1 @@ -7545,8 +7545,8 @@ glabel func_801D7AA4_ovl9 /* 185B50 801D7B00 0C02A806 */ jal func_800AA018 /* 185B54 801D7B04 34840100 */ ori $a0, (0x00010100 & 0xFFFF) # ori $a0, $a0, 0x100 /* 185B58 801D7B08 8E390000 */ lw $t9, ($s1) -/* 185B5C 801D7B0C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 185B60 801D7B10 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 185B5C 801D7B0C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 185B60 801D7B10 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 185B64 801D7B14 8F280000 */ lw $t0, ($t9) /* 185B68 801D7B18 3C01438C */ li $at, 0x438C0000 # 280.000000 /* 185B6C 801D7B1C 24130004 */ li $s3, 4 @@ -7966,8 +7966,8 @@ glabel func_801D8014_ovl9 /* 18617C 801D812C 0C02911F */ jal call_virtual_function /* 186180 801D8130 90847880 */ lbu $a0, 0x7880($a0) /* 186184 801D8134 3C118022 */ lui $s1, %hi(D_8021BC38) # $s1, 0x8022 -/* 186188 801D8138 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 18618C 801D813C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 186188 801D8138 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 18618C 801D813C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 186190 801D8140 2631BC38 */ addiu $s1, %lo(D_8021BC38) # addiu $s1, $s1, -0x43c8 /* 186194 801D8144 8E4A0000 */ lw $t2, ($s2) .L801D8148_ovl9: @@ -7997,14 +7997,14 @@ glabel func_801D8198_ovl9 /* 1861EC 801D819C AFB20020 */ sw $s2, 0x20($sp) /* 1861F0 801D81A0 AFB1001C */ sw $s1, 0x1c($sp) /* 1861F4 801D81A4 AFB00018 */ sw $s0, 0x18($sp) -/* 1861F8 801D81A8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1861F8 801D81A8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1861FC 801D81AC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 186200 801D81B0 3C128022 */ lui $s2, %hi(D_8021BC38) # $s2, 0x8022 /* 186204 801D81B4 AFBF0024 */ sw $ra, 0x24($sp) /* 186208 801D81B8 AFA40028 */ sw $a0, 0x28($sp) /* 18620C 801D81BC 2652BC38 */ addiu $s2, %lo(D_8021BC38) # addiu $s2, $s2, -0x43c8 /* 186210 801D81C0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 186214 801D81C4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 186214 801D81C4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 186218 801D81C8 8E2E0000 */ lw $t6, ($s1) .L801D81CC_ovl9: /* 18621C 801D81CC 24050002 */ li $a1, 2 @@ -8847,9 +8847,9 @@ glabel func_801D8DA8_ovl9 /* 186E74 801D8E24 24848EF8 */ addiu $a0, %lo(D_801D8EF8) # addiu $a0, $a0, -0x7108 /* 186E78 801D8E28 8E2A0000 */ lw $t2, ($s1) /* 186E7C 801D8E2C 3C0B800F */ lui $t3, 0x800f -/* 186E80 801D8E30 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 186E80 801D8E30 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 186E84 801D8E34 8D420000 */ lw $v0, ($t2) -/* 186E88 801D8E38 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 186E88 801D8E38 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 186E8C 801D8E3C 240DFFFF */ li $t5, -1 /* 186E90 801D8E40 00021880 */ sll $v1, $v0, 2 /* 186E94 801D8E44 01635821 */ addu $t3, $t3, $v1 @@ -8865,10 +8865,10 @@ glabel func_801D8DA8_ovl9 /* 186EBC 801D8E6C 8DC20000 */ lw $v0, ($t6) .L801D8E70_ovl9: /* 186EC0 801D8E70 3C04800E */ lui $a0, 0x800e -/* 186EC4 801D8E74 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 186EC4 801D8E74 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 186EC8 801D8E78 00822021 */ addu $a0, $a0, $v0 /* 186ECC 801D8E7C 3C068022 */ lui $a2, %hi(D_8021BC50) # $a2, 0x8022 -/* 186ED0 801D8E80 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 186ED0 801D8E80 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 186ED4 801D8E84 24C6BC50 */ addiu $a2, %lo(D_8021BC50) # addiu $a2, $a2, -0x43b0 /* 186ED8 801D8E88 90847880 */ lbu $a0, 0x7880($a0) /* 186EDC 801D8E8C 0C02911F */ jal call_virtual_function @@ -8905,14 +8905,14 @@ glabel func_801D8EF8_ovl9 /* 186F4C 801D8EFC AFB20020 */ sw $s2, 0x20($sp) /* 186F50 801D8F00 AFB1001C */ sw $s1, 0x1c($sp) /* 186F54 801D8F04 AFB00018 */ sw $s0, 0x18($sp) -/* 186F58 801D8F08 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 186F58 801D8F08 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 186F5C 801D8F0C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 186F60 801D8F10 3C128022 */ lui $s2, %hi(D_8021BC54) # $s2, 0x8022 /* 186F64 801D8F14 AFBF0024 */ sw $ra, 0x24($sp) /* 186F68 801D8F18 AFA40028 */ sw $a0, 0x28($sp) /* 186F6C 801D8F1C 2652BC54 */ addiu $s2, %lo(D_8021BC54) # addiu $s2, $s2, -0x43ac /* 186F70 801D8F20 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 186F74 801D8F24 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 186F74 801D8F24 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 186F78 801D8F28 8E2E0000 */ lw $t6, ($s1) .L801D8F2C_ovl9: /* 186F7C 801D8F2C 24050003 */ li $a1, 3 @@ -9397,8 +9397,8 @@ glabel func_801D9558_ovl9 /* 18767C 801D962C 0C02911F */ jal call_virtual_function /* 187680 801D9630 90847880 */ lbu $a0, 0x7880($a0) /* 187684 801D9634 3C128022 */ lui $s2, %hi(D_8021BC74) # $s2, 0x8022 -/* 187688 801D9638 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 18768C 801D963C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 187688 801D9638 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 18768C 801D963C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 187690 801D9640 2652BC74 */ addiu $s2, %lo(D_8021BC74) # addiu $s2, $s2, -0x438c /* 187694 801D9644 8E0D0000 */ lw $t5, ($s0) .L801D9648_ovl9: @@ -9428,14 +9428,14 @@ glabel func_801D9698_ovl9 /* 1876EC 801D969C AFB20020 */ sw $s2, 0x20($sp) /* 1876F0 801D96A0 AFB1001C */ sw $s1, 0x1c($sp) /* 1876F4 801D96A4 AFB00018 */ sw $s0, 0x18($sp) -/* 1876F8 801D96A8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1876F8 801D96A8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1876FC 801D96AC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 187700 801D96B0 3C128022 */ lui $s2, %hi(D_8021BC74) # $s2, 0x8022 /* 187704 801D96B4 AFBF0024 */ sw $ra, 0x24($sp) /* 187708 801D96B8 AFA40028 */ sw $a0, 0x28($sp) /* 18770C 801D96BC 2652BC74 */ addiu $s2, %lo(D_8021BC74) # addiu $s2, $s2, -0x438c /* 187710 801D96C0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 187714 801D96C4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 187714 801D96C4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 187718 801D96C8 8E2E0000 */ lw $t6, ($s1) .L801D96CC_ovl9: /* 18771C 801D96CC 24050006 */ li $a1, 6 @@ -10424,11 +10424,11 @@ glabel func_801DA498_ovl9 /* 188584 801DA534 2739A618 */ addiu $t9, %lo(D_801DA618) # addiu $t9, $t9, -0x59e8 /* 188588 801DA538 8D2B0000 */ lw $t3, ($t1) /* 18858C 801DA53C 3C18800F */ lui $t8, 0x800f -/* 188590 801DA540 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 188590 801DA540 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 188594 801DA544 000B5080 */ sll $t2, $t3, 2 /* 188598 801DA548 00CA6021 */ addu $t4, $a2, $t2 /* 18859C 801DA54C 8D8F0000 */ lw $t7, ($t4) -/* 1885A0 801DA550 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 1885A0 801DA550 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 1885A4 801DA554 2408FFFF */ li $t0, -1 /* 1885A8 801DA558 ADF9009C */ sw $t9, 0x9c($t7) /* 1885AC 801DA55C 8E2E0000 */ lw $t6, ($s1) @@ -10446,10 +10446,10 @@ glabel func_801DA498_ovl9 /* 1885DC 801DA58C 8D630000 */ lw $v1, ($t3) .L801DA590_ovl9: /* 1885E0 801DA590 3C04800E */ lui $a0, 0x800e -/* 1885E4 801DA594 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 1885E4 801DA594 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 1885E8 801DA598 00832021 */ addu $a0, $a0, $v1 /* 1885EC 801DA59C 3C068022 */ lui $a2, %hi(D_8021BC90) # $a2, 0x8022 -/* 1885F0 801DA5A0 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 1885F0 801DA5A0 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 1885F4 801DA5A4 24C6BC90 */ addiu $a2, %lo(D_8021BC90) # addiu $a2, $a2, -0x4370 /* 1885F8 801DA5A8 90847880 */ lbu $a0, 0x7880($a0) /* 1885FC 801DA5AC 0C02911F */ jal call_virtual_function @@ -10486,14 +10486,14 @@ glabel func_801DA618_ovl9 /* 18866C 801DA61C AFB20020 */ sw $s2, 0x20($sp) /* 188670 801DA620 AFB1001C */ sw $s1, 0x1c($sp) /* 188674 801DA624 AFB00018 */ sw $s0, 0x18($sp) -/* 188678 801DA628 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 188678 801DA628 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18867C 801DA62C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 188680 801DA630 3C128022 */ lui $s2, %hi(D_8021BC98) # $s2, 0x8022 /* 188684 801DA634 AFBF0024 */ sw $ra, 0x24($sp) /* 188688 801DA638 AFA40028 */ sw $a0, 0x28($sp) /* 18868C 801DA63C 2652BC98 */ addiu $s2, %lo(D_8021BC98) # addiu $s2, $s2, -0x4368 /* 188690 801DA640 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 188694 801DA644 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 188694 801DA644 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 188698 801DA648 8E2E0000 */ lw $t6, ($s1) .L801DA64C_ovl9: /* 18869C 801DA64C 24050006 */ li $a1, 6 @@ -11442,8 +11442,8 @@ glabel func_801DB3A4_ovl9 /* 189468 801DB418 3C0E800F */ lui $t6, 0x800f /* 18946C 801DB41C ADAA009C */ sw $t2, 0x9c($t5) /* 189470 801DB420 8E2F0000 */ lw $t7, ($s1) -/* 189474 801DB424 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e -/* 189478 801DB428 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 189474 801DB424 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e +/* 189478 801DB428 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 18947C 801DB42C 8DE30000 */ lw $v1, ($t7) /* 189480 801DB430 2408FFFF */ li $t0, -1 /* 189484 801DB434 00032880 */ sll $a1, $v1, 2 @@ -11459,10 +11459,10 @@ glabel func_801DB3A4_ovl9 /* 1894AC 801DB45C 8D230000 */ lw $v1, ($t1) .L801DB460_ovl9: /* 1894B0 801DB460 3C04800E */ lui $a0, 0x800e -/* 1894B4 801DB464 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 1894B4 801DB464 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 1894B8 801DB468 00832021 */ addu $a0, $a0, $v1 /* 1894BC 801DB46C 3C068022 */ lui $a2, %hi(D_8021BCB8) # $a2, 0x8022 -/* 1894C0 801DB470 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 1894C0 801DB470 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 1894C4 801DB474 24C6BCB8 */ addiu $a2, %lo(D_8021BCB8) # addiu $a2, $a2, -0x4348 /* 1894C8 801DB478 90847880 */ lbu $a0, 0x7880($a0) /* 1894CC 801DB47C 0C02911F */ jal call_virtual_function @@ -11495,14 +11495,14 @@ glabel func_801DB4D8_ovl9 /* 18952C 801DB4DC AFB20020 */ sw $s2, 0x20($sp) /* 189530 801DB4E0 AFB1001C */ sw $s1, 0x1c($sp) /* 189534 801DB4E4 AFB00018 */ sw $s0, 0x18($sp) -/* 189538 801DB4E8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 189538 801DB4E8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18953C 801DB4EC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 189540 801DB4F0 3C128022 */ lui $s2, %hi(D_8021BCC0) # $s2, 0x8022 /* 189544 801DB4F4 AFBF0024 */ sw $ra, 0x24($sp) /* 189548 801DB4F8 AFA40028 */ sw $a0, 0x28($sp) /* 18954C 801DB4FC 2652BCC0 */ addiu $s2, %lo(D_8021BCC0) # addiu $s2, $s2, -0x4340 /* 189550 801DB500 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 189554 801DB504 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 189554 801DB504 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 189558 801DB508 8E2E0000 */ lw $t6, ($s1) .L801DB50C_ovl9: /* 18955C 801DB50C 24050004 */ li $a1, 4 @@ -12098,11 +12098,11 @@ glabel func_801DBD14_ovl9 /* 189E00 801DBDB0 2739BE78 */ addiu $t9, %lo(D_801DBE78) # addiu $t9, $t9, -0x4188 /* 189E04 801DBDB4 8D2B0000 */ lw $t3, ($t1) /* 189E08 801DBDB8 3C18800F */ lui $t8, 0x800f -/* 189E0C 801DBDBC 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 189E0C 801DBDBC 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 189E10 801DBDC0 000B5080 */ sll $t2, $t3, 2 /* 189E14 801DBDC4 00CA6021 */ addu $t4, $a2, $t2 /* 189E18 801DBDC8 8D8F0000 */ lw $t7, ($t4) -/* 189E1C 801DBDCC 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 189E1C 801DBDCC 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 189E20 801DBDD0 2408FFFF */ li $t0, -1 /* 189E24 801DBDD4 ADF9009C */ sw $t9, 0x9c($t7) /* 189E28 801DBDD8 8E2E0000 */ lw $t6, ($s1) @@ -12120,10 +12120,10 @@ glabel func_801DBD14_ovl9 /* 189E58 801DBE08 8D630000 */ lw $v1, ($t3) .L801DBE0C_ovl9: /* 189E5C 801DBE0C 3C04800E */ lui $a0, 0x800e -/* 189E60 801DBE10 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 189E60 801DBE10 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 189E64 801DBE14 00832021 */ addu $a0, $a0, $v1 /* 189E68 801DBE18 3C068022 */ lui $a2, %hi(D_8021BD38) # $a2, 0x8022 -/* 189E6C 801DBE1C 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 189E6C 801DBE1C 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 189E70 801DBE20 24C6BD38 */ addiu $a2, %lo(D_8021BD38) # addiu $a2, $a2, -0x42c8 /* 189E74 801DBE24 90847880 */ lbu $a0, 0x7880($a0) /* 189E78 801DBE28 0C02911F */ jal call_virtual_function @@ -12153,14 +12153,14 @@ glabel func_801DBE78_ovl9 /* 189ECC 801DBE7C AFB20020 */ sw $s2, 0x20($sp) /* 189ED0 801DBE80 AFB1001C */ sw $s1, 0x1c($sp) /* 189ED4 801DBE84 AFB00018 */ sw $s0, 0x18($sp) -/* 189ED8 801DBE88 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 189ED8 801DBE88 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 189EDC 801DBE8C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 189EE0 801DBE90 3C128022 */ lui $s2, %hi(D_8021BD3C) # $s2, 0x8022 /* 189EE4 801DBE94 AFBF0024 */ sw $ra, 0x24($sp) /* 189EE8 801DBE98 AFA40028 */ sw $a0, 0x28($sp) /* 189EEC 801DBE9C 2652BD3C */ addiu $s2, %lo(D_8021BD3C) # addiu $s2, $s2, -0x42c4 /* 189EF0 801DBEA0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 189EF4 801DBEA4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 189EF4 801DBEA4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 189EF8 801DBEA8 8E2E0000 */ lw $t6, ($s1) .L801DBEAC_ovl9: /* 189EFC 801DBEAC 24050004 */ li $a1, 4 @@ -12346,8 +12346,8 @@ glabel func_801DC06C_ovl9 /* 18A198 801DC148 50400015 */ beql $v0, $zero, .L801DC1A0_ovl9 /* 18A19C 801DC14C 8E0B0000 */ lw $t3, ($s0) /* 18A1A0 801DC150 8E020000 */ lw $v0, ($s0) -/* 18A1A4 801DC154 3C0E800E */ lui $t6, %hi(D_800DDC50) # $t6, 0x800e -/* 18A1A8 801DC158 25CEDC50 */ addiu $t6, %lo(D_800DDC50) # addiu $t6, $t6, -0x23b0 +/* 18A1A4 801DC154 3C0E800E */ lui $t6, %hi(gEntityVtableIndexArray) # $t6, 0x800e +/* 18A1A8 801DC158 25CEDC50 */ addiu $t6, %lo(gEntityVtableIndexArray) # addiu $t6, $t6, -0x23b0 /* 18A1AC 801DC15C 8C490000 */ lw $t1, ($v0) /* 18A1B0 801DC160 24180003 */ li $t8, 3 /* 18A1B4 801DC164 3C04800E */ lui $a0, 0x800e @@ -12939,8 +12939,8 @@ glabel func_801DC8B4_ovl9 /* 18AA70 801DCA20 0C02911F */ jal call_virtual_function /* 18AA74 801DCA24 90847880 */ lbu $a0, 0x7880($a0) /* 18AA78 801DCA28 3C128022 */ lui $s2, %hi(D_8021BD70) # $s2, 0x8022 -/* 18AA7C 801DCA2C 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 18AA80 801DCA30 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 18AA7C 801DCA2C 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 18AA80 801DCA30 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 18AA84 801DCA34 2652BD70 */ addiu $s2, %lo(D_8021BD70) # addiu $s2, $s2, -0x4290 /* 18AA88 801DCA38 8E190000 */ lw $t9, ($s0) .L801DCA3C_ovl9: @@ -12965,14 +12965,14 @@ glabel func_801DCA78_ovl9 /* 18AACC 801DCA7C AFB20020 */ sw $s2, 0x20($sp) /* 18AAD0 801DCA80 AFB1001C */ sw $s1, 0x1c($sp) /* 18AAD4 801DCA84 AFB00018 */ sw $s0, 0x18($sp) -/* 18AAD8 801DCA88 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 18AAD8 801DCA88 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18AADC 801DCA8C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 18AAE0 801DCA90 3C128022 */ lui $s2, %hi(D_8021BD70) # $s2, 0x8022 /* 18AAE4 801DCA94 AFBF0024 */ sw $ra, 0x24($sp) /* 18AAE8 801DCA98 AFA40028 */ sw $a0, 0x28($sp) /* 18AAEC 801DCA9C 2652BD70 */ addiu $s2, %lo(D_8021BD70) # addiu $s2, $s2, -0x4290 /* 18AAF0 801DCAA0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 18AAF4 801DCAA4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 18AAF4 801DCAA4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 18AAF8 801DCAA8 8E2E0000 */ lw $t6, ($s1) .L801DCAAC_ovl9: /* 18AAFC 801DCAAC 24050009 */ li $a1, 9 @@ -15948,11 +15948,11 @@ glabel func_801DF628_ovl9 /* 18D694 801DF644 AFB00018 */ sw $s0, 0x18($sp) /* 18D698 801DF648 8DC20000 */ lw $v0, ($t6) /* 18D69C 801DF64C 3C0F800F */ lui $t7, 0x800f -/* 18D6A0 801DF650 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 18D6A0 801DF650 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 18D6A4 801DF654 00021880 */ sll $v1, $v0, 2 /* 18D6A8 801DF658 01E37821 */ addu $t7, $t7, $v1 /* 18D6AC 801DF65C 8DEF8AE0 */ lw $t7, -0x7520($t7) -/* 18D6B0 801DF660 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 18D6B0 801DF660 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 18D6B4 801DF664 02434021 */ addu $t0, $s2, $v1 /* 18D6B8 801DF668 31F80001 */ andi $t8, $t7, 1 /* 18D6BC 801DF66C 13000005 */ beqz $t8, .L801DF684_ovl9 @@ -15963,10 +15963,10 @@ glabel func_801DF628_ovl9 /* 18D6D0 801DF680 8D220000 */ lw $v0, ($t1) .L801DF684_ovl9: /* 18D6D4 801DF684 3C04800E */ lui $a0, 0x800e -/* 18D6D8 801DF688 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 18D6D8 801DF688 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 18D6DC 801DF68C 00822021 */ addu $a0, $a0, $v0 /* 18D6E0 801DF690 3C068022 */ lui $a2, %hi(D_8021BDE0) # $a2, 0x8022 -/* 18D6E4 801DF694 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 18D6E4 801DF694 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 18D6E8 801DF698 24C6BDE0 */ addiu $a2, %lo(D_8021BDE0) # addiu $a2, $a2, -0x4220 /* 18D6EC 801DF69C 90847880 */ lbu $a0, 0x7880($a0) /* 18D6F0 801DF6A0 0C02911F */ jal call_virtual_function @@ -15998,14 +15998,14 @@ glabel func_801DF6F8_ovl9 /* 18D74C 801DF6FC AFB20020 */ sw $s2, 0x20($sp) /* 18D750 801DF700 AFB1001C */ sw $s1, 0x1c($sp) /* 18D754 801DF704 AFB00018 */ sw $s0, 0x18($sp) -/* 18D758 801DF708 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 18D758 801DF708 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18D75C 801DF70C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 18D760 801DF710 3C128022 */ lui $s2, %hi(D_8021BDE8) # $s2, 0x8022 /* 18D764 801DF714 AFBF0024 */ sw $ra, 0x24($sp) /* 18D768 801DF718 AFA40028 */ sw $a0, 0x28($sp) /* 18D76C 801DF71C 2652BDE8 */ addiu $s2, %lo(D_8021BDE8) # addiu $s2, $s2, -0x4218 /* 18D770 801DF720 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 18D774 801DF724 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 18D774 801DF724 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 18D778 801DF728 8E2E0000 */ lw $t6, ($s1) .L801DF72C_ovl9: /* 18D77C 801DF72C 24050008 */ li $a1, 8 @@ -16197,8 +16197,8 @@ glabel func_801DF900_ovl9 /* 18DA3C 801DF9EC 0C02A806 */ jal func_800AA018 /* 18DA40 801DF9F0 348401AC */ ori $a0, (0x000101AC & 0xFFFF) # ori $a0, $a0, 0x1ac /* 18DA44 801DF9F4 8E090000 */ lw $t1, ($s0) -/* 18DA48 801DF9F8 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 18DA4C 801DF9FC 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 18DA48 801DF9F8 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 18DA4C 801DF9FC 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 18DA50 801DFA00 8D220000 */ lw $v0, ($t1) /* 18DA54 801DFA04 3C0143A0 */ li $at, 0x43A00000 # 320.000000 /* 18DA58 801DFA08 24130003 */ li $s3, 3 @@ -16360,8 +16360,8 @@ glabel func_801DFB50_ovl9 /* 18DCA0 801DFC50 0C02A806 */ jal func_800AA018 /* 18DCA4 801DFC54 348401AE */ ori $a0, (0x000101AE & 0xFFFF) # ori $a0, $a0, 0x1ae /* 18DCA8 801DFC58 8E220000 */ lw $v0, ($s1) -/* 18DCAC 801DFC5C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 18DCB0 801DFC60 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 18DCAC 801DFC5C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 18DCB0 801DFC60 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 18DCB4 801DFC64 8C430000 */ lw $v1, ($v0) /* 18DCB8 801DFC68 3C13800F */ lui $s3, %hi(D_800E9AA0) # $s3, 0x800f /* 18DCBC 801DFC6C 26739AA0 */ addiu $s3, %lo(D_800E9AA0) # addiu $s3, $s3, -0x6560 @@ -16571,8 +16571,8 @@ glabel func_801DFE74_ovl9 /* 18DFB8 801DFF68 0C02A806 */ jal func_800AA018 /* 18DFBC 801DFF6C 348401AC */ ori $a0, (0x000101AC & 0xFFFF) # ori $a0, $a0, 0x1ac /* 18DFC0 801DFF70 8E290000 */ lw $t1, ($s1) -/* 18DFC4 801DFF74 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 18DFC8 801DFF78 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 18DFC4 801DFF74 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 18DFC8 801DFF78 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 18DFCC 801DFF7C 8D220000 */ lw $v0, ($t1) /* 18DFD0 801DFF80 24140002 */ li $s4, 2 /* 18DFD4 801DFF84 3C014370 */ li $at, 0x43700000 # 240.000000 @@ -16840,8 +16840,8 @@ glabel func_801E0228_ovl9 /* 18E3C0 801E0370 0C02BB48 */ jal func_800AED20 /* 18E3C4 801E0374 00000000 */ nop /* 18E3C8 801E0378 8E0D0000 */ lw $t5, ($s0) -/* 18E3CC 801E037C 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e -/* 18E3D0 801E0380 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 18E3CC 801E037C 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e +/* 18E3D0 801E0380 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 18E3D4 801E0384 8DAE0000 */ lw $t6, ($t5) /* 18E3D8 801E0388 24110005 */ li $s1, 5 /* 18E3DC 801E038C 000E7880 */ sll $t7, $t6, 2 @@ -17349,8 +17349,8 @@ glabel func_801E0A90_ovl9 /* 18EB2C 801E0ADC 8C631B50 */ lw $v1, 0x1b50($v1) /* 18EB30 801E0AE0 31CF0001 */ andi $t7, $t6, 1 /* 18EB34 801E0AE4 11E0000B */ beqz $t7, .L801E0B14_ovl9 -/* 18EB38 801E0AE8 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e -/* 18EB3C 801E0AEC 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 18EB38 801E0AE8 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e +/* 18EB3C 801E0AEC 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 18EB40 801E0AF0 0250C821 */ addu $t9, $s2, $s0 /* 18EB44 801E0AF4 2418FFFF */ li $t8, -1 /* 18EB48 801E0AF8 AF380000 */ sw $t8, ($t9) @@ -17370,11 +17370,11 @@ glabel func_801E0A90_ovl9 /* 18EB7C 801E0B2C 3C01800E */ lui $at, 0x800e /* 18EB80 801E0B30 3C09801E */ lui $t1, %hi(D_801E0CC4) # $t1, 0x801e /* 18EB84 801E0B34 000A5880 */ sll $t3, $t2, 2 -/* 18EB88 801E0B38 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 18EB88 801E0B38 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 18EB8C 801E0B3C 002B0821 */ addu $at, $at, $t3 /* 18EB90 801E0B40 25290CC4 */ addiu $t1, %lo(D_801E0CC4) # addiu $t1, $t1, 0xcc4 /* 18EB94 801E0B44 3C04801E */ lui $a0, %hi(D_801E0BF8) # $a0, 0x801e -/* 18EB98 801E0B48 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 18EB98 801E0B48 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 18EB9C 801E0B4C AC29F150 */ sw $t1, -0xeb0($at) /* 18EBA0 801E0B50 24840BF8 */ addiu $a0, %lo(D_801E0BF8) # addiu $a0, $a0, 0xbf8 /* 18EBA4 801E0B54 0C068354 */ jal func_801A0D50_ovl9 @@ -17425,14 +17425,14 @@ glabel func_801E0BF8_ovl9 /* 18EC4C 801E0BFC AFB20020 */ sw $s2, 0x20($sp) /* 18EC50 801E0C00 AFB1001C */ sw $s1, 0x1c($sp) /* 18EC54 801E0C04 AFB00018 */ sw $s0, 0x18($sp) -/* 18EC58 801E0C08 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 18EC58 801E0C08 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 18EC5C 801E0C0C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 18EC60 801E0C10 3C128022 */ lui $s2, %hi(D_8021BE28) # $s2, 0x8022 /* 18EC64 801E0C14 AFBF0024 */ sw $ra, 0x24($sp) /* 18EC68 801E0C18 AFA40028 */ sw $a0, 0x28($sp) /* 18EC6C 801E0C1C 2652BE28 */ addiu $s2, %lo(D_8021BE28) # addiu $s2, $s2, -0x41d8 /* 18EC70 801E0C20 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 18EC74 801E0C24 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 18EC74 801E0C24 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 18EC78 801E0C28 8E2E0000 */ lw $t6, ($s1) .L801E0C2C_ovl9: /* 18EC7C 801E0C2C 24050009 */ li $a1, 9 @@ -19289,9 +19289,9 @@ glabel func_801E270C_ovl9 /* 1907F8 801E27A8 AF0D008C */ sw $t5, 0x8c($t8) /* 1907FC 801E27AC 8E280000 */ lw $t0, ($s1) /* 190800 801E27B0 3C19800F */ lui $t9, 0x800f -/* 190804 801E27B4 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 190804 801E27B4 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 190808 801E27B8 8D020000 */ lw $v0, ($t0) -/* 19080C 801E27BC 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 19080C 801E27BC 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 190810 801E27C0 240BFFFF */ li $t3, -1 /* 190814 801E27C4 00021880 */ sll $v1, $v0, 2 /* 190818 801E27C8 0323C821 */ addu $t9, $t9, $v1 @@ -19307,10 +19307,10 @@ glabel func_801E270C_ovl9 /* 190840 801E27F0 8D820000 */ lw $v0, ($t4) .L801E27F4_ovl9: /* 190844 801E27F4 3C04800E */ lui $a0, 0x800e -/* 190848 801E27F8 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 190848 801E27F8 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 19084C 801E27FC 00822021 */ addu $a0, $a0, $v0 /* 190850 801E2800 3C068022 */ lui $a2, %hi(D_8021BE7C) # $a2, 0x8022 -/* 190854 801E2804 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 190854 801E2804 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 190858 801E2808 24C6BE7C */ addiu $a2, %lo(D_8021BE7C) # addiu $a2, $a2, -0x4184 /* 19085C 801E280C 90847880 */ lbu $a0, 0x7880($a0) /* 190860 801E2810 0C02911F */ jal call_virtual_function @@ -19346,14 +19346,14 @@ glabel func_801E2878_ovl9 /* 1908CC 801E287C AFB20020 */ sw $s2, 0x20($sp) /* 1908D0 801E2880 AFB1001C */ sw $s1, 0x1c($sp) /* 1908D4 801E2884 AFB00018 */ sw $s0, 0x18($sp) -/* 1908D8 801E2888 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1908D8 801E2888 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1908DC 801E288C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1908E0 801E2890 3C128022 */ lui $s2, %hi(D_8021BE84) # $s2, 0x8022 /* 1908E4 801E2894 AFBF0024 */ sw $ra, 0x24($sp) /* 1908E8 801E2898 AFA40028 */ sw $a0, 0x28($sp) /* 1908EC 801E289C 2652BE84 */ addiu $s2, %lo(D_8021BE84) # addiu $s2, $s2, -0x417c /* 1908F0 801E28A0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1908F4 801E28A4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1908F4 801E28A4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1908F8 801E28A8 8E2E0000 */ lw $t6, ($s1) .L801E28AC_ovl9: /* 1908FC 801E28AC 24050007 */ li $a1, 7 @@ -20148,11 +20148,11 @@ glabel func_801E3430_ovl9 /* 19149C 801E344C AFB00018 */ sw $s0, 0x18($sp) /* 1914A0 801E3450 8DC20000 */ lw $v0, ($t6) /* 1914A4 801E3454 3C0F800F */ lui $t7, 0x800f -/* 1914A8 801E3458 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 1914A8 801E3458 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 1914AC 801E345C 00021880 */ sll $v1, $v0, 2 /* 1914B0 801E3460 01E37821 */ addu $t7, $t7, $v1 /* 1914B4 801E3464 8DEF8AE0 */ lw $t7, -0x7520($t7) -/* 1914B8 801E3468 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 1914B8 801E3468 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 1914BC 801E346C 02434021 */ addu $t0, $s2, $v1 /* 1914C0 801E3470 31F80001 */ andi $t8, $t7, 1 /* 1914C4 801E3474 13000005 */ beqz $t8, .L801E348C_ovl9 @@ -20163,10 +20163,10 @@ glabel func_801E3430_ovl9 /* 1914D8 801E3488 8D220000 */ lw $v0, ($t1) .L801E348C_ovl9: /* 1914DC 801E348C 3C04800E */ lui $a0, 0x800e -/* 1914E0 801E3490 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 1914E0 801E3490 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 1914E4 801E3494 00822021 */ addu $a0, $a0, $v0 /* 1914E8 801E3498 3C068022 */ lui $a2, %hi(D_8021BEA4) # $a2, 0x8022 -/* 1914EC 801E349C 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 1914EC 801E349C 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 1914F0 801E34A0 24C6BEA4 */ addiu $a2, %lo(D_8021BEA4) # addiu $a2, $a2, -0x415c /* 1914F4 801E34A4 90847880 */ lbu $a0, 0x7880($a0) /* 1914F8 801E34A8 0C02911F */ jal call_virtual_function @@ -20196,14 +20196,14 @@ glabel func_801E34F8_ovl9 /* 19154C 801E34FC AFB20020 */ sw $s2, 0x20($sp) /* 191550 801E3500 AFB1001C */ sw $s1, 0x1c($sp) /* 191554 801E3504 AFB00018 */ sw $s0, 0x18($sp) -/* 191558 801E3508 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 191558 801E3508 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 19155C 801E350C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 191560 801E3510 3C128022 */ lui $s2, %hi(D_8021BEB8) # $s2, 0x8022 /* 191564 801E3514 AFBF0024 */ sw $ra, 0x24($sp) /* 191568 801E3518 AFA40028 */ sw $a0, 0x28($sp) /* 19156C 801E351C 2652BEB8 */ addiu $s2, %lo(D_8021BEB8) # addiu $s2, $s2, -0x4148 /* 191570 801E3520 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 191574 801E3524 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 191574 801E3524 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 191578 801E3528 8E2E0000 */ lw $t6, ($s1) .L801E352C_ovl9: /* 19157C 801E352C 24050006 */ li $a1, 6 @@ -22582,8 +22582,8 @@ glabel func_801E570C_ovl9 /* 1937F4 801E57A4 002B0821 */ addu $at, $at, $t3 /* 1937F8 801E57A8 E424ADE0 */ swc1 $f4, -0x5220($at) /* 1937FC 801E57AC 8E020000 */ lw $v0, ($s0) -/* 193800 801E57B0 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e -/* 193804 801E57B4 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 193800 801E57B0 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e +/* 193804 801E57B4 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 193808 801E57B8 00021880 */ sll $v1, $v0, 2 /* 19380C 801E57BC 01836021 */ addu $t4, $t4, $v1 /* 193810 801E57C0 8D8C8AE0 */ lw $t4, -0x7520($t4) @@ -22599,10 +22599,10 @@ glabel func_801E570C_ovl9 /* 193838 801E57E8 8F020000 */ lw $v0, ($t8) .L801E57EC_ovl9: /* 19383C 801E57EC 3C04800E */ lui $a0, 0x800e -/* 193840 801E57F0 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 193840 801E57F0 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 193844 801E57F4 00822021 */ addu $a0, $a0, $v0 /* 193848 801E57F8 3C068022 */ lui $a2, %hi(D_8021BEE0) # $a2, 0x8022 -/* 19384C 801E57FC 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 19384C 801E57FC 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 193850 801E5800 24C6BEE0 */ addiu $a2, %lo(D_8021BEE0) # addiu $a2, $a2, -0x4120 /* 193854 801E5804 90847880 */ lbu $a0, 0x7880($a0) /* 193858 801E5808 0C02911F */ jal call_virtual_function @@ -22632,14 +22632,14 @@ glabel func_801E5858_ovl9 /* 1938AC 801E585C AFB20020 */ sw $s2, 0x20($sp) /* 1938B0 801E5860 AFB1001C */ sw $s1, 0x1c($sp) /* 1938B4 801E5864 AFB00018 */ sw $s0, 0x18($sp) -/* 1938B8 801E5868 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1938B8 801E5868 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1938BC 801E586C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1938C0 801E5870 3C128022 */ lui $s2, %hi(D_8021BEF0) # $s2, 0x8022 /* 1938C4 801E5874 AFBF0024 */ sw $ra, 0x24($sp) /* 1938C8 801E5878 AFA40028 */ sw $a0, 0x28($sp) /* 1938CC 801E587C 2652BEF0 */ addiu $s2, %lo(D_8021BEF0) # addiu $s2, $s2, -0x4110 /* 1938D0 801E5880 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1938D4 801E5884 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1938D4 801E5884 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1938D8 801E5888 8E2E0000 */ lw $t6, ($s1) .L801E588C_ovl9: /* 1938DC 801E588C 2405000B */ li $a1, 11 @@ -24992,9 +24992,9 @@ glabel func_801E7A20_ovl9 /* 195B00 801E7AB0 E4284C50 */ swc1 $f8, 0x4c50($at) /* 195B04 801E7AB4 8E220000 */ lw $v0, ($s1) /* 195B08 801E7AB8 3C0A800F */ lui $t2, 0x800f -/* 195B0C 801E7ABC 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 195B0C 801E7ABC 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 195B10 801E7AC0 8C500000 */ lw $s0, ($v0) -/* 195B14 801E7AC4 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 195B14 801E7AC4 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 195B18 801E7AC8 240CFFFF */ li $t4, -1 /* 195B1C 801E7ACC 00108080 */ sll $s0, $s0, 2 /* 195B20 801E7AD0 01505021 */ addu $t2, $t2, $s0 @@ -25028,10 +25028,10 @@ glabel func_801E7A20_ovl9 /* 195B8C 801E7B3C AC399E20 */ sw $t9, -0x61e0($at) /* 195B90 801E7B40 8C4B0000 */ lw $t3, ($v0) /* 195B94 801E7B44 3C04800E */ lui $a0, 0x800e -/* 195B98 801E7B48 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 195B98 801E7B48 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 195B9C 801E7B4C 3C068022 */ lui $a2, %hi(D_8021BF48) # $a2, 0x8022 /* 195BA0 801E7B50 008B2021 */ addu $a0, $a0, $t3 -/* 195BA4 801E7B54 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 195BA4 801E7B54 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 195BA8 801E7B58 90847880 */ lbu $a0, 0x7880($a0) /* 195BAC 801E7B5C 24C6BF48 */ addiu $a2, %lo(D_8021BF48) # addiu $a2, $a2, -0x40b8 /* 195BB0 801E7B60 0C02911F */ jal call_virtual_function @@ -25063,14 +25063,14 @@ glabel func_801E7BB8_ovl9 /* 195C0C 801E7BBC AFB20020 */ sw $s2, 0x20($sp) /* 195C10 801E7BC0 AFB1001C */ sw $s1, 0x1c($sp) /* 195C14 801E7BC4 AFB00018 */ sw $s0, 0x18($sp) -/* 195C18 801E7BC8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 195C18 801E7BC8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 195C1C 801E7BCC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 195C20 801E7BD0 3C128022 */ lui $s2, %hi(D_8021BF50) # $s2, 0x8022 /* 195C24 801E7BD4 AFBF0024 */ sw $ra, 0x24($sp) /* 195C28 801E7BD8 AFA40028 */ sw $a0, 0x28($sp) /* 195C2C 801E7BDC 2652BF50 */ addiu $s2, %lo(D_8021BF50) # addiu $s2, $s2, -0x40b0 /* 195C30 801E7BE0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 195C34 801E7BE4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 195C34 801E7BE4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 195C38 801E7BE8 8E2E0000 */ lw $t6, ($s1) .L801E7BEC_ovl9: /* 195C3C 801E7BEC 24050005 */ li $a1, 5 @@ -25223,8 +25223,8 @@ glabel func_801E7CD0_ovl9 /* 195E68 801E7E18 10000035 */ b .L801E7EF0_ovl9 /* 195E6C 801E7E1C 8FBF002C */ lw $ra, 0x2c($sp) .L801E7E20_ovl9: -/* 195E70 801E7E20 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 195E74 801E7E24 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 195E70 801E7E20 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 195E74 801E7E24 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 195E78 801E7E28 020E7821 */ addu $t7, $s0, $t6 /* 195E7C 801E7E2C ADED0000 */ sw $t5, ($t7) /* 195E80 801E7E30 8C620000 */ lw $v0, ($v1) @@ -25250,9 +25250,9 @@ glabel func_801E7CD0_ovl9 /* 195ED0 801E7E80 AD320000 */ sw $s2, ($t1) .L801E7E84_ovl9: /* 195ED4 801E7E84 3C11800E */ lui $s1, %hi(D_800E6F50) # $s1, 0x800e -/* 195ED8 801E7E88 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 195ED8 801E7E88 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 195EDC 801E7E8C 4481A000 */ mtc1 $at, $f20 -/* 195EE0 801E7E90 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 195EE0 801E7E90 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 195EE4 801E7E94 26316F50 */ addiu $s1, %lo(D_800E6F50) # addiu $s1, $s1, 0x6f50 /* 195EE8 801E7E98 24120004 */ li $s2, 4 .L801E7E9C_ovl9: @@ -25981,8 +25981,8 @@ glabel func_801E8860_ovl9 /* 1969A0 801E8950 0C02911F */ jal call_virtual_function /* 1969A4 801E8954 2405000C */ li $a1, 12 /* 1969A8 801E8958 3C118022 */ lui $s1, %hi(D_8021BFFC) # $s1, 0x8022 -/* 1969AC 801E895C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 1969B0 801E8960 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1969AC 801E895C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 1969B0 801E8960 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1969B4 801E8964 2631BFFC */ addiu $s1, %lo(D_8021BFFC) # addiu $s1, $s1, -0x4004 /* 1969B8 801E8968 8E4E0000 */ lw $t6, ($s2) .L801E896C_ovl9: @@ -26011,14 +26011,14 @@ glabel func_801E89B8_ovl9 /* 196A0C 801E89BC AFB20020 */ sw $s2, 0x20($sp) /* 196A10 801E89C0 AFB1001C */ sw $s1, 0x1c($sp) /* 196A14 801E89C4 AFB00018 */ sw $s0, 0x18($sp) -/* 196A18 801E89C8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 196A18 801E89C8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 196A1C 801E89CC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 196A20 801E89D0 3C128022 */ lui $s2, %hi(D_8021BFFC) # $s2, 0x8022 /* 196A24 801E89D4 AFBF0024 */ sw $ra, 0x24($sp) /* 196A28 801E89D8 AFA40028 */ sw $a0, 0x28($sp) /* 196A2C 801E89DC 2652BFFC */ addiu $s2, %lo(D_8021BFFC) # addiu $s2, $s2, -0x4004 /* 196A30 801E89E0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 196A34 801E89E4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 196A34 801E89E4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 196A38 801E89E8 8E2E0000 */ lw $t6, ($s1) .L801E89EC_ovl9: /* 196A3C 801E89EC 24050003 */ li $a1, 3 @@ -27274,8 +27274,8 @@ glabel func_801E9AA0_ovl9 /* 197C8C 801E9C3C 0C02911F */ jal call_virtual_function /* 197C90 801E9C40 24050002 */ li $a1, 2 /* 197C94 801E9C44 3C118022 */ lui $s1, %hi(D_8021C04C) # $s1, 0x8022 -/* 197C98 801E9C48 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 197C9C 801E9C4C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 197C98 801E9C48 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 197C9C 801E9C4C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 197CA0 801E9C50 2631C04C */ addiu $s1, %lo(D_8021C04C) # addiu $s1, $s1, -0x3fb4 /* 197CA4 801E9C54 8E580000 */ lw $t8, ($s2) .L801E9C58_ovl9: @@ -27301,14 +27301,14 @@ glabel func_801E9C98_ovl9 /* 197CEC 801E9C9C AFB20020 */ sw $s2, 0x20($sp) /* 197CF0 801E9CA0 AFB1001C */ sw $s1, 0x1c($sp) /* 197CF4 801E9CA4 AFB00018 */ sw $s0, 0x18($sp) -/* 197CF8 801E9CA8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 197CF8 801E9CA8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 197CFC 801E9CAC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 197D00 801E9CB0 3C128022 */ lui $s2, %hi(D_8021C04C) # $s2, 0x8022 /* 197D04 801E9CB4 AFBF0024 */ sw $ra, 0x24($sp) /* 197D08 801E9CB8 AFA40028 */ sw $a0, 0x28($sp) /* 197D0C 801E9CBC 2652C04C */ addiu $s2, %lo(D_8021C04C) # addiu $s2, $s2, -0x3fb4 /* 197D10 801E9CC0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 197D14 801E9CC4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 197D14 801E9CC4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 197D18 801E9CC8 8E2E0000 */ lw $t6, ($s1) .L801E9CCC_ovl9: /* 197D1C 801E9CCC 24050002 */ li $a1, 2 @@ -28371,8 +28371,8 @@ glabel func_801EABA4_ovl9 /* 198CAC 801EAC5C 0C02911F */ jal call_virtual_function /* 198CB0 801EAC60 90847880 */ lbu $a0, 0x7880($a0) /* 198CB4 801EAC64 3C128022 */ lui $s2, %hi(D_8021C080) # $s2, 0x8022 -/* 198CB8 801EAC68 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 198CBC 801EAC6C 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 198CB8 801EAC68 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 198CBC 801EAC6C 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 198CC0 801EAC70 2652C080 */ addiu $s2, %lo(D_8021C080) # addiu $s2, $s2, -0x3f80 /* 198CC4 801EAC74 8E0D0000 */ lw $t5, ($s0) .L801EAC78_ovl9: @@ -28398,14 +28398,14 @@ glabel func_801EACB8_ovl9 /* 198D0C 801EACBC AFB20020 */ sw $s2, 0x20($sp) /* 198D10 801EACC0 AFB1001C */ sw $s1, 0x1c($sp) /* 198D14 801EACC4 AFB00018 */ sw $s0, 0x18($sp) -/* 198D18 801EACC8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 198D18 801EACC8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 198D1C 801EACCC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 198D20 801EACD0 3C128022 */ lui $s2, %hi(D_8021C080) # $s2, 0x8022 /* 198D24 801EACD4 AFBF0024 */ sw $ra, 0x24($sp) /* 198D28 801EACD8 AFA40028 */ sw $a0, 0x28($sp) /* 198D2C 801EACDC 2652C080 */ addiu $s2, %lo(D_8021C080) # addiu $s2, $s2, -0x3f80 /* 198D30 801EACE0 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 198D34 801EACE4 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 198D34 801EACE4 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 198D38 801EACE8 8E2E0000 */ lw $t6, ($s1) .L801EACEC_ovl9: /* 198D3C 801EACEC 24050006 */ li $a1, 6 @@ -28608,13 +28608,13 @@ glabel func_801EAF10_ovl9 /* 199028 801EAFD8 4481D000 */ mtc1 $at, $f26 /* 19902C 801EAFDC 3C0141A0 */ li $at, 0x41A00000 # 20.000000 /* 199030 801EAFE0 3C13800E */ lui $s3, %hi(D_800E7880) # $s3, 0x800e -/* 199034 801EAFE4 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 199034 801EAFE4 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 199038 801EAFE8 3C11800E */ lui $s1, %hi(gEntitiesPosYArray) # $s1, 0x800e /* 19903C 801EAFEC 4481C000 */ mtc1 $at, $f24 /* 199040 801EAFF0 4480B000 */ mtc1 $zero, $f22 /* 199044 801EAFF4 4480A000 */ mtc1 $zero, $f20 /* 199048 801EAFF8 26312790 */ addiu $s1, %lo(gEntitiesPosYArray) # addiu $s1, $s1, 0x2790 -/* 19904C 801EAFFC 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 19904C 801EAFFC 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 199050 801EB000 26737880 */ addiu $s3, %lo(D_800E7880) # addiu $s3, $s3, 0x7880 /* 199054 801EB004 24150001 */ li $s5, 1 /* 199058 801EB008 24140002 */ li $s4, 2 @@ -29461,12 +29461,12 @@ glabel func_801EBBC8_ovl9 /* 199CA8 801EBC58 240F0001 */ li $t7, 1 /* 199CAC 801EBC5C 8E0E0000 */ lw $t6, ($s0) /* 199CB0 801EBC60 3C08800F */ lui $t0, 0x800f -/* 199CB4 801EBC64 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 199CB4 801EBC64 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 199CB8 801EBC68 000EC080 */ sll $t8, $t6, 2 /* 199CBC 801EBC6C 00380821 */ addu $at, $at, $t8 /* 199CC0 801EBC70 AC2F8920 */ sw $t7, -0x76e0($at) /* 199CC4 801EBC74 8E020000 */ lw $v0, ($s0) -/* 199CC8 801EBC78 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 199CC8 801EBC78 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 199CCC 801EBC7C 2409FFFF */ li $t1, -1 /* 199CD0 801EBC80 00021880 */ sll $v1, $v0, 2 /* 199CD4 801EBC84 01034021 */ addu $t0, $t0, $v1 @@ -29482,10 +29482,10 @@ glabel func_801EBBC8_ovl9 /* 199CFC 801EBCAC 8D820000 */ lw $v0, ($t4) .L801EBCB0_ovl9: /* 199D00 801EBCB0 3C04800E */ lui $a0, 0x800e -/* 199D04 801EBCB4 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 199D04 801EBCB4 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 199D08 801EBCB8 00822021 */ addu $a0, $a0, $v0 /* 199D0C 801EBCBC 3C068022 */ lui $a2, %hi(D_8021C0AC) # $a2, 0x8022 -/* 199D10 801EBCC0 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 199D10 801EBCC0 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 199D14 801EBCC4 24C6C0AC */ addiu $a2, %lo(D_8021C0AC) # addiu $a2, $a2, -0x3f54 /* 199D18 801EBCC8 90847880 */ lbu $a0, 0x7880($a0) /* 199D1C 801EBCCC 0C02911F */ jal call_virtual_function @@ -29522,14 +29522,14 @@ glabel func_801EBD38_ovl9 /* 199D8C 801EBD3C AFB20020 */ sw $s2, 0x20($sp) /* 199D90 801EBD40 AFB1001C */ sw $s1, 0x1c($sp) /* 199D94 801EBD44 AFB00018 */ sw $s0, 0x18($sp) -/* 199D98 801EBD48 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 199D98 801EBD48 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 199D9C 801EBD4C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 199DA0 801EBD50 3C128022 */ lui $s2, %hi(D_8021C0B0) # $s2, 0x8022 /* 199DA4 801EBD54 AFBF0024 */ sw $ra, 0x24($sp) /* 199DA8 801EBD58 AFA40028 */ sw $a0, 0x28($sp) /* 199DAC 801EBD5C 2652C0B0 */ addiu $s2, %lo(D_8021C0B0) # addiu $s2, $s2, -0x3f50 /* 199DB0 801EBD60 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 199DB4 801EBD64 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 199DB4 801EBD64 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 199DB8 801EBD68 8E2E0000 */ lw $t6, ($s1) .L801EBD6C_ovl9: /* 199DBC 801EBD6C 24050005 */ li $a1, 5 @@ -29649,8 +29649,8 @@ glabel func_801EBE74_ovl9 /* 199F64 801EBF14 0C02A7A9 */ jal func_800A9EA4 /* 199F68 801EBF18 AC2A8920 */ sw $t2, -0x76e0($at) /* 199F6C 801EBF1C 8E2E0000 */ lw $t6, ($s1) -/* 199F70 801EBF20 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e -/* 199F74 801EBF24 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 199F70 801EBF20 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e +/* 199F74 801EBF24 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 199F78 801EBF28 8DCF0000 */ lw $t7, ($t6) /* 199F7C 801EBF2C 3C13800E */ lui $s3, %hi(D_800E6A10) # $s3, 0x800e /* 199F80 801EBF30 26736A10 */ addiu $s3, %lo(D_800E6A10) # addiu $s3, $s3, 0x6a10 @@ -30408,8 +30408,8 @@ glabel func_801EC9E0_ovl9 /* 19AAC4 801ECA74 0C02911F */ jal call_virtual_function /* 19AAC8 801ECA78 90847880 */ lbu $a0, 0x7880($a0) /* 19AACC 801ECA7C 3C128022 */ lui $s2, %hi(D_8021C104) # $s2, 0x8022 -/* 19AAD0 801ECA80 3C11800E */ lui $s1, %hi(D_800DDC50) # $s1, 0x800e -/* 19AAD4 801ECA84 2631DC50 */ addiu $s1, %lo(D_800DDC50) # addiu $s1, $s1, -0x23b0 +/* 19AAD0 801ECA80 3C11800E */ lui $s1, %hi(gEntityVtableIndexArray) # $s1, 0x800e +/* 19AAD4 801ECA84 2631DC50 */ addiu $s1, %lo(gEntityVtableIndexArray) # addiu $s1, $s1, -0x23b0 /* 19AAD8 801ECA88 2652C104 */ addiu $s2, %lo(D_8021C104) # addiu $s2, $s2, -0x3efc /* 19AADC 801ECA8C 8E0F0000 */ lw $t7, ($s0) .L801ECA90_ovl9: @@ -30437,14 +30437,14 @@ glabel func_801ECAD8_ovl9 /* 19AB2C 801ECADC AFB20020 */ sw $s2, 0x20($sp) /* 19AB30 801ECAE0 AFB1001C */ sw $s1, 0x1c($sp) /* 19AB34 801ECAE4 AFB00018 */ sw $s0, 0x18($sp) -/* 19AB38 801ECAE8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 19AB38 801ECAE8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 19AB3C 801ECAEC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 19AB40 801ECAF0 3C128022 */ lui $s2, %hi(D_8021C104) # $s2, 0x8022 /* 19AB44 801ECAF4 AFBF0024 */ sw $ra, 0x24($sp) /* 19AB48 801ECAF8 AFA40028 */ sw $a0, 0x28($sp) /* 19AB4C 801ECAFC 2652C104 */ addiu $s2, %lo(D_8021C104) # addiu $s2, $s2, -0x3efc /* 19AB50 801ECB00 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 19AB54 801ECB04 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 19AB54 801ECB04 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 19AB58 801ECB08 8E2E0000 */ lw $t6, ($s1) .L801ECB0C_ovl9: /* 19AB5C 801ECB0C 24050004 */ li $a1, 4 @@ -40219,9 +40219,9 @@ glabel func_801F5C18_ovl9 /* 1A3C90 801F5C40 25CE5CD4 */ addiu $t6, %lo(D_801F5CD4) # addiu $t6, $t6, 0x5cd4 /* 1A3C94 801F5C44 AC2EF150 */ sw $t6, -0xeb0($at) /* 1A3C98 801F5C48 8C4F0000 */ lw $t7, ($v0) -/* 1A3C9C 801F5C4C 3C06800E */ lui $a2, %hi(D_800DDC50) # $a2, 0x800e +/* 1A3C9C 801F5C4C 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) # $a2, 0x800e /* 1A3CA0 801F5C50 3C03800E */ lui $v1, 0x800e -/* 1A3CA4 801F5C54 24C6DC50 */ addiu $a2, %lo(D_800DDC50) # addiu $a2, $a2, -0x23b0 +/* 1A3CA4 801F5C54 24C6DC50 */ addiu $a2, %lo(gEntityVtableIndexArray) # addiu $a2, $a2, -0x23b0 /* 1A3CA8 801F5C58 00651821 */ addu $v1, $v1, $a1 /* 1A3CAC 801F5C5C 000FC080 */ sll $t8, $t7, 2 /* 1A3CB0 801F5C60 8C631B50 */ lw $v1, 0x1b50($v1) @@ -40939,9 +40939,9 @@ glabel func_801F66D4_ovl9 /* 1A474C 801F66FC 25CE6794 */ addiu $t6, %lo(D_801F6794) # addiu $t6, $t6, 0x6794 /* 1A4750 801F6700 AC2EF150 */ sw $t6, -0xeb0($at) /* 1A4754 801F6704 8C580000 */ lw $t8, ($v0) -/* 1A4758 801F6708 3C06800E */ lui $a2, %hi(D_800DDC50) # $a2, 0x800e +/* 1A4758 801F6708 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) # $a2, 0x800e /* 1A475C 801F670C 3C03800E */ lui $v1, 0x800e -/* 1A4760 801F6710 24C6DC50 */ addiu $a2, %lo(D_800DDC50) # addiu $a2, $a2, -0x23b0 +/* 1A4760 801F6710 24C6DC50 */ addiu $a2, %lo(gEntityVtableIndexArray) # addiu $a2, $a2, -0x23b0 /* 1A4764 801F6714 00651821 */ addu $v1, $v1, $a1 /* 1A4768 801F6718 0018C880 */ sll $t9, $t8, 2 /* 1A476C 801F671C 8C631B50 */ lw $v1, 0x1b50($v1) @@ -44923,8 +44923,8 @@ glabel func_801FA0DC_ovl9 /* 1A8190 801FA140 3C01800F */ lui $at, 0x800f /* 1A8194 801FA144 240B0001 */ li $t3, 1 /* 1A8198 801FA148 8C4C0000 */ lw $t4, ($v0) -/* 1A819C 801FA14C 3C03800E */ lui $v1, %hi(D_800DDC50) # $v1, 0x800e -/* 1A81A0 801FA150 2463DC50 */ addiu $v1, %lo(D_800DDC50) # addiu $v1, $v1, -0x23b0 +/* 1A819C 801FA14C 3C03800E */ lui $v1, %hi(gEntityVtableIndexArray) # $v1, 0x800e +/* 1A81A0 801FA150 2463DC50 */ addiu $v1, %lo(gEntityVtableIndexArray) # addiu $v1, $v1, -0x23b0 /* 1A81A4 801FA154 000C6880 */ sll $t5, $t4, 2 /* 1A81A8 801FA158 002D0821 */ addu $at, $at, $t5 /* 1A81AC 801FA15C AC2B8920 */ sw $t3, -0x76e0($at) @@ -49362,8 +49362,8 @@ glabel func_801FE1EC_ovl9 /* 1AC248 801FE1F8 AFBF0014 */ sw $ra, 0x14($sp) /* 1AC24C 801FE1FC AFA40018 */ sw $a0, 0x18($sp) /* 1AC250 801FE200 8C620000 */ lw $v0, ($v1) -/* 1AC254 801FE204 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 1AC258 801FE208 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 1AC254 801FE204 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 1AC258 801FE208 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 1AC25C 801FE20C 00021080 */ sll $v0, $v0, 2 /* 1AC260 801FE210 00E27021 */ addu $t6, $a3, $v0 /* 1AC264 801FE214 8DCF0000 */ lw $t7, ($t6) @@ -49708,8 +49708,8 @@ glabel func_801FE6F4_ovl9 /* 1AC750 801FE700 AFBF0014 */ sw $ra, 0x14($sp) /* 1AC754 801FE704 AFA40018 */ sw $a0, 0x18($sp) /* 1AC758 801FE708 8C620000 */ lw $v0, ($v1) -/* 1AC75C 801FE70C 3C07800E */ lui $a3, %hi(D_800DDC50) # $a3, 0x800e -/* 1AC760 801FE710 24E7DC50 */ addiu $a3, %lo(D_800DDC50) # addiu $a3, $a3, -0x23b0 +/* 1AC75C 801FE70C 3C07800E */ lui $a3, %hi(gEntityVtableIndexArray) # $a3, 0x800e +/* 1AC760 801FE710 24E7DC50 */ addiu $a3, %lo(gEntityVtableIndexArray) # addiu $a3, $a3, -0x23b0 /* 1AC764 801FE714 00021080 */ sll $v0, $v0, 2 /* 1AC768 801FE718 00E27021 */ addu $t6, $a3, $v0 /* 1AC76C 801FE71C 8DCF0000 */ lw $t7, ($t6) @@ -61849,14 +61849,14 @@ glabel func_8020989C_ovl9 /* 1B78F0 802098A0 AFB20020 */ sw $s2, 0x20($sp) /* 1B78F4 802098A4 AFB1001C */ sw $s1, 0x1c($sp) /* 1B78F8 802098A8 AFB00018 */ sw $s0, 0x18($sp) -/* 1B78FC 802098AC 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1B78FC 802098AC 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1B7900 802098B0 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1B7904 802098B4 3C128022 */ lui $s2, %hi(D_8021C958) # $s2, 0x8022 /* 1B7908 802098B8 AFBF0024 */ sw $ra, 0x24($sp) /* 1B790C 802098BC AFA40028 */ sw $a0, 0x28($sp) /* 1B7910 802098C0 2652C958 */ addiu $s2, %lo(D_8021C958) # addiu $s2, $s2, -0x36a8 /* 1B7914 802098C4 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1B7918 802098C8 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1B7918 802098C8 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1B791C 802098CC 8E2E0000 */ lw $t6, ($s1) .L802098D0_ovl9: /* 1B7920 802098D0 24050005 */ li $a1, 5 @@ -62706,14 +62706,14 @@ glabel func_8020A510_ovl9 /* 1B8564 8020A514 AFB20020 */ sw $s2, 0x20($sp) /* 1B8568 8020A518 AFB1001C */ sw $s1, 0x1c($sp) /* 1B856C 8020A51C AFB00018 */ sw $s0, 0x18($sp) -/* 1B8570 8020A520 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1B8570 8020A520 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1B8574 8020A524 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1B8578 8020A528 3C128022 */ lui $s2, %hi(D_8021C980) # $s2, 0x8022 /* 1B857C 8020A52C AFBF0024 */ sw $ra, 0x24($sp) /* 1B8580 8020A530 AFA40028 */ sw $a0, 0x28($sp) /* 1B8584 8020A534 2652C980 */ addiu $s2, %lo(D_8021C980) # addiu $s2, $s2, -0x3680 /* 1B8588 8020A538 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1B858C 8020A53C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1B858C 8020A53C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1B8590 8020A540 8E2E0000 */ lw $t6, ($s1) .L8020A544_ovl9: /* 1B8594 8020A544 24050005 */ li $a1, 5 @@ -62996,14 +62996,14 @@ glabel func_8020A934_ovl9 /* 1B8988 8020A938 AFB20020 */ sw $s2, 0x20($sp) /* 1B898C 8020A93C AFB1001C */ sw $s1, 0x1c($sp) /* 1B8990 8020A940 AFB00018 */ sw $s0, 0x18($sp) -/* 1B8994 8020A944 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1B8994 8020A944 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1B8998 8020A948 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1B899C 8020A94C 3C128022 */ lui $s2, %hi(D_8021C9B0) # $s2, 0x8022 /* 1B89A0 8020A950 AFBF0024 */ sw $ra, 0x24($sp) /* 1B89A4 8020A954 AFA40028 */ sw $a0, 0x28($sp) /* 1B89A8 8020A958 2652C9B0 */ addiu $s2, %lo(D_8021C9B0) # addiu $s2, $s2, -0x3650 /* 1B89AC 8020A95C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1B89B0 8020A960 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1B89B0 8020A960 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1B89B4 8020A964 8E2E0000 */ lw $t6, ($s1) .L8020A968_ovl9: /* 1B89B8 8020A968 24050004 */ li $a1, 4 @@ -63566,14 +63566,14 @@ glabel func_8020B19C_ovl9 /* 1B91F0 8020B1A0 AFB20020 */ sw $s2, 0x20($sp) /* 1B91F4 8020B1A4 AFB1001C */ sw $s1, 0x1c($sp) /* 1B91F8 8020B1A8 AFB00018 */ sw $s0, 0x18($sp) -/* 1B91FC 8020B1AC 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1B91FC 8020B1AC 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1B9200 8020B1B0 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1B9204 8020B1B4 3C128022 */ lui $s2, %hi(D_8021C9D0) # $s2, 0x8022 /* 1B9208 8020B1B8 AFBF0024 */ sw $ra, 0x24($sp) /* 1B920C 8020B1BC AFA40028 */ sw $a0, 0x28($sp) /* 1B9210 8020B1C0 2652C9D0 */ addiu $s2, %lo(D_8021C9D0) # addiu $s2, $s2, -0x3630 /* 1B9214 8020B1C4 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1B9218 8020B1C8 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1B9218 8020B1C8 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1B921C 8020B1CC 8E2E0000 */ lw $t6, ($s1) .L8020B1D0_ovl9: /* 1B9220 8020B1D0 24050003 */ li $a1, 3 @@ -63743,14 +63743,14 @@ glabel func_8020B420_ovl9 /* 1B9474 8020B424 AFB20020 */ sw $s2, 0x20($sp) /* 1B9478 8020B428 AFB1001C */ sw $s1, 0x1c($sp) /* 1B947C 8020B42C AFB00018 */ sw $s0, 0x18($sp) -/* 1B9480 8020B430 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1B9480 8020B430 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1B9484 8020B434 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1B9488 8020B438 3C128022 */ lui $s2, %hi(D_8021C9E8) # $s2, 0x8022 /* 1B948C 8020B43C AFBF0024 */ sw $ra, 0x24($sp) /* 1B9490 8020B440 AFA40028 */ sw $a0, 0x28($sp) /* 1B9494 8020B444 2652C9E8 */ addiu $s2, %lo(D_8021C9E8) # addiu $s2, $s2, -0x3618 /* 1B9498 8020B448 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1B949C 8020B44C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1B949C 8020B44C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1B94A0 8020B450 8E2E0000 */ lw $t6, ($s1) .L8020B454_ovl9: /* 1B94A4 8020B454 24050005 */ li $a1, 5 @@ -63870,12 +63870,12 @@ glabel func_8020B598_ovl9 /* 1B9648 8020B5F8 0018C880 */ sll $t9, $t8, 2 /* 1B964C 8020B5FC 02D94021 */ addu $t0, $s6, $t9 /* 1B9650 8020B600 3C10800F */ lui $s0, %hi(D_800E9560) # $s0, 0x800f -/* 1B9654 8020B604 3C12800E */ lui $s2, %hi(D_800DDC50) # $s2, 0x800e +/* 1B9654 8020B604 3C12800E */ lui $s2, %hi(gEntityVtableIndexArray) # $s2, 0x800e /* 1B9658 8020B608 3C150001 */ lui $s5, (0x00010040 >> 16) # lui $s5, 1 /* 1B965C 8020B60C 4481A000 */ mtc1 $at, $f20 /* 1B9660 8020B610 AD000000 */ sw $zero, ($t0) /* 1B9664 8020B614 36B50040 */ ori $s5, (0x00010040 & 0xFFFF) # ori $s5, $s5, 0x40 -/* 1B9668 8020B618 2652DC50 */ addiu $s2, %lo(D_800DDC50) # addiu $s2, $s2, -0x23b0 +/* 1B9668 8020B618 2652DC50 */ addiu $s2, %lo(gEntityVtableIndexArray) # addiu $s2, $s2, -0x23b0 /* 1B966C 8020B61C 26109560 */ addiu $s0, %lo(D_800E9560) # addiu $s0, $s0, -0x6aa0 /* 1B9670 8020B620 24130003 */ li $s3, 3 .L8020B624_ovl9: @@ -64303,14 +64303,14 @@ glabel func_8020BC24_ovl9 /* 1B9C78 8020BC28 AFB20020 */ sw $s2, 0x20($sp) /* 1B9C7C 8020BC2C AFB1001C */ sw $s1, 0x1c($sp) /* 1B9C80 8020BC30 AFB00018 */ sw $s0, 0x18($sp) -/* 1B9C84 8020BC34 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1B9C84 8020BC34 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1B9C88 8020BC38 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1B9C8C 8020BC3C 3C128022 */ lui $s2, %hi(D_8021CA18) # $s2, 0x8022 /* 1B9C90 8020BC40 AFBF0024 */ sw $ra, 0x24($sp) /* 1B9C94 8020BC44 AFA40028 */ sw $a0, 0x28($sp) /* 1B9C98 8020BC48 2652CA18 */ addiu $s2, %lo(D_8021CA18) # addiu $s2, $s2, -0x35e8 /* 1B9C9C 8020BC4C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1B9CA0 8020BC50 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1B9CA0 8020BC50 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1B9CA4 8020BC54 8E2E0000 */ lw $t6, ($s1) .L8020BC58_ovl9: /* 1B9CA8 8020BC58 24050003 */ li $a1, 3 @@ -64770,14 +64770,14 @@ glabel func_8020C2EC_ovl9 /* 1BA340 8020C2F0 AFB20020 */ sw $s2, 0x20($sp) /* 1BA344 8020C2F4 AFB1001C */ sw $s1, 0x1c($sp) /* 1BA348 8020C2F8 AFB00018 */ sw $s0, 0x18($sp) -/* 1BA34C 8020C2FC 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BA34C 8020C2FC 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BA350 8020C300 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BA354 8020C304 3C128022 */ lui $s2, %hi(D_8021CA30) # $s2, 0x8022 /* 1BA358 8020C308 AFBF0024 */ sw $ra, 0x24($sp) /* 1BA35C 8020C30C AFA40028 */ sw $a0, 0x28($sp) /* 1BA360 8020C310 2652CA30 */ addiu $s2, %lo(D_8021CA30) # addiu $s2, $s2, -0x35d0 /* 1BA364 8020C314 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BA368 8020C318 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BA368 8020C318 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BA36C 8020C31C 8E2E0000 */ lw $t6, ($s1) .L8020C320_ovl9: /* 1BA370 8020C320 24050003 */ li $a1, 3 @@ -65274,14 +65274,14 @@ glabel func_8020CA4C_ovl9 /* 1BAAA0 8020CA50 AFB20020 */ sw $s2, 0x20($sp) /* 1BAAA4 8020CA54 AFB1001C */ sw $s1, 0x1c($sp) /* 1BAAA8 8020CA58 AFB00018 */ sw $s0, 0x18($sp) -/* 1BAAAC 8020CA5C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BAAAC 8020CA5C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BAAB0 8020CA60 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BAAB4 8020CA64 3C128022 */ lui $s2, %hi(D_8021CA48) # $s2, 0x8022 /* 1BAAB8 8020CA68 AFBF0024 */ sw $ra, 0x24($sp) /* 1BAABC 8020CA6C AFA40028 */ sw $a0, 0x28($sp) /* 1BAAC0 8020CA70 2652CA48 */ addiu $s2, %lo(D_8021CA48) # addiu $s2, $s2, -0x35b8 /* 1BAAC4 8020CA74 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BAAC8 8020CA78 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BAAC8 8020CA78 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BAACC 8020CA7C 8E2E0000 */ lw $t6, ($s1) .L8020CA80_ovl9: /* 1BAAD0 8020CA80 24050005 */ li $a1, 5 @@ -66041,14 +66041,14 @@ glabel func_8020D594_ovl9 /* 1BB5E8 8020D598 AFB20020 */ sw $s2, 0x20($sp) /* 1BB5EC 8020D59C AFB1001C */ sw $s1, 0x1c($sp) /* 1BB5F0 8020D5A0 AFB00018 */ sw $s0, 0x18($sp) -/* 1BB5F4 8020D5A4 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BB5F4 8020D5A4 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BB5F8 8020D5A8 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BB5FC 8020D5AC 3C128022 */ lui $s2, %hi(D_8021CA70) # $s2, 0x8022 /* 1BB600 8020D5B0 AFBF0024 */ sw $ra, 0x24($sp) /* 1BB604 8020D5B4 AFA40028 */ sw $a0, 0x28($sp) /* 1BB608 8020D5B8 2652CA70 */ addiu $s2, %lo(D_8021CA70) # addiu $s2, $s2, -0x3590 /* 1BB60C 8020D5BC 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BB610 8020D5C0 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BB610 8020D5C0 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BB614 8020D5C4 8E2E0000 */ lw $t6, ($s1) .L8020D5C8_ovl9: /* 1BB618 8020D5C8 24050006 */ li $a1, 6 @@ -66814,14 +66814,14 @@ glabel func_8020E0F4_ovl9 /* 1BC148 8020E0F8 AFB20020 */ sw $s2, 0x20($sp) /* 1BC14C 8020E0FC AFB1001C */ sw $s1, 0x1c($sp) /* 1BC150 8020E100 AFB00018 */ sw $s0, 0x18($sp) -/* 1BC154 8020E104 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BC154 8020E104 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BC158 8020E108 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BC15C 8020E10C 3C128022 */ lui $s2, %hi(D_8021CAA8) # $s2, 0x8022 /* 1BC160 8020E110 AFBF0024 */ sw $ra, 0x24($sp) /* 1BC164 8020E114 AFA40028 */ sw $a0, 0x28($sp) /* 1BC168 8020E118 2652CAA8 */ addiu $s2, %lo(D_8021CAA8) # addiu $s2, $s2, -0x3558 /* 1BC16C 8020E11C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BC170 8020E120 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BC170 8020E120 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BC174 8020E124 8E2E0000 */ lw $t6, ($s1) .L8020E128_ovl9: /* 1BC178 8020E128 24050004 */ li $a1, 4 @@ -67844,14 +67844,14 @@ glabel func_8020F008_ovl9 /* 1BD05C 8020F00C AFB20020 */ sw $s2, 0x20($sp) /* 1BD060 8020F010 AFB1001C */ sw $s1, 0x1c($sp) /* 1BD064 8020F014 AFB00018 */ sw $s0, 0x18($sp) -/* 1BD068 8020F018 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BD068 8020F018 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BD06C 8020F01C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BD070 8020F020 3C128022 */ lui $s2, %hi(D_8021CAD0) # $s2, 0x8022 /* 1BD074 8020F024 AFBF0024 */ sw $ra, 0x24($sp) /* 1BD078 8020F028 AFA40028 */ sw $a0, 0x28($sp) /* 1BD07C 8020F02C 2652CAD0 */ addiu $s2, %lo(D_8021CAD0) # addiu $s2, $s2, -0x3530 /* 1BD080 8020F030 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BD084 8020F034 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BD084 8020F034 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BD088 8020F038 8E2E0000 */ lw $t6, ($s1) .L8020F03C_ovl9: /* 1BD08C 8020F03C 24050005 */ li $a1, 5 @@ -68759,7 +68759,7 @@ glabel func_8020FD34_ovl9 /* 1BDDA4 8020FD54 00402825 */ move $a1, $v0 /* 1BDDA8 8020FD58 2401FFFF */ li $at, -1 /* 1BDDAC 8020FD5C 1441000A */ bne $v0, $at, .L8020FD88_ovl9 -/* 1BDDB0 8020FD60 3C06800E */ lui $a2, %hi(D_800DDC50) # $a2, 0x800e +/* 1BDDB0 8020FD60 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) # $a2, 0x800e .L8020FD64_ovl9: /* 1BDDB4 8020FD64 3C048022 */ lui $a0, %hi(D_8021DAF0) # $a0, 0x8022 /* 1BDDB8 8020FD68 2484DAF0 */ addiu $a0, %lo(D_8021DAF0) # addiu $a0, $a0, -0x2510 @@ -68773,7 +68773,7 @@ glabel func_8020FD34_ovl9 .L8020FD88_ovl9: /* 1BDDD8 8020FD88 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005 /* 1BDDDC 8020FD8C 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0) -/* 1BDDE0 8020FD90 24C6DC50 */ addiu $a2, %lo(D_800DDC50) # addiu $a2, $a2, -0x23b0 +/* 1BDDE0 8020FD90 24C6DC50 */ addiu $a2, %lo(gEntityVtableIndexArray) # addiu $a2, $a2, -0x23b0 /* 1BDDE4 8020FD94 00021880 */ sll $v1, $v0, 2 /* 1BDDE8 8020FD98 8C8E0000 */ lw $t6, ($a0) /* 1BDDEC 8020FD9C 3C01800E */ lui $at, 0x800e @@ -69168,14 +69168,14 @@ glabel func_80210354_ovl9 /* 1BE3A8 80210358 AFB20020 */ sw $s2, 0x20($sp) /* 1BE3AC 8021035C AFB1001C */ sw $s1, 0x1c($sp) /* 1BE3B0 80210360 AFB00018 */ sw $s0, 0x18($sp) -/* 1BE3B4 80210364 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BE3B4 80210364 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BE3B8 80210368 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BE3BC 8021036C 3C128022 */ lui $s2, %hi(D_8021CB18) # $s2, 0x8022 /* 1BE3C0 80210370 AFBF0024 */ sw $ra, 0x24($sp) /* 1BE3C4 80210374 AFA40028 */ sw $a0, 0x28($sp) /* 1BE3C8 80210378 2652CB18 */ addiu $s2, %lo(D_8021CB18) # addiu $s2, $s2, -0x34e8 /* 1BE3CC 8021037C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BE3D0 80210380 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BE3D0 80210380 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BE3D4 80210384 8E2E0000 */ lw $t6, ($s1) .L80210388_ovl9: /* 1BE3D8 80210388 24050004 */ li $a1, 4 @@ -69767,14 +69767,14 @@ glabel func_80210BE8_ovl9 /* 1BEC3C 80210BEC AFB20020 */ sw $s2, 0x20($sp) /* 1BEC40 80210BF0 AFB1001C */ sw $s1, 0x1c($sp) /* 1BEC44 80210BF4 AFB00018 */ sw $s0, 0x18($sp) -/* 1BEC48 80210BF8 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BEC48 80210BF8 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BEC4C 80210BFC 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BEC50 80210C00 3C128022 */ lui $s2, %hi(D_8021CB38) # $s2, 0x8022 /* 1BEC54 80210C04 AFBF0024 */ sw $ra, 0x24($sp) /* 1BEC58 80210C08 AFA40028 */ sw $a0, 0x28($sp) /* 1BEC5C 80210C0C 2652CB38 */ addiu $s2, %lo(D_8021CB38) # addiu $s2, $s2, -0x34c8 /* 1BEC60 80210C10 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BEC64 80210C14 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BEC64 80210C14 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BEC68 80210C18 8E2E0000 */ lw $t6, ($s1) .L80210C1C_ovl9: /* 1BEC6C 80210C1C 24050004 */ li $a1, 4 @@ -70047,14 +70047,14 @@ glabel func_80210FEC_ovl9 /* 1BF040 80210FF0 AFB20020 */ sw $s2, 0x20($sp) /* 1BF044 80210FF4 AFB1001C */ sw $s1, 0x1c($sp) /* 1BF048 80210FF8 AFB00018 */ sw $s0, 0x18($sp) -/* 1BF04C 80210FFC 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BF04C 80210FFC 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BF050 80211000 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BF054 80211004 3C128022 */ lui $s2, %hi(D_8021CB58) # $s2, 0x8022 /* 1BF058 80211008 AFBF0024 */ sw $ra, 0x24($sp) /* 1BF05C 8021100C AFA40028 */ sw $a0, 0x28($sp) /* 1BF060 80211010 2652CB58 */ addiu $s2, %lo(D_8021CB58) # addiu $s2, $s2, -0x34a8 /* 1BF064 80211014 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BF068 80211018 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BF068 80211018 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BF06C 8021101C 8E2E0000 */ lw $t6, ($s1) .L80211020_ovl9: /* 1BF070 80211020 24050002 */ li $a1, 2 @@ -70486,7 +70486,7 @@ glabel func_8021161C_ovl9 /* 1BF690 80211640 00402825 */ move $a1, $v0 /* 1BF694 80211644 2401FFFF */ li $at, -1 /* 1BF698 80211648 1441000A */ bne $v0, $at, .L80211674_ovl9 -/* 1BF69C 8021164C 3C06800E */ lui $a2, %hi(D_800DDC50) # $a2, 0x800e +/* 1BF69C 8021164C 3C06800E */ lui $a2, %hi(gEntityVtableIndexArray) # $a2, 0x800e .L80211650_ovl9: /* 1BF6A0 80211650 3C048022 */ lui $a0, %hi(D_8021DCB0) # $a0, 0x8022 /* 1BF6A4 80211654 2484DCB0 */ addiu $a0, %lo(D_8021DCB0) # addiu $a0, $a0, -0x2350 @@ -70500,7 +70500,7 @@ glabel func_8021161C_ovl9 .L80211674_ovl9: /* 1BF6C4 80211674 3C048005 */ lui $a0, %hi(D_8004A7C4) # $a0, 0x8005 /* 1BF6C8 80211678 8C84A7C4 */ lw $a0, %lo(D_8004A7C4)($a0) -/* 1BF6CC 8021167C 24C6DC50 */ addiu $a2, %lo(D_800DDC50) # addiu $a2, $a2, -0x23b0 +/* 1BF6CC 8021167C 24C6DC50 */ addiu $a2, %lo(gEntityVtableIndexArray) # addiu $a2, $a2, -0x23b0 /* 1BF6D0 80211680 00021880 */ sll $v1, $v0, 2 /* 1BF6D4 80211684 8C8E0000 */ lw $t6, ($a0) /* 1BF6D8 80211688 3C01800E */ lui $at, 0x800e @@ -70707,14 +70707,14 @@ glabel func_80211984_ovl9 /* 1BF9D8 80211988 AFB20020 */ sw $s2, 0x20($sp) /* 1BF9DC 8021198C AFB1001C */ sw $s1, 0x1c($sp) /* 1BF9E0 80211990 AFB00018 */ sw $s0, 0x18($sp) -/* 1BF9E4 80211994 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1BF9E4 80211994 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1BF9E8 80211998 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1BF9EC 8021199C 3C128022 */ lui $s2, %hi(D_8021CB70) # $s2, 0x8022 /* 1BF9F0 802119A0 AFBF0024 */ sw $ra, 0x24($sp) /* 1BF9F4 802119A4 AFA40028 */ sw $a0, 0x28($sp) /* 1BF9F8 802119A8 2652CB70 */ addiu $s2, %lo(D_8021CB70) # addiu $s2, $s2, -0x3490 /* 1BF9FC 802119AC 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1BFA00 802119B0 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1BFA00 802119B0 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1BFA04 802119B4 8E2E0000 */ lw $t6, ($s1) .L802119B8_ovl9: /* 1BFA08 802119B8 24050006 */ li $a1, 6 @@ -71378,14 +71378,14 @@ glabel func_80212338_ovl9 /* 1C038C 8021233C AFB20020 */ sw $s2, 0x20($sp) /* 1C0390 80212340 AFB1001C */ sw $s1, 0x1c($sp) /* 1C0394 80212344 AFB00018 */ sw $s0, 0x18($sp) -/* 1C0398 80212348 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C0398 80212348 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C039C 8021234C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C03A0 80212350 3C128022 */ lui $s2, %hi(D_8021CBB0) # $s2, 0x8022 /* 1C03A4 80212354 AFBF0024 */ sw $ra, 0x24($sp) /* 1C03A8 80212358 AFA40028 */ sw $a0, 0x28($sp) /* 1C03AC 8021235C 2652CBB0 */ addiu $s2, %lo(D_8021CBB0) # addiu $s2, $s2, -0x3450 /* 1C03B0 80212360 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C03B4 80212364 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C03B4 80212364 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C03B8 80212368 8E2E0000 */ lw $t6, ($s1) .L8021236C_ovl9: /* 1C03BC 8021236C 24050003 */ li $a1, 3 @@ -71717,14 +71717,14 @@ glabel func_8021282C_ovl9 /* 1C0880 80212830 AFB20020 */ sw $s2, 0x20($sp) /* 1C0884 80212834 AFB1001C */ sw $s1, 0x1c($sp) /* 1C0888 80212838 AFB00018 */ sw $s0, 0x18($sp) -/* 1C088C 8021283C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C088C 8021283C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C0890 80212840 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C0894 80212844 3C128022 */ lui $s2, %hi(D_8021CBC8) # $s2, 0x8022 /* 1C0898 80212848 AFBF0024 */ sw $ra, 0x24($sp) /* 1C089C 8021284C AFA40028 */ sw $a0, 0x28($sp) /* 1C08A0 80212850 2652CBC8 */ addiu $s2, %lo(D_8021CBC8) # addiu $s2, $s2, -0x3438 /* 1C08A4 80212854 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C08A8 80212858 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C08A8 80212858 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C08AC 8021285C 8E2E0000 */ lw $t6, ($s1) .L80212860_ovl9: /* 1C08B0 80212860 24050004 */ li $a1, 4 @@ -71874,14 +71874,14 @@ glabel func_80212A70_ovl9 /* 1C0AC4 80212A74 AFB20020 */ sw $s2, 0x20($sp) /* 1C0AC8 80212A78 AFB1001C */ sw $s1, 0x1c($sp) /* 1C0ACC 80212A7C AFB00018 */ sw $s0, 0x18($sp) -/* 1C0AD0 80212A80 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C0AD0 80212A80 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C0AD4 80212A84 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C0AD8 80212A88 3C128022 */ lui $s2, %hi(D_8021CBE8) # $s2, 0x8022 /* 1C0ADC 80212A8C AFBF0024 */ sw $ra, 0x24($sp) /* 1C0AE0 80212A90 AFA40028 */ sw $a0, 0x28($sp) /* 1C0AE4 80212A94 2652CBE8 */ addiu $s2, %lo(D_8021CBE8) # addiu $s2, $s2, -0x3418 /* 1C0AE8 80212A98 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C0AEC 80212A9C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C0AEC 80212A9C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C0AF0 80212AA0 8E2E0000 */ lw $t6, ($s1) .L80212AA4_ovl9: /* 1C0AF4 80212AA4 24050006 */ li $a1, 6 @@ -72546,14 +72546,14 @@ glabel func_80213458_ovl9 /* 1C14AC 8021345C AFB20020 */ sw $s2, 0x20($sp) /* 1C14B0 80213460 AFB1001C */ sw $s1, 0x1c($sp) /* 1C14B4 80213464 AFB00018 */ sw $s0, 0x18($sp) -/* 1C14B8 80213468 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C14B8 80213468 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C14BC 8021346C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C14C0 80213470 3C128022 */ lui $s2, %hi(D_8021CC18) # $s2, 0x8022 /* 1C14C4 80213474 AFBF0024 */ sw $ra, 0x24($sp) /* 1C14C8 80213478 AFA40028 */ sw $a0, 0x28($sp) /* 1C14CC 8021347C 2652CC18 */ addiu $s2, %lo(D_8021CC18) # addiu $s2, $s2, -0x33e8 /* 1C14D0 80213480 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C14D4 80213484 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C14D4 80213484 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C14D8 80213488 8E2E0000 */ lw $t6, ($s1) .L8021348C_ovl9: /* 1C14DC 8021348C 24050007 */ li $a1, 7 @@ -72733,14 +72733,14 @@ glabel func_80213708_ovl9 /* 1C175C 8021370C AFB20020 */ sw $s2, 0x20($sp) /* 1C1760 80213710 AFB1001C */ sw $s1, 0x1c($sp) /* 1C1764 80213714 AFB00018 */ sw $s0, 0x18($sp) -/* 1C1768 80213718 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C1768 80213718 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C176C 8021371C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C1770 80213720 3C128022 */ lui $s2, %hi(D_8021CC5C) # $s2, 0x8022 /* 1C1774 80213724 AFBF0024 */ sw $ra, 0x24($sp) /* 1C1778 80213728 AFA40028 */ sw $a0, 0x28($sp) /* 1C177C 8021372C 2652CC5C */ addiu $s2, %lo(D_8021CC5C) # addiu $s2, $s2, -0x33a4 /* 1C1780 80213730 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C1784 80213734 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C1784 80213734 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C1788 80213738 8E2E0000 */ lw $t6, ($s1) .L8021373C_ovl9: /* 1C178C 8021373C 24050003 */ li $a1, 3 @@ -73049,14 +73049,14 @@ glabel func_80213B94_ovl9 /* 1C1BE8 80213B98 AFB20020 */ sw $s2, 0x20($sp) /* 1C1BEC 80213B9C AFB1001C */ sw $s1, 0x1c($sp) /* 1C1BF0 80213BA0 AFB00018 */ sw $s0, 0x18($sp) -/* 1C1BF4 80213BA4 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C1BF4 80213BA4 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C1BF8 80213BA8 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C1BFC 80213BAC 3C128022 */ lui $s2, %hi(D_8021CC74) # $s2, 0x8022 /* 1C1C00 80213BB0 AFBF0024 */ sw $ra, 0x24($sp) /* 1C1C04 80213BB4 AFA40028 */ sw $a0, 0x28($sp) /* 1C1C08 80213BB8 2652CC74 */ addiu $s2, %lo(D_8021CC74) # addiu $s2, $s2, -0x338c /* 1C1C0C 80213BBC 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C1C10 80213BC0 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C1C10 80213BC0 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C1C14 80213BC4 8E2E0000 */ lw $t6, ($s1) .L80213BC8_ovl9: /* 1C1C18 80213BC8 24050004 */ li $a1, 4 @@ -73679,14 +73679,14 @@ glabel func_80214480_ovl9 /* 1C24D4 80214484 AFB20020 */ sw $s2, 0x20($sp) /* 1C24D8 80214488 AFB1001C */ sw $s1, 0x1c($sp) /* 1C24DC 8021448C AFB00018 */ sw $s0, 0x18($sp) -/* 1C24E0 80214490 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C24E0 80214490 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C24E4 80214494 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C24E8 80214498 3C128022 */ lui $s2, %hi(D_8021CC94) # $s2, 0x8022 /* 1C24EC 8021449C AFBF0024 */ sw $ra, 0x24($sp) /* 1C24F0 802144A0 AFA40028 */ sw $a0, 0x28($sp) /* 1C24F4 802144A4 2652CC94 */ addiu $s2, %lo(D_8021CC94) # addiu $s2, $s2, -0x336c /* 1C24F8 802144A8 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C24FC 802144AC 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C24FC 802144AC 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C2500 802144B0 8E2E0000 */ lw $t6, ($s1) .L802144B4_ovl9: /* 1C2504 802144B4 24050003 */ li $a1, 3 @@ -74411,14 +74411,14 @@ glabel func_80214F4C_ovl9 /* 1C2FA0 80214F50 AFB20020 */ sw $s2, 0x20($sp) /* 1C2FA4 80214F54 AFB1001C */ sw $s1, 0x1c($sp) /* 1C2FA8 80214F58 AFB00018 */ sw $s0, 0x18($sp) -/* 1C2FAC 80214F5C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C2FAC 80214F5C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C2FB0 80214F60 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C2FB4 80214F64 3C128022 */ lui $s2, %hi(D_8021CCBC) # $s2, 0x8022 /* 1C2FB8 80214F68 AFBF0024 */ sw $ra, 0x24($sp) /* 1C2FBC 80214F6C AFA40028 */ sw $a0, 0x28($sp) /* 1C2FC0 80214F70 2652CCBC */ addiu $s2, %lo(D_8021CCBC) # addiu $s2, $s2, -0x3344 /* 1C2FC4 80214F74 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C2FC8 80214F78 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C2FC8 80214F78 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C2FCC 80214F7C 8E2E0000 */ lw $t6, ($s1) .L80214F80_ovl9: /* 1C2FD0 80214F80 24050003 */ li $a1, 3 @@ -74670,7 +74670,7 @@ glabel func_802152F4_ovl9 /* 1C3350 80215300 AFB00020 */ sw $s0, 0x20($sp) /* 1C3354 80215304 F7B40018 */ sdc1 $f20, 0x18($sp) /* 1C3358 80215308 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 1C335C 8021530C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C335C 8021530C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C3360 80215310 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C3364 80215314 3C128022 */ lui $s2, %hi(D_8021CCD4) # $s2, 0x8022 /* 1C3368 80215318 4481A000 */ mtc1 $at, $f20 @@ -74678,7 +74678,7 @@ glabel func_802152F4_ovl9 /* 1C3370 80215320 AFA40030 */ sw $a0, 0x30($sp) /* 1C3374 80215324 2652CCD4 */ addiu $s2, %lo(D_8021CCD4) # addiu $s2, $s2, -0x332c /* 1C3378 80215328 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C337C 8021532C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C337C 8021532C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 .L80215330_ovl9: /* 1C3380 80215330 0C02BB30 */ jal func_800AECC0 /* 1C3384 80215334 4600A306 */ mov.s $f12, $f20 @@ -75255,14 +75255,14 @@ glabel func_80215B7C_ovl9 /* 1C3BD0 80215B80 AFB20020 */ sw $s2, 0x20($sp) /* 1C3BD4 80215B84 AFB1001C */ sw $s1, 0x1c($sp) /* 1C3BD8 80215B88 AFB00018 */ sw $s0, 0x18($sp) -/* 1C3BDC 80215B8C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C3BDC 80215B8C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C3BE0 80215B90 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C3BE4 80215B94 3C128022 */ lui $s2, %hi(D_8021CCFC) # $s2, 0x8022 /* 1C3BE8 80215B98 AFBF0024 */ sw $ra, 0x24($sp) /* 1C3BEC 80215B9C AFA40028 */ sw $a0, 0x28($sp) /* 1C3BF0 80215BA0 2652CCFC */ addiu $s2, %lo(D_8021CCFC) # addiu $s2, $s2, -0x3304 /* 1C3BF4 80215BA4 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C3BF8 80215BA8 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C3BF8 80215BA8 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 /* 1C3BFC 80215BAC 8E2E0000 */ lw $t6, ($s1) .L80215BB0_ovl9: /* 1C3C00 80215BB0 24050003 */ li $a1, 3 @@ -75582,7 +75582,7 @@ glabel func_80216024_ovl9 /* 1C4080 80216030 AFB00020 */ sw $s0, 0x20($sp) /* 1C4084 80216034 F7B40018 */ sdc1 $f20, 0x18($sp) /* 1C4088 80216038 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 1C408C 8021603C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C408C 8021603C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C4090 80216040 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C4094 80216044 3C128022 */ lui $s2, %hi(D_8021CD20) # $s2, 0x8022 /* 1C4098 80216048 4481A000 */ mtc1 $at, $f20 @@ -75590,7 +75590,7 @@ glabel func_80216024_ovl9 /* 1C40A0 80216050 AFA40030 */ sw $a0, 0x30($sp) /* 1C40A4 80216054 2652CD20 */ addiu $s2, %lo(D_8021CD20) # addiu $s2, $s2, -0x32e0 /* 1C40A8 80216058 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C40AC 8021605C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C40AC 8021605C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 .L80216060_ovl9: /* 1C40B0 80216060 0C02BB30 */ jal func_800AECC0 /* 1C40B4 80216064 4600A306 */ mov.s $f12, $f20 @@ -76055,7 +76055,7 @@ glabel func_80216700_ovl9 /* 1C475C 8021670C AFB00020 */ sw $s0, 0x20($sp) /* 1C4760 80216710 F7B40018 */ sdc1 $f20, 0x18($sp) /* 1C4764 80216714 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 1C4768 80216718 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C4768 80216718 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C476C 8021671C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C4770 80216720 3C128022 */ lui $s2, %hi(D_8021CD38) # $s2, 0x8022 /* 1C4774 80216724 4481A000 */ mtc1 $at, $f20 @@ -76063,7 +76063,7 @@ glabel func_80216700_ovl9 /* 1C477C 8021672C AFA40030 */ sw $a0, 0x30($sp) /* 1C4780 80216730 2652CD38 */ addiu $s2, %lo(D_8021CD38) # addiu $s2, $s2, -0x32c8 /* 1C4784 80216734 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C4788 80216738 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C4788 80216738 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 .L8021673C_ovl9: /* 1C478C 8021673C 0C02BB30 */ jal func_800AECC0 /* 1C4790 80216740 4600A306 */ mov.s $f12, $f20 @@ -77103,7 +77103,7 @@ glabel func_80217634_ovl9 /* 1C5690 80217640 AFB00020 */ sw $s0, 0x20($sp) /* 1C5694 80217644 F7B40018 */ sdc1 $f20, 0x18($sp) /* 1C5698 80217648 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 1C569C 8021764C 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C569C 8021764C 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C56A0 80217650 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C56A4 80217654 3C128022 */ lui $s2, %hi(D_8021CD60) # $s2, 0x8022 /* 1C56A8 80217658 4481A000 */ mtc1 $at, $f20 @@ -77111,7 +77111,7 @@ glabel func_80217634_ovl9 /* 1C56B0 80217660 AFA40030 */ sw $a0, 0x30($sp) /* 1C56B4 80217664 2652CD60 */ addiu $s2, %lo(D_8021CD60) # addiu $s2, $s2, -0x32a0 /* 1C56B8 80217668 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C56BC 8021766C 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C56BC 8021766C 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 .L80217670_ovl9: /* 1C56C0 80217670 0C02BB30 */ jal func_800AECC0 /* 1C56C4 80217674 4600A306 */ mov.s $f12, $f20 @@ -77843,7 +77843,7 @@ glabel func_802180D8_ovl9 /* 1C6134 802180E4 AFB00020 */ sw $s0, 0x20($sp) /* 1C6138 802180E8 F7B40018 */ sdc1 $f20, 0x18($sp) /* 1C613C 802180EC 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 1C6140 802180F0 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C6140 802180F0 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C6144 802180F4 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C6148 802180F8 3C128022 */ lui $s2, %hi(D_8021CDA0) # $s2, 0x8022 /* 1C614C 802180FC 4481A000 */ mtc1 $at, $f20 @@ -77851,7 +77851,7 @@ glabel func_802180D8_ovl9 /* 1C6154 80218104 AFA40030 */ sw $a0, 0x30($sp) /* 1C6158 80218108 2652CDA0 */ addiu $s2, %lo(D_8021CDA0) # addiu $s2, $s2, -0x3260 /* 1C615C 8021810C 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C6160 80218110 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C6160 80218110 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 .L80218114_ovl9: /* 1C6164 80218114 0C02BB30 */ jal func_800AECC0 /* 1C6168 80218118 4600A306 */ mov.s $f12, $f20 @@ -78543,7 +78543,7 @@ glabel func_80218B00_ovl9 /* 1C6B5C 80218B0C AFB00020 */ sw $s0, 0x20($sp) /* 1C6B60 80218B10 F7B40018 */ sdc1 $f20, 0x18($sp) /* 1C6B64 80218B14 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 1C6B68 80218B18 3C10800E */ lui $s0, %hi(D_800DDC50) # $s0, 0x800e +/* 1C6B68 80218B18 3C10800E */ lui $s0, %hi(gEntityVtableIndexArray) # $s0, 0x800e /* 1C6B6C 80218B1C 3C118005 */ lui $s1, %hi(D_8004A7C4) # $s1, 0x8005 /* 1C6B70 80218B20 3C128022 */ lui $s2, %hi(D_8021CDC0) # $s2, 0x8022 /* 1C6B74 80218B24 4481A000 */ mtc1 $at, $f20 @@ -78551,7 +78551,7 @@ glabel func_80218B00_ovl9 /* 1C6B7C 80218B2C AFA40030 */ sw $a0, 0x30($sp) /* 1C6B80 80218B30 2652CDC0 */ addiu $s2, %lo(D_8021CDC0) # addiu $s2, $s2, -0x3240 /* 1C6B84 80218B34 2631A7C4 */ addiu $s1, %lo(D_8004A7C4) # addiu $s1, $s1, -0x583c -/* 1C6B88 80218B38 2610DC50 */ addiu $s0, %lo(D_800DDC50) # addiu $s0, $s0, -0x23b0 +/* 1C6B88 80218B38 2610DC50 */ addiu $s0, %lo(gEntityVtableIndexArray) # addiu $s0, $s0, -0x23b0 .L80218B3C_ovl9: /* 1C6B8C 80218B3C 0C02BB30 */ jal func_800AECC0 /* 1C6B90 80218B40 4600A306 */ mov.s $f12, $f20 diff --git a/data/kirby.0F0D50.s b/data/kirby.0F0D50.s index 0a194723..84e543b6 100644 --- a/data/kirby.0F0D50.s +++ b/data/kirby.0F0D50.s @@ -19680,872 +19680,3 @@ glabel D_80196988 glabel D_8019698C .word 0x00000000 -# kirby.cc .data - -glabel D_80196990 -.word 0x8016CA8C - -glabel D_80196994 -.word 0x8016D3A8 - -glabel D_80196998 -.word 0x8016DA14 - -glabel D_8019699C -.word 0x8016DDE8 - -glabel D_801969A0 -.word 0x8016E638 - -glabel D_801969A4 -.word 0x8016E8A0 - -glabel D_801969A8 -.word 0x8016EF5C - -glabel D_801969AC -.word 0x8016F6DC - -glabel D_801969B0 -.word 0x8016F80C - -glabel D_801969B4 -.word 0x8016FD88 - -glabel D_801969B8 -.word 0x801702F0 - -glabel D_801969BC -.word 0x80170794 - -glabel D_801969C0 -.word 0x80170AC4 - -glabel D_801969C4 -.word 0x801712F8 - -glabel D_801969C8 -.word 0x80171E00 - -glabel D_801969CC -.word 0x801727D8 - -glabel D_801969D0 -.word 0x801741DC - -glabel D_801969D4 -.word 0x80174504 - -glabel D_801969D8 -.word 0x801747F0 - -glabel D_801969DC -.word 0x80174A30 - -glabel D_801969E0 -.word 0x80174C10 - -glabel D_801969E4 -.word 0x8017599C - -glabel D_801969E8 -.word 0x80176490 - -glabel D_801969EC -.word 0x80176860 - -glabel D_801969F0 -.word 0x80172AE4 - -glabel D_801969F4 -.word 0x801736BC - -glabel D_801969F8 -.word 0x80173CB4 - -glabel D_801969FC -.word 0x80173EC0 - -glabel D_80196A00 -.word 0x801772E0 - -glabel D_80196A04 -.word 0x801776E8 - -glabel D_80196A08 -.word 0x80177B40 - -glabel D_80196A0C -.word 0x80177E78 - -glabel D_80196A10 -.word 0x801782C8 - -glabel D_80196A14 -.word 0x80178728 - -glabel D_80196A18 -.word 0x801789D8 - -glabel D_80196A1C -.word 0x80179370 - -glabel D_80196A20 -.word 0x80179C28 - -glabel D_80196A24 -.word 0x8017B068 - -glabel D_80196A28 -.word 0x8017B78C - -glabel D_80196A2C -.word 0x8017BD68 - -glabel D_80196A30 -.word 0x8017BF34 - -glabel D_80196A34 -.word 0x8017C418 - -glabel D_80196A38 -.word 0x8017CF60 - -glabel D_80196A3C -.word 0x8017D8E8 - -glabel D_80196A40 -.word 0x8017E074 - -glabel D_80196A44 -.word 0x8017E284 - -glabel D_80196A48 -.word 0x8017EA0C - -glabel D_80196A4C -.word 0x8017F1C0 - -glabel D_80196A50 -.word 0x80180818 - -glabel D_80196A54 -.word 0x80181014 - -glabel D_80196A58 -.word 0x80181110 - -glabel D_80196A5C -.word 0x80181AF0 - -glabel D_80196A60 -.word 0x80181F64 - -glabel D_80196A64 -.word 0x80182D9C - -glabel D_80196A68 -.word 0x801835AC - -glabel D_80196A6C -.word 0x80183E38 - -glabel D_80196A70 -.word 0x80184538 - -glabel D_80196A74 -.word 0x80184B24 - -glabel D_80196A78 -.word 0x80184CA4 - -glabel D_80196A7C -.word 0x801856A4 - -glabel D_80196A80 -.word 0x80185788 - -glabel D_80196A84 -.word 0x80185A9C - -glabel D_80196A88 -.word 0x80186750 - -glabel D_80196A8C -.word 0x80186E30 - -glabel D_80196A90 -.word 0x80189914 - -glabel D_80196A94 -.word 0x8018CC54 - -glabel D_80196A98 -.word 0x8018DDCC - -glabel D_80196A9C -.word 0x8018E164 - -glabel D_80196AA0 -.word 0x8018E608 - -glabel D_80196AA4 -.word 0x8017C418 - -glabel D_80196AA8 -.word 0x80156050 - -glabel D_80196AAC -.word 0x801567B8 - -glabel D_80196AB0 -.word 0x8015A44C - -glabel D_80196AB4 -.word 0x8015849C - -glabel D_80196AB8 -.word 0x80158528 - -glabel D_80196ABC -.word 0x8015882C - -glabel D_80196AC0 -.word 0x80158924 - -glabel D_80196AC4 -.word 0x80158C40 - -glabel D_80196AC8 -.word 0x80158DB4 - -glabel D_80196ACC -.word 0x80159164 - -glabel D_80196AD0 -.word 0x80159BA0 - -glabel D_80196AD4 -.word 0x8015A144 - -glabel D_80196AD8 -.word 0x801585A0 - -glabel D_80196ADC -.word 0x80158604 - -glabel D_80196AE0 -.word 0x801586A8 - -glabel D_80196AE4 -.word 0x801587AC - -glabel D_80196AE8 -.word 0x8016D1E8 - -glabel D_80196AEC -.word 0x8016D81C - -glabel D_80196AF0 -.word 0x8016DD0C - -glabel D_80196AF4 -.word 0x8016E15C - -glabel D_80196AF8 -.word 0x8016EE5C - -glabel D_80196AFC -.word 0x8016F240 - -glabel D_80196B00 -.word 0x8016F7C8 - -glabel D_80196B04 -.word 0x8016FB58 - -glabel D_80196B08 -.word 0x8016FFF8 - -glabel D_80196B0C -.word 0x80170638 - -glabel D_80196B10 -.word 0x80170A24 - -glabel D_80196B14 -.word 0x80170D88 - -glabel D_80196B18 -.word 0x801717F0 - -glabel D_80196B1C -.word 0x80172234 - -glabel D_80196B20 -.word 0x80172A3C - -glabel D_80196B24 -.word 0x80174284 - -glabel D_80196B28 -.word 0x801746E0 - -glabel D_80196B2C -.word 0x8017499C - -glabel D_80196B30 -.word 0x80174B7C - -glabel D_80196B34 -.word 0x80175754 - -glabel D_80196B38 -.word 0x801760FC - -glabel D_80196B3C -.word 0x80176DE0 - -glabel D_80196B40 -.word 0x80173260 - -glabel D_80196B44 -.word 0x80173AF4 - -glabel D_80196B48 -.word 0x80173E40 - -glabel D_80196B4C -.word 0x80174144 - -glabel D_80196B50 -.word 0x80177438 - -glabel D_80196B54 -.word 0x8017782C - -glabel D_80196B58 -.word 0x80177CBC - -glabel D_80196B5C -.word 0x80177FB4 - -glabel D_80196B60 -.word 0x80178420 - -glabel D_80196B64 -.word 0x8017883C - -glabel D_80196B68 -.word 0x80178B18 - -glabel D_80196B6C -.word 0x8017982C - -glabel D_80196B70 -.word 0x8017A390 - -glabel D_80196B74 -.word 0x8017B3C4 - -glabel D_80196B78 -.word 0x8017B8F4 - -glabel D_80196B7C -.word 0x8017BEF4 - -glabel D_80196B80 -.word 0x8017C1FC - -glabel D_80196B84 -.word 0x8017CAF8 - -glabel D_80196B88 -.word 0x8017D430 - -glabel D_80196B8C -.word 0x8017DBB8 - -glabel D_80196B90 -.word 0x8017E1EC - -glabel D_80196B94 -.word 0x8017E54C - -glabel D_80196B98 -.word 0x8017EDDC - -glabel D_80196B9C -.word 0x8017F988 - -glabel D_80196BA0 -.word 0x80180B58 - -glabel D_80196BA4 -.word 0x801810D0 - -glabel D_80196BA8 -.word 0x801815F4 - -glabel D_80196BAC -.word 0x80181CFC - -glabel D_80196BB0 -.word 0x8018271C - -glabel D_80196BB4 -.word 0x80183428 - -glabel D_80196BB8 -.word 0x80183A1C - -glabel D_80196BBC -.word 0x80183FF4 - -glabel D_80196BC0 -.word 0x801848A4 - -glabel D_80196BC4 -.word 0x80184C64 - -glabel D_80196BC8 -.word 0x80185224 - -glabel D_80196BCC -.word 0x80185748 - -glabel D_80196BD0 -.word 0x80185968 - -glabel D_80196BD4 -.word 0x80186248 - -glabel D_80196BD8 -.word 0x80186A20 - -glabel D_80196BDC -.word 0x80188238 - -glabel D_80196BE0 -.word 0x8018B228 - -glabel D_80196BE4 -.word 0x8018D4C8 - -glabel D_80196BE8 -.word 0x8018DFB4 - -glabel D_80196BEC -.word 0x8018E3B0 - -glabel D_80196BF0 -.word 0x8018F368 - -glabel D_80196BF4 -.word 0x80156594 - -glabel D_80196BF8 -.word 0x80157738 - -glabel D_80196BFC -.word 0x8015A92C - -glabel D_80196C00 -.word 0x80158508 - -glabel D_80196C04 -.word 0x80158564 - -glabel D_80196C08 -.word 0x801588D0 - -glabel D_80196C0C -.word 0x80158B10 - -glabel D_80196C10 -.word 0x80158CA8 - -glabel D_80196C14 -.word 0x80158EEC - -glabel D_80196C18 -.word 0x80159ADC - -glabel D_80196C1C -.word 0x80159EF0 - -glabel D_80196C20 -.word 0x8015A31C - -glabel D_80196C24 -.word 0x80158668 - -glabel D_80196C28 -.word 0x80158688 - -glabel D_80196C2C -.word 0x80158744 - -glabel D_80196C30 -.word 0x8015880C - -glabel D_80196C34 -.word 0x0002013B - -glabel D_80196C38 -.word 0x0002013C - -glabel D_80196C3C -.word 0x0002013D - -glabel D_80196C40 -.word 0x0002013E - -glabel D_80196C44 -.word 0x0002013F - -glabel D_80196C48 -.word 0x00020140 - -glabel D_80196C4C -.word 0x0203090B - -glabel D_80196C50 -.word 0x0F000000 - -glabel D_80196C54 -.word 0x02040309 - -glabel D_80196C58 -.word 0x08070C0F - -glabel D_80196C5C -.word 0x04020309 - -glabel D_80196C60 -.word 0x08070F00 - -glabel D_80196C64 -.word 0x01050908 - -glabel D_80196C68 -.word 0x07060F00 - -glabel D_80196C6C -.word 0x01050908 - -glabel D_80196C70 -.word 0x07060F00 - -glabel D_80196C74 -.word 0x01020309 - -glabel D_80196C78 -.word 0x040D0F00 - -glabel D_80196C7C -.word 0x01050908 - -glabel D_80196C80 -.word 0x070F0000 - -glabel D_80196C84 -.word 0x01020F00 - -glabel D_80196C88 -.word 0x010F0000 - -glabel D_80196C8C -.word 0x02090F00 - -glabel D_80196C90 -.word 0x05090F00 - -glabel D_80196C94 -.word 0x09020F00 - -glabel D_80196C98 -.word 0x0102090F - -glabel D_80196C9C -.word 0x030F0000 - -glabel D_80196CA0 -.word 0x01090807 - -glabel D_80196CA4 -.word 0x0E0F0000 - -glabel D_80196CA8 -.word 0x80177130 - -glabel D_80196CAC -.word 0x80177174 - -glabel D_80196CB0 -.word 0x8017716C - -glabel D_80196CB4 -.word 0x80177270 - -glabel D_80196CB8 -.word 0x0000FFFF - -glabel D_80196CBC -.word 0x00000023 - -glabel D_80196CC0 -.word 0x00000024 - -glabel D_80196CC4 -.word 0x00000025 - -glabel D_80196CC8 -.word 0x00000026 - -glabel D_80196CCC -.word 0x00000027 - -glabel D_80196CD0 -.word 0x00000028 - -glabel D_80196CD4 -.word 0x00000029 - -glabel D_80196CD8 -.word 0x0000002A - -glabel D_80196CDC -.word 0x0000002B - -glabel D_80196CE0 -.word 0x0000002C - -glabel D_80196CE4 -.word 0x0000002D - -glabel D_80196CE8 -.word 0x0000002E - -glabel D_80196CEC -.word 0x0000003A - -glabel D_80196CF0 -.word 0x0000003F - -glabel D_80196CF4 -.word 0x0000002F - -glabel D_80196CF8 -.word 0x00000032 - -glabel D_80196CFC -.word 0x00000030 - -glabel D_80196D00 -.word 0x00000031 - -glabel D_80196D04 -.word 0x0000003B - -glabel D_80196D08 -.word 0x00000040 - -glabel D_80196D0C -.word 0x00000036 - -glabel D_80196D10 -.word 0x00000033 - -glabel D_80196D14 -.word 0x00000034 - -glabel D_80196D18 -.word 0x00000035 - -glabel D_80196D1C -.word 0x00000041 - -glabel D_80196D20 -.word 0x00000037 - -glabel D_80196D24 -.word 0x00000038 - -glabel D_80196D28 -.word 0x0000003C - -glabel D_80196D2C -.word 0x00000042 - -glabel D_80196D30 -.word 0x00000039 - -glabel D_80196D34 -.word 0x0000003D - -glabel D_80196D38 -.word 0x00000043 - -glabel D_80196D3C -.word 0x0000003E - -glabel D_80196D40 -.word 0x00000044 - -glabel D_80196D44 -.word 0x00000029 - -glabel D_80196D48 -.word 0x00020007 - -glabel D_80196D4C -.word 0x00020009 - -glabel D_80196D50 -.word 0x00020007 - -glabel D_80196D54 -.word 0x00000000 - -glabel D_80196D58 -.word 0x00000000 - -glabel D_80196D5C -.word 0x00000000 - -glabel D_80196D60 -.word 0x090F0000 - -glabel D_80196D64 -.word 0x090F0000 - -glabel D_80196D68 -.word 0x090F0000 - -glabel D_80196D6C -.word 0x090F0000 - -glabel D_80196D70 -.word 0x090F0000 - -glabel D_80196D74 -.word 0x090F0000 - -glabel D_80196D78 -.word 0x090F0000 - -glabel D_80196D7C -.word 0x00000000 - -glabel D_80196D80 -.word 0x00000006 - -glabel D_80196D84 -.word 0x000000B0 - -glabel D_80196D88 -.word 0x0000000C - -glabel D_80196D8C -.word 0x000000AF - -glabel D_80196D90 -.word 0x00000014 - -glabel D_80196D94 -.word 0x000000AF - -glabel D_80196D98 -.word 0x00000000 - -glabel D_80196D9C -.word 0x41400000 - -glabel D_80196DA0 -.word 0x41400000 - -glabel D_80196DA4 -.word 0x41100000 - -glabel D_80196DA8 -.word 0x000201DF - -glabel D_80196DAC -.word 0x000201E0 - -glabel D_80196DB0 -.word 0x000201E1 - -glabel D_80196DB4 -.word 0x801962E4 - -glabel D_80196DB8 -.word 0x801962E4 - -glabel D_80196DBC -.word 0x80196324 - -glabel D_80196DC0 -.word 0x80196364 - -glabel D_80196DC4 -.word 0x801963A4 - -glabel D_80196DC8 -.word 0x00000000 - -glabel D_80196DCC -.word 0x00000000 - - - -glabel D_80196DD0 -.word 0xBF4CCCCD - -glabel jtbl_80196DD4 -.word 0x80151F00 - -glabel D_80196DD8 -.word 0x80151F1C - -glabel D_80196DDC -.word 0x80151F38 - -glabel D_80196DE0 -.word 0x80151F54 - -glabel D_80196DE4 -.word 0x80151F70 - -glabel D_80196DE8 -.word 0x80151F8C - -glabel D_80196DEC -.word 0x80151FC4 - -glabel D_80196DF0 -.word 0x80151FA8 - -glabel D_80196DF4 -.word 0x80151FE0 - -glabel D_80196DF8 -.word 0x80152038 - -glabel D_80196DFC -.word 0x80151FFC - -glabel D_80196E00 -.word 0x8015200C - -glabel D_80196E04 -.word 0x8015201C - -glabel D_80196E08 -.word 0x8015202C - -glabel D_80196E0C -.word 0x00000000 - - diff --git a/data/ovl3/kirby.0F0D50.1.s b/data/ovl3/kirby.0F0D50.1.s new file mode 100644 index 00000000..17220e99 --- /dev/null +++ b/data/ovl3/kirby.0F0D50.1.s @@ -0,0 +1,138 @@ +.include "macros.inc" +.section .data + +glabel D_80196D60 +.word 0x090F0000 + +glabel D_80196D64 +.word 0x090F0000 + +glabel D_80196D68 +.word 0x090F0000 + +glabel D_80196D6C +.word 0x090F0000 + +glabel D_80196D70 +.word 0x090F0000 + +glabel D_80196D74 +.word 0x090F0000 + +glabel D_80196D78 +.word 0x090F0000 + +glabel D_80196D7C +.word 0x00000000 + +glabel D_80196D80 +.word 0x00000006 + +glabel D_80196D84 +.word 0x000000B0 + +glabel D_80196D88 +.word 0x0000000C + +glabel D_80196D8C +.word 0x000000AF + +glabel D_80196D90 +.word 0x00000014 + +glabel D_80196D94 +.word 0x000000AF + +glabel D_80196D98 +.word 0x00000000 + +glabel D_80196D9C +.word 0x41400000 + +glabel D_80196DA0 +.word 0x41400000 + +glabel D_80196DA4 +.word 0x41100000 + +glabel D_80196DA8 +.word 0x000201DF + +glabel D_80196DAC +.word 0x000201E0 + +glabel D_80196DB0 +.word 0x000201E1 + +glabel D_80196DB4 +.word 0x801962E4 + +glabel D_80196DB8 +.word 0x801962E4 + +glabel D_80196DBC +.word 0x80196324 + +glabel D_80196DC0 +.word 0x80196364 + +glabel D_80196DC4 +.word 0x801963A4 + +glabel D_80196DC8 +.word 0x00000000 + +glabel D_80196DCC +.word 0x00000000 + + + +glabel D_80196DD0 +.word 0xBF4CCCCD + +glabel jtbl_80196DD4 +.word 0x80151F00 + +glabel D_80196DD8 +.word 0x80151F1C + +glabel D_80196DDC +.word 0x80151F38 + +glabel D_80196DE0 +.word 0x80151F54 + +glabel D_80196DE4 +.word 0x80151F70 + +glabel D_80196DE8 +.word 0x80151F8C + +glabel D_80196DEC +.word 0x80151FC4 + +glabel D_80196DF0 +.word 0x80151FA8 + +glabel D_80196DF4 +.word 0x80151FE0 + +glabel D_80196DF8 +.word 0x80152038 + +glabel D_80196DFC +.word 0x80151FFC + +glabel D_80196E00 +.word 0x8015200C + +glabel D_80196E04 +.word 0x8015201C + +glabel D_80196E08 +.word 0x8015202C + +glabel D_80196E0C +.word 0x00000000 + + diff --git a/data/ovl3/kirby.0F0D50.2.s b/data/ovl3/kirby.0F0D50.2.s index 196b210d..933d9339 100644 --- a/data/ovl3/kirby.0F0D50.2.s +++ b/data/ovl3/kirby.0F0D50.2.s @@ -923,38 +923,16 @@ glabel D_801972F8 glabel jtbl_80197314 .word 0x8016C1EC - -glabel D_80197318 .word 0x8016C1CC - -glabel D_8019731C .word 0x8016C2DC - -glabel D_80197320 .word 0x8016C2DC - -glabel D_80197324 .word 0x8016C268 - -glabel D_80197328 .word 0x8016C354 - -glabel D_8019732C .word 0x8016C354 - -glabel D_80197330 .word 0x8016C3FC - -glabel D_80197334 .word 0x8016C3FC - -glabel D_80197338 .word 0x8016C1EC - -glabel D_8019733C .word 0x8016C2DC - -glabel D_80197340 .word 0x8016C268 glabel D_80197344 diff --git a/data/ovl3/kirby.s b/data/ovl3/kirby.s new file mode 100644 index 00000000..ffed342f --- /dev/null +++ b/data/ovl3/kirby.s @@ -0,0 +1,146 @@ +.include "macros.inc" +.section .data + +# kirby.cc .data + + +glabel D_80196CA0 +.word 0x01090807 + +glabel D_80196CA4 +.word 0x0E0F0000 + +glabel D_80196CA8 +.word 0x80177130 +.word 0x80177174 + +glabel D_80196CB0 +.word 0x8017716C +.word 0x80177270 + +glabel D_80196CB8 +.word 0x0000FFFF + +glabel D_80196CBC +.word 0x00000023 + +glabel D_80196CC0 +.word 0x00000024 + +glabel D_80196CC4 +.word 0x00000025 + +glabel D_80196CC8 +.word 0x00000026 + +glabel D_80196CCC +.word 0x00000027 + +glabel D_80196CD0 +.word 0x00000028 + +glabel D_80196CD4 +.word 0x00000029 + +glabel D_80196CD8 +.word 0x0000002A + +glabel D_80196CDC +.word 0x0000002B + +glabel D_80196CE0 +.word 0x0000002C + +glabel D_80196CE4 +.word 0x0000002D + +glabel D_80196CE8 +.word 0x0000002E + +glabel D_80196CEC +.word 0x0000003A + +glabel D_80196CF0 +.word 0x0000003F + +glabel D_80196CF4 +.word 0x0000002F + +glabel D_80196CF8 +.word 0x00000032 + +glabel D_80196CFC +.word 0x00000030 + +glabel D_80196D00 +.word 0x00000031 + +glabel D_80196D04 +.word 0x0000003B + +glabel D_80196D08 +.word 0x00000040 + +glabel D_80196D0C +.word 0x00000036 + +glabel D_80196D10 +.word 0x00000033 + +glabel D_80196D14 +.word 0x00000034 + +glabel D_80196D18 +.word 0x00000035 + +glabel D_80196D1C +.word 0x00000041 + +glabel D_80196D20 +.word 0x00000037 + +glabel D_80196D24 +.word 0x00000038 + +glabel D_80196D28 +.word 0x0000003C + +glabel D_80196D2C +.word 0x00000042 + +glabel D_80196D30 +.word 0x00000039 + +glabel D_80196D34 +.word 0x0000003D + +glabel D_80196D38 +.word 0x00000043 + +glabel D_80196D3C +.word 0x0000003E + +glabel D_80196D40 +.word 0x00000044 + +glabel D_80196D44 +.word 0x00000029 + +glabel D_80196D48 +.word 0x00020007 + +glabel D_80196D4C +.word 0x00020009 + +glabel D_80196D50 +.word 0x00020007 + +glabel D_80196D54 +.word 0x00000000 + +glabel D_80196D58 +.word 0x00000000 + +glabel D_80196D5C +.word 0x00000000 + diff --git a/kirby.us.ld b/kirby.us.ld index 31967249..d3b02139 100644 --- a/kirby.us.ld +++ b/kirby.us.ld @@ -411,6 +411,9 @@ SECTIONS BEGIN_SEG(ovl3Data, _ovl3SegmentEnd) { BUILD_DIR/data/kirby.0F0D50.o(.data*); BUILD_DIR/src/ovl3/ovl3.o(.rodata); + BUILD_DIR/src/ovl3/ovl3_5.o(.data*); + BUILD_DIR/data/ovl3/kirby.o(.data*); + BUILD_DIR/data/ovl3/kirby.0F0D50.1.o(.data*); BUILD_DIR/data/ovl3/kirby.0F0D50.2.o(.data*); } END_SEG(ovl3Data) diff --git a/src/ovl1/ovl1_1.c b/src/ovl1/ovl1_1.c index e685a3a7..939e495b 100644 --- a/src/ovl1/ovl1_1.c +++ b/src/ovl1/ovl1_1.c @@ -1179,7 +1179,7 @@ GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_1/func_800A4414.s") #endif -// executes a set of (arg1 - arg0) callback functions +// executes the virtual function at index arg0 void call_virtual_function(u32 arg0, u32 arg1, void (*callback[])(struct UnkStruct8004A7C4 *a1)) { // all of the function i've seen called from here have no arguments... if (arg0 < arg1) callback[arg0](D_8004A7C4); diff --git a/src/ovl1/ovl1_6.c b/src/ovl1/ovl1_6.c index c91935a2..31108d3d 100644 --- a/src/ovl1/ovl1_6.c +++ b/src/ovl1/ovl1_6.c @@ -40,7 +40,7 @@ void func_800AE138(s32 arg0) { D_800DE190[arg0] = 0; D_800DDFD0[arg0] = 0; D_800DDE10[arg0] = 0; - D_800DDC50[arg0] = 0; + gEntityVtableIndexArray[arg0] = 0; D_800DD8D0[arg0] = 0; D_800E0810[arg0] = 0x10; temp_f0 = D_800D6B10; diff --git a/src/ovl1/ovl1_6.h b/src/ovl1/ovl1_6.h index f7644f70..354ec865 100644 --- a/src/ovl1/ovl1_6.h +++ b/src/ovl1/ovl1_6.h @@ -9,7 +9,7 @@ extern s32 D_800DD710[]; extern s32 D_800DE190[]; extern s32 D_800DDFD0[]; extern s32 D_800DDE10[]; -extern s32 D_800DDC50[]; +extern s32 gEntityVtableIndexArray[]; extern s32 D_800DD8D0[]; extern s32 D_800E0810[]; diff --git a/src/ovl10/ovl10_1.c b/src/ovl10/ovl10_1.c index 15be0682..017a4c9e 100644 --- a/src/ovl10/ovl10_1.c +++ b/src/ovl10/ovl10_1.c @@ -28,11 +28,11 @@ void func_801DBC00_ovl10(s32 arg0) { D_800E8920[D_8004A7C4->objId] = 1; call_virtual_function(D_800E7880[D_8004A7C4->objId], 8, &D_801F4220_ovl10[0]); while(1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 0x14, &D_801F4240_ovl10[0]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 0x14, &D_801F4240_ovl10[0]); } void func_801DBD38_ovl10(s32 arg0) { - for(;;) call_virtual_function(D_800DDC50[D_8004A7C4->objId], 0x14, &D_801F4220_ovl10[8]); + for(;;) call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 0x14, &D_801F4220_ovl10[8]); } void func_801DBDB8_ovl10(s32 arg0) { @@ -174,7 +174,7 @@ void func_801DC598_ovl10(s32 arg0) { if (temp_v0 != 0) { func_800A22D4(temp_v0); } - temp_t5 = &D_800DDC50[sp3C]; + temp_t5 = &gEntityVtableIndexArray[sp3C]; sp24 = temp_t5; if (*temp_t5 == 5) { temp_v0_2 = *(&D_800EA520 + temp_s0); @@ -309,7 +309,7 @@ void func_801DCCB8_ovl10(s32 arg0) { D_800E1B50[D_8004A7C4->objId]->unk98 = &D_801F4094_ovl10; D_800E0490[D_8004A7C4->objId] = &D_801F3F94_ovl10; func_801A2ADC_ovl10(&D_801F3F94_ovl10); - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DCCB8_ovl10.s") @@ -332,7 +332,7 @@ void func_801DCDD4_ovl10(s32 arg0) { D_800E98E0[D_8004A7C4->objId] = -1; ((s32*)D_800E9AA0)[D_8004A7C4->objId] = -1; D_800EA360[D_8004A7C4->objId] = 0; - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } #ifdef MIPS_TO_C @@ -348,7 +348,7 @@ struct UnkStruct8004A7C4 *func_801DCF48_ovl10(void) { temp_v1 = temp_v0->unk0; phi_return = temp_v0; if (*(&D_800E83E0 + (temp_v1 * 4)) == 1) { - D_800DDC50[temp_v1] = 9; + gEntityVtableIndexArray[temp_v1] = 9; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v0->unk0], &D_801DBD38); } return phi_return; @@ -455,10 +455,10 @@ loop_10: } *phi_v1 = phi_v0; if (phi_v0 != 0) { - D_800DDC50[D_8004A7C4->objId] = 4; + gEntityVtableIndexArray[D_8004A7C4->objId] = 4; return; } - D_800DDC50[D_8004A7C4->objId] = 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = 3; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DCFC4_ovl10.s") @@ -482,7 +482,7 @@ void func_801DD2CC_ovl10(s32 arg0) { temp_a2 = temp_v1_2->unk0; temp_a2 = temp_a2 * 4; if (*(&D_800E83E0 + temp_a2) == 1) { - D_800DDC50[temp_a2] = 9; + gEntityVtableIndexArray[temp_a2] = 9; assign_new_process_entry(gEntityGObjProcessArray[temp_v1_2->unk0], &D_801DBD38, temp_a2); } } @@ -550,10 +550,10 @@ loop_2: *(&D_800E6850 + (temp_s0_4->unk0 * 4)) = D_801F49B8_ovl10; temp_s1_5 = temp_s0_4->unk0; if (*(&D_800EA520 + (temp_s1_5 * 4)) >= 0x65) { - D_800DDC50[temp_s1_5] = 4; + gEntityVtableIndexArray[temp_s1_5] = 4; return; } - D_800DDC50[temp_s1_5] = 2; + gEntityVtableIndexArray[temp_s1_5] = 2; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DD390_ovl10.s") @@ -571,7 +571,7 @@ void func_801DD674_ovl10(s32 arg0) {; func_801A0D74_ovl10(arg0); func_801E28C8_ovl10(0); if (D_800E83E0[D_8004A7C4->objId] == 1) { - D_800DDC50[D_8004A7C4->objId] = 9; + gEntityVtableIndexArray[D_8004A7C4->objId] = 9; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &D_801DBD38, temp_a2); } } @@ -672,7 +672,7 @@ void func_801DDAC8_ovl10(s32 arg0) { check = D_800E9AA0[D_8004A7C4->objId]; } D_800E9AA0[D_8004A7C4->objId] = rand; - D_800DDC50[D_8004A7C4->objId] = rand; + gEntityVtableIndexArray[D_8004A7C4->objId] = rand; } #else @@ -775,7 +775,7 @@ loop_3: *(&D_800EA520 + phi_a1_3) = 0x3E8; func_800AA018(0x102C7, phi_a1_3); func_800AA154(0x102C6); - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DDB88_ovl10.s") @@ -830,7 +830,7 @@ void *func_801DDEB8_ovl10(s32 arg0) { if (temp_ret_2 != 0) { func_80169430_ovl10(sp3C, sp30, sp31, 1); temp_v1_3 = D_8004A7C4; - D_800DDC50[temp_v1_3->unk0] = 6; + gEntityVtableIndexArray[temp_v1_3->unk0] = 6; temp_ret = assign_new_process_entry(gEntityGObjProcessArray[temp_v1_3->unk0], &D_801DBD38); temp_v1_4 = D_8004A7C4; D_800EC120[temp_v1_4->unk0] = 0; @@ -842,7 +842,7 @@ void *func_801DDEB8_ovl10(s32 arg0) { } else { phi_return = temp_v0; if (temp_a0 == 1) { - D_800DDC50[temp_a2_2] = 9; + gEntityVtableIndexArray[temp_a2_2] = 9; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v1_2->unk0], &D_801DBD38, temp_a2_2); } } @@ -973,7 +973,7 @@ loop_16: func_800AF27C(); func_800AA018(0x102C7); func_800AA154(0x102C6); - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DE124_ovl10.s") @@ -993,7 +993,7 @@ struct UnkStruct8004A7C4 *func_801DE5CC_ovl10(s32 arg0) { temp_v1 = temp_v0->unk0; phi_return = temp_v0; if (*(&D_800E83E0 + (temp_v1 * 4)) == 1) { - D_800DDC50[temp_v1] = 9; + gEntityVtableIndexArray[temp_v1] = 9; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v0->unk0], &D_801DBD38); } return phi_return; @@ -1102,7 +1102,7 @@ loop_10: func_801ACCA0_ovl10(6, phi_a1, 0x42A00000, 0x41700000); func_800AA018(0x102CF); func_800AA154(0x102CE); - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DE650_ovl10.s") @@ -1125,7 +1125,7 @@ void func_801DEA98_ovl10(s32 arg0) { temp_v0 = temp_v0 * 4; phi_v0 = temp_v0; if (*(&D_800E83E0 + temp_v0) == 1) { - D_800DDC50[temp_v0] = 9; + gEntityVtableIndexArray[temp_v0] = 9; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->unk0], &D_801DBD38); phi_v0 = D_8004A7C4->objId * 4; } @@ -1322,7 +1322,7 @@ loop_22: goto loop_19; } } - *(D_800DDC50 + phi_v0_4) = 2; + *(gEntityVtableIndexArray + phi_v0_4) = 2; return phi_return; } #else @@ -1357,7 +1357,7 @@ struct UnkStruct8004A7C4 *func_801DF310_ovl10(s32 arg0) { temp_v1 = temp_v0->unk0; phi_return = temp_v0; if (*(&D_800E83E0 + (temp_v1 * 4)) == 1) { - D_800DDC50[temp_v1] = 9; + gEntityVtableIndexArray[temp_v1] = 9; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v0->unk0], &D_801DBD38); } return phi_return; @@ -1389,7 +1389,7 @@ void func_801DF394_ovl10(s32 arg0) { } func_800AA018(0x102DF); func_800AA154(0x102DE); - D_800DDC50[D_8004A7C4->objId] = 0xA; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0xA; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DF394_ovl10.s") @@ -1624,7 +1624,7 @@ loop_17: D_800E9AA0[D_8004A7C4->objId] = random_soft_s32_range(4); temp_a1_6 = D_8004A7C4; *(&D_800E9C60 + (temp_a1_6->unk0 * 4)) = random_soft_s32_range(6); - D_800DDC50[temp_a1_6->unk0] = 0xB; + gEntityVtableIndexArray[temp_a1_6->unk0] = 0xB; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DF50C_ovl10.s") @@ -1933,10 +1933,10 @@ block_33: goto block_33; } if (phi_a1 == 0) { - *(D_800DDC50 + phi_v1_2) = 0xC; + *(gEntityVtableIndexArray + phi_v1_2) = 0xC; return phi_return; } - *(D_800DDC50 + phi_v1_2) = 0xD; + *(gEntityVtableIndexArray + phi_v1_2) = 0xD; return phi_return; } #else @@ -1957,7 +1957,7 @@ struct UnkStruct8004A7C4 *func_801E03CC_ovl10(void) { temp_v1 = temp_v0->unk0; phi_return = temp_v0; if (*(&D_800E83E0 + (temp_v1 * 4)) == 1) { - D_800DDC50[temp_v1] = 0x12; + gEntityVtableIndexArray[temp_v1] = 0x12; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v0->unk0], &D_801DBD38); } return phi_return; @@ -2193,7 +2193,7 @@ loop_17: } } *(&D_800E9020 + phi_v0_3) = 0.0f; - D_800DDC50[phi_a1_2->unk0] = 0xB; + gEntityVtableIndexArray[phi_a1_2->unk0] = 0xB; return phi_return; } #else @@ -2317,7 +2317,7 @@ void func_801E0B94_ovl10(s32 arg0) { temp_a2_3 = D_8004A7C4; temp_v1_8 = temp_a2_3->unk0; if (*(&D_800E83E0 + (temp_v1_8 * 4)) == 1) { - D_800DDC50[temp_v1_8] = 0x12; + gEntityVtableIndexArray[temp_v1_8] = 0x12; assign_new_process_entry(gEntityGObjProcessArray[temp_a2_3->unk0], &D_801DBD38, temp_a2_3); } } @@ -2392,10 +2392,10 @@ block_15: goto block_15; } if (phi_a1 == 0) { - *(D_800DDC50 + phi_v1) = 0xE; + *(gEntityVtableIndexArray + phi_v1) = 0xE; return phi_return; } - *(D_800DDC50 + phi_v1) = 0x10; + *(gEntityVtableIndexArray + phi_v1) = 0x10; return phi_return; } #else @@ -2497,7 +2497,7 @@ loop_11: func_800B33F4(); func_800AA018(0x102F7); func_800AA154(0x102F6); - D_800DDC50[D_8004A7C4->objId] = 0xB; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0xB; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801E100C_ovl10.s") @@ -2648,7 +2648,7 @@ void *func_801E1550_ovl10(s32 arg0) { if (temp_ret_2 != 0) { func_80169430_ovl10(sp38, sp2C, sp2D, 2); temp_v1_3 = D_8004A7C4; - D_800DDC50[temp_v1_3->unk0] = 0xF; + gEntityVtableIndexArray[temp_v1_3->unk0] = 0xF; temp_ret = assign_new_process_entry(gEntityGObjProcessArray[temp_v1_3->unk0], &D_801DBD38); temp_v1_4 = D_8004A7C4; D_800EC120[temp_v1_4->unk0] = 0; @@ -2660,7 +2660,7 @@ void *func_801E1550_ovl10(s32 arg0) { } else { phi_return = temp_v0_2; if (temp_a0 == 1) { - D_800DDC50[temp_a2_4] = 0x12; + gEntityVtableIndexArray[temp_a2_4] = 0x12; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v1_2->unk0], &D_801DBD38, temp_a2_4, &D_8004A7C4); } } @@ -2804,7 +2804,7 @@ loop_16: func_800AF27C(); func_800AA018(0x102F5); func_800AA154(0x102F4); - D_800DDC50[D_8004A7C4->objId] = 0xB; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0xB; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801E18A8_ovl10.s") @@ -2818,7 +2818,7 @@ void func_801E1D3C_ovl10(void) { func_801A0D74_ovl10(); func_801E28C8_ovl10(0); if (D_800E83E0[D_8004A7C4->objId] == 1) { - D_800DDC50[D_8004A7C4->objId] = 0x12; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x12; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_801DBD38_ovl10); } } @@ -2866,7 +2866,7 @@ loop_2: } func_800AA018(0x102FF); func_800AA154(0x102FE); - D_800DDC50[D_8004A7C4->objId] = 0xB; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0xB; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801E1DD0_ovl10.s") @@ -2886,7 +2886,7 @@ struct UnkStruct8004A7C4 *func_801E1FD8_ovl10(void) { temp_v1 = temp_v0->unk0; phi_return = temp_v0; if (*(&D_800E83E0 + (temp_v1 * 4)) == 1) { - D_800DDC50[temp_v1] = 0x12; + gEntityVtableIndexArray[temp_v1] = 0x12; phi_return = assign_new_process_entry(gEntityGObjProcessArray[temp_v0->unk0], &D_801DBD38); } return phi_return; @@ -3112,7 +3112,7 @@ loop_31: D_800E98E0[temp_a0_5->unk0] = -1; D_800E9AA0[temp_a0_5->unk0] = -1; *(&D_800E9C60 + (temp_a0_5->unk0 * 4)) = 1; - D_800DDC50[temp_a0_5->unk0] = 0x13; + gEntityVtableIndexArray[temp_a0_5->unk0] = 0x13; return -1; } #else @@ -3261,7 +3261,7 @@ block_15: phi_v1 = temp_v1_3; if (temp_v0_4 != -1) { temp_a0_2 = temp_v1_3->unk0; - if (D_800DDC50[temp_a0_2] < 0xA) { + if (gEntityVtableIndexArray[temp_a0_2] < 0xA) { D_800E98E0[D_800EBBE0[temp_a0_2]] = 0; } else { D_800E98E0[D_800EBBE0[temp_a0_2]] = 1; diff --git a/src/ovl10/ovl10_2.c b/src/ovl10/ovl10_2.c index 4f10faff..0e894155 100644 --- a/src/ovl10/ovl10_2.c +++ b/src/ovl10/ovl10_2.c @@ -13,7 +13,7 @@ extern f32 gEntitiesPosYArray[]; extern s32 D_800E98E0[]; -extern s32 D_800DDC50[]; +extern s32 gEntityVtableIndexArray[]; s32 func_801ACCA0_ovl10(s32, s32, f32, f32); extern void (*D_801F43F0_ovl10[])(s32); @@ -22,28 +22,28 @@ void func_801E2D40_ovl10(s32 arg0) { func_8019B9B0_ovl10(); call_virtual_function(D_800E7880[D_8004A7C4->objId], 3, &D_801F43F0_ovl10); while (1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_801F43F0_ovl10[3]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_801F43F0_ovl10[3]); } void func_801E2DD8_ovl10(s32 arg0) { func_8019B9B0_ovl10(); call_virtual_function(D_800E7880[D_8004A7C4->objId], 3, &D_801F43F0_ovl10); while (1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_801F43F0_ovl10[3]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_801F43F0_ovl10[3]); } void func_801E2E78_ovl10(s32 arg0) { D_800E6A10[D_8004A7C4->objId] = -1.0f; func_800A9864(0x1008D, 0x23, 0x10); func_800AA018(0x10521); - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; } void func_801E2EF0_ovl10(s32 arg0) { D_800E6A10[D_8004A7C4->objId] = 1.0f; func_800A9864(0x1008D, 0x23, 0x10); func_800AA018(0x10521); - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; } extern f32 D_801F4A40_ovl10, D_801F4A48_ovl10, D_801F4A44_ovl10; @@ -308,7 +308,7 @@ block_11: *temp_v1_2 = *temp_v1_2 - 1.0f; func_8019EBCC_ovl10(D_800DE350[temp_v0_2->objId], temp_a1); temp_v0_3 = D_8004A7C4; - D_800DDC50[temp_v0_3->objId] = 7; + gEntityVtableIndexArray[temp_v0_3->objId] = 7; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_3->objId], &D_801E5754); return 1; } @@ -340,7 +340,7 @@ void func_801E3A64_ovl10(void) { func_800B1900(temp_v0 & 0xFFFF); break; } - D_800DDC50[temp_v0] = D_800DDC50[D_8004A7C4->objId]; + gEntityVtableIndexArray[temp_v0] = gEntityVtableIndexArray[D_8004A7C4->objId]; D_800E76C0[temp_v0] = 0xFF; D_800E7730[temp_v0] = 1; D_800E77A0[temp_v0] = 1; @@ -354,7 +354,7 @@ void func_801E3A64_ovl10(void) { #ifdef MIPS_TO_C void func_801E3BE4_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 9, &D_801F44B4_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 9, &D_801F44B4_ovl10); } #else void func_801E3BE4_ovl10(s32 arg0); @@ -382,12 +382,12 @@ void func_801E3C2C_ovl10(s32 arg0) { D_800E9560[D_8004A7C4->objId] = 1; D_800EA360[D_8004A7C4->objId] = 0; D_800EA6E0[D_8004A7C4->objId] = 5.0f; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; sp1C->unk98 = &D_801CB494; func_801A0D50_ovl10(&func_801E3BE4_ovl10); D_800EC2E0[D_8004A7C4->objId] = 0x1E; func_801E3A64_ovl10(); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 9, &D_801F44B0_ovl10[1]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 9, &D_801F44B0_ovl10[1]); } extern void func_800BC1FC(s32); @@ -412,7 +412,7 @@ void func_801E3E04_ovl10(s32 arg0) { call_virtual_function(D_800DDFD0[D_8004A7C4->objId], 9, &D_801F44B0_ovl10[10]); } if (D_800E9C60[D_8004A7C4->objId] != 0) { - if (D_800DDC50[D_8004A7C4->objId] != 7) { + if (gEntityVtableIndexArray[D_8004A7C4->objId] != 7) { func_801E3874_ovl10(); } } @@ -443,7 +443,7 @@ void func_801E4030_ovl10(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 1; + gEntityVtableIndexArray[temp_v1] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E3BE4); } } @@ -464,7 +464,7 @@ void func_801E409C_ovl10(void) { func_800B1900((u16)new); return; } - D_800DDC50[temp_v0] = D_800DDC50[D_8004A7C4->objId]; + gEntityVtableIndexArray[temp_v0] = gEntityVtableIndexArray[D_8004A7C4->objId]; D_800E76C0[temp_v0] = 0xFF; D_800E7730[temp_v0] = 1; D_800E77A0[temp_v0] = 1; @@ -555,9 +555,9 @@ void func_801E4518_ovl10(s32 arg0) { if ((D_800DD8D0[D_8004A7C4->objId] >> 0x1E) != 0) { D_800E93A0[D_8004A7C4->objId]--; if (D_800E93A0[D_8004A7C4->objId] == 0) { - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } else { - (&D_800DDC50[D_8004A7C4->objId])[-0x8EC] = 1; + (&gEntityVtableIndexArray[D_8004A7C4->objId])[-0x8EC] = 1; } assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &D_801E3BE4); } @@ -610,7 +610,7 @@ void func_801E48C8_ovl10(s32 arg0) { if (D_800EA360[temp_v0] == 0) { temp_a0 = &D_800E9E20[temp_v0]; if (3 == *temp_a0) { - D_800DDC50[temp_v0] = 3; + gEntityVtableIndexArray[temp_v0] = 3; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801E3BE4); return; } @@ -752,9 +752,9 @@ void func_801E4C7C_ovl10(s32 arg0) { if (D_800E98E0[temp_v0_2] < 3) { D_800E9FE0[temp_v0_2] = temp_a1; D_800E93A0[temp_v1->objId] = *temp_a1; - D_800DDC50[temp_v1->objId] = 1; + gEntityVtableIndexArray[temp_v1->objId] = 1; } else { - D_800DDC50[temp_v0_2] = 4; + gEntityVtableIndexArray[temp_v0_2] = 4; } assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801E3BE4); } @@ -867,7 +867,7 @@ void func_801E50A4_ovl10(s32 arg0) { } } if (*(D_800E9E20 + phi_v0) == 2) { - *(D_800DDC50 + phi_v0) = 8; + *(gEntityVtableIndexArray + phi_v0) = 8; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801E3BE4); } } @@ -904,12 +904,12 @@ void func_801E5278_ovl10(s32 arg0) { if (func_8019A900_ovl10(&sp20, &D_8004A7C4) != 0) { temp_v0 = D_8004A7C4->objId; if (sp20 != D_800E6A10[temp_v0]) { - D_800DDC50[temp_v0] = 6; + gEntityVtableIndexArray[temp_v0] = 6; } else { - (&D_800DDC50[temp_v0])[-0x8EC] = 5; + (&gEntityVtableIndexArray[temp_v0])[-0x8EC] = 5; } } else { - D_800DDC50[D_8004A7C4->objId] = 5; + gEntityVtableIndexArray[D_8004A7C4->objId] = 5; } assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &D_801E3BE4); } @@ -957,7 +957,7 @@ void func_801E5468_ovl10(s32 arg0) { temp_v1_2 = temp_v0->objId; D_800E64D0[temp_v1_2] = D_800E6690[temp_v1_2]; D_800E6850[temp_v0->objId] = D_801F4B2C_ovl10; - D_800DDC50[temp_v0->objId] = 6; + gEntityVtableIndexArray[temp_v0->objId] = 6; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E3BE4); } } @@ -1009,7 +1009,7 @@ void func_801E56C4_ovl10(s32 arg0) { temp_v0 = &D_800E6A10[temp_a2]; if (D_800E9E20[temp_a2] != 0) { *temp_v0 = -*temp_v0; - D_800DDC50[temp_v1->objId] = 5; + gEntityVtableIndexArray[temp_v1->objId] = 5; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801E3BE4); } } @@ -1454,7 +1454,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E63E4_ovl10.s") #ifdef MIPS_TO_C void func_801E63FC_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4510_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4510_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E63FC_ovl10.s") @@ -1478,11 +1478,11 @@ void func_801E6444_ovl10(s32 arg0) { D_800E9C60[temp_v0->objId] = 0; temp_v1_3 = temp_v0->objId; D_800EB160[temp_v1_3] = D_800E7B20[temp_v1_3]; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; func_800A9760(0x1005F); sp1C->unk98 = &D_801CB494; func_801A0D50_ovl10(&D_801E63FC); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4510_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4510_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E6444_ovl10.s") @@ -1546,7 +1546,7 @@ void func_801E66E0_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801E63FC); } } @@ -1669,7 +1669,7 @@ void func_801E6AB4_ovl10(s32 arg0) { } if (2 == *(D_800E9E20 + phi_v0)) { *(D_800E8920 + phi_v0) = 1; - D_800DDC50[temp_v1->objId] = 2; + gEntityVtableIndexArray[temp_v1->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801E63FC); } } @@ -1725,7 +1725,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E6CAC_ovl10.s") #ifdef MIPS_TO_C void func_801E6D08_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4528_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4528_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E6D08_ovl10.s") @@ -1752,11 +1752,11 @@ void func_801E6D50_ovl10(s32 arg0) { temp_v1_3 = temp_v0->objId; D_800EB160[temp_v1_3] = D_800E7B20[temp_v1_3]; D_800E8920[temp_v0->objId] = 0; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; func_800A9760(0x10060); temp_t7->unk98 = &D_801CB590; func_801A0D50_ovl10(&D_801E6D08); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4528_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4528_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E6D50_ovl10.s") @@ -1820,7 +1820,7 @@ void func_801E7000_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801E6D08); } } @@ -1879,7 +1879,7 @@ void func_801E7248_ovl10(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] == 1) { - D_800DDC50[temp_v1] = 2; + gEntityVtableIndexArray[temp_v1] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E6D08); } } @@ -1973,7 +1973,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E7424_ovl10.s") #ifdef MIPS_TO_C void func_801E75E4_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4540_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4540_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E75E4_ovl10.s") @@ -2000,11 +2000,11 @@ void func_801E762C_ovl10(s32 arg0) { temp_v1_3 = temp_v0->objId; D_800EB160[temp_v1_3] = D_800E7B20[temp_v1_3]; D_800E8920[temp_v0->objId] = 0; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; func_800A9760(0x10065); temp_t7->unk98 = &D_801CB494; func_801A0D50_ovl10(&D_801E75E4); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4540_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4540_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E762C_ovl10.s") @@ -2067,7 +2067,7 @@ void func_801E78D4_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801E75E4); } } @@ -2154,7 +2154,7 @@ void func_801E7C38_ovl10(s32 arg0) { temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] == 1) { D_800E8920[temp_v1] = 1; - D_800DDC50[temp_v0->objId] = 2; + gEntityVtableIndexArray[temp_v0->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E75E4); } } @@ -2243,7 +2243,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E7ED4_ovl10.s") #ifdef MIPS_TO_C void func_801E8008_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4558_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4558_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E8008_ovl10.s") @@ -2270,11 +2270,11 @@ void func_801E8050_ovl10(s32 arg0) { temp_v1_3 = temp_v0->objId; D_800EB160[temp_v1_3] = D_800E7B20[temp_v1_3]; D_800E8920[temp_v0->objId] = 0; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; func_800A9760(0x10064); temp_t7->unk98 = &D_801CB590; func_801A0D50_ovl10(&D_801E8008); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4558_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4558_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E8050_ovl10.s") @@ -2338,7 +2338,7 @@ void func_801E8300_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801E8008); } } @@ -2397,7 +2397,7 @@ void func_801E8548_ovl10(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] == 1) { - D_800DDC50[temp_v1] = 2; + gEntityVtableIndexArray[temp_v1] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E8008); } } @@ -2521,7 +2521,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E88E4_ovl10.s") #ifdef MIPS_TO_C void func_801E8988_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4570_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4570_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E8988_ovl10.s") @@ -2546,10 +2546,10 @@ void func_801E89D0_ovl10(s32 arg0) { temp_v0_3 = temp_v1->objId; D_800EB160[temp_v0_3] = D_800E7B20[temp_v0_3]; sp1C->unk98 = &D_801F4100_ovl10; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_800A9760(0x10061, &D_8004A7C4); func_801A0D50_ovl10(&D_801E8988); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801F4570_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801F4570_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E89D0_ovl10.s") @@ -2612,7 +2612,7 @@ void func_801E8C68_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801E8988); } } @@ -2681,7 +2681,7 @@ void func_801E8F24_ovl10(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 2; + gEntityVtableIndexArray[temp_v1] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E8988); } } @@ -2754,7 +2754,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E9128_ovl10.s") #ifdef MIPS_TO_C void func_801E91B0_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 6, &D_801F4588_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 6, &D_801F4588_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E91B0_ovl10.s") @@ -2781,11 +2781,11 @@ void func_801E91F8_ovl10(s32 arg0) { D_800EA1A0[temp_v0->objId] = 0; temp_v1_3 = temp_v0->objId; D_800EB160[temp_v1_3] = D_800E7B20[temp_v1_3]; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; func_800A9760(0x10062); temp_t7->unk98 = &D_801F4124_ovl10; func_801A0D50_ovl10(&D_801E91B0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 6, &D_801F4588_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 6, &D_801F4588_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E91F8_ovl10.s") @@ -2859,7 +2859,7 @@ void func_801E94C4_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801E91B0); } } @@ -2921,7 +2921,7 @@ void func_801E9770_ovl10(s32 arg0) { if (D_800E9E20[temp_v1] == 1) { D_800E9FE0[temp_v1] = -1; D_800E9560[temp_v0->objId] = 0; - D_800DDC50[temp_v0->objId] = 2; + gEntityVtableIndexArray[temp_v0->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E91B0); } } @@ -2996,9 +2996,9 @@ void func_801E9A10_ovl10(s32 arg0) { temp_v1 = D_8004A7C4; temp_v0 = temp_v1->objId; if ((D_800E9FE0[temp_v0] & 1) != 0) { - D_800DDC50[temp_v0] = 4; + gEntityVtableIndexArray[temp_v0] = 4; } else { - (&D_800DDC50[temp_v0])[-0x8EC] = 3; + (&gEntityVtableIndexArray[temp_v0])[-0x8EC] = 3; } assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801E91B0); } @@ -3146,7 +3146,7 @@ void func_801E9DCC_ovl10(s32 arg0) { phi_v0 = phi_v0_2 * 4; } if (*(D_800E9E20 + phi_v0) != 0) { - *(D_800DDC50 + phi_v0) = 5; + *(gEntityVtableIndexArray + phi_v0) = 5; assign_new_process_entry(gEntityGObjProcessArray[phi_v1->objId], &D_801E91B0); } } @@ -3290,7 +3290,7 @@ void func_801EA1E4_ovl10(s32 arg0) { phi_v0 = temp_v0_4; } if (phi_a0 == 3) { - *(D_800DDC50 + phi_v1) = 5; + *(gEntityVtableIndexArray + phi_v1) = 5; assign_new_process_entry(gEntityGObjProcessArray[phi_v0->objId], &D_801E91B0); } } @@ -3397,7 +3397,7 @@ void func_801EA718_ovl10(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 2; + gEntityVtableIndexArray[temp_v1] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801E91B0); } } @@ -3407,7 +3407,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EA718_ovl10.s") #ifdef MIPS_TO_C void func_801EA784_ovl10(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_801F45B8_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_801F45B8_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EA784_ovl10.s") @@ -3434,11 +3434,11 @@ void func_801EA7CC_ovl10(s32 arg0) { D_800EA1A0[temp_v0->objId] = 0; temp_v1_3 = temp_v0->objId; D_800EB160[temp_v1_3] = D_800E7B20[temp_v1_3]; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; func_800A9760(0x10063); temp_t7->unk98 = &D_801CB494; func_801A0D50_ovl10(&D_801EA784); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_801F45B8_ovl10); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_801F45B8_ovl10); } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EA7CC_ovl10.s") @@ -3512,7 +3512,7 @@ void func_801EAA98_ovl10(s32 arg0) { func_800AECC0(D_800D6B10); func_800AED20(D_800D6B10); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801EA784); } } @@ -3632,7 +3632,7 @@ void func_801EAF3C_ovl10(s32 arg0) { } } if (2 == *(D_800E9E20 + phi_v0)) { - *(D_800DDC50 + phi_v0) = 2; + *(gEntityVtableIndexArray + phi_v0) = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801EA784); } } @@ -3682,13 +3682,13 @@ void func_801EB0C0_ovl10(s32 arg0) { block_4: func_8019B424_ovl10(arg0); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 3; + gEntityVtableIndexArray[temp_v0_2->objId] = 3; phi_v1_2 = temp_v0_2->objId; block_6: phi_v1 = phi_v1_2 * 4; } } else { - D_800DDC50[temp_v1] = 4; + gEntityVtableIndexArray[temp_v1] = 4; phi_v1_2 = temp_v0->objId; goto block_6; } @@ -3779,7 +3779,7 @@ void func_801EB39C_ovl10(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 2; + gEntityVtableIndexArray[temp_v1] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801EA784); } } @@ -3864,7 +3864,7 @@ void func_801EB744_ovl10(s32 arg0) { temp_v0 = temp_v1->objId; temp_a0 = &D_800E9E20[temp_v0]; if (2 == *temp_a0) { - D_800DDC50[temp_v0] = 2; + gEntityVtableIndexArray[temp_v0] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801EA784); return; } @@ -4250,7 +4250,7 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EC2A0_ovl10.s") #ifdef MIPS_TO_C void func_801EC37C_ovl10(s32 arg0) { func_801A0D50_ovl10(&D_801EC3C8); - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; D_801EC3C8_ovl10(arg0); } #else @@ -4272,7 +4272,7 @@ loop_1: temp_s1->unk8C = temp_s1->unk88->unk14; temp_v0 = D_8004A7C4; D_800DF150[temp_v0->objId] = &D_801EC4CC; - call_virtual_function(D_800DDC50[temp_v0->objId], 0xF, &D_801F45E4_ovl10); + call_virtual_function(gEntityVtableIndexArray[temp_v0->objId], 0xF, &D_801F45E4_ovl10); phi_s0 = D_8004A7C4->objId * 4; goto loop_1; } @@ -4324,7 +4324,7 @@ void func_801EC4CC_ovl10(s32 arg0) { func_801EEF4C_ovl10(arg0); } else if (func_801EEED4_ovl10(arg0) != 0) { temp_v0_4 = D_8004A7C4; - D_800DDC50[temp_v0_4->objId] = 9; + gEntityVtableIndexArray[temp_v0_4->objId] = 9; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_4->objId], &D_801EC3C8); return; } @@ -4397,7 +4397,7 @@ loop_2: } *(D_800E4C50 + phi_s0_2) = *(D_800E6A10 + phi_s0_2) * D_801F4B9C_ovl10; D_800E98E0[D_8004A7C4->objId] = 2; - D_800DDC50[D_8004A7C4->objId] = 8; + gEntityVtableIndexArray[D_8004A7C4->objId] = 8; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EC6D8_ovl10.s") @@ -4430,7 +4430,7 @@ loop_1: goto loop_1; } } - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EC930_ovl10.s") @@ -4473,7 +4473,7 @@ void func_801ECA34_ovl10(s32 arg0) { func_800B3520(); func_801EEFCC_ovl10(); temp_s1_2 = D_8004A7C4->objId; - temp_v0 = D_800DDC50[temp_s1_2]; + temp_v0 = gEntityVtableIndexArray[temp_s1_2]; if ((temp_v0 == 8) || (temp_v0 == 0xC)) { temp_f0 = D_800E6A10[temp_s1_2]; if (1.0f != temp_f0) { @@ -4573,7 +4573,7 @@ loop_1: goto loop_1; } } - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801ECCEC_ovl10.s") @@ -4589,7 +4589,7 @@ void func_801ECE90_ovl10(void) { func_8019D4D0_ovl10(0x41700000, 8); if ((sp1C->unk3C == 0) && (func_8019A9AC_ovl10(0, 0x43700000) == 2)) { temp_v0 = D_8004A7C4; - D_800DDC50[temp_v0->objId] = 4; + gEntityVtableIndexArray[temp_v0->objId] = 4; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801EC3C8); } } @@ -4675,9 +4675,9 @@ void func_801ED208_ovl10(s32 arg0) { temp_v0 = temp_v1->objId; if ((0.0f != D_800E3210[temp_v0]) && (D_800E8920[temp_v0] == 1)) { if (D_800E9C60[temp_v0] != 0) { - D_800DDC50[temp_v0] = 5; + gEntityVtableIndexArray[temp_v0] = 5; } else { - (&D_800DDC50[temp_v0])[-0x8EC] = 7; + (&gEntityVtableIndexArray[temp_v0])[-0x8EC] = 7; } assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &D_801EC3C8); } @@ -4781,7 +4781,7 @@ block_5: goto block_5; } } - *(D_800DDC50 + phi_v1) = 6; + *(gEntityVtableIndexArray + phi_v1) = 6; return phi_return; } #else @@ -4817,7 +4817,7 @@ void func_801ED6E4_ovl10(s32 arg0) { func_800AA018(0x10256); func_800AA018(0x10257); func_800AF27C(); - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801ED6E4_ovl10.s") @@ -4902,7 +4902,7 @@ void func_801ED930_ovl10(s32 arg0) { func_800A7F74(6, 3, 2, (bitwise s32) gEntitiesPosXArray[temp_v0_2], gEntitiesPosYArray[temp_v0_2] - 10.0f, gEntitiesPosZArray[temp_v0_2] + 20.0f); func_801ED7D0_ovl10(arg0); func_800AF27C(); - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801ED930_ovl10.s") @@ -4962,7 +4962,7 @@ loop_1: goto loop_1; } } - D_800DDC50[temp_v1_5] = 0xB; + gEntityVtableIndexArray[temp_v1_5] = 0xB; return temp_f0; } #else @@ -5048,7 +5048,7 @@ loop_11: } } } - *(D_800DDC50 + phi_a1) = 0xA; + *(gEntityVtableIndexArray + phi_a1) = 0xA; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EDD24_ovl10.s") @@ -5080,7 +5080,7 @@ void func_801EDF84_ovl10(s32 arg0) { func_801ED7D0_ovl10(arg0); play_sound(0x1AF); func_800AF27C(); - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EDF84_ovl10.s") @@ -5128,7 +5128,7 @@ void func_801EE050_ovl10(s32 arg0) { func_800A7F74(6, 3, 3, (bitwise s32) gEntitiesPosXArray[temp_v0_4], gEntitiesPosYArray[temp_v0_4] - 10.0f, gEntitiesPosZArray[temp_v0_4] + 20.0f); func_801ED7D0_ovl10(arg0); func_800AF27C(); - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EE050_ovl10.s") @@ -5219,7 +5219,7 @@ void func_801EE410_ovl10(s32 arg0) { func_8000B6BC(0x4C); func_800B3520(); func_800AF27C(); - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801EE410_ovl10.s") @@ -5411,9 +5411,9 @@ void func_801EEFCC_ovl10(void) { do { switch (temp_a1) { - case 1: D_800DDC50[D_8004A7C4->objId] = 3; break; - case 2: D_800DDC50[D_8004A7C4->objId] = 8; break; - case 3: D_800DDC50[D_8004A7C4->objId] = 0xC; break; + case 1: gEntityVtableIndexArray[D_8004A7C4->objId] = 3; break; + case 2: gEntityVtableIndexArray[D_8004A7C4->objId] = 8; break; + case 3: gEntityVtableIndexArray[D_8004A7C4->objId] = 0xC; break; } } while (0); D_800E98E0[D_8004A7C4->objId] = temp_a1; diff --git a/src/ovl11/boss2.c b/src/ovl11/boss2.c index 38fb0077..94db59fa 100644 --- a/src/ovl11/boss2.c +++ b/src/ovl11/boss2.c @@ -93,7 +93,7 @@ void func_801DB34C_ovl11(void) { func_800B1900(temp_v0); return; } - D_800DDC50[temp_v0] = D_800DDC50[D_8004A7C4->objId]; + gEntityVtableIndexArray[temp_v0] = gEntityVtableIndexArray[D_8004A7C4->objId]; D_800E76C0[temp_v0] = 0xFF; D_800E7730[temp_v0] = 2; D_800E77A0[temp_v0] = 0; @@ -234,10 +234,10 @@ void func_801DB7D0_ovl11(void) { } } -// extern u32 D_800DDC50[]; +// extern u32 gEntityVtableIndexArray[]; extern u32 *D_801E0B24; void func_801DB8A0_ovl11(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_801E0B24); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_801E0B24); } #ifdef MIPS_TO_C @@ -258,7 +258,7 @@ void func_801DB8E8_ovl11(void) { temp_v0 = temp_a0->objId; temp_v0 = temp_v0 * 4; temp_v1 = D_800EA520[temp_v0]; - temp_a1 = &D_800DDC50[temp_v0]; + temp_a1 = &gEntityVtableIndexArray[temp_v0]; temp_a2 = *temp_a1; if (temp_v1 != 0) { if (temp_v1 != 1) { @@ -271,7 +271,7 @@ void func_801DB8E8_ovl11(void) { if (temp_a2 != 3) { *temp_a1 = 3; temp_v0_2 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v0_2]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v0_2]; phi_v0 = temp_v0_2 * 4; block_10: phi_a2 = *phi_a2_2; @@ -283,7 +283,7 @@ block_10: if (temp_a2 != 2) { *temp_a1 = 2; temp_v0_3 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v0_3]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v0_3]; phi_v0 = temp_v0_3 * 4; goto block_10; } @@ -294,7 +294,7 @@ block_10: if (temp_a2 != 1) { *temp_a1 = 1; temp_v0_4 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v0_4]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v0_4]; phi_v0 = temp_v0_4 * 4; goto block_10; } @@ -320,11 +320,11 @@ void func_801DB9E0_ovl11(s32 arg0) { D_800EA8A0[D_8004A7C4->objId] = D_801E0C1C; D_800EC2E0[D_8004A7C4->objId] = 0x1E; D_800E7CE0[D_8004A7C4->objId] = 0x6C; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801DB34C_ovl11(); D_800E9560[D_8004A7C4->objId] = -1; D_800E93A0[D_8004A7C4->objId] = D_800E9560[D_8004A7C4->objId]; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_801E0B24); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_801E0B24); } #ifdef MIPS_TO_C @@ -372,7 +372,7 @@ void func_801DBB4C_ovl11(s32 arg0) { } if (D_800D70D8 <= 0.0f) { temp_v0_3 = D_8004A7C4; - D_800DDC50[temp_v0_3->objId] = 4; + gEntityVtableIndexArray[temp_v0_3->objId] = 4; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_3->objId], &D_801DB8A0); } } @@ -400,7 +400,7 @@ void func_801DBD58_ovl11(s32 arg0) { void func_801DBDF8_ovl11(s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_801DB8A0_ovl11); } } @@ -470,7 +470,7 @@ void func_801DC064_ovl11(s32 arg0) { void func_801DC158_ovl11(s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_801DB8A0_ovl11); } } @@ -497,7 +497,7 @@ void func_801DC250_ovl11(s32 arg0) { #ifdef MIPS_TO_C void func_801DC258_ovl11(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 9, &D_801E0B4C); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 9, &D_801E0B4C); } #else GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DC258_ovl11.s") @@ -619,7 +619,7 @@ void func_801DC45C_ovl11(void) { temp_v1 = temp_a0->objId; temp_v1 = temp_v1 * 4; temp_v0 = D_800EA520[temp_v1]; - temp_a1 = &D_800DDC50[temp_v1]; + temp_a1 = &gEntityVtableIndexArray[temp_v1]; temp_a2 = *temp_a1; if (temp_v0 != 0) { if (temp_v0 != 1) { @@ -632,19 +632,19 @@ void func_801DC45C_ovl11(void) { case 0: *temp_a1 = 7; temp_v1_4 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v1_4]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v1_4]; phi_v1 = temp_v1_4 * 4; break; case 1: *temp_a1 = 5; temp_v1_3 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v1_3]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v1_3]; phi_v1 = temp_v1_3 * 4; break; case 2: *temp_a1 = 3; temp_v1_2 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v1_2]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v1_2]; phi_v1 = temp_v1_2 * 4; default: phi_a2 = temp_a2; @@ -658,7 +658,7 @@ void func_801DC45C_ovl11(void) { if (temp_a2 != 2) { *temp_a1 = 2; temp_v1_5 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v1_5]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v1_5]; phi_v1 = temp_v1_5 * 4; goto block_15; } @@ -669,7 +669,7 @@ void func_801DC45C_ovl11(void) { if (temp_a2 != 1) { *temp_a1 = 1; temp_v1_6 = temp_a0->objId; - phi_a2_2 = &D_800DDC50[temp_v1_6]; + phi_a2_2 = &gEntityVtableIndexArray[temp_v1_6]; phi_v1 = temp_v1_6 * 4; goto block_15; } @@ -807,7 +807,7 @@ void func_801DC83C_ovl11(void) { } func_801DC7B8_ovl11(); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 8; + gEntityVtableIndexArray[temp_v0_2->objId] = 8; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801DC258); } } @@ -828,12 +828,12 @@ void func_801DC8F8_ovl11(s32 arg0) { D_800E9720[temp_v0->objId] = 0; D_800D70D8 = 6.0f; D_800EA8A0[temp_v0->objId] = D_801E0C20; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; D_800E9560[temp_v0->objId] = -1; temp_v1 = temp_v0->objId; D_800E93A0[temp_v1] = D_800E9560[temp_v1]; func_800BC1FC(D_800D70D8, &D_800D70D8, D_800E9560); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 9, &D_801E0B4C); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 9, &D_801E0B4C); } #else GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DC8F8_ovl11.s") @@ -889,7 +889,7 @@ void func_801DCBE0_ovl11(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 1; + gEntityVtableIndexArray[temp_v1] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DC258); } } @@ -1010,7 +1010,7 @@ void func_801DCF70_ovl11(s32 arg0) { if (temp_v1 != 0) { if (4 == temp_v1) { if (4 == D_800E9AA0[temp_v0]) { - D_800DDC50[temp_v0] = 4; + gEntityVtableIndexArray[temp_v0] = 4; assign_new_process_entry(gEntityGObjProcessArray[temp_a2->objId], &D_801DC258); return; } @@ -1059,7 +1059,7 @@ void func_801DD160_ovl11(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 1; + gEntityVtableIndexArray[temp_v1] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DC258); } } @@ -1252,7 +1252,7 @@ void func_801DD588_ovl11(s32 arg0) { if (phi_a0 == 9) { play_sound(0x177); temp_v0_3 = D_8004A7C4; - D_800DDC50[temp_v0_3->objId] = 6; + gEntityVtableIndexArray[temp_v0_3->objId] = 6; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_3->objId], &D_801DC258); return; } @@ -1299,7 +1299,7 @@ void func_801DD7D4_ovl11(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 1; + gEntityVtableIndexArray[temp_v1] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DC258); } } @@ -1362,7 +1362,7 @@ void func_801DD9C8_ovl11(s32 arg0) { temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { D_800E9720[temp_v1] = 0; - D_800DDC50[temp_v0->objId] = 1; + gEntityVtableIndexArray[temp_v0->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DC258); } } @@ -1528,7 +1528,7 @@ GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DDE08_ovl11.s") #ifdef MIPS_TO_C void func_801DDEC0_ovl11(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_801E0B9C); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_801E0B9C); } #else GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DDEC0_ovl11.s") @@ -1551,13 +1551,13 @@ void func_801DDF08_ovl11(s32 arg0) { func_80198880_ovl11(&D_801D79E8); func_800FF0C4(sp1C->unk80); func_800A9760(0x10068); - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; temp_t6->unk98 = &D_801DAF18; temp_v0_2 = D_8004A7C4; D_800E7CE0[temp_v0_2->objId] = 0x6C; D_800E6A10[temp_v0_2->objId] = -1.0f; func_801A0D50_ovl11(&D_801DDEC0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_801E0B9C); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_801E0B9C); } #else GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DDF08_ovl11.s") @@ -1622,7 +1622,7 @@ void func_801DE1EC_ovl11(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 1; + gEntityVtableIndexArray[temp_v1] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DDEC0); } } @@ -1719,9 +1719,9 @@ void func_801DE454_ovl11(s32 arg0) { D_800E64D0[temp_v1_2->objId] = 0.0f; temp_v0_2 = temp_v1_2->objId; if (D_800E9560[temp_v0_2] != 0) { - D_800DDC50[temp_v0_2] = 4; + gEntityVtableIndexArray[temp_v0_2] = 4; } else { - D_800DDC50[temp_v0_2] = 2; + gEntityVtableIndexArray[temp_v0_2] = 2; } assign_new_process_entry(gEntityGObjProcessArray[temp_v1_2->objId], &D_801DDEC0); return; @@ -1844,12 +1844,12 @@ void func_801DE8D0_ovl11(s32 arg0) { if (D_800E9FE0[temp_v1_2] == 0) { D_800E1B50[temp_v1]->unk3C = 1; temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801DDEC0); return; } - D_800DDC50[temp_v1_2] = 2; - assign_new_process_entry(D_800DDC50[temp_v0->objId], &D_801DDEC0); + gEntityVtableIndexArray[temp_v1_2] = 2; + assign_new_process_entry(gEntityVtableIndexArray[temp_v0->objId], &D_801DDEC0); } } #else @@ -1895,7 +1895,7 @@ void func_801DEAE8_ovl11(s32 arg0) { if (D_800E9E20[temp_v0] != 0) { D_800E1B50[temp_v0]->unk3C = 1; temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 1; + gEntityVtableIndexArray[temp_v0_2->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_801DDEC0); } } @@ -2052,7 +2052,7 @@ GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DEED0_ovl11.s") #ifdef MIPS_TO_C void func_801DEF9C_ovl11(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_801E0BC4); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_801E0BC4); } #else GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DEF9C_ovl11.s") @@ -2074,8 +2074,8 @@ void func_801DEFE4_ovl11(s32 arg0) { func_800FF0C4(sp1C->unk80); func_800A9760(0x1009D); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 0; - call_virtual_function(D_800DDC50[temp_v0_2->objId], 3, &D_801E0BC4); + gEntityVtableIndexArray[temp_v0_2->objId] = 0; + call_virtual_function(gEntityVtableIndexArray[temp_v0_2->objId], 3, &D_801E0BC4); } #else GLOBAL_ASM("asm/non_matchings/ovl11/ovl11/func_801DEFE4_ovl11.s") @@ -2163,7 +2163,7 @@ void func_801DF318_ovl11(s32 arg0) { temp_v0 = D_8004A7C4; temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { - D_800DDC50[temp_v1] = 1; + gEntityVtableIndexArray[temp_v1] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DEF9C); } } @@ -2196,13 +2196,13 @@ void func_801DF3DC_ovl11(s32 arg0) { temp_a0 = &D_800E9720[temp_v1]; temp_a1 = *temp_a0; if (temp_a1 == 0) { - D_800DDC50[temp_v1] = 2; + gEntityVtableIndexArray[temp_v1] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DEF9C); return; } *temp_a0 = temp_a1 - 1; if (D_800D70D8 <= 0.0f) { - D_800DDC50[temp_v0->objId] = 2; + gEntityVtableIndexArray[temp_v0->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_801DEF9C); } } diff --git a/src/ovl16/ovl16.c b/src/ovl16/ovl16.c index b9da36d7..cab861f9 100644 --- a/src/ovl16/ovl16.c +++ b/src/ovl16/ovl16.c @@ -34,12 +34,12 @@ void func_801DB1E0_ovl16(s32 arg0) { func_801A3280_ovl16(); call_virtual_function(D_800E7880[D_8004A7C4->objId], 9, &D_801EF4C0_ovl16[0]); while (1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 0x23, &D_801EF4C0_ovl16[9]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 0x23, &D_801EF4C0_ovl16[9]); } void func_801DB338_ovl16(s32 arg0) { while (1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 0x23, &D_801EF4C0_ovl16[9]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 0x23, &D_801EF4C0_ovl16[9]); } void func_801DB3B8_ovl16(s32 arg0) { @@ -92,7 +92,7 @@ loop_1: if ((D_800E77A0[phi_s1] != 0x39) && (D_800E77A0[phi_s1] != 0x3A)) { D_800E7B20[phi_s0]; if ((D_801EFDF8_ovl16 < D_800E7B20[phi_s0]) && (D_800E7B20[phi_s0] < D_801EFDF4_ovl16) && (D_800E83E0[phi_s0] != 1) && (D_800E0D50[phi_s0] != 0)) { - *(D_800DDC50 + phi_s0) = -1; + *(gEntityVtableIndexArray + phi_s0) = -1; assign_new_process_entry(gEntityGObjProcessArray[phi_s0], &D_801A3E80); } } @@ -175,7 +175,7 @@ loop_6: func_800BC11C(D_800E7B20[temp_a2->objId]); phi_a2 = D_8004A7C4; } - D_800DDC50[phi_a2->objId] = *(&D_801EF5E0_ovl16 + (D_800D709C * 4)); + gEntityVtableIndexArray[phi_a2->objId] = *(&D_801EF5E0_ovl16 + (D_800D709C * 4)); assign_new_process_entry(*(&gEntityGObjProcessArray + (phi_a2->objId * 4)), &func_801DB338_ovl16, phi_a2); phi_v1_3 = D_8004A7C4->objId; block_15: @@ -215,7 +215,7 @@ block_15: func_800BC11C(D_800E7B20[D_8004A7C4->objId]); } temp_a2_3 = D_8004A7C4; - D_800DDC50[temp_a2_3->objId] = *(&D_801EF5E0_ovl16 + (D_800D709C * 4)); + gEntityVtableIndexArray[temp_a2_3->objId] = *(&D_801EF5E0_ovl16 + (D_800D709C * 4)); assign_new_process_entry(gEntityGObjProcessArray[temp_a2_3->objId], &func_801DB338_ovl16, temp_a2_3); } return sp1C; @@ -839,7 +839,7 @@ void *func_801DCBF8_ovl16(s32 arg0) { } else { phi_v0->unkC = 3; } - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; return phi_return; } #else @@ -1124,7 +1124,7 @@ void func_801DDA98_ovl16(s32 arg0) { temp_s2 = &gEntitiesPosYArray[temp_s0]; if (*temp_s2 > 45.0f) { loop_5: - if (((&D_800D7098)[1] == 5) && ((&D_800D7098)[6] == 0) && (D_800DDC50[temp_s0] != 1)) { + if (((&D_800D7098)[1] == 5) && ((&D_800D7098)[6] == 0) && (gEntityVtableIndexArray[temp_s0] != 1)) { gEntitiesPosYArray[D_8004A7C4->objId] = -1000.0f; func_8000B6BC(1); if (*temp_s2 > 45.0f) { @@ -1132,7 +1132,7 @@ loop_5: } } } - if (((&D_800D7098)[1] == 5) && ((&D_800D7098)[6] == 0) && (D_800DDC50[temp_s0] != 1)) { + if (((&D_800D7098)[1] == 5) && ((&D_800D7098)[6] == 0) && (gEntityVtableIndexArray[temp_s0] != 1)) { gEntitiesPosYArray[D_8004A7C4->objId] = 0.0f; play_sound(0x1C5); func_800AA018(*(&D_801EF738_ovl16 + (D_800E98E0[D_8004A7C4->objId] * 4))); @@ -1370,7 +1370,7 @@ u32 func_801DE8DC_ovl16(s32 arg0) { func_8000B6BC(0x1E); func_800BC1FC(D_800E7B20[D_8004A7C4->objId]); D_800D7098.unk0 = 1; - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; return 1; } #else @@ -1411,7 +1411,7 @@ void func_801DEAE0_ovl16(s32 arg0) { if (D_800E7B20[temp_v0_2->objId] <= 0.0f) { block_3: func_8000B6BC(0x1E); - D_800DDC50[D_8004A7C4->objId] = 0x22; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x22; return; } if ((&D_800D7098)[3] <= 0) { @@ -1421,7 +1421,7 @@ block_3: goto block_3; } func_8000B6BC(0x1E); - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801DEAE0_ovl16.s") @@ -2027,7 +2027,7 @@ loop_1: } D_800D70B4 = phi_v0; D_800D70A0 = phi_v0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF864_ovl16 + ((&D_800D7098)[2] * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF864_ovl16 + ((&D_800D7098)[2] * 4)); } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801DFC4C_ovl16.s") @@ -2255,7 +2255,7 @@ loop_15: if (temp_t0 != 0xC) { goto loop_1; } - D_800DDC50[D_8004A7C4->objId] = 7; + gEntityVtableIndexArray[D_8004A7C4->objId] = 7; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801DFF40_ovl16.s") @@ -2539,7 +2539,7 @@ loop_15: if (temp_t1 != 8) { goto loop_1; } - D_800DDC50[D_8004A7C4->objId] = 7; + gEntityVtableIndexArray[D_8004A7C4->objId] = 7; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E0820_ovl16.s") @@ -2719,7 +2719,7 @@ loop_5: func_800AF27C(); func_800AA018(0x10483); func_800AA154(0x10482); - D_800DDC50[D_8004A7C4->objId] = 7; + gEntityVtableIndexArray[D_8004A7C4->objId] = 7; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E0F04_ovl16.s") @@ -2806,7 +2806,7 @@ void func_801E16F8_ovl16(s32 arg0) { D_800E3210[temp_v0_2] = (160.0f - gEntitiesPosYArray[temp_v0_2]) / 30.0f; func_8000B6BC(0x1E); D_800D70A8 = 0; - D_800DDC50[D_8004A7C4->objId] = 0x21; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x21; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E16F8_ovl16.s") @@ -2978,7 +2978,7 @@ block_18: phi_v1 = temp_v1; phi_return = temp_v0_3 * 4; } - D_800DDC50[phi_v1->objId] = 7; + gEntityVtableIndexArray[phi_v1->objId] = 7; return phi_return; } #else @@ -3047,7 +3047,7 @@ u32 *func_801E1E84_ovl16(s32 arg0) { func_800B33F4(); (&D_800D7098)[4] = 1; (&D_800D7098)[2] = 0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF914_ovl16 + (0 * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF914_ovl16 + (0 * 4)); return &D_800D7098; } #else @@ -3207,7 +3207,7 @@ void func_801E20D8_ovl16(struct UnkStruct8004A7C4 *arg0) { D_800DFBD0[D_8004A7C4->objId][4]->scale.x = D_800EA6E0[D_8004A7C4->objId]; D_800DFBD0[D_8004A7C4->objId][4]->scale.z = D_800EA6E0[D_8004A7C4->objId]; func_800B33F4(); - D_800DDC50[D_8004A7C4->objId] = 0xB; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0xB; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E20D8_ovl16.s") @@ -3265,7 +3265,7 @@ void func_801E2960_ovl16(s32 arg0) { D_800E3210[temp_v0_2] = (160.0f - gEntitiesPosYArray[temp_v0_2]) / 30.0f; func_8000B6BC(0x1E); D_800D70A8 = 0; - D_800DDC50[D_8004A7C4->objId] = 0x21; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x21; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E2960_ovl16.s") @@ -3321,7 +3321,7 @@ f32 func_801E2B08_ovl16(s32 arg0) { func_8000B6BC(0xA); D_800DFBD0[D_8004A7C4->objId][4]->unk40 = 1.0f; D_800DFBD0[D_8004A7C4->objId][4]->unk48 = 1.0f; - D_800DDC50[D_8004A7C4->objId] = 0xB; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0xB; return 1.0f; } #else @@ -3367,7 +3367,7 @@ u32 *func_801E2D88_ovl16(s32 arg0) { func_800B33F4(); (&D_800D7098)[4] = 1; (&D_800D7098)[2] = 0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF920_ovl16 + (0 * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF920_ovl16 + (0 * 4)); return &D_800D7098; } #else @@ -3480,7 +3480,7 @@ block_13: } } *(D_800E9AA0 + phi_a0_2) = 0xA; - D_800DDC50[phi_a1_2->objId] = 0xF; + gEntityVtableIndexArray[phi_a1_2->objId] = 0xF; return phi_return; } #else @@ -3520,7 +3520,7 @@ struct UnkStruct8004A7C4 *func_801E3284_ovl16(s32 arg0) { temp_v0 = D_8004A7C4; D_800DDFD0[temp_v0->objId] = 0xC; D_800D70A8 = 0; - D_800DDC50[temp_v0->objId] = 0x21; + gEntityVtableIndexArray[temp_v0->objId] = 0x21; return temp_v0; } #else @@ -3572,7 +3572,7 @@ f32 func_801E33AC_ovl16(s32 arg0) { D_800E3C90[temp_v0->objId] = D_801EFF5C_ovl16; temp_v1_2 = temp_v0->objId; D_800E3AD0[temp_v1_2] = D_800E3C90[temp_v1_2]; - D_800DDC50[temp_v0->objId] = 0xF; + gEntityVtableIndexArray[temp_v0->objId] = 0xF; return temp_f0; } #else @@ -3604,7 +3604,7 @@ u32 *func_801E3518_ovl16(s32 arg0) { func_800B33F4(); (&D_800D7098)[4] = 1; (&D_800D7098)[2] = 0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF92C_ovl16 + (0 * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF92C_ovl16 + (0 * 4)); return &D_800D7098; } #else @@ -3883,7 +3883,7 @@ loop_74: func_800AA154(0x104EE); func_800AA154(0x104FA); func_8000B6BC(0x1E); - D_800DDC50[D_8004A7C4->objId] = 0x13; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x13; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E35D4_ovl16.s") @@ -4030,7 +4030,7 @@ struct UnkStruct8004A7C4 *func_801E4024_ovl16(s32 arg0) { temp_v0 = D_8004A7C4; D_800DDFD0[temp_v0->objId] = 0xF; D_800D70A8 = 0; - D_800DDC50[temp_v0->objId] = 0x21; + gEntityVtableIndexArray[temp_v0->objId] = 0x21; return temp_v0; } #else @@ -4120,7 +4120,7 @@ loop_3: } } func_800AA154(0x104EE); - D_800DDC50[D_8004A7C4->objId] = 0x13; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x13; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E4148_ovl16.s") @@ -4258,7 +4258,7 @@ u32 *func_801E4698_ovl16(s32 arg0) { func_800B33F4(); (&D_800D7098)[4] = 1; (&D_800D7098)[2] = 0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF9B4_ovl16 + (0 * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF9B4_ovl16 + (0 * 4)); return &D_800D7098; } #else @@ -4452,7 +4452,7 @@ void func_801E4754_ovl16(s32 arg0) { D_800E3AD0[D_8004A7C4->objId] = D_801EFFAC_ovl16; D_800EA6E0[D_8004A7C4->objId] = 0.0f; D_800E9FE0[D_8004A7C4->objId] = 0; - D_800DDC50[D_8004A7C4->objId] = 0x17; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x17; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E4754_ovl16.s") @@ -4652,7 +4652,7 @@ void func_801E5734_ovl16(s32 arg0) { D_800E3210[temp_v0_2] = (160.0f - gEntitiesPosYArray[temp_v0_2]) / 30.0f; func_8000B6BC(0x1E); D_800D70A8 = 0; - D_800DDC50[D_8004A7C4->objId] = 0x21; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x21; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E5734_ovl16.s") @@ -4701,7 +4701,7 @@ f32 func_801E58D8_ovl16(s32 arg0) { D_800E3C90[temp_v0->objId] = D_801EFFBC_ovl16; temp_v1_2 = temp_v0->objId; D_800E3AD0[temp_v1_2] = D_800E3C90[temp_v1_2]; - D_800DDC50[temp_v0->objId] = 0x17; + gEntityVtableIndexArray[temp_v0->objId] = 0x17; return temp_f0; } #else @@ -4732,7 +4732,7 @@ u32 *func_801E5A28_ovl16(s32 arg0) { func_800B33F4(); (&D_800D7098)[4] = 1; (&D_800D7098)[2] = 0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF9D8_ovl16 + (0 * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF9D8_ovl16 + (0 * 4)); return &D_800D7098; } #else @@ -5057,7 +5057,7 @@ void func_801E68E0_ovl16(s32 arg0) { D_800E3210[temp_v0_2] = (160.0f - gEntitiesPosYArray[temp_v0_2]) / 30.0f; func_8000B6BC(0x1E); D_800D70A8 = 0; - D_800DDC50[D_8004A7C4->objId] = 0x21; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x21; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E68E0_ovl16.s") @@ -5106,7 +5106,7 @@ f32 func_801E6A84_ovl16(s32 arg0) { D_800E3C90[temp_v0->objId] = D_801F0044; temp_v1_2 = temp_v0->objId; D_800E3AD0[temp_v1_2] = D_800E3C90[temp_v1_2]; - D_800DDC50[temp_v0->objId] = 0x1B; + gEntityVtableIndexArray[temp_v0->objId] = 0x1B; return temp_f0; } #else @@ -5137,7 +5137,7 @@ u32 *func_801E6BD4_ovl16(s32 arg0) { func_800B33F4(); (&D_800D7098)[4] = 1; (&D_800D7098)[2] = 0; - D_800DDC50[D_8004A7C4->objId] = *(&D_801EF9F8_ovl16 + (0 * 4)); + gEntityVtableIndexArray[D_8004A7C4->objId] = *(&D_801EF9F8_ovl16 + (0 * 4)); return &D_800D7098; } #else @@ -5248,7 +5248,7 @@ loop_2: } } *(D_800E9AA0 + phi_s0_3) = 0xA; - D_800DDC50[D_8004A7C4->objId] = 0x1F; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0x1F; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E6E0C_ovl16.s") @@ -5379,7 +5379,7 @@ struct UnkStruct8004A7C4 *func_801E72C4_ovl16(s32 arg0) { temp_v0 = D_8004A7C4; D_800DDFD0[temp_v0->objId] = 0x18; D_800D70A8 = 0; - D_800DDC50[temp_v0->objId] = 0x21; + gEntityVtableIndexArray[temp_v0->objId] = 0x21; return temp_v0; } #else @@ -5495,7 +5495,7 @@ f32 func_801E74E8_ovl16(s32 arg0) { D_800E3C90[temp_v0->objId] = D_801F0064; temp_v1_2 = temp_v0->objId; D_800E3AD0[temp_v1_2] = D_800E3C90[temp_v1_2]; - D_800DDC50[temp_v0->objId] = 0x1F; + gEntityVtableIndexArray[temp_v0->objId] = 0x1F; return temp_f0; } #else @@ -5557,7 +5557,7 @@ loop_3: } temp_s4->unk80->unk10 = 40.0f; (&D_800D7098)[0xB] = 0; - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; } #else GLOBAL_ASM("asm/non_matchings/ovl16/ovl16/func_801E7650_ovl16.s") diff --git a/src/ovl17/ovl17_last-0.c b/src/ovl17/ovl17_last-0.c index eb9666e2..f5b3fc16 100644 --- a/src/ovl17/ovl17_last-0.c +++ b/src/ovl17/ovl17_last-0.c @@ -47,7 +47,7 @@ s32 func_801E4488_ovl17(void) { switch (D_800E83E0[D_8004A7C4->objId]) { case 1: D_800E7CE0[D_8004A7C4->objId] = 0x276U; - D_800DDC50[D_8004A7C4->objId] = 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = 3; assign_new_process_entry((s32) gEntityGObjProcessArray[D_8004A7C4->objId], &func_801E40F4); play_sound(0x1C3); if (sp28.unkC != 0) { @@ -55,7 +55,7 @@ s32 func_801E4488_ovl17(void) { } break; case 2: - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; assign_new_process_entry((s32) gEntityGObjProcessArray[D_8004A7C4->objId], &func_801E40F4); D_800E7CE0[D_8004A7C4->objId] = 1; play_sound(0x1BE); diff --git a/src/ovl18/ovl18_1.c b/src/ovl18/ovl18_1.c index 2a4ecd26..affd36df 100644 --- a/src/ovl18/ovl18_1.c +++ b/src/ovl18/ovl18_1.c @@ -15,12 +15,12 @@ void func_802201C0_ovl18(s32 arg0) { D_800E8920[D_8004A7C4->objId] = 0; call_virtual_function(D_800E7880[D_8004A7C4->objId], 1, &D_8022AB80); while(1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[1]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[1]); } void func_802202B8_ovl18(s32 arg0) { while(1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[1]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[1]); } void func_80220338_ovl18(s32 arg0) { @@ -30,7 +30,7 @@ void func_80220338_ovl18(s32 arg0) { D_800E1B50[D_8004A7C4->objId]->unk8C = &D_8022A184; D_800E1B50[D_8004A7C4->objId]->unk98 = &D_8022A940; D_800E98E0[D_8004A7C4->objId] = 0x1E; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; } void func_80220424_ovl18(void) { @@ -54,7 +54,7 @@ void func_802204F8_ovl18(s32 arg0) { D_800E98E0[D_8004A7C4->objId] -= 1; } if ((D_800E98E0[D_8004A7C4->objId] <= 0) && (func_8019B738_ovl18(D_8022BBC0) != 0)) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802202B8_ovl18); } } @@ -85,7 +85,7 @@ void func_802205AC_ovl18(s32 arg0) { func_800AA154(0x10023); } while (0); D_800E98E0[D_8004A7C4->objId] = 0x1E; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; } void func_80220720_ovl18(s32 arg0) { @@ -99,12 +99,12 @@ void func_80220728_ovl18(s32 arg0) { D_800E8920[D_8004A7C4->objId] = 0; call_virtual_function(D_800E7880[D_8004A7C4->objId], 1, &D_8022AB80[5]); while(1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[6]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[6]); } void func_80220818_ovl18(s32 arg0) { while(1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[6]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[6]); } void func_80220898_ovl18(s32 arg0) { @@ -125,7 +125,7 @@ void func_80220898_ovl18(s32 arg0) { D_800EA8A0[D_8004A7C4->objId] = gEntitiesPosXArray[D_8004A7C4->objId]; D_800EAA60[D_8004A7C4->objId] = gEntitiesPosYArray[D_8004A7C4->objId]; D_800EAC20[D_8004A7C4->objId] = gEntitiesPosZArray[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; } void func_80220AA8_ovl18(s32 arg0) { @@ -334,7 +334,7 @@ void func_80221288_ovl18(s32 arg0) { } void func_802212E8_ovl18(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[9]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[9]); } @@ -346,9 +346,9 @@ void func_80221330_ovl18(s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_80221440_ovl18; D_800E48D0[D_8004A7C4->objId] = 2.0f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId];; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_802212E8_ovl18, &D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[9]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[9]); } void func_80221440_ovl18(void) { @@ -400,7 +400,7 @@ void func_802216C8_ovl18(s32 arg0) { } void func_80221758_ovl18(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 4, &D_8022AB80[12]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 4, &D_8022AB80[12]); } void func_802217A0_ovl18(s32 arg0) { @@ -413,8 +413,8 @@ void func_802217A0_ovl18(s32 arg0) { gEntitiesPosYArray[D_8004A7C4->objId] -= 110.0f; D_800EA6E0[D_8004A7C4->objId] = gEntitiesPosYArray[D_8004A7C4->objId]; D_800EA8A0[D_8004A7C4->objId] = D_800EA6E0[D_8004A7C4->objId] + 60.0f; - D_800DDC50[D_8004A7C4->objId] = 0; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 4, &D_8022AB80[12]); + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 4, &D_8022AB80[12]); } void func_802218E4_ovl18(s32 arg0) { @@ -433,7 +433,7 @@ void func_80221934_ovl18(s32 arg0) { void func_80221A04_ovl18(s32 arg0) { if (D_800E9720[D_8004A7C4->objId] == 0) { - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80221758_ovl18); } else D_800E9720[D_8004A7C4->objId]--; } @@ -447,7 +447,7 @@ void func_80221A84_ovl18(s32 arg0) { void func_80221ADC_ovl18(s32 arg0) { if (D_800E9720[D_8004A7C4->objId] == 0) { - D_800DDC50[D_8004A7C4->objId] = 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = 3; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80221758_ovl18); } else D_800E9720[D_8004A7C4->objId]--; } @@ -467,7 +467,7 @@ void func_80221BF0_ovl18(s32 arg0) { D_800E3210[D_8004A7C4->objId] = D_800E3750[D_8004A7C4->objId]; D_800E3C90[D_8004A7C4->objId] = 65535.0f; gEntitiesPosYArray[D_8004A7C4->objId] = D_800EA8A0[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80221758_ovl18); } } @@ -487,7 +487,7 @@ void func_80221D78_ovl18(s32 arg0) { D_800E3C90[D_8004A7C4->objId] = 65535.0f; gEntitiesPosYArray[D_8004A7C4->objId] = D_800EA6E0[D_8004A7C4->objId]; D_800E9720[D_8004A7C4->objId] = 0xF; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80221758_ovl18); } } diff --git a/src/ovl18/ovl18_1.h b/src/ovl18/ovl18_1.h index b6254310..d4f77031 100644 --- a/src/ovl18/ovl18_1.h +++ b/src/ovl18/ovl18_1.h @@ -10,7 +10,7 @@ extern s32 D_800E8920[]; extern u8 D_800E7880[]; -extern s32 D_800DDC50[]; +extern s32 gEntityVtableIndexArray[]; extern void call_virtual_function(s32, s32, void (*c)); diff --git a/src/ovl18/ovl18_3.c b/src/ovl18/ovl18_3.c index cb690c65..1896b02c 100644 --- a/src/ovl18/ovl18_3.c +++ b/src/ovl18/ovl18_3.c @@ -18,7 +18,7 @@ void func_80222220_ovl18(UNUSED s32 arg0) { } void func_80222280_ovl18(UNUSED s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[21]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[21]); } void func_802222C8_ovl18(UNUSED s32 arg0) { @@ -28,9 +28,9 @@ void func_802222C8_ovl18(UNUSED s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_802223D8_ovl18; D_800E48D0[D_8004A7C4->objId] = 2.0f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_80222280_ovl18, D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[21]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[21]); } void func_802223D8_ovl18(void) { @@ -61,7 +61,7 @@ void func_80222510_ovl18(UNUSED s32 arg0) { } void func_80222570_ovl18(UNUSED s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[24]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[24]); } void func_802225B8_ovl18(UNUSED s32 *arg0) { @@ -74,9 +74,9 @@ void func_802225B8_ovl18(UNUSED s32 *arg0) { D_800E48D0[D_8004A7C4->objId] = 2.0f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; func_8019BC34_ovl18(120.0f); - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_80222570_ovl18); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[24]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[24]); } void func_802226E0_ovl18(void) { @@ -118,7 +118,7 @@ void func_80222898_ovl18(UNUSED s32 arg0) { } void func_802228F8_ovl18(UNUSED s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 7, &D_8022AB80[27]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 7, &D_8022AB80[27]); } void func_80222940_ovl18(UNUSED s32 arg0) { @@ -130,9 +130,9 @@ void func_80222940_ovl18(UNUSED s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_80222A54_ovl18; D_800E48D0[D_8004A7C4->objId] = 2.0f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId];; - D_800DDC50[D_8004A7C4->objId] = 6; + gEntityVtableIndexArray[D_8004A7C4->objId] = 6; func_801A0D50_ovl18(&func_802228F8_ovl18, D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 7, &D_8022AB80[27]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 7, &D_8022AB80[27]); } void func_80222A54_ovl18(s32 arg0) { @@ -167,7 +167,7 @@ void func_80222BB4_ovl18(UNUSED s32 arg0) { struct UnkStruct800E1B50 *tmp = D_800E1B50[D_8004A7C4->objId]; if (tmp->unk3C == 0 && func_8019A7E8_ovl18(560.0f) != 0) { - D_800DDC50[D_8004A7C4->objId] = func_8019B260_ovl18(80.0f) == 1 ? 1 : 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = func_8019B260_ovl18(80.0f) == 1 ? 1 : 3; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802228F8_ovl18); } } @@ -196,7 +196,7 @@ void func_80222DA4_ovl18(UNUSED s32 arg0) { block_2: D_800E3750[D_8004A7C4->objId] = -1.0f; temp_a2->unk98 = &D_8022AA18; - D_800DDC50[D_8004A7C4->objId] = 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = 3; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802228F8_ovl18); } } else { @@ -236,7 +236,7 @@ void func_80222F00_ovl18(UNUSED s32 arg0) { void func_80223030_ovl18(UNUSED s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 4; + gEntityVtableIndexArray[D_8004A7C4->objId] = 4; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802228F8_ovl18); } } @@ -279,9 +279,9 @@ void func_80223278_ovl18(UNUSED s32 arg0) { if (D_800E9AA0[D_8004A7C4->objId] != 0) { if (((D_800DD8D0[D_8004A7C4->objId]) >> 0x1E) != 0) { if (D_800E8920[D_8004A7C4->objId] == 0) { - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; } else { - D_800DDC50[D_8004A7C4->objId] = 4; + gEntityVtableIndexArray[D_8004A7C4->objId] = 4; } assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802228F8_ovl18); } @@ -300,7 +300,7 @@ void func_80223320_ovl18(UNUSED s32 arg0) { void func_802233C8_ovl18(UNUSED s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802228F8_ovl18); } } @@ -347,7 +347,7 @@ void func_80223684_ovl18(UNUSED s32 arg0) { } void func_802236E4_ovl18(UNUSED s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[42]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[42]); } void func_8022372C_ovl18(UNUSED s32 arg0) { @@ -358,9 +358,9 @@ void func_8022372C_ovl18(UNUSED s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_8022383C_ovl18; D_800E48D0[D_8004A7C4->objId] = 1.5f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_802236E4_ovl18, D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[42]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[42]); } void func_8022383C_ovl18(void) { @@ -391,7 +391,7 @@ void func_8022396C_ovl18(UNUSED s32 arg0) { } void func_802239CC_ovl18(UNUSED s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_8022AB80[45]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_8022AB80[45]); } void func_80223A14_ovl18(UNUSED s32 arg0) { @@ -404,8 +404,8 @@ void func_80223A14_ovl18(UNUSED s32 arg0) { D_800E9720[D_8004A7C4->objId] = 0xA; D_800EB320[D_8004A7C4->objId] = 380.0f; gEntitiesAngleYArray[D_8004A7C4->objId] = 0.0f; - D_800DDC50[D_8004A7C4->objId] = 0; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 5, &D_8022AB80[45]); + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 5, &D_8022AB80[45]); } void func_80223B4C_ovl18(UNUSED s32 arg0) { @@ -446,7 +446,7 @@ void func_80223C94_ovl18(UNUSED s32 arg0) { void func_80223D40_ovl18(UNUSED s32 arg0) { if (D_800E9720[D_8004A7C4->objId] == 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802239CC_ovl18); return; } else D_800E9720[D_8004A7C4->objId]--; @@ -467,7 +467,7 @@ void func_80223E50_ovl18(UNUSED s32 arg0) { return; } play_sound(0x244); - D_800DDC50[D_8004A7C4->objId] = 4; + gEntityVtableIndexArray[D_8004A7C4->objId] = 4; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802239CC_ovl18); } @@ -480,7 +480,7 @@ void func_80223F20_ovl18(UNUSED s32 arg0) { void func_80223FA4_ovl18(UNUSED s32 arg0) { if (D_800E9FE0[D_8004A7C4->objId] >= 3) { - D_800DDC50[D_8004A7C4->objId] = 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = 3; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802239CC_ovl18); } else if (gEntitiesPosYArray[D_8004A7C4->objId] <= 60.0f) { D_800E3210[D_8004A7C4->objId] = -(D_800E3210[D_8004A7C4->objId] * 0.5f); @@ -500,7 +500,7 @@ void func_80224088_ovl18(UNUSED s32 arg0) { void func_80224134_ovl18(UNUSED s32 arg0) { if (D_800E9720[D_8004A7C4->objId] == 0) { - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802239CC_ovl18); } else D_800E9720[D_8004A7C4->objId]--; } @@ -520,7 +520,7 @@ void func_80224244_ovl18(UNUSED s32 arg0) { } else { gEntitiesPosYArray[D_8004A7C4->objId] = 380.0f; D_800E9720[D_8004A7C4->objId] = 0xF; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802239CC_ovl18); } } diff --git a/src/ovl18/ovl18_5.c b/src/ovl18/ovl18_5.c index ba925dd9..cfc8d7ae 100644 --- a/src/ovl18/ovl18_5.c +++ b/src/ovl18/ovl18_5.c @@ -21,7 +21,7 @@ void func_80224580_ovl18(s32 arg0) { } void func_802245E0_ovl18(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[61]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[61]); } void func_80224628_ovl18(s32 arg0) { @@ -32,9 +32,9 @@ void func_80224628_ovl18(s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_80224738_ovl18; D_800E48D0[D_8004A7C4->objId] = 2.0f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_802245E0_ovl18, D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[61]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[61]); } void func_80224738_ovl18(void) { @@ -57,7 +57,7 @@ void func_80224790_ovl18(s32 arg0) { void func_80224864_ovl18(s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802245E0_ovl18); } } @@ -93,7 +93,7 @@ void func_802249D8_ovl18(UNUSED s32 arg0) { } } if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_802245E0_ovl18); } } @@ -110,7 +110,7 @@ void func_80224AF4_ovl18(s32 arg0) { } void func_80224B54_ovl18(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[66]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[66]); } void func_80224B9C_ovl18(s32 arg0) { @@ -121,9 +121,9 @@ void func_80224B9C_ovl18(s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_80224CAC_ovl18; D_800E48D0[D_8004A7C4->objId] = 2.0f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_80224B54_ovl18, D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[66]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[66]); } void func_80224CAC_ovl18(void) { @@ -147,7 +147,7 @@ void func_80224D04_ovl18(s32 arg0) { void func_80224DE4_ovl18(s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80224B54_ovl18); } } @@ -196,7 +196,7 @@ void func_80224FCC_ovl18(UNUSED s32 arg0) { } } if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80224B54_ovl18); } } @@ -210,7 +210,7 @@ void func_802250EC_ovl18(s32 arg0) { } void func_8022514C_ovl18(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[71]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[71]); } void func_80225194_ovl18(s32 arg0) { @@ -221,9 +221,9 @@ void func_80225194_ovl18(s32 arg0) { D_800DF150[D_8004A7C4->objId] = &func_802252A4_ovl18; D_800E48D0[D_8004A7C4->objId] = 1.5f; D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_801A0D50_ovl18(&func_8022514C_ovl18, D_800E48D0); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_8022AB80[71]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_8022AB80[71]); } void func_802252A4_ovl18(void) { @@ -265,7 +265,7 @@ void func_80225418_ovl18(s32 arg0) { } void func_80225478_ovl18(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[90]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[90]); } void func_802254C0_ovl18(s32 arg0) { @@ -276,8 +276,8 @@ void func_802254C0_ovl18(s32 arg0) { D_800E4550[D_8004A7C4->objId] = D_800E4710[D_8004A7C4->objId] = D_800E48D0[D_8004A7C4->objId]; D_800E93A0[D_8004A7C4->objId] = 0; gEntitiesAngleYArray[D_8004A7C4->objId] = 0.0f; - D_800DDC50[D_8004A7C4->objId] = 0; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022AB80[90]); + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022AB80[90]); } void func_802255C0_ovl18(s32 arg0) { @@ -305,7 +305,7 @@ void func_80225650_ovl18(s32 arg0) { #ifdef NON_MATCHING void func_80225724_ovl18(s32 arg0) { if (D_800E9720[D_8004A7C4->objId]-- == 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80225478_ovl18); } else D_800E9720[D_8004A7C4->objId]--; } @@ -331,7 +331,7 @@ void func_802257A4_ovl18(s32 arg0) { void func_802258EC_ovl18(s32 arg0) { if (D_800E9E20[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], &func_80225478_ovl18); } } diff --git a/src/ovl19/ovl19.c b/src/ovl19/ovl19.c index 24d4aaa4..ebb7eb7d 100644 --- a/src/ovl19/ovl19.c +++ b/src/ovl19/ovl19.c @@ -14,7 +14,7 @@ void func_8021DF20_ovl19(struct UnkStruct8004A7C4 *arg0) { func_800AED20(D_800D6B10); D_800E8760[D_8004A7C4->objId] = 0; D_800E83E0[D_8004A7C4->objId] = D_800E8760[D_8004A7C4->objId]; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 0xA, &D_8022F040[0]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 0xA, &D_8022F040[0]); } @@ -369,7 +369,7 @@ void func_8021EA40_ovl19(struct UnkStruct8004A7C4 *arg0) { D_800E1450[D_8004A7C4->objId] = D_800E1450[D_800E0D50[D_8004A7C4->objId]]; D_800E6A10[D_8004A7C4->objId] = D_800E6A10[D_800E0D50[D_8004A7C4->objId]]; D_800E6BD0[D_8004A7C4->objId] = D_800E6BD0[D_800E0D50[D_8004A7C4->objId]]; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8022F070[0]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8022F070[0]); } extern f32 D_8022F70C; @@ -437,7 +437,7 @@ s32 func_8021EE88_ovl19(struct UnkStruct8004A7C4 *arg0) { temp_v0 = func_800AEC08(0x16, 0x3C, 0x4A); if (temp_v0 != -1) { - D_800DDC50[temp_v0] = arg0; + gEntityVtableIndexArray[temp_v0] = arg0; } else { print_error_stub(&D_8022F6E0); } diff --git a/src/ovl2/ovl2_4.c b/src/ovl2/ovl2_4.c index b3093c8a..2a0cf412 100644 --- a/src/ovl2/ovl2_4.c +++ b/src/ovl2/ovl2_4.c @@ -14,7 +14,7 @@ void func_800FD330(s32 arg0) { D_800E1290[D_8004A7C4->objId] = D_800E1290[D_800E0D50[D_8004A7C4->objId]]; D_800E1450[D_8004A7C4->objId] = D_800E1450[D_800E0D50[D_8004A7C4->objId]]; } - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 1, &D_801245C0); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 1, &D_801245C0); } extern u32 D_80124624; @@ -162,7 +162,7 @@ s32 func_800FD9D4(s32 arg0) { if (temp_v0 == -1) { print_error_stub(&D_8012896C); } else { - D_800DDC50[temp_v0] = arg0; + gEntityVtableIndexArray[temp_v0] = arg0; } return temp_v0; diff --git a/src/ovl2/ovl2_8.c b/src/ovl2/ovl2_8.c index 658346f5..ce6df28a 100644 --- a/src/ovl2/ovl2_8.c +++ b/src/ovl2/ovl2_8.c @@ -756,7 +756,7 @@ void func_8011CFF4(s32 arg0) { temp_v1_3 = gKirbyState.actionChange; if (temp_v1_3 != -1) { temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = temp_v1_3; + gEntityVtableIndexArray[temp_v0_2->objId] = temp_v1_3; gKirbyState.actionChange = -1; if (D_800D6FB2 == 2) { assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_8022947C); diff --git a/src/ovl3/ovl3.c b/src/ovl3/ovl3.c index 76aaa4ea..2cbbb8ed 100644 --- a/src/ovl3/ovl3.c +++ b/src/ovl3/ovl3.c @@ -430,7 +430,7 @@ u8 func_80151C78_ovl3(void) { extern u32 D_800D6B54; #ifdef NON_MATCHING //generated by mips_to_c commit 09d006c9da5d6bbcd31ac6ca5c9165c1a8533a83 -u32 func_80151E94_ovl3(u8 arg0[]) { +u32 ovl3_process_command_string(u8 arg0[]) { u32 phi_v1_2; u32 phi_v1_3; @@ -511,3 +511,4 @@ u32 func_80151E94_ovl3(u8 arg0[]) { GLOBAL_ASM("asm/non_matchings/ovl3/ovl3/func_80151E94_ovl3.s") #endif + diff --git a/src/ovl3/ovl3_5.c b/src/ovl3/ovl3_5.c index f4df914e..f7393f15 100644 --- a/src/ovl3/ovl3_5.c +++ b/src/ovl3/ovl3_5.c @@ -1,6 +1,8 @@ #include #include #include "types.h" +#include "stages.h" + #include "D_8004A7C4.h" #include "ovl1/ovl1_6.h" #include "ovl2/ovl2_8.h" @@ -10,7 +12,84 @@ extern void play_sound(s32 a); extern struct KirbyState gKirbyState; -extern void (*D_80196990[])(struct UnkStruct8004A7C4 *); +void (*D_80196990[])(struct UnkStruct8004A7C4 *) = { + 0x8016CA8C, 0x8016D3A8, 0x8016DA14, 0x8016DDE8, + 0x8016E638, 0x8016E8A0, 0x8016EF5C, 0x8016F6DC, + 0x8016F80C, 0x8016FD88, 0x801702F0, 0x80170794, + 0x80170AC4, 0x801712F8, 0x80171E00, 0x801727D8, + 0x801741DC, 0x80174504, 0x801747F0, 0x80174A30, + 0x80174C10, 0x8017599C, 0x80176490, 0x80176860, + 0x80172AE4, 0x801736BC, 0x80173CB4, 0x80173EC0, + 0x801772E0, 0x801776E8, 0x80177B40, 0x80177E78, +}; + +void (*D_80196A10[])(struct UnkStruct8004A7C4 *) = { + 0x801782C8, 0x80178728, 0x801789D8, 0x80179370, + 0x80179C28, 0x8017B068, 0x8017B78C, 0x8017BD68, + 0x8017BF34, 0x8017C418, 0x8017CF60, 0x8017D8E8, + 0x8017E074, 0x8017E284, 0x8017EA0C, 0x8017F1C0, + 0x80180818, 0x80181014, 0x80181110, 0x80181AF0, + 0x80181F64, 0x80182D9C, 0x801835AC, 0x80183E38, + 0x80184538, 0x80184B24, 0x80184CA4, 0x801856A4, + 0x80185788, 0x80185A9C, 0x80186750, 0x80186E30, + 0x80189914, 0x8018CC54, 0x8018DDCC, 0x8018E164, + 0x8018E608, 0x8017C418, 0x80156050, 0x801567B8, + 0x8015A44C, 0x8015849C, 0x80158528, 0x8015882C, + 0x80158924, 0x80158C40, 0x80158DB4, 0x80159164, + 0x80159BA0, 0x8015A144, 0x801585A0, 0x80158604, + 0x801586A8, 0x801587AC, +}; + +void (*D_80196AE8[])(struct UnkStruct8004A7C4 *) = { + 0x8016D1E8, 0x8016D81C, 0x8016DD0C, 0x8016E15C, + 0x8016EE5C, 0x8016F240, 0x8016F7C8, 0x8016FB58, + 0x8016FFF8, 0x80170638, 0x80170A24, 0x80170D88, + 0x801717F0, 0x80172234, 0x80172A3C, 0x80174284, + 0x801746E0, 0x8017499C, 0x80174B7C, 0x80175754, + 0x801760FC, 0x80176DE0, 0x80173260, 0x80173AF4, + 0x80173E40, 0x80174144, 0x80177438, 0x8017782C, + 0x80177CBC, 0x80177FB4, 0x80178420, 0x8017883C, + 0x80178B18, 0x8017982C, 0x8017A390, 0x8017B3C4, + 0x8017B8F4, 0x8017BEF4, 0x8017C1FC, 0x8017CAF8, +}; + +void (*D_80196B88[])(struct UnkStruct8004A7C4 *) = { + 0x8017D430, 0x8017DBB8, 0x8017E1EC, 0x8017E54C, + 0x8017EDDC, 0x8017F988, 0x80180B58, 0x801810D0, + 0x801815F4, 0x80181CFC, 0x8018271C, 0x80183428, + 0x80183A1C, 0x80183FF4, 0x801848A4, 0x80184C64, + 0x80185224, 0x80185748, 0x80185968, 0x80186248, + 0x80186A20, 0x80188238, 0x8018B228, 0x8018D4C8, + 0x8018DFB4, 0x8018E3B0, 0x8018F368, 0x80156594, + 0x80157738, 0x8015A92C, 0x80158508, 0x80158564, + 0x801588D0, 0x80158B10, 0x80158CA8, 0x80158EEC, + 0x80159ADC, 0x80159EF0, 0x8015A31C, 0x80158668, + 0x80158688, 0x80158744, 0x8015880C, +}; + +u32 D_80196C34[] = { + BANK_INDEX(2, 315), + BANK_INDEX(2, 316), + BANK_INDEX(2, 317), + BANK_INDEX(2, 318), + BANK_INDEX(2, 319), + BANK_INDEX(2, 320), +}; + +u8 D_80196C4C[] = {2, 3, 9, 0xB, 0xF}; +u8 D_80196C54[] = {2, 4, 3, 9, 8, 7, 0xC, 0xF}; +u8 D_80196C5C[] = {4, 2, 3, 9, 8, 7, 0xF}; +u8 D_80196C64[] = {1, 5, 9, 8, 7, 6, 0xF}; +u8 D_80196C6C[] = {1, 5, 9, 8, 7, 6, 0xF}; +u8 D_80196C74[] = {1, 2, 3, 9, 4, 0xD, 0xF}; +u8 D_80196C7C[] = {1, 5, 9, 8, 7, 0xF}; +u8 D_80196C84[] = {1, 2, 0xF}; +u8 D_80196C88[] = {1, 0xF}; +u8 D_80196C8C[] = {2, 9, 0xF}; +u8 D_80196C90[] = {5, 9, 0xF}; +u8 D_80196C94[] = {9, 2, 0xF}; +u8 D_80196C98[] = {1, 2, 9, 0xF}; +u8 D_80196C9C[] = {3, 0xF}; #ifdef MIPS_TO_C Failed to decompile function func_8016BF60_ovl3: @@ -23,13 +102,9 @@ the instruction, which has a name starting with "jtbl"/"jpt_". GLOBAL_ASM("asm/non_matchings/ovl3/ovl3_5/func_8016BF60_ovl3.s") #endif -#ifdef MIPS_TO_C void func_8016C510_ovl3(s32 arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 0x56, &D_80196990); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 0x56, D_80196990); } -#else -GLOBAL_ASM("asm/non_matchings/ovl3/ovl3_5/func_8016C510_ovl3.s") -#endif extern f32 gKirbyHp; extern s32 D_800D6B54; @@ -52,6 +127,7 @@ s32 func_801693C4_ovl3(s32); s32 random_soft_s32_range(s32); s32 func_8012209C(void); +// kirby jump start? void func_8016C558_ovl3(s32 arg0) { f32 **tmp; s32 idx; @@ -65,7 +141,7 @@ void func_8016C558_ovl3(s32 arg0) { if (gKirbyState.unk68 == 2) { func_8015449C_ovl3(&D_80193168, 0); } - call_virtual_function(D_800DDFD0[D_8004A7C4->objId], 0x53, &D_80196990[86]); + call_virtual_function(D_800DDFD0[D_8004A7C4->objId], 0x53, &D_80196AE8); if (func_8012209C() != 0) { gKirbyState.unk17 = 1; } @@ -114,7 +190,7 @@ void func_8016C558_ovl3(s32 arg0) { D_8012E944->unk4.z = sp24.z; D_8012E944->unk1C = gEntitiesAngleYArray[D_8004A7C4->objId]; } else { - if (D_800DDC50[D_8004A7C4->objId] != 0x50) { + if (gEntityVtableIndexArray[D_8004A7C4->objId] != 0x50) { func_800FF200(D_8012E944); } } @@ -370,7 +446,7 @@ u32 func_8016D1E8_ovl3(s32 arg0) { D_800E98E0[D_8004A7C4->objId] = gKirbyState.unk150; func_80153984_ovl3(&gKirbyState); func_8011CF58(); - temp_ret = func_80151E94_ovl3(&sp28); + temp_ret = ovl3_process_command_string(&sp28); if (temp_ret != 0) { block_2: gKirbyState.isTurning = gKirbyState.isTurning & ~2; @@ -576,7 +652,7 @@ void func_8016D81C_ovl3(void *arg0) { func_800AECC0(3.0f); func_800AED20(3.0f); } - if (func_80151E94_ovl3(&sp20) == 0) { + if (ovl3_process_command_string(&sp20) == 0) { func_801219C8(); if ((gKirbyState.isTurning & 1) == 0) { if (func_801210FC(&gKirbyState) == 0) { @@ -716,7 +792,7 @@ void func_8016DD0C_ovl3(s32 arg0) { sp18.unk4 = (first 3 bytes) D_80196C5C.unk4; func_80153984_ovl3(); func_8011CF58(); - if (func_80151E94_ovl3(&sp18) == 0) { + if (ovl3_process_command_string(&sp18) == 0) { if ((D_800E64D0[D_8004A7C4->objId] == 0.0f) && ((D_800D6FE8.buttonHeld & 0x300) == 0)) { gKirbyState.unk7 = 0; set_kirby_action_1(0, 1); @@ -837,7 +913,7 @@ void func_8016E15C_ovl3(void *arg0) { sp20.unk0 = D_80196C64.unk0; sp20.unk4 = (first 3 bytes) D_80196C64.unk4; func_80153984_ovl3(); - if (func_80151E94_ovl3(&sp20) != 0) { + if (ovl3_process_command_string(&sp20) != 0) { if (gKirbyState.unk4 != 1) { gKirbyState.unk15C = &D_80190358; return; @@ -1311,7 +1387,7 @@ s32 func_8016F240_ovl3(s32 arg0) { sp30.unk4 = (first 3 bytes) D_80196C6C.unk4; func_80153984_ovl3(); func_8011CF58(); - if (func_80151E94_ovl3(&sp30) == 0) { + if (ovl3_process_command_string(&sp30) == 0) { temp_a2 = gKirbyState.unk17; if ((temp_a2 == 0) || (phi_a3 = &gKirbyState, (gKirbyState.unkB != 2))) { if ((temp_a2 == 0) && ((D_800D6FEA & 0x8000) != 0)) { @@ -1467,7 +1543,7 @@ void func_8016F7C8_ovl3(s32 arg0) { sp18.unk0 = D_80196C74.unk0; sp18.unk4 = (first 3 bytes) D_80196C74.unk4; func_80153984_ovl3(); - func_80151E94_ovl3(&sp18); + ovl3_process_command_string(&sp18); } #else GLOBAL_ASM("asm/non_matchings/ovl3/ovl3_5/func_8016F7C8_ovl3.s") @@ -1572,7 +1648,7 @@ s32 func_8016FB58_ovl3(void *arg0) { sp20.unk0 = D_80196C7C.unk0; sp20.unk4 = D_80196C7C.unk4; func_80153984_ovl3(); - if (func_80151E94_ovl3(&sp20) == 0) { + if (ovl3_process_command_string(&sp20) == 0) { if ((gKirbyState.unk17 == 0) || (phi_a3 = &gKirbyState, (gKirbyState.unkB != 2))) { temp_v1 = gKirbyState.unk44; phi_v1 = temp_v1; @@ -1695,7 +1771,7 @@ void func_8016FFF8_ovl3(s32 arg0) { sp24 = (first 3 bytes) D_80196C84; func_80153984_ovl3(); - if (func_80151E94_ovl3(&sp24) != 0) { + if (ovl3_process_command_string(&sp24) != 0) { D_800D6F10 = 0; gKirbyState.unkA = 0; gKirbyState.unk15C = &D_80190358; @@ -2063,7 +2139,7 @@ void func_80170D88_ovl3(s32 arg0) { if (D_800E3210[temp_v1] >= 0.0f) { D_800E8920[temp_v1] = 0; } - func_80151E94_ovl3(&sp24); + ovl3_process_command_string(&sp24); if (D_800D6B54 != 0) { set_kirby_action_1(6, 6); func_8011E0E8(); @@ -2264,9 +2340,9 @@ void func_801717F0_ovl3(s32 arg0) { func_80153984_ovl3(&gKirbyState); } if (D_800E98E0[D_8004A7C4->objId] == 5) { - phi_v0 = func_80151E94_ovl3(&sp3C); + phi_v0 = ovl3_process_command_string(&sp3C); } else { - phi_v0 = func_80151E94_ovl3(&sp40); + phi_v0 = ovl3_process_command_string(&sp40); } if (phi_v0 != 0) { func_8011CF58(); @@ -2436,39 +2512,12 @@ GLOBAL_ASM("asm/non_matchings/ovl3/ovl3_5/func_80171E00_ovl3.s") #ifdef MIPS_TO_C void func_80172234_ovl3(s32 arg0) { - ? sp3C; - f32 sp38; - f32 sp34; - f32 temp_f0; - s32 temp_v0_10; - s32 temp_v0_9; - s32 temp_v1; - struct UnkStruct8004A7C4 *temp_v1_2; - struct UnkStruct8004A7C4 *temp_v1_3; - struct UnkStruct8004A7C4 *temp_v1_4; - struct UnkStruct8004A7C4 *temp_v1_5; - u32 temp_v0; - u32 temp_v0_2; - u32 temp_v0_3; - u32 temp_v0_4; - u32 temp_v0_5; - u32 temp_v0_6; - u32 temp_v0_8; - u8 temp_v0_7; - s32 phi_v0; - f32 phi_f0; - f32 phi_f12; - f32 phi_f2; - f32 phi_f2_2; - f32 phi_f2_3; - f32 phi_f0_2; + u8 sp3C[] = {9, 2, 0xF}; - sp3C = (first 3 bytes) D_80196C94; + // sp3C = D_80196C94; if (gKirbyState.unk17 == 0) { - temp_v0 = D_8004A7C4->objId; - temp_v1 = D_800E98E0[temp_v0]; - if ((temp_v1 == 6) || (temp_v1 == 5)) { - if (D_800E8920[temp_v0] != 0) { + if ((D_800E98E0[D_8004A7C4->objId] == 6) || (D_800E98E0[D_8004A7C4->objId] == 5)) { + if (D_800E8920[D_8004A7C4->objId] != 0) { func_80153984_ovl3(&gKirbyState); } else { func_80153B98_ovl3(&gKirbyState); @@ -2477,44 +2526,36 @@ void func_80172234_ovl3(s32 arg0) { func_80153B98_ovl3(&gKirbyState); } if (D_800E98E0[D_8004A7C4->objId] != 0) { - if ((gKirbyState.unk3C == 0) && (func_80151E94_ovl3(&sp3C) != 0)) { + if ((gKirbyState.unk3C == 0) && (ovl3_process_command_string(&sp3C) != 0)) { func_8011CF58(); func_8011E234(); - func_8011DC5C(ERROR(Read from unset register $f12)); + func_8011DC5C(); func_8011E0E8(); if ((D_800D6FEA & 0x4000) != 0) { - temp_v1_2 = D_8004A7C4; - D_800E3750[temp_v1_2->objId] = 0.0f; - temp_v0_2 = temp_v1_2->objId; - D_800E3210[temp_v0_2] = D_800E3750[temp_v0_2]; - D_800E3C90[temp_v1_2->objId] = D_80197410; + D_800E3750[D_8004A7C4->objId] = 0.0f; + D_800E3210[D_8004A7C4->objId] = D_800E3750[D_8004A7C4->objId]; + D_800E3C90[D_8004A7C4->objId] = D_80197410; } if (gKirbyState.action == 5) { if (func_80121194() != 0) { - gKirbyState.isTurning = gKirbyState.isTurning & ~4; - temp_v1_3 = D_8004A7C4; - temp_v0_3 = temp_v1_3->objId; - if ((D_800E8AE0[temp_v0_3] & 6) != 0) { - D_800E64D0[temp_v0_3] = D_800E6A10[temp_v0_3] * -2.0f; - temp_v0_4 = temp_v1_3->objId; - D_800E6690[temp_v0_4] = D_800E6A10[temp_v0_4] * D_80197414; - ((temp_v1_3->objId * 4) + 0x800E0000)->unk6850 = 2.0f; + gKirbyState.isTurning &= ~4; + if ((D_800E8AE0[D_8004A7C4->objId] & 6) != 0) { + D_800E64D0[D_8004A7C4->objId] = D_800E6A10[D_8004A7C4->objId] * -2.0f; + D_800E6690[D_8004A7C4->objId] = D_800E6A10[D_8004A7C4->objId] * D_80197414; + D_800E6850[D_8004A7C4->objId] = 2.0f; } else { - D_800E64D0[temp_v0_3] = D_800E6A10[temp_v0_3] * -6.0f; - temp_v0_5 = temp_v1_3->objId; - D_800E6690[temp_v0_5] = D_800E6A10[temp_v0_5] * 0.125f; - D_800E6850[temp_v1_3->objId] = 6.0f; + D_800E64D0[D_8004A7C4->objId] = D_800E6A10[D_8004A7C4->objId] * -6.0f; + D_800E6690[D_8004A7C4->objId] = D_800E6A10[D_8004A7C4->objId] * 0.125f; + D_800E6850[D_8004A7C4->objId] = 6.0f; } } else { - temp_v1_4 = D_8004A7C4; - D_800E6690[temp_v1_4->objId] = 0.0f; - temp_v0_6 = temp_v1_4->objId; - D_800E64D0[temp_v0_6] = D_800E6690[temp_v0_6]; - D_800E6850[temp_v1_4->objId] = D_80197418; - gKirbyState.isTurning = gKirbyState.isTurning | 4; + D_800E6690[D_8004A7C4->objId] = 0.0f; + D_800E64D0[D_8004A7C4->objId] = D_800E6690[D_8004A7C4->objId]; + D_800E6850[D_8004A7C4->objId] = D_80197418; + gKirbyState.isTurning |= 4; } } else { - gKirbyState.isTurning = gKirbyState.isTurning & ~4; + gKirbyState.isTurning &= ~4; } if (gKirbyState.previousAction == 0xB) { gKirbyState.unk15 = 8; @@ -2522,78 +2563,52 @@ void func_80172234_ovl3(s32 arg0) { } } else { if (func_8011FEF8() != 0) { - func_8011DC5C(ERROR(Read from unset register $f12)); + func_8011DC5C(); func_8011E0E8(); - assign_new_process_entry(*(&gEntityGObjProcessArray + (D_8004A7C4->objId * 4)), &D_8016C510); + assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_8016C510_ovl3); return; } if (gKirbyState.action != 0xB) { func_8011E234(); - func_8011DC5C(ERROR(Read from unset register $f12)); + func_8011DC5C(); func_8011E0E8(); return; } } } } else { - temp_v0_7 = gKirbyState.unkB; - if (temp_v0_7 == 0) { - print_error_stub(&D_801972F8, &gKirbyState); -loop_27: - goto loop_27; + if (gKirbyState.unkB == 0) { + print_error_stub(&D_801972F8); + while (1) } - if (temp_v0_7 == 1) { - phi_v0 = D_8004A7C4->objId * 4; + if (gKirbyState.unkB == 1) { phi_f0_2 = 4.0f; } else { - temp_v0_8 = D_8004A7C4->objId; - temp_v0_9 = temp_v0_8 * 4; - if (D_800E98E0[temp_v0_8] != 4) { - phi_v0 = temp_v0_9; + if (D_800E98E0[D_8004A7C4->objId] != 4) { phi_f0_2 = -4.0f; } else { - phi_v0 = temp_v0_9; phi_f0_2 = -10.0f; } } phi_f0 = phi_f0_2; phi_f12 = 3.0f; - if ((*(D_800E8AE0 + phi_v0) & 6) != 0) { - phi_f0 = phi_f0_2 * 0.5f; + if (D_800E8AE0[D_8004A7C4->objId] & 6) { + phi_f0 *= 0.5f; phi_f12 = 3.0f * 0.5f; } - sp38 = phi_f0; - sp34 = phi_f12; + // sp38 = phi_f0; + // sp34 = phi_f12; func_800AECC0(phi_f12); func_800AED20(phi_f12); - temp_v1_5 = D_8004A7C4; - temp_f0 = phi_f0; - D_800E3210[temp_v1_5->objId] = temp_f0; - if (temp_f0 < 0.0f) { - phi_f2 = -temp_f0; + D_800E3210[D_8004A7C4->objId] = phi_f0; + if (ABSF(phi_f0) < 0.0f) { + D_800E3C90[D_8004A7C4->objId] = -ABSF(phi_f0); } else { - phi_f2 = temp_f0; + D_800E3C90[D_8004A7C4->objId] = ABSF(phi_f0); } - if (phi_f2 < 0.0f) { - if (temp_f0 < 0.0f) { - phi_f2_2 = -temp_f0; - } else { - phi_f2_2 = temp_f0; - } - D_800E3C90[temp_v1_5->objId] = -phi_f2_2; - } else { - if (temp_f0 < 0.0f) { - phi_f2_3 = -temp_f0; - } else { - phi_f2_3 = temp_f0; - } - D_800E3C90[temp_v1_5->objId] = phi_f2_3; - } - temp_v0_10 = gKirbyState.unk2C; - gKirbyState.unk2C = temp_v0_10 - 1; - if (temp_v0_10 == 0) { + if (gKirbyState.unk2C-- == 0) { D_800BE4F8 = 2; - func_8011DC5C(0.0f); + func_8011DC5C(); func_8011E0E8(); } } @@ -2688,7 +2703,7 @@ void func_80172A3C_ovl3(s32 arg0) { sp1C = D_80196C98; func_80153984_ovl3(); - if ((func_80151E94_ovl3(&sp1C) == 0) && ((D_8012E7F4 & 1) == 0) && (func_80121194() != 0)) { + if ((ovl3_process_command_string(&sp1C) == 0) && ((D_8012E7F4 & 1) == 0) && (func_80121194() != 0)) { temp_v0 = D_8004A7C4->objId; D_800E6690[temp_v0] = D_800E6A10[temp_v0] * 0.5f; } @@ -3215,7 +3230,7 @@ void func_80173AF4_ovl3(s32 arg0) { func_8015449C_ovl3(&D_801930CC, 0); } func_80153984_ovl3(); - if (func_80151E94_ovl3(&sp1C) != 0) { + if (ovl3_process_command_string(&sp1C) != 0) { func_8011E0E8(); } if (D_8012E7F0 == 0) { @@ -4136,7 +4151,7 @@ u32 func_80176DE0_ovl3(s32 arg0) { *temp_v1 = *temp_v1 - 1; } } - temp_ret = func_80151E94_ovl3(&sp28); + temp_ret = ovl3_process_command_string(&sp28); phi_return = temp_ret; if (temp_ret == 0) { temp_v1_2 = D_8004A7C4; @@ -4325,7 +4340,7 @@ void func_80177438_ovl3(s32 arg0) { set_kirby_action_1(6, 6); return; } - if (func_80151E94_ovl3(&sp24) == 0) { + if (ovl3_process_command_string(&sp24) == 0) { if ((gKirbyState.unkB9 == 0) && ((gKirbyState.isTurning & 1) == 0) && (func_80121194() != 0)) { gKirbyState.isTurning = gKirbyState.isTurning | 1; } @@ -4435,7 +4450,7 @@ void func_8017782C_ovl3(s32 arg0) { set_kirby_action_1(6, 6); return; } - if (func_80151E94_ovl3(&sp24) == 0) { + if (ovl3_process_command_string(&sp24) == 0) { if ((gKirbyState.unkB9 == 0) && ((gKirbyState.isTurning & 1) == 0) && (func_80121194() != 0)) { gKirbyState.isTurning = gKirbyState.isTurning | 1; } @@ -4545,7 +4560,7 @@ void func_80177CBC_ovl3(s32 arg0) { sp24 = D_80196D68; D_800E8920[D_8004A7C4->objId] = 0; func_80153984_ovl3(); - if (func_80151E94_ovl3(&sp24) == 0) { + if (ovl3_process_command_string(&sp24) == 0) { if ((gKirbyState.unkB9 == 0) && ((gKirbyState.isTurning & 1) == 0) && (func_80121194() != 0)) { gKirbyState.isTurning = gKirbyState.isTurning | 1; } @@ -4637,7 +4652,7 @@ void func_80177FB4_ovl3(s32 arg0) { set_kirby_action_1(6, 6); return; } - if (func_80151E94_ovl3(&sp24) == 0) { + if (ovl3_process_command_string(&sp24) == 0) { if ((D_800D6FE8.buttonHeld & 0x300) != 0) { temp_v0 = D_8004A7C4->objId; D_800E6690[temp_v0] = D_800E6A10[temp_v0] * 0.125f; @@ -4762,7 +4777,7 @@ void func_80178420_ovl3(s32 arg0) { set_kirby_action_1(6, 6); return; } - if (func_80151E94_ovl3(&sp24) == 0) { + if (ovl3_process_command_string(&sp24) == 0) { if ((gKirbyState.unkB9 == 0) && ((gKirbyState.isTurning & 1) == 0) && (func_80121194() != 0)) { gKirbyState.isTurning = gKirbyState.isTurning | 1; } @@ -4866,7 +4881,7 @@ void func_8017883C_ovl3(s32 arg0) { D_800E8920[D_8004A7C4->objId] = 0; func_80153984_ovl3(); temp_v1 = gKirbyState.unkB; - if ((temp_v1 != 1) && (temp_v1 != 2) && (func_80151E94_ovl3(&sp24) == 0)) { + if ((temp_v1 != 1) && (temp_v1 != 2) && (ovl3_process_command_string(&sp24) == 0)) { if ((gKirbyState.unkB9 == 0) && ((gKirbyState.isTurning & 1) == 0) && (func_80121194() != 0)) { gKirbyState.isTurning = gKirbyState.isTurning | 1; } @@ -4951,7 +4966,7 @@ void func_80178B18_ovl3(s32 arg0) { sp24 = D_80196D78; D_800E8920[D_8004A7C4->objId] = 0; func_80153984_ovl3(); - if (func_80151E94_ovl3(&sp24) == 0) { + if (ovl3_process_command_string(&sp24) == 0) { sp20 = 0; if ((gKirbyState.unk17 == 0) || (gKirbyState.unkB != 4)) { @@ -9784,12 +9799,10 @@ the instruction, which has a name starting with "jtbl"/"jpt_". GLOBAL_ASM("asm/non_matchings/ovl3/ovl3_5/func_8018CC54_ovl3.s") #endif -extern void func_8011DC5C(f32 a); - void func_8018D460_ovl3(s32 arg0, s32 arg1, f32 arg2) { if (arg1 == 0 && arg2 != 0.0f) { if (gKirbyState.unk30 == 0 && gKirbyState.unk17 == 0) { - func_8011DC5C(arg2); + func_8011DC5C(); func_8011DC04(0x3C); } } diff --git a/src/ovl4/ovl4_3.c b/src/ovl4/ovl4_3.c index 7fa43f5a..ec255ddf 100644 --- a/src/ovl4/ovl4_3.c +++ b/src/ovl4/ovl4_3.c @@ -482,7 +482,7 @@ GLOBAL_ASM("asm/non_matchings/ovl4/ovl4_3/func_801598C4_ovl4.s") s32 func_80159B00_ovl4(void) { s32 temp_v0; - temp_v0 = *(&D_800DDC50 + (*D_8004A7C4 * 4)); + temp_v0 = *(&gEntityVtableIndexArray + (*D_8004A7C4 * 4)); if (temp_v0 == 0) { return func_80159B68_ovl4(); } @@ -593,11 +593,11 @@ void func_80159DE8_ovl4(void) { temp_v0 = func_800AEC08(5, 0, 0x70); temp_t8 = temp_v0 * 4; D_800D71F8 = temp_v0; - *(&D_800DDC50 + temp_t8) = 0; + *(&gEntityVtableIndexArray + temp_t8) = 0; temp_v0_2 = func_800AEC08(5, 0, 0x70); temp_t1 = temp_v0_2 * 4; D_800D71FC = temp_v0_2; - *(&D_800DDC50 + temp_t1) = 1; + *(&gEntityVtableIndexArray + temp_t1) = 1; func_8000A180(0, &D_80159D78, 0x1A, 0x80000000); func_800A5744(0, 0, 0); func_800A5A14(0xFF, -0x10, 0); diff --git a/src/ovl8/ovl8_2.c b/src/ovl8/ovl8_2.c index af54f256..8103221a 100644 --- a/src/ovl8/ovl8_2.c +++ b/src/ovl8/ovl8_2.c @@ -19,7 +19,7 @@ void func_801D2040_ovl8(s32 arg0, s32 arg1, f32 arg2) { func_800B1900(newIdx); return; } - D_800DDC50[newIdx] = D_800DDC50[D_8004A7C4->objId]; + gEntityVtableIndexArray[newIdx] = gEntityVtableIndexArray[D_8004A7C4->objId]; D_800E76C0[newIdx] = 0xFF; D_800E7730[newIdx] = 2; D_800E77A0[newIdx] = 0; diff --git a/src/ovl9/ovl9_16.c b/src/ovl9/ovl9_16.c index 01b8f7ea..2e72955f 100644 --- a/src/ovl9/ovl9_16.c +++ b/src/ovl9/ovl9_16.c @@ -22,7 +22,7 @@ GLOBAL_ASM("asm/non_matchings/ovl9/ovl9_16/func_8021A1A0_ovl9.s") void func_8021A22C_ovl9(struct UnkStruct8004A7C4 *arg0) { while (1) - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 3, &D_8021CE00_ovl9[1]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 3, &D_8021CE00_ovl9[1]); } #ifdef MIPS_TO_C @@ -86,7 +86,7 @@ void func_8021A418_ovl9(struct UnkStruct8004A7C4 *arg0) { D_800E98E0[D_8004A7C4->objId] = 0; D_800E9C60[D_8004A7C4->objId] = 0; D_800DF150[D_8004A7C4->objId] = &func_8021A494_ovl9; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_8021A22C_ovl9(arg0); } @@ -141,12 +141,12 @@ void func_8021A5C0_ovl9(void) { temp_v1 = D_8004A7C4; temp_v0 = temp_v1->objId; if (D_800E98E0[temp_v0] != 0) { - D_800DDC50[temp_v0] = 1; + gEntityVtableIndexArray[temp_v0] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &func_8021A22C); return; } if (D_800E9C60[temp_v0] != 0) { - D_800DDC50[temp_v0] = 2; + gEntityVtableIndexArray[temp_v0] = 2; assign_new_process_entry(gEntityGObjProcessArray[temp_v1->objId], &func_8021A22C); } } @@ -210,12 +210,12 @@ void func_8021A7FC_ovl9(struct UnkStruct8004A7C4 *arg0) { void func_8021A93C_ovl9(void) { func_8021A9F0_ovl9(); if (D_800E98E0[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_8021A22C_ovl9); return; } if (D_800EA520[D_8004A7C4->objId] != 0) { - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_8021A22C_ovl9); } } @@ -307,7 +307,7 @@ GLOBAL_ASM("asm/non_matchings/ovl9/ovl9_16/func_8021AB6C_ovl9.s") #endif void func_8021ABB4_ovl9(struct UnkStruct8004A7C4 *arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 4, &D_8021CE00_ovl9[8]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 4, &D_8021CE00_ovl9[8]); } @@ -316,11 +316,11 @@ void func_8021ACA4_ovl9(struct UnkStruct8004A7C4 *arg0); void func_8021ABFC_ovl9(struct UnkStruct8004A7C4 *arg0) { D_800DF150[D_8004A7C4->objId] = func_8021ACA4_ovl9; - D_800DDC50[D_8004A7C4->objId] = 0; + gEntityVtableIndexArray[D_8004A7C4->objId] = 0; func_8021B424_ovl9(); func_8019CD08_ovl9(120.0f); D_800E9720[D_8004A7C4->objId] = 0; - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 4, &D_8021CE00_ovl9[8]); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 4, &D_8021CE00_ovl9[8]); } #ifdef MIPS_TO_C @@ -375,7 +375,7 @@ void func_8021AD88_ovl9(struct UnkStruct8004A7C4 *arg0) { temp_f2 = D_800E3E50[D_8004A7C4->objId]; D_800E3C90[D_8004A7C4->objId] = temp_f2; D_800E3AD0[D_8004A7C4->objId] = temp_f2; - D_800DDC50[D_8004A7C4->objId] = 1; + gEntityVtableIndexArray[D_8004A7C4->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_8021ABB4_ovl9); } else if (D_800E9720[D_8004A7C4->objId] != 0) { @@ -394,7 +394,7 @@ void func_8021AD88_ovl9(struct UnkStruct8004A7C4 *arg0) { temp_f2_2 = D_800E3E50[D_8004A7C4->objId]; D_800E3C90[D_8004A7C4->objId] = temp_f2_2; D_800E3AD0[D_8004A7C4->objId] = temp_f2_2; - D_800DDC50[D_8004A7C4->objId] = 2; + gEntityVtableIndexArray[D_8004A7C4->objId] = 2; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_8021ABB4_ovl9); } } @@ -437,7 +437,7 @@ void func_8021B0D0_ovl9(struct UnkStruct8004A7C4 *arg0) { *temp_a2 = *temp_a2 + D_8021DEE8_ovl9; func_8019CD68_ovl9(temp_a0, temp_a1, temp_a2, temp_a3 * 4); temp_v0_2 = D_8004A7C4; - D_800DDC50[temp_v0_2->objId] = 0; + gEntityVtableIndexArray[temp_v0_2->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[temp_v0_2->objId], &D_8021ABB4); } } @@ -459,7 +459,7 @@ void func_8021B1D0_ovl9(struct UnkStruct8004A7C4 *arg0) { s32 func_8019A7E8_ovl9(f32); void func_8021B27C_ovl9(struct UnkStruct8004A7C4 *arg0) { if ((D_800E9E20[D_8004A7C4->objId] != 0) && (func_8019A7E8_ovl9(120.0f) == 0)) { - D_800DDC50[D_8004A7C4->objId] = 3; + gEntityVtableIndexArray[D_8004A7C4->objId] = 3; assign_new_process_entry(gEntityGObjProcessArray[D_8004A7C4->objId], func_8021ABB4_ovl9); } } @@ -491,7 +491,7 @@ void func_8021B3A0_ovl9(struct UnkStruct8004A7C4 *arg0) { temp_v1 = temp_v0->objId; if (D_800E9E20[temp_v1] != 0) { D_800E9720[temp_v1] = 0x3C; - D_800DDC50[temp_v0->objId] = 0; + gEntityVtableIndexArray[temp_v0->objId] = 0; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_8021ABB4); } } @@ -546,7 +546,7 @@ GLOBAL_ASM("asm/non_matchings/ovl9/ovl9_16/func_8021B528_ovl9.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3ec45aadfc2cb619035fb802d88c52eacfab0326 void func_8021B58C_ovl9(struct UnkStruct8004A7C4 *arg0) { - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8021CE44_ovl9); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8021CE44_ovl9); } #else GLOBAL_ASM("asm/non_matchings/ovl9/ovl9_16/func_8021B58C_ovl9.s") @@ -563,11 +563,11 @@ void func_8021B5D4_ovl9(struct UnkStruct8004A7C4 *arg0) { temp_a1 = temp_v1->objId; D_800DF150[temp_a1] = &D_8021B680; temp_v0 = D_800E1B50[temp_a1]; - D_800DDC50[temp_v1->objId] = 0; + gEntityVtableIndexArray[temp_v1->objId] = 0; temp_v0->unk42 = 2; temp_v0->unk98 = &D_801CD21C; func_801A0D50_ovl9(&D_8021B58C, temp_a1 * 4); - call_virtual_function(D_800DDC50[D_8004A7C4->objId], 2, &D_8021CE44_ovl9); + call_virtual_function(gEntityVtableIndexArray[D_8004A7C4->objId], 2, &D_8021CE44_ovl9); } #else GLOBAL_ASM("asm/non_matchings/ovl9/ovl9_16/func_8021B5D4_ovl9.s") @@ -602,7 +602,7 @@ void func_8021B71C_ovl9(struct UnkStruct8004A7C4 *arg0) { if (func_8019A7E8_ovl9(0x43200000) != 0) { temp_v0 = D_8004A7C4; - D_800DDC50[temp_v0->objId] = 1; + gEntityVtableIndexArray[temp_v0->objId] = 1; assign_new_process_entry(gEntityGObjProcessArray[temp_v0->objId], &D_8021B58C); } } diff --git a/undefined_syms.txt b/undefined_syms.txt index fc082fa8..0b0aaa03 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2019,7 +2019,6 @@ D_8019734C = 0x8019734C; D_80197350 = 0x80197350; D_80196C34 = 0x80196C34; D_80196C4C = 0x80196C4C; -func_80151E94_ovl3 = 0x80151E94; D_8012E7E0 = 0x8012E7E0; D_80197354 = 0x80197354; D_80196C54 = 0x80196C54;