diff --git a/Makefile b/Makefile index 0cba6b44..f01cf673 100755 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ endif ######## Extract Assets & Microcode ######## -DUMMY != python3 ./tools/python/check_if_need_to_extract.py $(VERSION) +DUMMY != python3 ./tools/python/check_if_need_to_extract.py $(VERSION) >&2 || echo FAIL # NEED_TO_EXTRACT = no # diff --git a/README.md b/README.md index 982b3420..37461796 100755 --- a/README.md +++ b/README.md @@ -109,13 +109,13 @@ s32 is_drumstick_unlocked(void) { } ``` -As of June 13th 2021, this is our current score: +As of June 24th 2021, this is our current score: ``` -======================================================= + ======================================================= ADVENTURE ONE (ASM -> C Decompilation) - ------------------- 9.15% Complete ------------------- - # Decompiled functions: 677 - # GLOBAL_ASM remaining: 1076 + ------------------- 9.47% Complete ------------------- + # Decompiled functions: 699 + # GLOBAL_ASM remaining: 1061 --------------------- Game Status --------------------- Balloons: 6/47, Keys: 1/4, Trophies: 0/5 T.T. Amulets: 0/4, Wizpig Amulets: 0/4 @@ -123,9 +123,9 @@ As of June 13th 2021, this is our current score: We are racing in Jungle Falls. (Lap 1/3) ======================================================= ADVENTURE TWO (Cleanup & Documentation) - ------------------- 0.01% Complete ------------------- - # Documented functions: 4 - # Undocumented remaining: 1749 + ------------------- 0.49% Complete ------------------- + # Documented functions: 42 + # Undocumented remaining: 1718 --------------------- Game Status --------------------- Balloons: 0/47, Keys: 0/4, Trophies: 0/5 T.T. Amulets: 0/4, Wizpig Amulets: 0/4 diff --git a/asm/non_matchings/menu/func_80081218.s b/asm/non_matchings/menu/func_80081218.s index cf4ed12f..5e116124 100644 --- a/asm/non_matchings/menu/func_80081218.s +++ b/asm/non_matchings/menu/func_80081218.s @@ -76,7 +76,7 @@ glabel func_80081218 /* 081F40 80081340 8DAE0004 */ lw $t6, 4($t5) /* 081F44 80081344 00000000 */ nop /* 081F48 80081348 01C65821 */ addu $t3, $t6, $a2 -/* 081F4C 8008134C 0C0078A7 */ jal func_8001E29C +/* 081F4C 8008134C 0C0078A7 */ jal get_misc_asset /* 081F50 80081350 ADAB0000 */ sw $t3, ($t5) /* 081F54 80081354 3C038012 */ lui $v1, %hi(gCheatsAssetData) # $v1, 0x8012 /* 081F58 80081358 24636C30 */ addiu $v1, %lo(gCheatsAssetData) # addiu $v1, $v1, 0x6c30 diff --git a/asm/non_matchings/menu/func_8008FF1C.s b/asm/non_matchings/menu/func_8008FF1C.s index 9d9d8312..1598b0b0 100644 --- a/asm/non_matchings/menu/func_8008FF1C.s +++ b/asm/non_matchings/menu/func_8008FF1C.s @@ -13,7 +13,7 @@ glabel func_8008FF1C /* 090B48 8008FF48 0C01BAA4 */ jal get_settings /* 090B4C 8008FF4C AFA40080 */ sw $a0, 0x80($sp) /* 090B50 8008FF50 AFA20058 */ sw $v0, 0x58($sp) -/* 090B54 8008FF54 0C0078A7 */ jal func_8001E29C +/* 090B54 8008FF54 0C0078A7 */ jal get_misc_asset /* 090B58 8008FF58 2404001A */ li $a0, 26 /* 090B5C 8008FF5C 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e /* 090B60 8008FF60 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) diff --git a/asm/non_matchings/menu/func_80095728.s b/asm/non_matchings/menu/func_80095728.s index 8f65af1a..243dd17f 100644 --- a/asm/non_matchings/menu/func_80095728.s +++ b/asm/non_matchings/menu/func_80095728.s @@ -1010,7 +1010,7 @@ glabel L800964DC /* 097190 80096590 24010009 */ li $at, 9 /* 097194 80096594 1441000D */ bne $v0, $at, .L800965CC /* 097198 80096598 00000000 */ nop -/* 09719C 8009659C 0C0078A7 */ jal func_8001E29C +/* 09719C 8009659C 0C0078A7 */ jal get_misc_asset /* 0971A0 800965A0 24040019 */ li $a0, 25 /* 0971A4 800965A4 3C058012 */ lui $a1, %hi(D_80126C28) # $a1, 0x8012 /* 0971A8 800965A8 80A56C28 */ lb $a1, %lo(D_80126C28)($a1) @@ -1023,7 +1023,7 @@ glabel L800964DC /* 0971C4 800965C4 1000000C */ b .L800965F8 /* 0971C8 800965C8 2419000D */ li $t9, 13 .L800965CC: -/* 0971CC 800965CC 0C0078A7 */ jal func_8001E29C +/* 0971CC 800965CC 0C0078A7 */ jal get_misc_asset /* 0971D0 800965D0 24040019 */ li $a0, 25 /* 0971D4 800965D4 3C058012 */ lui $a1, %hi(D_80126C28) # $a1, 0x8012 /* 0971D8 800965D8 80A56C28 */ lb $a1, %lo(D_80126C28)($a1) diff --git a/asm/non_matchings/menu/func_8009963C.s b/asm/non_matchings/menu/func_8009963C.s index 8196d271..e57c0165 100644 --- a/asm/non_matchings/menu/func_8009963C.s +++ b/asm/non_matchings/menu/func_8009963C.s @@ -4,7 +4,7 @@ glabel func_8009963C /* 09A244 80099644 252964D4 */ addiu $t1, %lo(D_801264D4) # addiu $t1, $t1, 0x64d4 /* 09A248 80099648 AFBF0014 */ sw $ra, 0x14($sp) /* 09A24C 8009964C AD200000 */ sw $zero, ($t1) -/* 09A250 80099650 0C0078A7 */ jal func_8001E29C +/* 09A250 80099650 0C0078A7 */ jal get_misc_asset /* 09A254 80099654 2404001C */ li $a0, 28 /* 09A258 80099658 3C098012 */ lui $t1, %hi(D_801264D4) # $t1, 0x8012 /* 09A25C 8009965C 3C078012 */ lui $a3, %hi(D_801264DC) # $a3, 0x8012 diff --git a/asm/non_matchings/menu/menu_credits_loop.s b/asm/non_matchings/menu/menu_credits_loop.s index b61bca36..e6068df6 100644 --- a/asm/non_matchings/menu/menu_credits_loop.s +++ b/asm/non_matchings/menu/menu_credits_loop.s @@ -19,10 +19,10 @@ glabel menu_credits_loop /* 09BF5C 8009B35C E7B50028 */ swc1 $f21, 0x28($sp) /* 09BF60 8009B360 E7B4002C */ swc1 $f20, 0x2c($sp) /* 09BF64 8009B364 AFA00068 */ sw $zero, 0x68($sp) -/* 09BF68 8009B368 0C0078A7 */ jal func_8001E29C +/* 09BF68 8009B368 0C0078A7 */ jal get_misc_asset /* 09BF6C 8009B36C 2404001C */ li $a0, 28 /* 09BF70 8009B370 AFA2005C */ sw $v0, 0x5c($sp) -/* 09BF74 8009B374 0C0078A7 */ jal func_8001E29C +/* 09BF74 8009B374 0C0078A7 */ jal get_misc_asset /* 09BF78 8009B378 24040045 */ li $a0, 69 /* 09BF7C 8009B37C 0C031CFC */ jal func_800C73F0 /* 09BF80 8009B380 AFA20060 */ sw $v0, 0x60($sp) diff --git a/asm/non_matchings/menu/menu_file_select_loop.s b/asm/non_matchings/menu/menu_file_select_loop.s index 5c8c6b9a..40d2c2f2 100644 --- a/asm/non_matchings/menu/menu_file_select_loop.s +++ b/asm/non_matchings/menu/menu_file_select_loop.s @@ -346,7 +346,7 @@ glabel menu_file_select_loop /* 08EF80 8008E380 35CF0004 */ ori $t7, $t6, 4 /* 08EF84 8008E384 AC4F0010 */ sw $t7, 0x10($v0) .L8008E388: -/* 08EF88 8008E388 0C0078A7 */ jal func_8001E29C +/* 08EF88 8008E388 0C0078A7 */ jal get_misc_asset /* 08EF8C 8008E38C 24040019 */ li $a0, 25 /* 08EF90 8008E390 3C06800E */ lui $a2, %hi(gNumberOfActivePlayers) # $a2, 0x800e /* 08EF94 8008E394 8CC6F4BC */ lw $a2, %lo(gNumberOfActivePlayers)($a2) diff --git a/asm/non_matchings/menu/menu_title_screen_init.s b/asm/non_matchings/menu/menu_title_screen_init.s index 50d08162..09aa43df 100644 --- a/asm/non_matchings/menu/menu_title_screen_init.s +++ b/asm/non_matchings/menu/menu_title_screen_init.s @@ -111,7 +111,7 @@ glabel menu_title_screen_init /* 0842E4 800836E4 00002025 */ move $a0, $zero /* 0842E8 800836E8 3C018012 */ lui $at, %hi(D_80126864) # $at, 0x8012 /* 0842EC 800836EC AC206864 */ sw $zero, %lo(D_80126864)($at) -/* 0842F0 800836F0 0C0078A7 */ jal func_8001E29C +/* 0842F0 800836F0 0C0078A7 */ jal get_misc_asset /* 0842F4 800836F4 24040042 */ li $a0, 66 /* 0842F8 800836F8 3C048012 */ lui $a0, %hi(D_80126874) # $a0, 0x8012 /* 0842FC 800836FC 24846874 */ addiu $a0, %lo(D_80126874) # addiu $a0, $a0, 0x6874 diff --git a/asm/non_matchings/menu/menu_track_select_init.s b/asm/non_matchings/menu/menu_track_select_init.s index 6ea2e186..03200d1a 100644 --- a/asm/non_matchings/menu/menu_track_select_init.s +++ b/asm/non_matchings/menu/menu_track_select_init.s @@ -18,7 +18,7 @@ glabel menu_track_select_init /* 08F3E0 8008E7E0 27A4007C */ addiu $a0, $sp, 0x7c /* 08F3E4 8008E7E4 0C01AC89 */ jal func_8006B224 /* 08F3E8 8008E7E8 27A50078 */ addiu $a1, $sp, 0x78 -/* 08F3EC 8008E7EC 0C0078A7 */ jal func_8001E29C +/* 08F3EC 8008E7EC 0C0078A7 */ jal get_misc_asset /* 08F3F0 8008E7F0 2404001A */ li $a0, 26 /* 08F3F4 8008E7F4 3C03800E */ lui $v1, %hi(D_800DF488) # $v1, 0x800e /* 08F3F8 8008E7F8 2463F488 */ addiu $v1, %lo(D_800DF488) # addiu $v1, $v1, -0xb78 diff --git a/asm/non_matchings/menu/menu_trophy_race_rankings_init.s b/asm/non_matchings/menu/menu_trophy_race_rankings_init.s index 5a71003f..704cc619 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_init.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_init.s @@ -4,7 +4,7 @@ glabel menu_trophy_race_rankings_init /* 09962C 80098A2C 0C01BAA4 */ jal get_settings /* 099630 80098A30 00000000 */ nop /* 099634 80098A34 2404001A */ li $a0, 26 -/* 099638 80098A38 0C0078A7 */ jal func_8001E29C +/* 099638 80098A38 0C0078A7 */ jal get_misc_asset /* 09963C 80098A3C AFA20040 */ sw $v0, 0x40($sp) /* 099640 80098A40 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 099644 80098A44 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) diff --git a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s index 1d148431..4d503ae4 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s @@ -393,7 +393,7 @@ glabel menu_trophy_race_rankings_loop .L80099588: /* 09A188 80099588 10200015 */ beqz $at, .L800995E0 /* 09A18C 8009958C 2404001F */ li $a0, 31 -/* 09A190 80099590 0C0078A7 */ jal func_8001E29C +/* 09A190 80099590 0C0078A7 */ jal get_misc_asset /* 09A194 80099594 AFAC0034 */ sw $t4, 0x34($sp) /* 09A198 80099598 3C0F800E */ lui $t7, %hi(gTrophyRaceWorldId) # $t7, 0x800e /* 09A19C 8009959C 8DEF0FE8 */ lw $t7, %lo(gTrophyRaceWorldId)($t7) diff --git a/asm/non_matchings/menu/menu_trophy_race_round_init.s b/asm/non_matchings/menu/menu_trophy_race_round_init.s index 02fd211e..9533cfac 100644 --- a/asm/non_matchings/menu/menu_trophy_race_round_init.s +++ b/asm/non_matchings/menu/menu_trophy_race_round_init.s @@ -7,7 +7,7 @@ glabel menu_trophy_race_round_init /* 098E80 80098280 0C01BAA4 */ jal get_settings /* 098E84 80098284 AFB00014 */ sw $s0, 0x14($sp) /* 098E88 80098288 00408825 */ move $s1, $v0 -/* 098E8C 8009828C 0C0078A7 */ jal func_8001E29C +/* 098E8C 8009828C 0C0078A7 */ jal get_misc_asset /* 098E90 80098290 2404001A */ li $a0, 26 /* 098E94 80098294 3C03800E */ lui $v1, %hi(D_800E0FEC) # $v1, 0x800e /* 098E98 80098298 8C630FEC */ lw $v1, %lo(D_800E0FEC)($v1) diff --git a/asm/non_matchings/menu/menu_trophy_race_round_loop.s b/asm/non_matchings/menu/menu_trophy_race_round_loop.s index bf06c161..04121dea 100644 --- a/asm/non_matchings/menu/menu_trophy_race_round_loop.s +++ b/asm/non_matchings/menu/menu_trophy_race_round_loop.s @@ -2,7 +2,7 @@ glabel menu_trophy_race_round_loop /* 09919C 8009859C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0991A0 800985A0 AFBF0014 */ sw $ra, 0x14($sp) /* 0991A4 800985A4 AFA40020 */ sw $a0, 0x20($sp) -/* 0991A8 800985A8 0C0078A7 */ jal func_8001E29C +/* 0991A8 800985A8 0C0078A7 */ jal get_misc_asset /* 0991AC 800985AC 2404001A */ li $a0, 26 /* 0991B0 800985B0 3C07800E */ lui $a3, %hi(D_800E0980) # $a3, 0x800e /* 0991B4 800985B4 24E70980 */ addiu $a3, %lo(D_800E0980) # addiu $a3, $a3, 0x980 diff --git a/asm/non_matchings/unknown_00BC20/func_8001D80C.s b/asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s similarity index 99% rename from asm/non_matchings/unknown_00BC20/func_8001D80C.s rename to asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s index a6d77b85..f158da98 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001D80C.s +++ b/asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s @@ -1,4 +1,4 @@ -glabel func_8001D80C +glabel calc_dynamic_lighting_for_object_1 /* 01E40C 8001D80C 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 01E410 8001D810 AFB20020 */ sw $s2, 0x20($sp) /* 01E414 8001D814 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001DD54.s b/asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s similarity index 99% rename from asm/non_matchings/unknown_00BC20/func_8001DD54.s rename to asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s index f40b5b55..c8054938 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001DD54.s +++ b/asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s @@ -1,4 +1,4 @@ -glabel func_8001DD54 +glabel calc_env_mapping_for_object /* 01E954 8001DD54 27BDFEE8 */ addiu $sp, $sp, -0x118 /* 01E958 8001DD58 AFBF003C */ sw $ra, 0x3c($sp) /* 01E95C 8001DD5C AFBE0038 */ sw $fp, 0x38($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000C2D8.s b/asm/non_matchings/unknown_00BC20/decrypt_magic_codes.s similarity index 99% rename from asm/non_matchings/unknown_00BC20/func_8000C2D8.s rename to asm/non_matchings/unknown_00BC20/decrypt_magic_codes.s index fb74dd74..0e3b56f2 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C2D8.s +++ b/asm/non_matchings/unknown_00BC20/decrypt_magic_codes.s @@ -1,4 +1,4 @@ -glabel func_8000C2D8 +glabel decrypt_magic_codes /* 00CED8 8000C2D8 00053083 */ sra $a2, $a1, 2 /* 00CEDC 8000C2DC 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 00CEE0 8000C2E0 00801025 */ move $v0, $a0 diff --git a/asm/non_matchings/unknown_00BC20/func_8000B020.s b/asm/non_matchings/unknown_00BC20/func_8000B020.s index 1c787a98..22655639 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B020.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B020.s @@ -43,7 +43,7 @@ glabel func_8000B020 /* 00BCC4 8000B0C4 AC20B004 */ sw $zero, %lo(D_8011B004)($at) /* 00BCC8 8000B0C8 3C018012 */ lui $at, %hi(D_8011B008) # $at, 0x8012 /* 00BCCC 8000B0CC AC20B008 */ sw $zero, %lo(D_8011B008)($at) -/* 00BCD0 8000B0D0 0C0078A7 */ jal func_8001E29C +/* 00BCD0 8000B0D0 0C0078A7 */ jal get_misc_asset /* 00BCD4 8000B0D4 24040014 */ li $a0, 20 /* 00BCD8 8000B0D8 3C118012 */ lui $s1, %hi(D_8011B020) # $s1, 0x8012 /* 00BCDC 8000B0DC 3C138012 */ lui $s3, %hi(D_8011B068) # $s3, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_8000B290.s b/asm/non_matchings/unknown_00BC20/func_8000B290.s index 66bec198..6068e9b1 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B290.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B290.s @@ -17,7 +17,7 @@ glabel func_8000B290 /* 00BECC 8000B2CC AC400000 */ sw $zero, ($v0) /* 00BED0 8000B2D0 AC400004 */ sw $zero, 4($v0) .L8000B2D4: -/* 00BED4 8000B2D4 0C0078A7 */ jal func_8001E29C +/* 00BED4 8000B2D4 0C0078A7 */ jal get_misc_asset /* 00BED8 8000B2D8 24040014 */ li $a0, 20 /* 00BEDC 8000B2DC 00008825 */ move $s1, $zero /* 00BEE0 8000B2E0 00408025 */ move $s0, $v0 @@ -48,7 +48,7 @@ glabel func_8000B290 /* 00BF38 8000B338 00000000 */ nop /* 00BF3C 8000B33C 10800003 */ beqz $a0, .L8000B34C /* 00BF40 8000B340 00000000 */ nop -/* 00BF44 8000B344 0C003FEE */ jal particlePtrList_addObject +/* 00BF44 8000B344 0C003FEE */ jal gParticlePtrList_addObject /* 00BF48 8000B348 00000000 */ nop .L8000B34C: /* 00BF4C 8000B34C 3C11800E */ lui $s1, %hi(D_800DC764) # $s1, 0x800e @@ -57,10 +57,10 @@ glabel func_8000B290 /* 00BF58 8000B358 AE000000 */ sw $zero, ($s0) /* 00BF5C 8000B35C 10800003 */ beqz $a0, .L8000B36C /* 00BF60 8000B360 00000000 */ nop -/* 00BF64 8000B364 0C003FEE */ jal particlePtrList_addObject +/* 00BF64 8000B364 0C003FEE */ jal gParticlePtrList_addObject /* 00BF68 8000B368 00000000 */ nop .L8000B36C: -/* 00BF6C 8000B36C 0C004013 */ jal particlePtrList_flush +/* 00BF6C 8000B36C 0C004013 */ jal gParticlePtrList_flush /* 00BF70 8000B370 AE200000 */ sw $zero, ($s1) /* 00BF74 8000B374 8FBF0024 */ lw $ra, 0x24($sp) /* 00BF78 8000B378 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 88e3a5ca..b85afe42 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -33,7 +33,7 @@ glabel func_8000B750 /* 00C3A8 8000B7A8 8FBF002C */ lw $ra, 0x2c($sp) /* 00C3AC 8000B7AC 102000C7 */ beqz $at, .L8000BACC /* 00C3B0 8000B7B0 24040014 */ li $a0, 20 -/* 00C3B4 8000B7B4 0C0078A7 */ jal func_8001E29C +/* 00C3B4 8000B7B4 0C0078A7 */ jal get_misc_asset /* 00C3B8 8000B7B8 AFA60088 */ sw $a2, 0x88($sp) /* 00C3BC 8000B7BC 3C0E8012 */ lui $t6, %hi(D_8011B020) # $t6, 0x8012 /* 00C3C0 8000B7C0 25CEB020 */ addiu $t6, %lo(D_8011B020) # addiu $t6, $t6, -0x4fe0 diff --git a/asm/non_matchings/unknown_00BC20/func_8000BADC.s b/asm/non_matchings/unknown_00BC20/func_8000BADC.s index f0b093f7..dacbc328 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000BADC.s +++ b/asm/non_matchings/unknown_00BC20/func_8000BADC.s @@ -29,7 +29,7 @@ glabel func_8000BADC /* 00C714 8000BB14 AFB20024 */ sw $s2, 0x24($sp) /* 00C718 8000BB18 AFB0001C */ sw $s0, 0x1c($sp) /* 00C71C 8000BB1C AC20B004 */ sw $zero, %lo(D_8011B004)($at) -/* 00C720 8000BB20 0C0078A7 */ jal func_8001E29C +/* 00C720 8000BB20 0C0078A7 */ jal get_misc_asset /* 00C724 8000BB24 24040014 */ li $a0, 20 /* 00C728 8000BB28 24190009 */ li $t9, 9 /* 00C72C 8000BB2C 3C01800E */ lui $at, %hi(D_800DC760) # $at, 0x800e @@ -57,8 +57,8 @@ glabel func_8000BADC /* 00C77C 8000BB7C 24630001 */ addiu $v1, $v1, 1 /* 00C780 8000BB80 1420FFF3 */ bnez $at, .L8000BB50 /* 00C784 8000BB84 A06AFFFF */ sb $t2, -1($v1) -/* 00C788 8000BB88 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012 -/* 00C78C 8000BB8C 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6) +/* 00C788 8000BB88 3C0E8012 */ lui $t6, %hi(gObjectCount) # $t6, 0x8012 +/* 00C78C 8000BB8C 8DCEAEF0 */ lw $t6, %lo(gObjectCount)($t6) /* 00C790 8000BB90 00004025 */ move $t0, $zero /* 00C794 8000BB94 19C000DD */ blez $t6, .L8000BF0C /* 00C798 8000BB98 00009025 */ move $s2, $zero @@ -66,10 +66,10 @@ glabel func_8000BADC /* 00C7A0 8000BBA0 44819000 */ mtc1 $at, $f18 /* 00C7A4 8000BBA4 44912000 */ mtc1 $s1, $f4 /* 00C7A8 8000BBA8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 00C7AC 8000BBAC 3C138012 */ lui $s3, %hi(playerStructArray_Ptr) # $s3, 0x8012 +/* 00C7AC 8000BBAC 3C138012 */ lui $s3, %hi(gObjectStructArrayPtr) # $s3, 0x8012 /* 00C7B0 8000BBB0 44817000 */ mtc1 $at, $f14 /* 00C7B4 8000BBB4 44806000 */ mtc1 $zero, $f12 -/* 00C7B8 8000BBB8 2673AEE4 */ addiu $s3, %lo(playerStructArray_Ptr) # addiu $s3, $s3, -0x511c +/* 00C7B8 8000BBB8 2673AEE4 */ addiu $s3, %lo(gObjectStructArrayPtr) # addiu $s3, $s3, -0x511c /* 00C7BC 8000BBBC 24090002 */ li $t1, 2 /* 00C7C0 8000BBC0 46802420 */ cvt.s.w $f16, $f4 .L8000BBC4: @@ -269,7 +269,7 @@ glabel func_8000BADC /* 00CA98 8000BE98 A0580001 */ sb $t8, 1($v0) /* 00CA9C 8000BE9C A04C0002 */ sb $t4, 2($v0) /* 00CAA0 8000BEA0 820D0175 */ lb $t5, 0x175($s0) -/* 00CAA4 8000BEA4 3C0C8012 */ lui $t4, %hi(playerCount) # $t4, 0x8012 +/* 00CAA4 8000BEA4 3C0C8012 */ lui $t4, %hi(gObjectCount) # $t4, 0x8012 /* 00CAA8 8000BEA8 11A0000B */ beqz $t5, .L8000BED8 /* 00CAAC 8000BEAC 00000000 */ nop /* 00CAB0 8000BEB0 904F0003 */ lbu $t7, 3($v0) @@ -294,7 +294,7 @@ glabel func_8000BADC .L8000BEF4: /* 00CAF4 8000BEF4 A0400003 */ sb $zero, 3($v0) .L8000BEF8: -/* 00CAF8 8000BEF8 8D8CAEF0 */ lw $t4, %lo(playerCount)($t4) +/* 00CAF8 8000BEF8 8D8CAEF0 */ lw $t4, %lo(gObjectCount)($t4) /* 00CAFC 8000BEFC 25080001 */ addiu $t0, $t0, 1 /* 00CB00 8000BF00 010C082A */ slt $at, $t0, $t4 /* 00CB04 8000BF04 1420FF2F */ bnez $at, .L8000BBC4 diff --git a/asm/non_matchings/unknown_00BC20/func_8000C718.s b/asm/non_matchings/unknown_00BC20/func_8000C718.s index 42eac649..96e57580 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C718.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C718.s @@ -6,7 +6,7 @@ glabel func_8000C718 /* 00D328 8000C728 AFA40028 */ sw $a0, 0x28($sp) /* 00D32C 8000C72C 01C41821 */ addu $v1, $t6, $a0 /* 00D330 8000C730 90650000 */ lbu $a1, ($v1) -/* 00D334 8000C734 3C0C8012 */ lui $t4, %hi(D_8011AD64) # $t4, 0x8012 +/* 00D334 8000C734 3C0C8012 */ lui $t4, %hi(gAssetsObjectHeadersTable) # $t4, 0x8012 /* 00D338 8000C738 10A0000B */ beqz $a1, .L8000C768 /* 00D33C 8000C73C 3C048012 */ lui $a0, %hi(D_8011AE68) # $a0, 0x8012 /* 00D340 8000C740 24B80001 */ addiu $t8, $a1, 1 @@ -21,7 +21,7 @@ glabel func_8000C718 /* 00D364 8000C764 8FBF0014 */ lw $ra, 0x14($sp) .L8000C768: /* 00D368 8000C768 8FA30028 */ lw $v1, 0x28($sp) -/* 00D36C 8000C76C 8D8CAD64 */ lw $t4, %lo(D_8011AD64)($t4) +/* 00D36C 8000C76C 8D8CAD64 */ lw $t4, %lo(gAssetsObjectHeadersTable)($t4) /* 00D370 8000C770 00035880 */ sll $t3, $v1, 2 /* 00D374 8000C774 018B1021 */ addu $v0, $t4, $t3 /* 00D378 8000C778 8C460000 */ lw $a2, ($v0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index 90ff8e56..f3d8dec3 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -171,7 +171,7 @@ glabel func_8000C8F8 /* 00D778 8000CB78 00000000 */ nop /* 00D77C 8000CB7C 15000009 */ bnez $t0, .L8000CBA4 /* 00D780 8000CB80 00000000 */ nop -/* 00D784 8000CB84 0C004013 */ jal particlePtrList_flush +/* 00D784 8000CB84 0C004013 */ jal gParticlePtrList_flush /* 00D788 8000CB88 00000000 */ nop /* 00D78C 8000CB8C 0C005FA6 */ jal func_80017E98 /* 00D790 8000CB90 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index c62eefcd..e03664cd 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -22,13 +22,13 @@ glabel func_8000CC7C /* 00D898 8000CC98 A020ADC4 */ sb $zero, %lo(D_8011ADC4)($at) /* 00D89C 8000CC9C 3C118012 */ lui $s1, %hi(D_8011AF00) # $s1, 0x8012 /* 00D8A0 8000CCA0 AFBE0038 */ sw $fp, 0x38($sp) -/* 00D8A4 8000CCA4 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 +/* 00D8A4 8000CCA4 3C018012 */ lui $at, %hi(gObjectCount) # $at, 0x8012 /* 00D8A8 8000CCA8 0080F025 */ move $fp, $a0 /* 00D8AC 8000CCAC 2631AF00 */ addiu $s1, %lo(D_8011AF00) # addiu $s1, $s1, -0x5100 /* 00D8B0 8000CCB0 AFBF003C */ sw $ra, 0x3c($sp) /* 00D8B4 8000CCB4 AFB30024 */ sw $s3, 0x24($sp) /* 00D8B8 8000CCB8 AFB00018 */ sw $s0, 0x18($sp) -/* 00D8BC 8000CCBC AC20AEF0 */ sw $zero, %lo(playerCount)($at) +/* 00D8BC 8000CCBC AC20AEF0 */ sw $zero, %lo(gObjectCount)($at) /* 00D8C0 8000CCC0 00A08025 */ move $s0, $a1 /* 00D8C4 8000CCC4 00C09825 */ move $s3, $a2 /* 00D8C8 8000CCC8 AFB70034 */ sw $s7, 0x34($sp) @@ -84,7 +84,7 @@ glabel func_8000CC7C /* 00D984 8000CD84 0C01BAA4 */ jal get_settings /* 00D988 8000CD88 AFA20138 */ sw $v0, 0x138($sp) /* 00D98C 8000CD8C 0040B825 */ move $s7, $v0 -/* 00D990 8000CD90 0C0078A7 */ jal func_8001E29C +/* 00D990 8000CD90 0C0078A7 */ jal get_misc_asset /* 00D994 8000CD94 24040003 */ li $a0, 3 /* 00D998 8000CD98 3C0B8012 */ lui $t3, %hi(D_8011ADC5) # $t3, 0x8012 /* 00D99C 8000CD9C 256BADC5 */ addiu $t3, %lo(D_8011ADC5) # addiu $t3, $t3, -0x523b @@ -127,8 +127,8 @@ glabel func_8000CC7C /* 00DA28 8000CE28 00009025 */ move $s2, $zero /* 00DA2C 8000CE2C 18400050 */ blez $v0, .L8000CF70 /* 00DA30 8000CE30 0000A825 */ move $s5, $zero -/* 00DA34 8000CE34 3C048012 */ lui $a0, %hi(objPtrList) # $a0, 0x8012 -/* 00DA38 8000CE38 8C84AE58 */ lw $a0, %lo(objPtrList)($a0) +/* 00DA34 8000CE34 3C048012 */ lui $a0, %hi(gObjPtrList) # $a0, 0x8012 +/* 00DA38 8000CE38 8C84AE58 */ lw $a0, %lo(gObjPtrList)($a0) /* 00DA3C 8000CE3C 00022880 */ sll $a1, $v0, 2 /* 00DA40 8000CE40 27AA0094 */ addiu $t2, $sp, 0x94 /* 00DA44 8000CE44 27A900B4 */ addiu $t1, $sp, 0xb4 @@ -214,11 +214,11 @@ glabel func_8000CC7C /* 00DB74 8000CF74 81780000 */ lb $t8, ($t3) /* 00DB78 8000CF78 3C10800E */ lui $s0, %hi(D_800DC740) # $s0, 0x800e /* 00DB7C 8000CF7C 240D0008 */ li $t5, 8 -/* 00DB80 8000CF80 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 +/* 00DB80 8000CF80 3C018012 */ lui $at, %hi(gObjectCount) # $at, 0x8012 /* 00DB84 8000CF84 A5980000 */ sh $t8, ($t4) /* 00DB88 8000CF88 2610C740 */ addiu $s0, %lo(D_800DC740) # addiu $s0, $s0, -0x38c0 /* 00DB8C 8000CF8C 26620001 */ addiu $v0, $s3, 1 -/* 00DB90 8000CF90 AC2DAEF0 */ sw $t5, %lo(playerCount)($at) +/* 00DB90 8000CF90 AC2DAEF0 */ sw $t5, %lo(gObjectCount)($at) /* 00DB94 8000CF94 AFA20144 */ sw $v0, 0x144($sp) /* 00DB98 8000CF98 A2000000 */ sb $zero, ($s0) /* 00DB9C 8000CF9C 0C01B067 */ jal func_8006C19C @@ -258,9 +258,9 @@ glabel func_8000CC7C /* 00DC18 8000D018 24010002 */ li $at, 2 .L8000D01C: /* 00DC1C 8000D01C 8FAD0144 */ lw $t5, 0x144($sp) -/* 00DC20 8000D020 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 +/* 00DC20 8000D020 3C018012 */ lui $at, %hi(gObjectCount) # $at, 0x8012 /* 00DC24 8000D024 0C01B0BC */ jal func_8006C2F0 -/* 00DC28 8000D028 AC2DAEF0 */ sw $t5, %lo(playerCount)($at) +/* 00DC28 8000D028 AC2DAEF0 */ sw $t5, %lo(gObjectCount)($at) /* 00DC2C 8000D02C 14400010 */ bnez $v0, .L8000D070 /* 00DC30 8000D030 3C03800E */ lui $v1, %hi(D_800DC708) # $v1, 0x800e /* 00DC34 8000D034 2463C708 */ addiu $v1, %lo(D_800DC708) # addiu $v1, $v1, -0x38f8 @@ -277,23 +277,23 @@ glabel func_8000CC7C /* 00DC5C 8000D05C 8FB80064 */ lw $t8, 0x64($sp) /* 00DC60 8000D060 0C027110 */ jal get_multiplayer_racer_count /* 00DC64 8000D064 00000000 */ nop -/* 00DC68 8000D068 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 -/* 00DC6C 8000D06C AC22AEF0 */ sw $v0, %lo(playerCount)($at) +/* 00DC68 8000D068 3C018012 */ lui $at, %hi(gObjectCount) # $at, 0x8012 +/* 00DC6C 8000D06C AC22AEF0 */ sw $v0, %lo(gObjectCount)($at) .L8000D070: /* 00DC70 8000D070 8FB80064 */ lw $t8, 0x64($sp) .L8000D074: /* 00DC74 8000D074 3C058012 */ lui $a1, %hi(D_8011AD3C) # $a1, 0x8012 /* 00DC78 8000D078 13000005 */ beqz $t8, .L8000D090 /* 00DC7C 8000D07C 24A5AD3C */ addiu $a1, %lo(D_8011AD3C) # addiu $a1, $a1, -0x52c4 -/* 00DC80 8000D080 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 -/* 00DC84 8000D084 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 +/* 00DC80 8000D080 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012 +/* 00DC84 8000D084 24C6AEF0 */ addiu $a2, %lo(gObjectCount) # addiu $a2, $a2, -0x5110 /* 00DC88 8000D088 240D0004 */ li $t5, 4 /* 00DC8C 8000D08C ACCD0000 */ sw $t5, ($a2) .L8000D090: /* 00DC90 8000D090 8FB90068 */ lw $t9, 0x68($sp) -/* 00DC94 8000D094 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 +/* 00DC94 8000D094 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012 /* 00DC98 8000D098 24010008 */ li $at, 8 -/* 00DC9C 8000D09C 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 +/* 00DC9C 8000D09C 24C6AEF0 */ addiu $a2, %lo(gObjectCount) # addiu $a2, $a2, -0x5110 /* 00DCA0 8000D0A0 17210006 */ bne $t9, $at, .L8000D0BC /* 00DCA4 8000D0A4 A0A00000 */ sb $zero, ($a1) /* 00DCA8 8000D0A8 24070001 */ li $a3, 1 @@ -512,11 +512,11 @@ glabel func_8000CC7C /* 00DF80 8000D380 24190001 */ li $t9, 1 /* 00DF84 8000D384 01F50019 */ multu $t7, $s5 /* 00DF88 8000D388 A0590000 */ sb $t9, ($v0) -/* 00DF8C 8000D38C 3C038012 */ lui $v1, %hi(playerCount) # $v1, 0x8012 +/* 00DF8C 8000D38C 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012 /* 00DF90 8000D390 0000C012 */ mflo $t8 /* 00DF94 8000D394 02F86821 */ addu $t5, $s7, $t8 /* 00DF98 8000D398 A1B2005A */ sb $s2, 0x5a($t5) -/* 00DF9C 8000D39C 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) +/* 00DF9C 8000D39C 8C63AEF0 */ lw $v1, %lo(gObjectCount)($v1) /* 00DFA0 8000D3A0 00000000 */ nop /* 00DFA4 8000D3A4 00609025 */ move $s2, $v1 .L8000D3A8: @@ -544,7 +544,7 @@ glabel func_8000CC7C /* 00DFF4 8000D3F4 832E004D */ lb $t6, 0x4d($t9) /* 00DFF8 8000D3F8 2419FFFF */ li $t9, -1 /* 00DFFC 8000D3FC 15C00004 */ bnez $t6, .L8000D410 -/* 00E000 8000D400 3C038012 */ lui $v1, %hi(playerCount) # $v1, 0x8012 +/* 00E000 8000D400 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012 /* 00E004 8000D404 3C018012 */ lui $at, %hi(D_8011AE02) # $at, 0x8012 /* 00E008 8000D408 10000004 */ b .L8000D41C /* 00E00C 8000D40C A020AE02 */ sb $zero, %lo(D_8011AE02)($at) @@ -554,7 +554,7 @@ glabel func_8000CC7C /* 00E018 8000D418 A02FAE02 */ sb $t7, %lo(D_8011AE02)($at) .L8000D41C: /* 00E01C 8000D41C 8FB80078 */ lw $t8, 0x78($sp) -/* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) +/* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(gObjectCount)($v1) /* 00E024 8000D424 830D00B8 */ lb $t5, 0xb8($t8) /* 00E028 8000D428 3C018012 */ lui $at, %hi(D_8011AD24+1) # $at, 0x8012 /* 00E02C 8000D42C A3B90127 */ sb $t9, 0x127($sp) @@ -803,9 +803,9 @@ glabel func_8000CC7C /* 00E394 8000D794 8FA60054 */ lw $a2, 0x54($sp) /* 00E398 8000D798 8F0F0000 */ lw $t7, ($t8) /* 00E39C 8000D79C 8FA7005C */ lw $a3, 0x5c($sp) -/* 00E3A0 8000D7A0 3C0D8012 */ lui $t5, %hi(playerStructArray_Ptr) # $t5, 0x8012 +/* 00E3A0 8000D7A0 3C0D8012 */ lui $t5, %hi(gObjectStructArrayPtr) # $t5, 0x8012 /* 00E3A4 8000D7A4 A44F0000 */ sh $t7, ($v0) -/* 00E3A8 8000D7A8 8DADAEE4 */ lw $t5, %lo(playerStructArray_Ptr)($t5) +/* 00E3A8 8000D7A8 8DADAEE4 */ lw $t5, %lo(gObjectStructArrayPtr)($t5) /* 00E3AC 8000D7AC 3C198012 */ lui $t9, %hi(D_8011AEE8) # $t9, 0x8012 /* 00E3B0 8000D7B0 01A67021 */ addu $t6, $t5, $a2 /* 00E3B4 8000D7B4 ADC20000 */ sw $v0, ($t6) @@ -946,8 +946,8 @@ glabel L8000D98C /* 00E58C 8000D98C 8FA40068 */ lw $a0, 0x68($sp) /* 00E590 8000D990 24020005 */ li $v0, 5 .L8000D994: -/* 00E594 8000D994 3C038012 */ lui $v1, %hi(playerCount) # $v1, 0x8012 -/* 00E598 8000D998 8C63AEF0 */ lw $v1, %lo(playerCount)($v1) +/* 00E594 8000D994 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012 +/* 00E598 8000D998 8C63AEF0 */ lw $v1, %lo(gObjectCount)($v1) /* 00E59C 8000D99C 26100001 */ addiu $s0, $s0, 1 /* 00E5A0 8000D9A0 0203082A */ slt $at, $s0, $v1 /* 00E5A4 8000D9A4 1420FEA6 */ bnez $at, .L8000D440 @@ -974,8 +974,8 @@ glabel L8000D98C /* 00E5EC 8000D9EC 8C42AE5C */ lw $v0, %lo(objCount)($v0) /* 00E5F0 8000D9F0 0000A825 */ move $s5, $zero /* 00E5F4 8000D9F4 18400029 */ blez $v0, .L8000DA9C -/* 00E5F8 8000D9F8 3C138012 */ lui $s3, %hi(objPtrList) # $s3, 0x8012 -/* 00E5FC 8000D9FC 2673AE58 */ addiu $s3, %lo(objPtrList) # addiu $s3, $s3, -0x51a8 +/* 00E5F8 8000D9F8 3C138012 */ lui $s3, %hi(gObjPtrList) # $s3, 0x8012 +/* 00E5FC 8000D9FC 2673AE58 */ addiu $s3, %lo(gObjPtrList) # addiu $s3, $s3, -0x51a8 .L8000DA00: /* 00E600 8000DA00 8E6E0000 */ lw $t6, ($s3) /* 00E604 8000DA04 3C0D8012 */ lui $t5, %hi(D_8011AEF5) # $t5, 0x8012 @@ -993,7 +993,7 @@ glabel L8000D98C /* 00E634 8000DA34 00000000 */ nop /* 00E638 8000DA38 11A00007 */ beqz $t5, .L8000DA58 /* 00E63C 8000DA3C 00000000 */ nop -/* 00E640 8000DA40 0C003FEE */ jal particlePtrList_addObject +/* 00E640 8000DA40 0C003FEE */ jal gParticlePtrList_addObject /* 00E644 8000DA44 02202025 */ move $a0, $s1 /* 00E648 8000DA48 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 /* 00E64C 8000DA4C 8C42AE5C */ lw $v0, %lo(objCount)($v0) @@ -1007,7 +1007,7 @@ glabel L8000D98C /* 00E668 8000DA68 2B210002 */ slti $at, $t9, 2 /* 00E66C 8000DA6C 14200006 */ bnez $at, .L8000DA88 /* 00E670 8000DA70 00000000 */ nop -/* 00E674 8000DA74 0C003FEE */ jal particlePtrList_addObject +/* 00E674 8000DA74 0C003FEE */ jal gParticlePtrList_addObject /* 00E678 8000DA78 02202025 */ move $a0, $s1 /* 00E67C 8000DA7C 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012 /* 00E680 8000DA80 8C42AE5C */ lw $v0, %lo(objCount)($v0) @@ -1148,16 +1148,16 @@ glabel L8000D98C /* 00E888 8000DC88 00000000 */ nop /* 00E88C 8000DC8C A26D01F7 */ sb $t5, 0x1f7($s3) .L8000DC90: -/* 00E890 8000DC90 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012 -/* 00E894 8000DC94 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6) +/* 00E890 8000DC90 3C0E8012 */ lui $t6, %hi(gObjectCount) # $t6, 0x8012 +/* 00E894 8000DC94 8DCEAEF0 */ lw $t6, %lo(gObjectCount)($t6) /* 00E898 8000DC98 24180064 */ li $t8, 100 /* 00E89C 8000DC9C 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 00E8A0 8000DCA0 19C00068 */ blez $t6, .L8000DE44 /* 00E8A4 8000DCA4 AC38ADB0 */ sw $t8, %lo(D_8011ADB0)($at) /* 00E8A8 8000DCA8 0000A825 */ move $s5, $zero .L8000DCAC: -/* 00E8AC 8000DCAC 3C198012 */ lui $t9, %hi(playerStructArray_Ptr) # $t9, 0x8012 -/* 00E8B0 8000DCB0 8F39AEE4 */ lw $t9, %lo(playerStructArray_Ptr)($t9) +/* 00E8AC 8000DCAC 3C198012 */ lui $t9, %hi(gObjectStructArrayPtr) # $t9, 0x8012 +/* 00E8B0 8000DCB0 8F39AEE4 */ lw $t9, %lo(gObjectStructArrayPtr)($t9) /* 00E8B4 8000DCB4 00008025 */ move $s0, $zero /* 00E8B8 8000DCB8 03357821 */ addu $t7, $t9, $s5 /* 00E8BC 8000DCBC 8DF10000 */ lw $s1, ($t7) @@ -1259,10 +1259,10 @@ glabel L8000D98C .L8000DE1C: /* 00EA1C 8000DE1C 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00EA20 8000DE20 44810000 */ mtc1 $at, $f0 -/* 00EA24 8000DE24 3C0D8012 */ lui $t5, %hi(playerCount) # $t5, 0x8012 +/* 00EA24 8000DE24 3C0D8012 */ lui $t5, %hi(gObjectCount) # $t5, 0x8012 /* 00EA28 8000DE28 E6600090 */ swc1 $f0, 0x90($s3) /* 00EA2C 8000DE2C E660008C */ swc1 $f0, 0x8c($s3) -/* 00EA30 8000DE30 8DADAEF0 */ lw $t5, %lo(playerCount)($t5) +/* 00EA30 8000DE30 8DADAEF0 */ lw $t5, %lo(gObjectCount)($t5) /* 00EA34 8000DE34 26520001 */ addiu $s2, $s2, 1 /* 00EA38 8000DE38 024D082A */ slt $at, $s2, $t5 /* 00EA3C 8000DE3C 1420FF9B */ bnez $at, .L8000DCAC @@ -1334,7 +1334,7 @@ glabel L8000D98C /* 00EB2C 8000DF2C 00000000 */ nop /* 00EB30 8000DF30 14400038 */ bnez $v0, .L8000E014 /* 00EB34 8000DF34 24040010 */ li $a0, 16 -/* 00EB38 8000DF38 0C0078A7 */ jal func_8001E29C +/* 00EB38 8000DF38 0C0078A7 */ jal get_misc_asset /* 00EB3C 8000DF3C 00009025 */ move $s2, $zero /* 00EB40 8000DF40 96E30014 */ lhu $v1, 0x14($s7) /* 00EB44 8000DF44 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 954b8248..fe152e73 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -75,11 +75,11 @@ glabel func_8000E2B4 /* 00EFB0 8000E3B0 27A4002C */ addiu $a0, $sp, 0x2c /* 00EFB4 8000E3B4 0C003A95 */ jal func_8000EA54 /* 00EFB8 8000E3B8 24050011 */ li $a1, 17 -/* 00EFBC 8000E3BC 3C0C8012 */ lui $t4, %hi(playerStructArray_Ptr) # $t4, 0x8012 -/* 00EFC0 8000E3C0 8D8CAEE4 */ lw $t4, %lo(playerStructArray_Ptr)($t4) +/* 00EFBC 8000E3BC 3C0C8012 */ lui $t4, %hi(gObjectStructArrayPtr) # $t4, 0x8012 +/* 00EFC0 8000E3C0 8D8CAEE4 */ lw $t4, %lo(gObjectStructArrayPtr)($t4) /* 00EFC4 8000E3C4 240B0001 */ li $t3, 1 -/* 00EFC8 8000E3C8 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 -/* 00EFCC 8000E3CC AC2BAEF0 */ sw $t3, %lo(playerCount)($at) +/* 00EFC8 8000E3C8 3C018012 */ lui $at, %hi(gObjectCount) # $at, 0x8012 +/* 00EFCC 8000E3CC AC2BAEF0 */ sw $t3, %lo(gObjectCount)($at) /* 00EFD0 8000E3D0 3C0E8012 */ lui $t6, %hi(D_8011AEEC) # $t6, 0x8012 /* 00EFD4 8000E3D4 AD820000 */ sw $v0, ($t4) /* 00EFD8 8000E3D8 8DCEAEEC */ lw $t6, %lo(D_8011AEEC)($t6) diff --git a/asm/non_matchings/unknown_00BC20/func_8000E5EC.s b/asm/non_matchings/unknown_00BC20/func_8000E5EC.s index 5e77aab2..a9ff6c16 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E5EC.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E5EC.s @@ -80,8 +80,8 @@ glabel func_8000E5EC /* 00F308 8000E708 00004025 */ move $t0, $zero /* 00F30C 8000E70C 18C00021 */ blez $a2, .L8000E794 /* 00F310 8000E710 00002825 */ move $a1, $zero -/* 00F314 8000E714 3C0B8012 */ lui $t3, %hi(objPtrList) # $t3, 0x8012 -/* 00F318 8000E718 256BAE58 */ addiu $t3, %lo(objPtrList) # addiu $t3, $t3, -0x51a8 +/* 00F314 8000E714 3C0B8012 */ lui $t3, %hi(gObjPtrList) # $t3, 0x8012 +/* 00F318 8000E718 256BAE58 */ addiu $t3, %lo(gObjPtrList) # addiu $t3, $t3, -0x51a8 .L8000E71C: /* 00F31C 8000E71C 8D6D0000 */ lw $t5, ($t3) /* 00F320 8000E720 24A50001 */ addiu $a1, $a1, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index e63f77ce..5d1322ca 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -24,7 +24,7 @@ glabel func_8000EA54 /* 00F698 8000EA98 0C02DDAE */ jal func_800B76B8 /* 00F69C 8000EA9C 00002025 */ move $a0, $zero /* 00F6A0 8000EAA0 8FA3006C */ lw $v1, 0x6c($sp) -/* 00F6A4 8000EAA4 3C0F8012 */ lui $t7, %hi(D_8011AD68) # $t7, 0x8012 +/* 00F6A4 8000EAA4 3C0F8012 */ lui $t7, %hi(gAssetsObjectHeadersTableLength) # $t7, 0x8012 /* 00F6A8 8000EAA8 30680002 */ andi $t0, $v1, 2 /* 00F6AC 8000EAAC 11000004 */ beqz $t0, .L8000EAC0 /* 00F6B0 8000EAB0 01001825 */ move $v1, $t0 @@ -33,15 +33,15 @@ glabel func_8000EA54 /* 00F6BC 8000EABC 00000000 */ nop .L8000EAC0: /* 00F6C0 8000EAC0 8FAA0064 */ lw $t2, 0x64($sp) -/* 00F6C4 8000EAC4 3C098012 */ lui $t1, %hi(D_8011AEB8) # $t1, 0x8012 -/* 00F6C8 8000EAC8 8D29AEB8 */ lw $t1, %lo(D_8011AEB8)($t1) +/* 00F6C4 8000EAC4 3C098012 */ lui $t1, %hi(gAssetsLvlObjTranslationTable) # $t1, 0x8012 +/* 00F6C8 8000EAC8 8D29AEB8 */ lw $t1, %lo(gAssetsLvlObjTranslationTable)($t1) /* 00F6CC 8000EACC 000A5840 */ sll $t3, $t2, 1 /* 00F6D0 8000EAD0 012B6021 */ addu $t4, $t1, $t3 /* 00F6D4 8000EAD4 85840000 */ lh $a0, ($t4) /* 00F6D8 8000EAD8 00000000 */ nop /* 00F6DC 8000EADC A7A4004E */ sh $a0, 0x4e($sp) .L8000EAE0: -/* 00F6E0 8000EAE0 8DEFAD68 */ lw $t7, %lo(D_8011AD68)($t7) +/* 00F6E0 8000EAE0 8DEFAD68 */ lw $t7, %lo(gAssetsObjectHeadersTableLength)($t7) /* 00F6E4 8000EAE4 00008025 */ move $s0, $zero /* 00F6E8 8000EAE8 008F082A */ slt $at, $a0, $t7 /* 00F6EC 8000EAEC 14200002 */ bnez $at, .L8000EAF8 @@ -727,7 +727,7 @@ glabel L8000EDE0 /* 0100A0 8000F4A0 8068005A */ lb $t0, 0x5a($v1) /* 0100A4 8000F4A4 24490080 */ addiu $t1, $v0, 0x80 /* 0100A8 8000F4A8 19000006 */ blez $t0, .L8000F4C4 -/* 0100AC 8000F4AC 3C0F8012 */ lui $t7, %hi(objPtrList) # $t7, 0x8012 +/* 0100AC 8000F4AC 3C0F8012 */ lui $t7, %hi(gObjPtrList) # $t7, 0x8012 /* 0100B0 8000F4B0 8C4A0070 */ lw $t2, 0x70($v0) /* 0100B4 8000F4B4 8CAB0000 */ lw $t3, ($a1) /* 0100B8 8000F4B8 004AC821 */ addu $t9, $v0, $t2 @@ -741,7 +741,7 @@ glabel L8000EDE0 /* 0100D4 8000F4D4 11A0000A */ beqz $t5, .L8000F500 /* 0100D8 8000F4D8 01A08825 */ move $s1, $t5 /* 0100DC 8000F4DC 8E180000 */ lw $t8, ($s0) -/* 0100E0 8000F4E0 8DEFAE58 */ lw $t7, %lo(objPtrList)($t7) +/* 0100E0 8000F4E0 8DEFAE58 */ lw $t7, %lo(gObjPtrList)($t7) /* 0100E4 8000F4E4 00187080 */ sll $t6, $t8, 2 /* 0100E8 8000F4E8 01EE4021 */ addu $t0, $t7, $t6 /* 0100EC 8000F4EC AD020000 */ sw $v0, ($t0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000FD54.s b/asm/non_matchings/unknown_00BC20/func_8000FD54.s index 7b63dc65..c74c0e37 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000FD54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000FD54.s @@ -1,7 +1,7 @@ glabel func_8000FD54 /* 010954 8000FD54 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 010958 8000FD58 3C0E8012 */ lui $t6, %hi(D_8011AD68) # $t6, 0x8012 -/* 01095C 8000FD5C 8DCEAD68 */ lw $t6, %lo(D_8011AD68)($t6) +/* 010958 8000FD58 3C0E8012 */ lui $t6, %hi(gAssetsObjectHeadersTableLength) # $t6, 0x8012 +/* 01095C 8000FD5C 8DCEAD68 */ lw $t6, %lo(gAssetsObjectHeadersTableLength)($t6) /* 010960 8000FD60 AFBF002C */ sw $ra, 0x2c($sp) /* 010964 8000FD64 008E082A */ slt $at, $a0, $t6 /* 010968 8000FD68 AFB40028 */ sw $s4, 0x28($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 4b8de525..8fec110e 100644 --- a/asm/non_matchings/unknown_00BC20/func_800101AC.s +++ b/asm/non_matchings/unknown_00BC20/func_800101AC.s @@ -139,8 +139,8 @@ glabel L80010374 /* 010F88 80010388 24050001 */ li $a1, 1 /* 010F8C 8001038C 2404003D */ li $a0, 61 .L80010390: -/* 010F90 80010390 3C0D8012 */ lui $t5, %hi(objPtrList) # $t5, 0x8012 -/* 010F94 80010394 8DADAE58 */ lw $t5, %lo(objPtrList)($t5) +/* 010F90 80010390 3C0D8012 */ lui $t5, %hi(gObjPtrList) # $t5, 0x8012 +/* 010F94 80010394 8DADAE58 */ lw $t5, %lo(gObjPtrList)($t5) /* 010F98 80010398 26B50001 */ addiu $s5, $s5, 1 /* 010F9C 8001039C 01B47021 */ addu $t6, $t5, $s4 /* 010FA0 800103A0 8DD10000 */ lw $s1, ($t6) @@ -238,7 +238,7 @@ glabel L800104D8 /* 0110E4 800104E4 00000000 */ nop /* 0110E8 800104E8 17200005 */ bnez $t9, .L80010500 /* 0110EC 800104EC 00000000 */ nop -/* 0110F0 800104F0 0C003FEE */ jal particlePtrList_addObject +/* 0110F0 800104F0 0C003FEE */ jal gParticlePtrList_addObject /* 0110F4 800104F4 00000000 */ nop /* 0110F8 800104F8 86C50048 */ lh $a1, 0x48($s6) /* 0110FC 800104FC 00000000 */ nop @@ -420,8 +420,8 @@ glabel L80010664 /* 011354 80010754 24120005 */ li $s2, 5 /* 011358 80010758 2411004C */ li $s1, 76 .L8001075C: -/* 01135C 8001075C 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 -/* 011360 80010760 8D29AE58 */ lw $t1, %lo(objPtrList)($t1) +/* 01135C 8001075C 3C098012 */ lui $t1, %hi(gObjPtrList) # $t1, 0x8012 +/* 011360 80010760 8D29AE58 */ lw $t1, %lo(gObjPtrList)($t1) /* 011364 80010764 00000000 */ nop /* 011368 80010768 01305021 */ addu $t2, $t1, $s0 /* 01136C 8001076C 8D440000 */ lw $a0, ($t2) @@ -432,11 +432,11 @@ glabel L80010664 /* 011380 80010780 1180000B */ beqz $t4, .L800107B0 /* 011384 80010784 00000000 */ nop /* 011388 80010788 8C8D003C */ lw $t5, 0x3c($a0) -/* 01138C 8001078C 3C0F8012 */ lui $t7, %hi(objPtrList) # $t7, 0x8012 +/* 01138C 8001078C 3C0F8012 */ lui $t7, %hi(gObjPtrList) # $t7, 0x8012 /* 011390 80010790 16CD0007 */ bne $s6, $t5, .L800107B0 /* 011394 80010794 00000000 */ nop /* 011398 80010798 AC80003C */ sw $zero, 0x3c($a0) -/* 01139C 8001079C 8DEFAE58 */ lw $t7, %lo(objPtrList)($t7) +/* 01139C 8001079C 8DEFAE58 */ lw $t7, %lo(gObjPtrList)($t7) /* 0113A0 800107A0 00000000 */ nop /* 0113A4 800107A4 01F07021 */ addu $t6, $t7, $s0 /* 0113A8 800107A8 8DC40000 */ lw $a0, ($t6) @@ -451,7 +451,7 @@ glabel L80010664 /* 0113C8 800107C8 16420003 */ bne $s2, $v0, .L800107D8 /* 0113CC 800107CC 00000000 */ nop .L800107D0: -/* 0113D0 800107D0 0C003FEE */ jal particlePtrList_addObject +/* 0113D0 800107D0 0C003FEE */ jal gParticlePtrList_addObject /* 0113D4 800107D4 00000000 */ nop .L800107D8: /* 0113D8 800107D8 8EB80000 */ lw $t8, ($s5) diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index 2ec1bb21..08dc95be 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -39,7 +39,7 @@ glabel func_80010994 /* 011624 80010A24 00000000 */ nop .L80010A28: /* 011628 80010A28 1C400003 */ bgtz $v0, .L80010A38 -/* 01162C 80010A2C 3C048012 */ lui $a0, %hi(playerCount) # $a0, 0x8012 +/* 01162C 80010A2C 3C048012 */ lui $a0, %hi(gObjectCount) # $a0, 0x8012 /* 011630 80010A30 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 011634 80010A34 AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at) .L80010A38: @@ -54,13 +54,13 @@ glabel func_80010994 /* 011658 80010A58 804B0000 */ lb $t3, ($v0) /* 01165C 80010A5C 3C018012 */ lui $at, %hi(D_8011AD22) # $at, 0x8012 /* 011660 80010A60 002B0821 */ addu $at, $at, $t3 -/* 011664 80010A64 2484AEF0 */ addiu $a0, %lo(playerCount) # addiu $a0, $a0, -0x5110 +/* 011664 80010A64 2484AEF0 */ addiu $a0, %lo(gObjectCount) # addiu $a0, $a0, -0x5110 /* 011668 80010A68 A020AD22 */ sb $zero, %lo(D_8011AD22)($at) /* 01166C 80010A6C 8C8C0000 */ lw $t4, ($a0) /* 011670 80010A70 00009825 */ move $s3, $zero /* 011674 80010A74 19800021 */ blez $t4, .L80010AFC -/* 011678 80010A78 3C158012 */ lui $s5, %hi(playerStructArray_Ptr) # $s5, 0x8012 -/* 01167C 80010A7C 26B5AEE4 */ addiu $s5, %lo(playerStructArray_Ptr) # addiu $s5, $s5, -0x511c +/* 011678 80010A78 3C158012 */ lui $s5, %hi(gObjectStructArrayPtr) # $s5, 0x8012 +/* 01167C 80010A7C 26B5AEE4 */ addiu $s5, %lo(gObjectStructArrayPtr) # addiu $s5, $s5, -0x511c /* 011680 80010A80 00001825 */ move $v1, $zero .L80010A84: /* 011684 80010A84 8EAD0000 */ lw $t5, ($s5) @@ -94,9 +94,9 @@ glabel func_80010994 /* 0116F4 80010AF4 1420FFE3 */ bnez $at, .L80010A84 /* 0116F8 80010AF8 00000000 */ nop .L80010AFC: -/* 0116FC 80010AFC 3C158012 */ lui $s5, %hi(playerStructArray_Ptr) # $s5, 0x8012 +/* 0116FC 80010AFC 3C158012 */ lui $s5, %hi(gObjectStructArrayPtr) # $s5, 0x8012 /* 011700 80010B00 0C0050AE */ jal func_800142B8 -/* 011704 80010B04 26B5AEE4 */ addiu $s5, %lo(playerStructArray_Ptr) # addiu $s5, $s5, -0x511c +/* 011704 80010B04 26B5AEE4 */ addiu $s5, %lo(gObjectStructArrayPtr) # addiu $s5, $s5, -0x511c /* 011708 80010B08 0C00556E */ jal func_800155B8 /* 01170C 80010B0C 00000000 */ nop /* 011710 80010B10 0C007A27 */ jal func_8001E89C @@ -153,8 +153,8 @@ glabel func_80010994 /* 0117CC 80010BCC 1020004C */ beqz $at, .L80010D00 /* 0117D0 80010BD0 00119080 */ sll $s2, $s1, 2 /* 0117D4 80010BD4 00135080 */ sll $t2, $s3, 2 -/* 0117D8 80010BD8 3C168012 */ lui $s6, %hi(objPtrList) # $s6, 0x8012 -/* 0117DC 80010BDC 26D6AE58 */ addiu $s6, %lo(objPtrList) # addiu $s6, $s6, -0x51a8 +/* 0117D8 80010BD8 3C168012 */ lui $s6, %hi(gObjPtrList) # $s6, 0x8012 +/* 0117DC 80010BDC 26D6AE58 */ addiu $s6, %lo(gObjPtrList) # addiu $s6, $s6, -0x51a8 /* 0117E0 80010BE0 AFAA0038 */ sw $t2, 0x38($sp) /* 0117E4 80010BE4 24110021 */ li $s1, 33 .L80010BE8: @@ -237,10 +237,10 @@ glabel func_80010994 /* 0118F8 80010CF8 1420FFBB */ bnez $at, .L80010BE8 /* 0118FC 80010CFC 00000000 */ nop .L80010D00: -/* 011900 80010D00 3C0C8012 */ lui $t4, %hi(playerCount) # $t4, 0x8012 -/* 011904 80010D04 8D8CAEF0 */ lw $t4, %lo(playerCount)($t4) -/* 011908 80010D08 3C168012 */ lui $s6, %hi(objPtrList) # $s6, 0x8012 -/* 01190C 80010D0C 26D6AE58 */ addiu $s6, %lo(objPtrList) # addiu $s6, $s6, -0x51a8 +/* 011900 80010D00 3C0C8012 */ lui $t4, %hi(gObjectCount) # $t4, 0x8012 +/* 011904 80010D04 8D8CAEF0 */ lw $t4, %lo(gObjectCount)($t4) +/* 011908 80010D08 3C168012 */ lui $s6, %hi(gObjPtrList) # $s6, 0x8012 +/* 01190C 80010D0C 26D6AE58 */ addiu $s6, %lo(gObjPtrList) # addiu $s6, $s6, -0x51a8 /* 011910 80010D10 1980000E */ blez $t4, .L80010D4C /* 011914 80010D14 00008825 */ move $s1, $zero /* 011918 80010D18 00009025 */ move $s2, $zero @@ -251,8 +251,8 @@ glabel func_80010994 /* 011928 80010D28 8DC40000 */ lw $a0, ($t6) /* 01192C 80010D2C 0C01378E */ jal func_8004DE38 /* 011930 80010D30 00000000 */ nop -/* 011934 80010D34 3C0F8012 */ lui $t7, %hi(playerCount) # $t7, 0x8012 -/* 011938 80010D38 8DEFAEF0 */ lw $t7, %lo(playerCount)($t7) +/* 011934 80010D34 3C0F8012 */ lui $t7, %hi(gObjectCount) # $t7, 0x8012 +/* 011938 80010D38 8DEFAEF0 */ lw $t7, %lo(gObjectCount)($t7) /* 01193C 80010D3C 26310001 */ addiu $s1, $s1, 1 /* 011940 80010D40 022F082A */ slt $at, $s1, $t7 /* 011944 80010D44 1420FFF5 */ bnez $at, .L80010D1C @@ -261,8 +261,8 @@ glabel func_80010994 /* 01194C 80010D4C 0C01AF66 */ jal get_current_level_race_type /* 011950 80010D50 00000000 */ nop /* 011954 80010D54 1440001C */ bnez $v0, .L80010DC8 -/* 011958 80010D58 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 -/* 01195C 80010D5C 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) +/* 011958 80010D58 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012 +/* 01195C 80010D5C 8CE7AEF0 */ lw $a3, %lo(gObjectCount)($a3) /* 011960 80010D60 00008825 */ move $s1, $zero /* 011964 80010D64 18E00018 */ blez $a3, .L80010DC8 /* 011968 80010D68 2412FFFF */ li $s2, -1 @@ -282,8 +282,8 @@ glabel func_80010994 /* 01199C 80010D9C 26310001 */ addiu $s1, $s1, 1 /* 0119A0 80010DA0 0C010FB3 */ jal func_80043ECC /* 0119A4 80010DA4 02803025 */ move $a2, $s4 -/* 0119A8 80010DA8 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 -/* 0119AC 80010DAC 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) +/* 0119A8 80010DA8 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012 +/* 0119AC 80010DAC 8CE7AEF0 */ lw $a3, %lo(gObjectCount)($a3) /* 0119B0 80010DB0 00000000 */ nop /* 0119B4 80010DB4 00E08825 */ move $s1, $a3 /* 0119B8 80010DB8 26310001 */ addiu $s1, $s1, 1 @@ -419,7 +419,7 @@ glabel func_80010994 /* 011B88 80010F88 00000000 */ nop /* 011B8C 80010F8C 17200009 */ bnez $t9, .L80010FB4 /* 011B90 80010F90 00000000 */ nop -/* 011B94 80010F94 0C004013 */ jal particlePtrList_flush +/* 011B94 80010F94 0C004013 */ jal gParticlePtrList_flush /* 011B98 80010F98 00000000 */ nop /* 011B9C 80010F9C 0C005FA6 */ jal func_80017E98 /* 011BA0 80010FA0 00000000 */ nop @@ -428,8 +428,8 @@ glabel func_80010994 /* 011BAC 80010FAC 0C007A4F */ jal func_8001E93C /* 011BB0 80010FB0 00000000 */ nop .L80010FB4: -/* 011BB4 80010FB4 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 -/* 011BB8 80010FB8 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) +/* 011BB4 80010FB4 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012 +/* 011BB8 80010FB8 8CE7AEF0 */ lw $a3, %lo(gObjectCount)($a3) /* 011BBC 80010FBC 3C098012 */ lui $t1, %hi(D_8011AD4E) # $t1, 0x8012 /* 011BC0 80010FC0 10E00010 */ beqz $a3, .L80011004 /* 011BC4 80010FC4 00000000 */ nop @@ -439,15 +439,15 @@ glabel func_80010994 /* 011BD4 80010FD4 00000000 */ nop /* 011BD8 80010FD8 0C006602 */ jal func_80019808 /* 011BDC 80010FDC 02802025 */ move $a0, $s4 -/* 011BE0 80010FE0 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 -/* 011BE4 80010FE4 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) +/* 011BE0 80010FE0 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012 +/* 011BE4 80010FE4 8CE7AEF0 */ lw $a3, %lo(gObjectCount)($a3) /* 011BE8 80010FE8 10000006 */ b .L80011004 /* 011BEC 80010FEC 00000000 */ nop .L80010FF0: /* 011BF0 80010FF0 0C006A3D */ jal func_8001A8F4 /* 011BF4 80010FF4 02802025 */ move $a0, $s4 -/* 011BF8 80010FF8 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 -/* 011BFC 80010FFC 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) +/* 011BF8 80010FF8 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012 +/* 011BFC 80010FFC 8CE7AEF0 */ lw $a3, %lo(gObjectCount)($a3) /* 011C00 80011000 00000000 */ nop .L80011004: /* 011C04 80011004 3C048012 */ lui $a0, %hi(D_8011AEEC) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_800113CC.s b/asm/non_matchings/unknown_00BC20/func_800113CC.s index ff3a69ce..a1a91169 100644 --- a/asm/non_matchings/unknown_00BC20/func_800113CC.s +++ b/asm/non_matchings/unknown_00BC20/func_800113CC.s @@ -23,7 +23,7 @@ glabel func_800113CC /* 012020 80011420 00001825 */ move $v1, $zero /* 012024 80011424 00457821 */ addu $t7, $v0, $a1 /* 012028 80011428 91E4005C */ lbu $a0, 0x5c($t7) -/* 01202C 8001142C 0C0078A7 */ jal func_8001E29C +/* 01202C 8001142C 0C0078A7 */ jal get_misc_asset /* 012030 80011430 AFA00050 */ sw $zero, 0x50($sp) /* 012034 80011434 80580001 */ lb $t8, 1($v0) /* 012038 80011438 80480002 */ lb $t0, 2($v0) diff --git a/asm/non_matchings/unknown_00BC20/func_800120C8.s b/asm/non_matchings/unknown_00BC20/func_800120C8.s index 09516c62..28b01d7c 100644 --- a/asm/non_matchings/unknown_00BC20/func_800120C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800120C8.s @@ -116,7 +116,7 @@ glabel func_800120C8 /* 012E78 80012278 8FA40078 */ lw $a0, 0x78($sp) /* 012E7C 8001227C 8E270000 */ lw $a3, ($s1) /* 012E80 80012280 02402825 */ move $a1, $s2 -/* 012E84 80012284 0C0075B9 */ jal func_8001D6E4 +/* 012E84 80012284 0C0075B9 */ jal calc_dyn_light_and_env_map_for_object /* 012E88 80012288 00003025 */ move $a2, $zero /* 012E8C 8001228C 1000000D */ b .L800122C4 /* 012E90 80012290 00000000 */ nop @@ -125,7 +125,7 @@ glabel func_800120C8 /* 012E98 80012298 02402825 */ move $a1, $s2 /* 012E9C 8001229C 8FA40078 */ lw $a0, 0x78($sp) /* 012EA0 800122A0 8E270000 */ lw $a3, ($s1) -/* 012EA4 800122A4 0C0075B9 */ jal func_8001D6E4 +/* 012EA4 800122A4 0C0075B9 */ jal calc_dyn_light_and_env_map_for_object /* 012EA8 800122A8 2406FFFF */ li $a2, -1 /* 012EAC 800122AC 10000005 */ b .L800122C4 /* 012EB0 800122B0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80012F94.s b/asm/non_matchings/unknown_00BC20/func_80012F94.s index fb1d4872..5e739917 100644 --- a/asm/non_matchings/unknown_00BC20/func_80012F94.s +++ b/asm/non_matchings/unknown_00BC20/func_80012F94.s @@ -78,7 +78,7 @@ glabel func_80012F94 /* 013C80 80013080 00004825 */ move $t1, $zero /* 013C84 80013084 AFA0004C */ sw $zero, 0x4c($sp) /* 013C88 80013088 AFAA0024 */ sw $t2, 0x24($sp) -/* 013C8C 8001308C 0C0078A7 */ jal func_8001E29C +/* 013C8C 8001308C 0C0078A7 */ jal get_misc_asset /* 013C90 80013090 E7AE002C */ swc1 $f14, 0x2c($sp) /* 013C94 80013094 0C019884 */ jal func_80066210 /* 013C98 80013098 AFA20038 */ sw $v0, 0x38($sp) @@ -137,7 +137,7 @@ glabel func_80012F94 /* 013D60 80013160 AFAA0024 */ sw $t2, 0x24($sp) /* 013D64 80013164 AFA9004C */ sw $t1, 0x4c($sp) /* 013D68 80013168 AFA50038 */ sw $a1, 0x38($sp) -/* 013D6C 8001316C 0C0078A7 */ jal func_8001E29C +/* 013D6C 8001316C 0C0078A7 */ jal get_misc_asset /* 013D70 80013170 AFA30044 */ sw $v1, 0x44($sp) /* 013D74 80013174 8FAA0024 */ lw $t2, 0x24($sp) /* 013D78 80013178 8FA30044 */ lw $v1, 0x44($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_800135B8.s b/asm/non_matchings/unknown_00BC20/func_800135B8.s index fa2f4bbc..399ea5ce 100644 --- a/asm/non_matchings/unknown_00BC20/func_800135B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800135B8.s @@ -28,7 +28,7 @@ glabel func_800135B8 .L80013608: /* 014208 80013608 24040014 */ li $a0, 20 /* 01420C 8001360C AFA30050 */ sw $v1, 0x50($sp) -/* 014210 80013610 0C0078A7 */ jal func_8001E29C +/* 014210 80013610 0C0078A7 */ jal get_misc_asset /* 014214 80013614 AFA50078 */ sw $a1, 0x78($sp) /* 014218 80013618 3C188012 */ lui $t8, %hi(D_8011B058) # $t8, 0x8012 /* 01421C 8001361C 2718B058 */ addiu $t8, %lo(D_8011B058) # addiu $t8, $t8, -0x4fa8 diff --git a/asm/non_matchings/unknown_00BC20/func_80013A0C.s b/asm/non_matchings/unknown_00BC20/func_80013A0C.s index 8e67b167..6baab4e3 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013A0C.s +++ b/asm/non_matchings/unknown_00BC20/func_80013A0C.s @@ -52,7 +52,7 @@ glabel func_80013A0C .L80013AA8: /* 0146A8 80013AA8 AFA50050 */ sw $a1, 0x50($sp) /* 0146AC 80013AAC AFA6004C */ sw $a2, 0x4c($sp) -/* 0146B0 80013AB0 0C0078A7 */ jal func_8001E29C +/* 0146B0 80013AB0 0C0078A7 */ jal get_misc_asset /* 0146B4 80013AB4 AFA80064 */ sw $t0, 0x64($sp) /* 0146B8 80013AB8 8FA50050 */ lw $a1, 0x50($sp) /* 0146BC 80013ABC 8FA6004C */ lw $a2, 0x4c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80013DCC.s b/asm/non_matchings/unknown_00BC20/func_80013DCC.s index 8f9b02cd..d4590046 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013DCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80013DCC.s @@ -37,7 +37,7 @@ glabel func_80013DCC /* 014A3C 80013E3C 8CD90000 */ lw $t9, ($a2) /* 014A40 80013E40 3C018012 */ lui $at, %hi(D_8011AE94) # $at, 0x8012 /* 014A44 80013E44 AFAB0054 */ sw $t3, 0x54($sp) -/* 014A48 80013E48 0C0078A7 */ jal func_8001E29C +/* 014A48 80013E48 0C0078A7 */ jal get_misc_asset /* 014A4C 80013E4C AC39AE94 */ sw $t9, %lo(D_8011AE94)($at) /* 014A50 80013E50 8FAB0054 */ lw $t3, 0x54($sp) /* 014A54 80013E54 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80014814.s b/asm/non_matchings/unknown_00BC20/func_80014814.s index c837a15e..b0d52b1a 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014814.s +++ b/asm/non_matchings/unknown_00BC20/func_80014814.s @@ -21,8 +21,8 @@ glabel func_80014814 /* 015458 80014858 00402825 */ move $a1, $v0 /* 01545C 8001485C 14200054 */ bnez $at, .L800149B0 /* 015460 80014860 00602025 */ move $a0, $v1 -/* 015464 80014864 3C0B8012 */ lui $t3, %hi(objPtrList) # $t3, 0x8012 -/* 015468 80014868 256BAE58 */ addiu $t3, %lo(objPtrList) # addiu $t3, $t3, -0x51a8 +/* 015464 80014864 3C0B8012 */ lui $t3, %hi(gObjPtrList) # $t3, 0x8012 +/* 015468 80014868 256BAE58 */ addiu $t3, %lo(gObjPtrList) # addiu $t3, $t3, -0x51a8 /* 01546C 8001486C 00A3082A */ slt $at, $a1, $v1 .L80014870: /* 015470 80014870 1420001E */ bnez $at, .L800148EC @@ -157,9 +157,9 @@ glabel func_80014814 /* 015638 80014A38 30990003 */ andi $t9, $a0, 3 /* 01563C 80014A3C 13200010 */ beqz $t9, .L80014A80 /* 015640 80014A40 03223021 */ addu $a2, $t9, $v0 -/* 015644 80014A44 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 015644 80014A44 3C098012 */ lui $t1, %hi(gObjPtrList) # $t1, 0x8012 /* 015648 80014A48 8FA80040 */ lw $t0, 0x40($sp) -/* 01564C 80014A4C 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 +/* 01564C 80014A4C 2529AE58 */ addiu $t1, %lo(gObjPtrList) # addiu $t1, $t1, -0x51a8 /* 015650 80014A50 00051880 */ sll $v1, $a1, 2 .L80014A54: /* 015654 80014A54 8D2C0000 */ lw $t4, ($t1) @@ -174,9 +174,9 @@ glabel func_80014814 /* 015678 80014A78 A08E0038 */ sb $t6, 0x38($a0) /* 01567C 80014A7C 10AB002A */ beq $a1, $t3, .L80014B28 .L80014A80: -/* 015680 80014A80 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 015680 80014A80 3C098012 */ lui $t1, %hi(gObjPtrList) # $t1, 0x8012 /* 015684 80014A84 8FA80040 */ lw $t0, 0x40($sp) -/* 015688 80014A88 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 +/* 015688 80014A88 2529AE58 */ addiu $t1, %lo(gObjPtrList) # addiu $t1, $t1, -0x51a8 /* 01568C 80014A8C 00051880 */ sll $v1, $a1, 2 /* 015690 80014A90 000B5080 */ sll $t2, $t3, 2 .L80014A94: diff --git a/asm/non_matchings/unknown_00BC20/func_80014B50.s b/asm/non_matchings/unknown_00BC20/func_80014B50.s index 0269af6a..bc3a0ca2 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014B50.s +++ b/asm/non_matchings/unknown_00BC20/func_80014B50.s @@ -19,8 +19,8 @@ glabel func_80014B50 glabel L80014B80 /* 015780 80014B80 00A4082A */ slt $at, $a1, $a0 /* 015784 80014B84 142001EE */ bnez $at, .L80015340 -/* 015788 80014B88 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 01578C 80014B8C 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015788 80014B88 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 01578C 80014B8C 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015790 80014B90 0064082A */ slt $at, $v1, $a0 .L80014B94: /* 015794 80014B94 1420001D */ bnez $at, .L80014C0C @@ -112,8 +112,8 @@ glabel L80014B80 glabel L80014CCC /* 0158CC 80014CCC 00A4082A */ slt $at, $a1, $a0 /* 0158D0 80014CD0 1420019B */ bnez $at, .L80015340 -/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 0158DC 80014CDC 0064082A */ slt $at, $v1, $a0 .L80014CE0: /* 0158E0 80014CE0 1420001D */ bnez $at, .L80014D58 @@ -205,8 +205,8 @@ glabel L80014CCC glabel L80014E18 /* 015A18 80014E18 00A4082A */ slt $at, $a1, $a0 /* 015A1C 80014E1C 14200148 */ bnez $at, .L80015340 -/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015A28 80014E28 0064082A */ slt $at, $v1, $a0 .L80014E2C: /* 015A2C 80014E2C 1420001D */ bnez $at, .L80014EA4 @@ -298,8 +298,8 @@ glabel L80014E18 glabel L80014F64 /* 015B64 80014F64 00A4082A */ slt $at, $a1, $a0 /* 015B68 80014F68 142000F5 */ bnez $at, .L80015340 -/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015B74 80014F74 0064082A */ slt $at, $v1, $a0 .L80014F78: /* 015B78 80014F78 1420001D */ bnez $at, .L80014FF0 @@ -391,8 +391,8 @@ glabel L80014F64 glabel L800150B0 /* 015CB0 800150B0 00A4082A */ slt $at, $a1, $a0 /* 015CB4 800150B4 142000A2 */ bnez $at, .L80015340 -/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015CC0 800150C0 0064082A */ slt $at, $v1, $a0 .L800150C4: /* 015CC4 800150C4 1420001D */ bnez $at, .L8001513C @@ -484,8 +484,8 @@ glabel L800150B0 glabel L800151FC /* 015DFC 800151FC 00A4082A */ slt $at, $a1, $a0 /* 015E00 80015200 1420004F */ bnez $at, .L80015340 -/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015E0C 8001520C 0064082A */ slt $at, $v1, $a0 .L80015210: /* 015E10 80015210 1420001D */ bnez $at, .L80015288 diff --git a/asm/non_matchings/unknown_00BC20/func_80014CCC.s b/asm/non_matchings/unknown_00BC20/func_80014CCC.s index 18735204..ee8fe251 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014CCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80014CCC.s @@ -1,8 +1,8 @@ glabel func_80014CCC /* 0158CC 80014CCC 00A4082A */ slt $at, $a1, $a0 /* 0158D0 80014CD0 1420019B */ bnez $at, .L80015340 -/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 0158D8 80014CD8 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 0158DC 80014CDC 0064082A */ slt $at, $v1, $a0 .L80014CE0: /* 0158E0 80014CE0 1420001D */ bnez $at, .L80014D58 @@ -93,8 +93,8 @@ glabel func_80014CCC /* 015A18 80014E18 00A4082A */ slt $at, $a1, $a0 /* 015A1C 80014E1C 14200148 */ bnez $at, .L80015340 -/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015A24 80014E24 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015A28 80014E28 0064082A */ slt $at, $v1, $a0 .L80014E2C: /* 015A2C 80014E2C 1420001D */ bnez $at, .L80014EA4 @@ -185,8 +185,8 @@ glabel func_80014CCC /* 015B64 80014F64 00A4082A */ slt $at, $a1, $a0 /* 015B68 80014F68 142000F5 */ bnez $at, .L80015340 -/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015B70 80014F70 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015B74 80014F74 0064082A */ slt $at, $v1, $a0 .L80014F78: /* 015B78 80014F78 1420001D */ bnez $at, .L80014FF0 @@ -277,8 +277,8 @@ glabel func_80014CCC /* 015CB0 800150B0 00A4082A */ slt $at, $a1, $a0 /* 015CB4 800150B4 142000A2 */ bnez $at, .L80015340 -/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015CBC 800150BC 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015CC0 800150C0 0064082A */ slt $at, $v1, $a0 .L800150C4: /* 015CC4 800150C4 1420001D */ bnez $at, .L8001513C @@ -369,8 +369,8 @@ glabel func_80014CCC /* 015DFC 800151FC 00A4082A */ slt $at, $a1, $a0 /* 015E00 80015200 1420004F */ bnez $at, .L80015340 -/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 -/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(objPtrList) # addiu $t2, $t2, -0x51a8 +/* 015E04 80015204 3C0A8012 */ lui $t2, %hi(gObjPtrList) # $t2, 0x8012 +/* 015E08 80015208 254AAE58 */ addiu $t2, %lo(gObjPtrList) # addiu $t2, $t2, -0x51a8 /* 015E0C 8001520C 0064082A */ slt $at, $v1, $a0 .L80015210: /* 015E10 80015210 1420001D */ bnez $at, .L80015288 diff --git a/asm/non_matchings/unknown_00BC20/func_80015348.s b/asm/non_matchings/unknown_00BC20/func_80015348.s index d7576517..1259a28c 100644 --- a/asm/non_matchings/unknown_00BC20/func_80015348.s +++ b/asm/non_matchings/unknown_00BC20/func_80015348.s @@ -20,10 +20,10 @@ glabel func_80015348 /* 015F90 80015390 00048880 */ sll $s1, $a0, 2 /* 015F94 80015394 3C01C67A */ li $at, 0xC67A0000 # -16000.000000 /* 015F98 80015398 0005A880 */ sll $s5, $a1, 2 -/* 015F9C 8001539C 3C128012 */ lui $s2, %hi(objPtrList) # $s2, 0x8012 +/* 015F9C 8001539C 3C128012 */ lui $s2, %hi(gObjPtrList) # $s2, 0x8012 /* 015FA0 800153A0 4481A000 */ mtc1 $at, $f20 /* 015FA4 800153A4 4480B000 */ mtc1 $zero, $f22 -/* 015FA8 800153A8 2652AE58 */ addiu $s2, %lo(objPtrList) # addiu $s2, $s2, -0x51a8 +/* 015FA8 800153A8 2652AE58 */ addiu $s2, %lo(gObjPtrList) # addiu $s2, $s2, -0x51a8 /* 015FAC 800153AC 26B50004 */ addiu $s5, $s5, 4 .L800153B0: /* 015FB0 800153B0 8E4E0000 */ lw $t6, ($s2) @@ -75,8 +75,8 @@ glabel func_80015348 /* 016058 80015458 16B1FFD5 */ bne $s5, $s1, .L800153B0 /* 01605C 8001545C 00000000 */ nop .L80015460: -/* 016060 80015460 3C128012 */ lui $s2, %hi(objPtrList) # $s2, 0x8012 -/* 016064 80015464 2652AE58 */ addiu $s2, %lo(objPtrList) # addiu $s2, $s2, -0x51a8 +/* 016060 80015460 3C128012 */ lui $s2, %hi(gObjPtrList) # $s2, 0x8012 +/* 016064 80015464 2652AE58 */ addiu $s2, %lo(gObjPtrList) # addiu $s2, $s2, -0x51a8 /* 016068 80015468 0274082A */ slt $at, $s3, $s4 .L8001546C: /* 01606C 8001546C 24050001 */ li $a1, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_800155B8.s b/asm/non_matchings/unknown_00BC20/func_800155B8.s index 3eccd4ba..cee76354 100644 --- a/asm/non_matchings/unknown_00BC20/func_800155B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800155B8.s @@ -21,8 +21,8 @@ glabel func_800155B8 /* 016204 80015604 E7B4001C */ swc1 $f20, 0x1c($sp) /* 016208 80015608 10200026 */ beqz $at, .L800156A4 /* 01620C 8001560C 0000A825 */ move $s5, $zero -/* 016210 80015610 3C048012 */ lui $a0, %hi(objPtrList) # $a0, 0x8012 -/* 016214 80015614 2484AE58 */ addiu $a0, %lo(objPtrList) # addiu $a0, $a0, -0x51a8 +/* 016210 80015610 3C048012 */ lui $a0, %hi(gObjPtrList) # $a0, 0x8012 +/* 016214 80015614 2484AE58 */ addiu $a0, %lo(gObjPtrList) # addiu $a0, $a0, -0x51a8 /* 016218 80015618 00131080 */ sll $v0, $s3, 2 /* 01621C 8001561C 241E0002 */ li $fp, 2 /* 016220 80015620 27B60064 */ addiu $s6, $sp, 0x64 diff --git a/asm/non_matchings/unknown_00BC20/func_80016C68.s b/asm/non_matchings/unknown_00BC20/func_80016C68.s index ca16303f..58396558 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016C68.s +++ b/asm/non_matchings/unknown_00BC20/func_80016C68.s @@ -25,9 +25,9 @@ glabel func_80016C68 /* 0178C4 80016CC4 E7B70020 */ swc1 $f23, 0x20($sp) /* 0178C8 80016CC8 19C00034 */ blez $t6, .L80016D9C /* 0178CC 80016CCC 00008825 */ move $s1, $zero -/* 0178D0 80016CD0 3C148012 */ lui $s4, %hi(objPtrList) # $s4, 0x8012 +/* 0178D0 80016CD0 3C148012 */ lui $s4, %hi(gObjPtrList) # $s4, 0x8012 /* 0178D4 80016CD4 8FB30068 */ lw $s3, 0x68($sp) -/* 0178D8 80016CD8 2694AE58 */ addiu $s4, %lo(objPtrList) # addiu $s4, $s4, -0x51a8 +/* 0178D8 80016CD8 2694AE58 */ addiu $s4, %lo(gObjPtrList) # addiu $s4, $s4, -0x51a8 /* 0178DC 80016CDC 00009025 */ move $s2, $zero /* 0178E0 80016CE0 24150055 */ li $s5, 85 .L80016CE4: diff --git a/asm/non_matchings/unknown_00BC20/func_80016DE8.s b/asm/non_matchings/unknown_00BC20/func_80016DE8.s index 4dbb803a..7d4a684e 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016DE8.s +++ b/asm/non_matchings/unknown_00BC20/func_80016DE8.s @@ -1,8 +1,8 @@ glabel func_80016DE8 /* 0179E8 80016DE8 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 0179EC 80016DEC AFB6004C */ sw $s6, 0x4c($sp) -/* 0179F0 80016DF0 3C168012 */ lui $s6, %hi(playerCount) # $s6, 0x8012 -/* 0179F4 80016DF4 26D6AEF0 */ addiu $s6, %lo(playerCount) # addiu $s6, $s6, -0x5110 +/* 0179F0 80016DF0 3C168012 */ lui $s6, %hi(gObjectCount) # $s6, 0x8012 +/* 0179F4 80016DF4 26D6AEF0 */ addiu $s6, %lo(gObjectCount) # addiu $s6, $s6, -0x5110 /* 0179F8 80016DF8 8EC20000 */ lw $v0, ($s6) /* 0179FC 80016DFC E7BA002C */ swc1 $f26, 0x2c($sp) /* 017A00 80016E00 E7B6001C */ swc1 $f22, 0x1c($sp) @@ -28,10 +28,10 @@ glabel func_80016DE8 /* 017A50 80016E50 0000A025 */ move $s4, $zero /* 017A54 80016E54 1840003C */ blez $v0, .L80016F48 /* 017A58 80016E58 00008825 */ move $s1, $zero -/* 017A5C 80016E5C 3C138012 */ lui $s3, %hi(playerStructArray_Ptr) # $s3, 0x8012 +/* 017A5C 80016E5C 3C138012 */ lui $s3, %hi(gObjectStructArrayPtr) # $s3, 0x8012 /* 017A60 80016E60 8FB500C8 */ lw $s5, 0xc8($sp) /* 017A64 80016E64 8FB000CC */ lw $s0, 0xcc($sp) -/* 017A68 80016E68 2673AEE4 */ addiu $s3, %lo(playerStructArray_Ptr) # addiu $s3, $s3, -0x511c +/* 017A68 80016E68 2673AEE4 */ addiu $s3, %lo(gObjectStructArrayPtr) # addiu $s3, $s3, -0x511c /* 017A6C 80016E6C 00009025 */ move $s2, $zero /* 017A70 80016E70 27B70098 */ addiu $s7, $sp, 0x98 .L80016E74: diff --git a/asm/non_matchings/unknown_00BC20/func_80017E98.s b/asm/non_matchings/unknown_00BC20/func_80017E98.s index c6c1cc22..f11a0f49 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017E98.s +++ b/asm/non_matchings/unknown_00BC20/func_80017E98.s @@ -23,8 +23,8 @@ glabel func_80017E98 /* 018AEC 80017EEC 00009825 */ move $s3, $zero /* 018AF0 80017EF0 3C148012 */ lui $s4, %hi(D_8011AECC) # $s4, 0x8012 /* 018AF4 80017EF4 3C098012 */ lui $t1, %hi(D_8011AED8) # $t1, 0x8012 -/* 018AF8 80017EF8 3C068012 */ lui $a2, %hi(objPtrList) # $a2, 0x8012 -/* 018AFC 80017EFC 24C6AE58 */ addiu $a2, %lo(objPtrList) # addiu $a2, $a2, -0x51a8 +/* 018AF8 80017EF8 3C068012 */ lui $a2, %hi(gObjPtrList) # $a2, 0x8012 +/* 018AFC 80017EFC 24C6AE58 */ addiu $a2, %lo(gObjPtrList) # addiu $a2, $a2, -0x51a8 /* 018B00 80017F00 2529AED8 */ addiu $t1, %lo(D_8011AED8) # addiu $t1, $t1, -0x5128 /* 018B04 80017F04 2694AECC */ addiu $s4, %lo(D_8011AECC) # addiu $s4, $s4, -0x5134 /* 018B08 80017F08 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_80018CE0.s b/asm/non_matchings/unknown_00BC20/func_80018CE0.s index 32d52818..da63689b 100644 --- a/asm/non_matchings/unknown_00BC20/func_80018CE0.s +++ b/asm/non_matchings/unknown_00BC20/func_80018CE0.s @@ -48,8 +48,8 @@ glabel func_80018CE0 /* 019998 80018D98 24160002 */ li $s6, 2 /* 01999C 80018D9C 24150001 */ li $s5, 1 .L80018DA0: -/* 0199A0 80018DA0 3C0F8012 */ lui $t7, %hi(objPtrList) # $t7, 0x8012 -/* 0199A4 80018DA4 8DEFAE58 */ lw $t7, %lo(objPtrList)($t7) +/* 0199A0 80018DA0 3C0F8012 */ lui $t7, %hi(gObjPtrList) # $t7, 0x8012 +/* 0199A4 80018DA4 8DEFAE58 */ lw $t7, %lo(gObjPtrList)($t7) /* 0199A8 80018DA8 8FAE0098 */ lw $t6, 0x98($sp) /* 0199AC 80018DAC 00000000 */ nop /* 0199B0 80018DB0 01EEC821 */ addu $t9, $t7, $t6 diff --git a/asm/non_matchings/unknown_00BC20/func_80019808.s b/asm/non_matchings/unknown_00BC20/func_80019808.s index 05557dc7..8d48db4c 100644 --- a/asm/non_matchings/unknown_00BC20/func_80019808.s +++ b/asm/non_matchings/unknown_00BC20/func_80019808.s @@ -27,8 +27,8 @@ glabel func_80019808 /* 01A46C 8001986C 11C003D0 */ beqz $t6, .L8001A7B0 /* 01A470 80019870 24010042 */ li $at, 66 /* 01A474 80019874 14610008 */ bne $v1, $at, .L80019898 -/* 01A478 80019878 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 -/* 01A47C 8001987C 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01A478 80019878 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 +/* 01A47C 8001987C 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c /* 01A480 80019880 8D640000 */ lw $a0, ($t3) /* 01A484 80019884 AFBF0064 */ sw $ra, 0x64($sp) /* 01A488 80019888 0C01144A */ jal func_80045128 @@ -38,11 +38,11 @@ glabel func_80019808 .L80019898: /* 01A498 80019898 3C0F8012 */ lui $t7, %hi(D_8011ADB4) # $t7, 0x8012 /* 01A49C 8001989C 8DEFADB4 */ lw $t7, %lo(D_8011ADB4)($t7) -/* 01A4A0 800198A0 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01A4A0 800198A0 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 /* 01A4A4 800198A4 15E003C2 */ bnez $t7, .L8001A7B0 -/* 01A4A8 800198A8 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c -/* 01A4AC 800198AC 3C128012 */ lui $s2, %hi(playerCount) # $s2, 0x8012 -/* 01A4B0 800198B0 2652AEF0 */ addiu $s2, %lo(playerCount) # addiu $s2, $s2, -0x5110 +/* 01A4A8 800198A8 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c +/* 01A4AC 800198AC 3C128012 */ lui $s2, %hi(gObjectCount) # $s2, 0x8012 +/* 01A4B0 800198B0 2652AEF0 */ addiu $s2, %lo(gObjectCount) # addiu $s2, $s2, -0x5110 /* 01A4B4 800198B4 8E470000 */ lw $a3, ($s2) /* 01A4B8 800198B8 00008025 */ move $s0, $zero /* 01A4BC 800198BC 18E00066 */ blez $a3, .L80019A58 @@ -86,8 +86,8 @@ glabel func_80019808 /* 01A550 80019950 AFAA0044 */ sw $t2, 0x44($sp) /* 01A554 80019954 0C001AB2 */ jal func_80006AC8 /* 01A558 80019958 AFA5004C */ sw $a1, 0x4c($sp) -/* 01A55C 8001995C 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 -/* 01A560 80019960 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01A55C 8001995C 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 +/* 01A560 80019960 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c /* 01A564 80019964 8FAA0044 */ lw $t2, 0x44($sp) /* 01A568 80019968 8D6E0000 */ lw $t6, ($t3) /* 01A56C 8001996C 8FA5004C */ lw $a1, 0x4c($sp) @@ -478,13 +478,13 @@ glabel func_80019808 /* 01AAD4 80019ED4 10000236 */ b .L8001A7B0 /* 01AAD8 80019ED8 AC34ADB4 */ sw $s4, %lo(D_8011ADB4)($at) .L80019EDC: -/* 01AADC 80019EDC 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 -/* 01AAE0 80019EE0 3C128012 */ lui $s2, %hi(playerCount) # $s2, 0x8012 -/* 01AAE4 80019EE4 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 -/* 01AAE8 80019EE8 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) +/* 01AADC 80019EDC 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012 +/* 01AAE0 80019EE0 3C128012 */ lui $s2, %hi(gObjectCount) # $s2, 0x8012 +/* 01AAE4 80019EE4 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 +/* 01AAE8 80019EE8 8CE7AEF0 */ lw $a3, %lo(gObjectCount)($a3) /* 01AAEC 80019EEC 00008025 */ move $s0, $zero -/* 01AAF0 80019EF0 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c -/* 01AAF4 80019EF4 2652AEF0 */ addiu $s2, %lo(playerCount) # addiu $s2, $s2, -0x5110 +/* 01AAF0 80019EF0 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c +/* 01AAF4 80019EF4 2652AEF0 */ addiu $s2, %lo(gObjectCount) # addiu $s2, $s2, -0x5110 /* 01AAF8 80019EF8 00005025 */ move $t2, $zero /* 01AAFC 80019EFC 240D000A */ li $t5, 10 .L80019F00: @@ -608,11 +608,11 @@ glabel func_80019808 /* 01ACB0 8001A0B0 AFAA0044 */ sw $t2, 0x44($sp) /* 01ACB4 8001A0B4 8FA80080 */ lw $t0, 0x80($sp) /* 01ACB8 8001A0B8 8FAA0044 */ lw $t2, 0x44($sp) -/* 01ACBC 8001A0BC 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01ACBC 8001A0BC 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 /* 01ACC0 8001A0C0 8FBF0064 */ lw $ra, 0x64($sp) /* 01ACC4 8001A0C4 24010004 */ li $at, 4 /* 01ACC8 8001A0C8 10410019 */ beq $v0, $at, .L8001A130 -/* 01ACCC 8001A0CC 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01ACCC 8001A0CC 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c /* 01ACD0 8001A0D0 A11401D8 */ sb $s4, 0x1d8($t0) /* 01ACD4 8001A0D4 8E380000 */ lw $t8, ($s1) /* 01ACD8 8001A0D8 00000000 */ nop @@ -629,12 +629,12 @@ glabel func_80019808 /* 01AD04 8001A104 AFA80080 */ sw $t0, 0x80($sp) /* 01AD08 8001A108 0C000741 */ jal func_80001D04 /* 01AD0C 8001A10C AFAA0044 */ sw $t2, 0x44($sp) -/* 01AD10 8001A110 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 +/* 01AD10 8001A110 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 /* 01AD14 8001A114 8FA80080 */ lw $t0, 0x80($sp) /* 01AD18 8001A118 8FAA0044 */ lw $t2, 0x44($sp) /* 01AD1C 8001A11C 8FBF0064 */ lw $ra, 0x64($sp) /* 01AD20 8001A120 8E220000 */ lw $v0, ($s1) -/* 01AD24 8001A124 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01AD24 8001A124 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c .L8001A128: /* 01AD28 8001A128 244E0001 */ addiu $t6, $v0, 1 .L8001A12C: @@ -781,8 +781,8 @@ glabel func_80019808 /* 01AF20 8001A320 8FA50094 */ lw $a1, 0x94($sp) /* 01AF24 8001A324 26100001 */ addiu $s0, $s0, 1 /* 01AF28 8001A328 2A010004 */ slti $at, $s0, 4 -/* 01AF2C 8001A32C 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 -/* 01AF30 8001A330 256BAEE4 */ addiu $t3, %lo(playerStructArray_Ptr) # addiu $t3, $t3, -0x511c +/* 01AF2C 8001A32C 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 +/* 01AF30 8001A330 256BAEE4 */ addiu $t3, %lo(gObjectStructArrayPtr) # addiu $t3, $t3, -0x511c /* 01AF34 8001A334 1420FFF7 */ bnez $at, .L8001A314 /* 01AF38 8001A338 00A22825 */ or $a1, $a1, $v0 /* 01AF3C 8001A33C 3C198012 */ lui $t9, %hi(D_8011AEF6) # $t9, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index 33fd6b60..7f3d5fb6 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -37,15 +37,15 @@ glabel func_8001A8F4 /* 01B578 8001A978 860A0000 */ lh $t2, ($s0) /* 01B57C 8001A97C 2401FFFF */ li $at, -1 /* 01B580 8001A980 1541006D */ bne $t2, $at, .L8001AB38 -/* 01B584 8001A984 3C118012 */ lui $s1, %hi(playerCount) # $s1, 0x8012 -/* 01B588 8001A988 2631AEF0 */ addiu $s1, %lo(playerCount) # addiu $s1, $s1, -0x5110 +/* 01B584 8001A984 3C118012 */ lui $s1, %hi(gObjectCount) # $s1, 0x8012 +/* 01B588 8001A988 2631AEF0 */ addiu $s1, %lo(gObjectCount) # addiu $s1, $s1, -0x5110 /* 01B58C 8001A98C 8E2B0000 */ lw $t3, ($s1) /* 01B590 8001A990 00008025 */ move $s0, $zero /* 01B594 8001A994 19600029 */ blez $t3, .L8001AA3C /* 01B598 8001A998 00001825 */ move $v1, $zero .L8001A99C: -/* 01B59C 8001A99C 3C0C8012 */ lui $t4, %hi(playerStructArray_Ptr) # $t4, 0x8012 -/* 01B5A0 8001A9A0 8D8CAEE4 */ lw $t4, %lo(playerStructArray_Ptr)($t4) +/* 01B59C 8001A99C 3C0C8012 */ lui $t4, %hi(gObjectStructArrayPtr) # $t4, 0x8012 +/* 01B5A0 8001A9A0 8D8CAEE4 */ lw $t4, %lo(gObjectStructArrayPtr)($t4) /* 01B5A4 8001A9A4 2401FFFF */ li $at, -1 /* 01B5A8 8001A9A8 01836821 */ addu $t5, $t4, $v1 /* 01B5AC 8001A9AC 8DAE0000 */ lw $t6, ($t5) @@ -89,19 +89,19 @@ glabel func_8001A8F4 /* 01B638 8001AA38 24630004 */ addiu $v1, $v1, 4 .L8001AA3C: /* 01B63C 8001AA3C 8FA30030 */ lw $v1, 0x30($sp) -/* 01B640 8001AA40 3C028012 */ lui $v0, %hi(playerStructArray_Ptr) # $v0, 0x8012 -/* 01B644 8001AA44 8C42AEE4 */ lw $v0, %lo(playerStructArray_Ptr)($v0) +/* 01B640 8001AA40 3C028012 */ lui $v0, %hi(gObjectStructArrayPtr) # $v0, 0x8012 +/* 01B644 8001AA44 8C42AEE4 */ lw $v0, %lo(gObjectStructArrayPtr)($v0) /* 01B648 8001AA48 00034880 */ sll $t1, $v1, 2 /* 01B64C 8001AA4C 00495021 */ addu $t2, $v0, $t1 /* 01B650 8001AA50 8D4B0000 */ lw $t3, ($t2) /* 01B654 8001AA54 8C460000 */ lw $a2, ($v0) -/* 01B658 8001AA58 3C0C8012 */ lui $t4, %hi(playerStructArray_Ptr) # $t4, 0x8012 +/* 01B658 8001AA58 3C0C8012 */ lui $t4, %hi(gObjectStructArrayPtr) # $t4, 0x8012 /* 01B65C 8001AA5C AC4B0000 */ sw $t3, ($v0) -/* 01B660 8001AA60 8D8CAEE4 */ lw $t4, %lo(playerStructArray_Ptr)($t4) -/* 01B664 8001AA64 3C0E8012 */ lui $t6, %hi(playerStructArray_Ptr) # $t6, 0x8012 +/* 01B660 8001AA60 8D8CAEE4 */ lw $t4, %lo(gObjectStructArrayPtr)($t4) +/* 01B664 8001AA64 3C0E8012 */ lui $t6, %hi(gObjectStructArrayPtr) # $t6, 0x8012 /* 01B668 8001AA68 01896821 */ addu $t5, $t4, $t1 /* 01B66C 8001AA6C ADA60000 */ sw $a2, ($t5) -/* 01B670 8001AA70 8DCEAEE4 */ lw $t6, %lo(playerStructArray_Ptr)($t6) +/* 01B670 8001AA70 8DCEAEE4 */ lw $t6, %lo(gObjectStructArrayPtr)($t6) /* 01B674 8001AA74 00000000 */ nop /* 01B678 8001AA78 8DC40000 */ lw $a0, ($t6) /* 01B67C 8001AA7C 0C001AB2 */ jal func_80006AC8 @@ -120,8 +120,8 @@ glabel func_8001A8F4 /* 01B6B0 8001AAB0 00002025 */ move $a0, $zero /* 01B6B4 8001AAB4 0C01994B */ jal func_8006652C /* 01B6B8 8001AAB8 00002025 */ move $a0, $zero -/* 01B6BC 8001AABC 3C0F8012 */ lui $t7, %hi(playerStructArray_Ptr) # $t7, 0x8012 -/* 01B6C0 8001AAC0 8DEFAEE4 */ lw $t7, %lo(playerStructArray_Ptr)($t7) +/* 01B6BC 8001AABC 3C0F8012 */ lui $t7, %hi(gObjectStructArrayPtr) # $t7, 0x8012 +/* 01B6C0 8001AAC0 8DEFAEE4 */ lw $t7, %lo(gObjectStructArrayPtr)($t7) /* 01B6C4 8001AAC4 3C078012 */ lui $a3, %hi(D_8011AEEC) # $a3, 0x8012 /* 01B6C8 8001AAC8 24E7AEEC */ addiu $a3, %lo(D_8011AEEC) # addiu $a3, $a3, -0x5114 /* 01B6CC 8001AACC 8CE40000 */ lw $a0, ($a3) @@ -153,10 +153,10 @@ glabel func_8001A8F4 /* 01B730 8001AB30 A02AAD50 */ sb $t2, %lo(D_8011AD50)($at) /* 01B734 8001AB34 24020001 */ li $v0, 1 .L8001AB38: -/* 01B738 8001AB38 3C118012 */ lui $s1, %hi(playerCount) # $s1, 0x8012 +/* 01B738 8001AB38 3C118012 */ lui $s1, %hi(gObjectCount) # $s1, 0x8012 /* 01B73C 8001AB3C 24010001 */ li $at, 1 /* 01B740 8001AB40 14410055 */ bne $v0, $at, .L8001AC98 -/* 01B744 8001AB44 2631AEF0 */ addiu $s1, %lo(playerCount) # addiu $s1, $s1, -0x5110 +/* 01B744 8001AB44 2631AEF0 */ addiu $s1, %lo(gObjectCount) # addiu $s1, $s1, -0x5110 /* 01B748 8001AB48 0C02AC75 */ jal func_800AB1D4 /* 01B74C 8001AB4C 00002025 */ move $a0, $zero /* 01B750 8001AB50 3C078012 */ lui $a3, %hi(D_8011AD51) # $a3, 0x8012 @@ -173,8 +173,8 @@ glabel func_8001A8F4 /* 01B77C 8001AB7C 00008025 */ move $s0, $zero /* 01B780 8001AB80 18800015 */ blez $a0, .L8001ABD8 /* 01B784 8001AB84 3C058012 */ lui $a1, %hi(D_8011AEE8) # $a1, 0x8012 -/* 01B788 8001AB88 3C0D8012 */ lui $t5, %hi(playerStructArray_Ptr) # $t5, 0x8012 -/* 01B78C 8001AB8C 8DADAEE4 */ lw $t5, %lo(playerStructArray_Ptr)($t5) +/* 01B788 8001AB88 3C0D8012 */ lui $t5, %hi(gObjectStructArrayPtr) # $t5, 0x8012 +/* 01B78C 8001AB8C 8DADAEE4 */ lw $t5, %lo(gObjectStructArrayPtr)($t5) /* 01B790 8001AB90 24A5AEE8 */ addiu $a1, %lo(D_8011AEE8) # addiu $a1, $a1, -0x5118 /* 01B794 8001AB94 8CA20000 */ lw $v0, ($a1) /* 01B798 8001AB98 00067080 */ sll $t6, $a2, 2 @@ -219,18 +219,18 @@ glabel func_8001A8F4 /* 01B828 8001AC28 80E60000 */ lb $a2, ($a3) /* 01B82C 8001AC2C 00000000 */ nop .L8001AC30: -/* 01B830 8001AC30 3C188012 */ lui $t8, %hi(playerStructArray_Ptr) # $t8, 0x8012 -/* 01B834 8001AC34 8F18AEE4 */ lw $t8, %lo(playerStructArray_Ptr)($t8) +/* 01B830 8001AC30 3C188012 */ lui $t8, %hi(gObjectStructArrayPtr) # $t8, 0x8012 +/* 01B834 8001AC34 8F18AEE4 */ lw $t8, %lo(gObjectStructArrayPtr)($t8) /* 01B838 8001AC38 0006C880 */ sll $t9, $a2, 2 /* 01B83C 8001AC3C 03194821 */ addu $t1, $t8, $t9 /* 01B840 8001AC40 8D240000 */ lw $a0, ($t1) -/* 01B844 8001AC44 0C003FEE */ jal particlePtrList_addObject +/* 01B844 8001AC44 0C003FEE */ jal gParticlePtrList_addObject /* 01B848 8001AC48 00000000 */ nop /* 01B84C 8001AC4C 3C078012 */ lui $a3, %hi(D_8011AD51) # $a3, 0x8012 /* 01B850 8001AC50 24E7AD51 */ addiu $a3, %lo(D_8011AD51) # addiu $a3, $a3, -0x52af /* 01B854 8001AC54 80EB0000 */ lb $t3, ($a3) -/* 01B858 8001AC58 3C0A8012 */ lui $t2, %hi(playerStructArray_Ptr) # $t2, 0x8012 -/* 01B85C 8001AC5C 8D4AAEE4 */ lw $t2, %lo(playerStructArray_Ptr)($t2) +/* 01B858 8001AC58 3C0A8012 */ lui $t2, %hi(gObjectStructArrayPtr) # $t2, 0x8012 +/* 01B85C 8001AC5C 8D4AAEE4 */ lw $t2, %lo(gObjectStructArrayPtr)($t2) /* 01B860 8001AC60 000B6080 */ sll $t4, $t3, 2 /* 01B864 8001AC64 014C6821 */ addu $t5, $t2, $t4 /* 01B868 8001AC68 ADA00000 */ sw $zero, ($t5) @@ -250,8 +250,8 @@ glabel func_8001A8F4 /* 01B898 8001AC98 24010002 */ li $at, 2 .L8001AC9C: /* 01B89C 8001AC9C 14410016 */ bne $v0, $at, .L8001ACF8 -/* 01B8A0 8001ACA0 3C198012 */ lui $t9, %hi(playerStructArray_Ptr) # $t9, 0x8012 -/* 01B8A4 8001ACA4 8F39AEE4 */ lw $t9, %lo(playerStructArray_Ptr)($t9) +/* 01B8A0 8001ACA0 3C198012 */ lui $t9, %hi(gObjectStructArrayPtr) # $t9, 0x8012 +/* 01B8A4 8001ACA4 8F39AEE4 */ lw $t9, %lo(gObjectStructArrayPtr)($t9) /* 01B8A8 8001ACA8 00000000 */ nop /* 01B8AC 8001ACAC 8F240000 */ lw $a0, ($t9) /* 01B8B0 8001ACB0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001AE64.s b/asm/non_matchings/unknown_00BC20/func_8001AE64.s index 65e006a2..d9d1b2e7 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001AE64.s +++ b/asm/non_matchings/unknown_00BC20/func_8001AE64.s @@ -11,9 +11,9 @@ glabel func_8001AE64 /* 01BA88 8001AE88 A0400115 */ sb $zero, 0x115($v0) /* 01BA8C 8001AE8C 3C0E8012 */ lui $t6, %hi(D_8011AEE8) # $t6, 0x8012 /* 01BA90 8001AE90 8DCEAEE8 */ lw $t6, %lo(D_8011AEE8)($t6) -/* 01BA94 8001AE94 3C198012 */ lui $t9, %hi(playerCount) # $t9, 0x8012 +/* 01BA94 8001AE94 3C198012 */ lui $t9, %hi(gObjectCount) # $t9, 0x8012 /* 01BA98 8001AE98 8DCF0000 */ lw $t7, ($t6) -/* 01BA9C 8001AE9C 8F39AEF0 */ lw $t9, %lo(playerCount)($t9) +/* 01BA9C 8001AE9C 8F39AEF0 */ lw $t9, %lo(gObjectCount)($t9) /* 01BAA0 8001AEA0 8DF80064 */ lw $t8, 0x64($t7) /* 01BAA4 8001AEA4 00404025 */ move $t0, $v0 /* 01BAA8 8001AEA8 34108CA1 */ li $s0, 36001 @@ -109,8 +109,8 @@ glabel func_8001AE64 /* 01BC00 8001B000 A1190114 */ sb $t9, 0x114($t0) /* 01BC04 8001B004 AFA70034 */ sw $a3, 0x34($sp) .L8001B008: -/* 01BC08 8001B008 3C0E8012 */ lui $t6, %hi(playerCount) # $t6, 0x8012 -/* 01BC0C 8001B00C 8DCEAEF0 */ lw $t6, %lo(playerCount)($t6) +/* 01BC08 8001B008 3C0E8012 */ lui $t6, %hi(gObjectCount) # $t6, 0x8012 +/* 01BC0C 8001B00C 8DCEAEF0 */ lw $t6, %lo(gObjectCount)($t6) /* 01BC10 8001B010 25AD0001 */ addiu $t5, $t5, 1 /* 01BC14 8001B014 01AE082A */ slt $at, $t5, $t6 /* 01BC18 8001B018 1420FFA9 */ bnez $at, .L8001AEC0 diff --git a/asm/non_matchings/unknown_00BC20/func_8001B3C4.s b/asm/non_matchings/unknown_00BC20/func_8001B3C4.s index 1123c287..63edfae2 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B3C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B3C4.s @@ -9,7 +9,7 @@ glabel func_8001B3C4 /* 01BFE0 8001B3E0 AC20C718 */ sw $zero, %lo(D_800DC718)($at) /* 01BFE4 8001B3E4 3C01800E */ lui $at, %hi(D_800DC734) # $at, 0x800e /* 01BFE8 8001B3E8 A020C734 */ sb $zero, %lo(D_800DC734)($at) -/* 01BFEC 8001B3EC 0C0078A7 */ jal func_8001E29C +/* 01BFEC 8001B3EC 0C0078A7 */ jal get_misc_asset /* 01BFF0 8001B3F0 2404001C */ li $a0, 28 /* 01BFF4 8001B3F4 804E0000 */ lb $t6, ($v0) /* 01BFF8 8001B3F8 2407FFFF */ li $a3, -1 diff --git a/asm/non_matchings/unknown_00BC20/func_8001B4FC.s b/asm/non_matchings/unknown_00BC20/func_8001B4FC.s index 87a1fc2c..adf4dc4f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B4FC.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B4FC.s @@ -16,10 +16,10 @@ glabel func_8001B4FC /* 01C134 8001B534 00000000 */ nop /* 01C138 8001B538 144E003C */ bne $v0, $t6, .L8001B62C /* 01C13C 8001B53C 8FBF001C */ lw $ra, 0x1c($sp) -/* 01C140 8001B540 0C0078A7 */ jal func_8001E29C +/* 01C140 8001B540 0C0078A7 */ jal get_misc_asset /* 01C144 8001B544 2404001C */ li $a0, 28 /* 01C148 8001B548 24040018 */ li $a0, 24 -/* 01C14C 8001B54C 0C0078A7 */ jal func_8001E29C +/* 01C14C 8001B54C 0C0078A7 */ jal get_misc_asset /* 01C150 8001B550 AFA20028 */ sw $v0, 0x28($sp) /* 01C154 8001B554 8FA80028 */ lw $t0, 0x28($sp) /* 01C158 8001B558 2407FFFF */ li $a3, -1 diff --git a/asm/non_matchings/unknown_00BC20/func_8001B7A8.s b/asm/non_matchings/unknown_00BC20/func_8001B7A8.s index 6910eba0..1e1d19aa 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B7A8.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B7A8.s @@ -3,12 +3,12 @@ glabel func_8001B7A8 /* 01C3AC 8001B7AC AFBF0014 */ sw $ra, 0x14($sp) /* 01C3B0 8001B7B0 AFA60028 */ sw $a2, 0x28($sp) /* 01C3B4 8001B7B4 848E01AA */ lh $t6, 0x1aa($a0) -/* 01C3B8 8001B7B8 3C0F8012 */ lui $t7, %hi(playerCount) # $t7, 0x8012 +/* 01C3B8 8001B7B8 3C0F8012 */ lui $t7, %hi(gObjectCount) # $t7, 0x8012 /* 01C3BC 8001B7BC 01C52823 */ subu $a1, $t6, $a1 /* 01C3C0 8001B7C0 24A5FFFF */ addiu $a1, $a1, -1 /* 01C3C4 8001B7C4 04A00006 */ bltz $a1, .L8001B7E0 /* 01C3C8 8001B7C8 00000000 */ nop -/* 01C3CC 8001B7CC 8DEFAEF0 */ lw $t7, %lo(playerCount)($t7) +/* 01C3CC 8001B7CC 8DEFAEF0 */ lw $t7, %lo(gObjectCount)($t7) /* 01C3D0 8001B7D0 3C188012 */ lui $t8, %hi(D_8011AEE8) # $t8, 0x8012 /* 01C3D4 8001B7D4 00AF082A */ slt $at, $a1, $t7 /* 01C3D8 8001B7D8 14200003 */ bnez $at, .L8001B7E8 diff --git a/asm/non_matchings/unknown_00BC20/func_8001BB18.s b/asm/non_matchings/unknown_00BC20/func_8001BB18.s index d30367f6..e597fd58 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BB18.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BB18.s @@ -1,6 +1,6 @@ glabel func_8001BB18 -/* 01C718 8001BB18 3C028012 */ lui $v0, %hi(playerCount) # $v0, 0x8012 -/* 01C71C 8001BB1C 8C42AEF0 */ lw $v0, %lo(playerCount)($v0) +/* 01C718 8001BB18 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012 +/* 01C71C 8001BB1C 8C42AEF0 */ lw $v0, %lo(gObjectCount)($v0) /* 01C720 8001BB20 00000000 */ nop /* 01C724 8001BB24 14400003 */ bnez $v0, .L8001BB34 /* 01C728 8001BB28 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001BC54.s b/asm/non_matchings/unknown_00BC20/func_8001BC54.s index a53d3f2f..29e6450f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BC54.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BC54.s @@ -8,8 +8,8 @@ glabel func_8001BC54 /* 01C86C 8001BC6C 18600026 */ blez $v1, .L8001BD08 /* 01C870 8001BC70 00002825 */ move $a1, $zero /* 01C874 8001BC74 3C0A8012 */ lui $t2, %hi(D_8011AEDC) # $t2, 0x8012 -/* 01C878 8001BC78 3C088012 */ lui $t0, %hi(objPtrList) # $t0, 0x8012 -/* 01C87C 8001BC7C 2508AE58 */ addiu $t0, %lo(objPtrList) # addiu $t0, $t0, -0x51a8 +/* 01C878 8001BC78 3C088012 */ lui $t0, %hi(gObjPtrList) # $t0, 0x8012 +/* 01C87C 8001BC7C 2508AE58 */ addiu $t0, %lo(gObjPtrList) # addiu $t0, $t0, -0x51a8 /* 01C880 8001BC80 254AAEDC */ addiu $t2, %lo(D_8011AEDC) # addiu $t2, $t2, -0x5124 /* 01C884 8001BC84 2409000A */ li $t1, 10 .L8001BC88: diff --git a/asm/non_matchings/unknown_00BC20/func_8001BF20.s b/asm/non_matchings/unknown_00BC20/func_8001BF20.s index aec05458..cd2c9e6f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BF20.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BF20.s @@ -38,8 +38,8 @@ glabel func_8001BF20 /* 01CB90 8001BF90 A7A00186 */ sh $zero, 0x186($sp) /* 01CB94 8001BF94 1880002D */ blez $a0, .L8001C04C /* 01CB98 8001BF98 00003825 */ move $a3, $zero -/* 01CB9C 8001BF9C 3C058012 */ lui $a1, %hi(objPtrList) # $a1, 0x8012 -/* 01CBA0 8001BFA0 24A5AE58 */ addiu $a1, %lo(objPtrList) # addiu $a1, $a1, -0x51a8 +/* 01CB9C 8001BF9C 3C058012 */ lui $a1, %hi(gObjPtrList) # $a1, 0x8012 +/* 01CBA0 8001BFA0 24A5AE58 */ addiu $a1, %lo(gObjPtrList) # addiu $a1, $a1, -0x51a8 /* 01CBA4 8001BFA4 0000F025 */ move $fp, $zero /* 01CBA8 8001BFA8 27B70064 */ addiu $s7, $sp, 0x64 /* 01CBAC 8001BFAC 24060010 */ li $a2, 16 diff --git a/asm/non_matchings/unknown_00BC20/func_8001E13C.s b/asm/non_matchings/unknown_00BC20/func_8001E13C.s index 24141b8a..8cf198a0 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E13C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E13C.s @@ -12,11 +12,11 @@ glabel func_8001E13C /* 01ED64 8001E164 AFA40010 */ sw $a0, 0x10($sp) /* 01ED68 8001E168 18600048 */ blez $v1, .L8001E28C /* 01ED6C 8001E16C 00001025 */ move $v0, $zero -/* 01ED70 8001E170 3C0C8012 */ lui $t4, %hi(objPtrList) # $t4, 0x8012 +/* 01ED70 8001E170 3C0C8012 */ lui $t4, %hi(gObjPtrList) # $t4, 0x8012 /* 01ED74 8001E174 8FAA0028 */ lw $t2, 0x28($sp) /* 01ED78 8001E178 8FA90024 */ lw $t1, 0x24($sp) /* 01ED7C 8001E17C 8FA80020 */ lw $t0, 0x20($sp) -/* 01ED80 8001E180 258CAE58 */ addiu $t4, %lo(objPtrList) # addiu $t4, $t4, -0x51a8 +/* 01ED80 8001E180 258CAE58 */ addiu $t4, %lo(gObjPtrList) # addiu $t4, $t4, -0x51a8 /* 01ED84 8001E184 240D0001 */ li $t5, 1 .L8001E188: /* 01ED88 8001E188 8D8F0000 */ lw $t7, ($t4) diff --git a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s index 3f474f97..fb665024 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s @@ -5,8 +5,8 @@ glabel func_8001E4C4 /* 01F0D0 8001E4D0 00001025 */ move $v0, $zero /* 01F0D4 8001E4D4 18600013 */ blez $v1, .L8001E524 /* 01F0D8 8001E4D8 00002025 */ move $a0, $zero -/* 01F0DC 8001E4DC 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 -/* 01F0E0 8001E4E0 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 +/* 01F0DC 8001E4DC 3C098012 */ lui $t1, %hi(gObjPtrList) # $t1, 0x8012 +/* 01F0E0 8001E4E0 2529AE58 */ addiu $t1, %lo(gObjPtrList) # addiu $t1, $t1, -0x51a8 /* 01F0E4 8001E4E4 2406DFFF */ li $a2, -8193 .L8001E4E8: /* 01F0E8 8001E4E8 8D2E0000 */ lw $t6, ($t1) @@ -25,9 +25,9 @@ glabel func_8001E4C4 /* 01F11C 8001E51C 00000000 */ nop /* 01F120 8001E520 00001025 */ move $v0, $zero .L8001E524: -/* 01F124 8001E524 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 01F124 8001E524 3C098012 */ lui $t1, %hi(gObjPtrList) # $t1, 0x8012 /* 01F128 8001E528 1860002C */ blez $v1, .L8001E5DC -/* 01F12C 8001E52C 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 +/* 01F12C 8001E52C 2529AE58 */ addiu $t1, %lo(gObjPtrList) # addiu $t1, $t1, -0x51a8 /* 01F130 8001E530 3C0B8012 */ lui $t3, %hi(D_8011AE7A) # $t3, 0x8012 /* 01F134 8001E534 256BAE7A */ addiu $t3, %lo(D_8011AE7A) # addiu $t3, $t3, -0x5186 /* 01F138 8001E538 00002025 */ move $a0, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_8001E93C.s b/asm/non_matchings/unknown_00BC20/func_8001E93C.s index db0e8063..6868e407 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001E93C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001E93C.s @@ -31,7 +31,7 @@ glabel func_8001E93C /* 01F5AC 8001E9AC 1219000A */ beq $s0, $t9, .L8001E9D8 /* 01F5B0 8001E9B0 00000000 */ nop /* 01F5B4 8001E9B4 00602025 */ move $a0, $v1 -/* 01F5B8 8001E9B8 0C003FEE */ jal particlePtrList_addObject +/* 01F5B8 8001E9B8 0C003FEE */ jal gParticlePtrList_addObject /* 01F5BC 8001E9BC AFA2003C */ sw $v0, 0x3c($sp) /* 01F5C0 8001E9C0 8FA2003C */ lw $v0, 0x3c($sp) /* 01F5C4 8001E9C4 3C048012 */ lui $a0, %hi(D_8011AE78) # $a0, 0x8012 @@ -61,10 +61,10 @@ glabel func_8001E93C /* 01F618 8001EA18 3C0D8012 */ lui $t5, %hi(D_8011AE74) # $t5, 0x8012 /* 01F61C 8001EA1C 18C00023 */ blez $a2, .L8001EAAC /* 01F620 8001EA20 25ADAE74 */ addiu $t5, %lo(D_8011AE74) # addiu $t5, $t5, -0x518c -/* 01F624 8001EA24 3C058012 */ lui $a1, %hi(objPtrList) # $a1, 0x8012 +/* 01F624 8001EA24 3C058012 */ lui $a1, %hi(gObjPtrList) # $a1, 0x8012 /* 01F628 8001EA28 3C0B8012 */ lui $t3, %hi(D_8011ADD8) # $t3, 0x8012 /* 01F62C 8001EA2C 3C098012 */ lui $t1, %hi(D_8011AE7A) # $t1, 0x8012 -/* 01F630 8001EA30 8CA5AE58 */ lw $a1, %lo(objPtrList)($a1) +/* 01F630 8001EA30 8CA5AE58 */ lw $a1, %lo(gObjPtrList)($a1) /* 01F634 8001EA34 2529AE7A */ addiu $t1, %lo(D_8011AE7A) # addiu $t1, $t1, -0x5186 /* 01F638 8001EA38 256BADD8 */ addiu $t3, %lo(D_8011ADD8) # addiu $t3, $t3, -0x5228 /* 01F63C 8001EA3C 00005025 */ move $t2, $zero @@ -111,8 +111,8 @@ glabel func_8001E93C /* 01F6D0 8001EAD0 0186082A */ slt $at, $t4, $a2 /* 01F6D4 8001EAD4 1020001E */ beqz $at, .L8001EB50 /* 01F6D8 8001EAD8 00009825 */ move $s3, $zero -/* 01F6DC 8001EADC 3C038012 */ lui $v1, %hi(objPtrList) # $v1, 0x8012 -/* 01F6E0 8001EAE0 2463AE58 */ addiu $v1, %lo(objPtrList) # addiu $v1, $v1, -0x51a8 +/* 01F6DC 8001EADC 3C038012 */ lui $v1, %hi(gObjPtrList) # $v1, 0x8012 +/* 01F6E0 8001EAE0 2463AE58 */ addiu $v1, %lo(gObjPtrList) # addiu $v1, $v1, -0x51a8 /* 01F6E4 8001EAE4 000C5080 */ sll $t2, $t4, 2 /* 01F6E8 8001EAE8 24040031 */ li $a0, 49 .L8001EAEC: diff --git a/asm/non_matchings/unknown_00BC20/func_8001F23C.s b/asm/non_matchings/unknown_00BC20/func_8001F23C.s index a3b50f53..721b30f9 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F23C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F23C.s @@ -37,7 +37,7 @@ glabel func_8001F23C /* 01FEC8 8001F2C8 00000000 */ nop /* 01FECC 8001F2CC 11A00005 */ beqz $t5, .L8001F2E4 /* 01FED0 8001F2D0 00000000 */ nop -/* 01FED4 8001F2D4 0C003FEE */ jal particlePtrList_addObject +/* 01FED4 8001F2D4 0C003FEE */ jal gParticlePtrList_addObject /* 01FED8 8001F2D8 00402025 */ move $a0, $v0 /* 01FEDC 8001F2DC AE800064 */ sw $zero, 0x64($s4) /* 01FEE0 8001F2E0 00008825 */ move $s1, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_8001F460.s b/asm/non_matchings/unknown_00BC20/func_8001F460.s index 22fba985..249b6417 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F460.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F460.s @@ -256,7 +256,7 @@ glabel func_8001F460 /* 0203CC 8001F7CC 2A410008 */ slti $at, $s2, 8 /* 0203D0 8001F7D0 14200026 */ bnez $at, .L8001F86C /* 0203D4 8001F7D4 2A410006 */ slti $at, $s2, 6 -/* 0203D8 8001F7D8 0C0078A7 */ jal func_8001E29C +/* 0203D8 8001F7D8 0C0078A7 */ jal get_misc_asset /* 0203DC 8001F7DC 2404000D */ li $a0, 13 /* 0203E0 8001F7E0 00127880 */ sll $t7, $s2, 2 /* 0203E4 8001F7E4 01F27821 */ addu $t7, $t7, $s2 @@ -324,7 +324,7 @@ glabel func_8001F460 /* 0204D0 8001F8D0 1000002C */ b .L8001F984 /* 0204D4 8001F8D4 241800FF */ li $t8, 255 .L8001F8D8: -/* 0204D8 8001F8D8 0C0078A7 */ jal func_8001E29C +/* 0204D8 8001F8D8 0C0078A7 */ jal get_misc_asset /* 0204DC 8001F8DC A3A200A4 */ sb $v0, 0xa4($sp) /* 0204E0 8001F8E0 82780040 */ lb $t8, 0x40($s3) /* 0204E4 8001F8E4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80021104.s b/asm/non_matchings/unknown_00BC20/func_80021104.s index 5fc18ad6..b2170c02 100644 --- a/asm/non_matchings/unknown_00BC20/func_80021104.s +++ b/asm/non_matchings/unknown_00BC20/func_80021104.s @@ -57,8 +57,8 @@ glabel func_80021104 /* 021DD8 800211D8 1420001C */ bnez $at, .L8002124C /* 021DDC 800211DC 28810012 */ slti $at, $a0, 0x12 /* 021DE0 800211E0 1020001A */ beqz $at, .L8002124C -/* 021DE4 800211E4 3C188012 */ lui $t8, %hi(playerStructArray_Ptr) # $t8, 0x8012 -/* 021DE8 800211E8 8F18AEE4 */ lw $t8, %lo(playerStructArray_Ptr)($t8) +/* 021DE4 800211E4 3C188012 */ lui $t8, %hi(gObjectStructArrayPtr) # $t8, 0x8012 +/* 021DE8 800211E8 8F18AEE4 */ lw $t8, %lo(gObjectStructArrayPtr)($t8) /* 021DEC 800211EC 0004C880 */ sll $t9, $a0, 2 /* 021DF0 800211F0 03194021 */ addu $t0, $t8, $t9 /* 021DF4 800211F4 8D02FFD8 */ lw $v0, -0x28($t0) diff --git a/asm/non_matchings/unknown_00BC20/func_80022948.s b/asm/non_matchings/unknown_00BC20/func_80022948.s index 0fb7ac6d..2b9444e7 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022948.s +++ b/asm/non_matchings/unknown_00BC20/func_80022948.s @@ -22,7 +22,7 @@ glabel func_80022948 /* 023598 80022998 AC29AEFC */ sw $t1, %lo(D_8011AEFC)($at) /* 02359C 8002299C A04A0052 */ sb $t2, 0x52($v0) /* 0235A0 800229A0 A44B0054 */ sh $t3, 0x54($v0) -/* 0235A4 800229A4 0C006EB2 */ jal getPlayerStruct +/* 0235A4 800229A4 0C006EB2 */ jal get_object_struct /* 0235A8 800229A8 00002025 */ move $a0, $zero /* 0235AC 800229AC 8C500064 */ lw $s0, 0x64($v0) /* 0235B0 800229B0 3C018012 */ lui $at, %hi(D_8011AEF6) # $at, 0x8012 @@ -166,8 +166,8 @@ glabel func_80022948 /* 0237CC 80022BCC 27A40058 */ addiu $a0, $sp, 0x58 /* 0237D0 80022BD0 0C003A95 */ jal func_8000EA54 /* 0237D4 80022BD4 24050001 */ li $a1, 1 -/* 0237D8 80022BD8 3C0B8012 */ lui $t3, %hi(playerStructArray_Ptr) # $t3, 0x8012 -/* 0237DC 80022BDC 8D6BAEE4 */ lw $t3, %lo(playerStructArray_Ptr)($t3) +/* 0237D8 80022BD8 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 +/* 0237DC 80022BDC 8D6BAEE4 */ lw $t3, %lo(gObjectStructArrayPtr)($t3) /* 0237E0 80022BE0 3C0D8012 */ lui $t5, %hi(D_8011AEE8) # $t5, 0x8012 /* 0237E4 80022BE4 AD620004 */ sw $v0, 4($t3) /* 0237E8 80022BE8 8DADAEE8 */ lw $t5, %lo(D_8011AEE8)($t5) @@ -178,9 +178,9 @@ glabel func_80022948 /* 0237FC 80022BFC 44810000 */ mtc1 $at, $f0 /* 023800 80022C00 AD820004 */ sw $v0, 4($t4) /* 023804 80022C04 AC40003C */ sw $zero, 0x3c($v0) -/* 023808 80022C08 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 +/* 023808 80022C08 3C018012 */ lui $at, %hi(gObjectCount) # $at, 0x8012 /* 02380C 80022C0C 240E0002 */ li $t6, 2 -/* 023810 80022C10 AC2EAEF0 */ sw $t6, %lo(playerCount)($at) +/* 023810 80022C10 AC2EAEF0 */ sw $t6, %lo(gObjectCount)($at) /* 023814 80022C14 8C500064 */ lw $s0, 0x64($v0) /* 023818 80022C18 2418000A */ li $t8, 10 /* 02381C 80022C1C A21801D6 */ sb $t8, 0x1d6($s0) @@ -207,8 +207,8 @@ glabel func_80022948 /* 023870 80022C70 0085082A */ slt $at, $a0, $a1 /* 023874 80022C74 10200018 */ beqz $at, .L80022CD8 /* 023878 80022C78 00041880 */ sll $v1, $a0, 2 -/* 02387C 80022C7C 3C068012 */ lui $a2, %hi(objPtrList) # $a2, 0x8012 -/* 023880 80022C80 24C6AE58 */ addiu $a2, %lo(objPtrList) # addiu $a2, $a2, -0x51a8 +/* 02387C 80022C7C 3C068012 */ lui $a2, %hi(gObjPtrList) # $a2, 0x8012 +/* 023880 80022C80 24C6AE58 */ addiu $a2, %lo(gObjPtrList) # addiu $a2, $a2, -0x51a8 .L80022C84: /* 023884 80022C84 8CCE0000 */ lw $t6, ($a2) /* 023888 80022C88 24840001 */ addiu $a0, $a0, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_80022CFC.s b/asm/non_matchings/unknown_00BC20/func_80022CFC.s index 19cb247c..753a81df 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022CFC.s +++ b/asm/non_matchings/unknown_00BC20/func_80022CFC.s @@ -18,10 +18,10 @@ glabel func_80022CFC /* 02393C 80022D3C 19000030 */ blez $t0, .L80022E00 /* 023940 80022D40 00003025 */ move $a2, $zero /* 023944 80022D44 3C014024 */ li $at, 0x40240000 # 2.562500 -/* 023948 80022D48 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012 +/* 023948 80022D48 3C098012 */ lui $t1, %hi(gObjPtrList) # $t1, 0x8012 /* 02394C 80022D4C 44810800 */ mtc1 $at, $f1 /* 023950 80022D50 44800000 */ mtc1 $zero, $f0 -/* 023954 80022D54 2529AE58 */ addiu $t1, %lo(objPtrList) # addiu $t1, $t1, -0x51a8 +/* 023954 80022D54 2529AE58 */ addiu $t1, %lo(gObjPtrList) # addiu $t1, $t1, -0x51a8 /* 023958 80022D58 00003825 */ move $a3, $zero /* 02395C 80022D5C 240A004D */ li $t2, 77 .L80022D60: diff --git a/asm/non_matchings/unknown_00BC20/func_80022E18.s b/asm/non_matchings/unknown_00BC20/func_80022E18.s index f4b990d0..e23ebe8d 100644 --- a/asm/non_matchings/unknown_00BC20/func_80022E18.s +++ b/asm/non_matchings/unknown_00BC20/func_80022E18.s @@ -13,11 +13,11 @@ glabel func_80022E18 /* 023A44 80022E44 24040001 */ li $a0, 1 /* 023A48 80022E48 0C02AC6B */ jal func_800AB1AC /* 023A4C 80022E4C A4580054 */ sh $t8, 0x54($v0) -/* 023A50 80022E50 3C078012 */ lui $a3, %hi(playerStructArray_Ptr) # $a3, 0x8012 -/* 023A54 80022E54 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 +/* 023A50 80022E50 3C078012 */ lui $a3, %hi(gObjectStructArrayPtr) # $a3, 0x8012 +/* 023A54 80022E54 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012 /* 023A58 80022E58 00002825 */ move $a1, $zero -/* 023A5C 80022E5C 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 -/* 023A60 80022E60 24E7AEE4 */ addiu $a3, %lo(playerStructArray_Ptr) # addiu $a3, $a3, -0x511c +/* 023A5C 80022E5C 24C6AEF0 */ addiu $a2, %lo(gObjectCount) # addiu $a2, $a2, -0x5110 +/* 023A60 80022E60 24E7AEE4 */ addiu $a3, %lo(gObjectStructArrayPtr) # addiu $a3, $a3, -0x511c /* 023A64 80022E64 00001025 */ move $v0, $zero .L80022E68: /* 023A68 80022E68 8CF90000 */ lw $t9, ($a3) @@ -39,16 +39,16 @@ glabel func_80022E18 /* 023AA8 80022EA8 8CEB0000 */ lw $t3, ($a3) /* 023AAC 80022EAC 00000000 */ nop /* 023AB0 80022EB0 8D640004 */ lw $a0, 4($t3) -/* 023AB4 80022EB4 0C003FEE */ jal particlePtrList_addObject +/* 023AB4 80022EB4 0C003FEE */ jal gParticlePtrList_addObject /* 023AB8 80022EB8 00000000 */ nop -/* 023ABC 80022EBC 3C078012 */ lui $a3, %hi(playerStructArray_Ptr) # $a3, 0x8012 -/* 023AC0 80022EC0 24E7AEE4 */ addiu $a3, %lo(playerStructArray_Ptr) # addiu $a3, $a3, -0x511c +/* 023ABC 80022EBC 3C078012 */ lui $a3, %hi(gObjectStructArrayPtr) # $a3, 0x8012 +/* 023AC0 80022EC0 24E7AEE4 */ addiu $a3, %lo(gObjectStructArrayPtr) # addiu $a3, $a3, -0x511c /* 023AC4 80022EC4 8CEC0000 */ lw $t4, ($a3) /* 023AC8 80022EC8 3C0E8012 */ lui $t6, %hi(D_8011AEE8) # $t6, 0x8012 /* 023ACC 80022ECC 8DCEAEE8 */ lw $t6, %lo(D_8011AEE8)($t6) /* 023AD0 80022ED0 8D8D0000 */ lw $t5, ($t4) -/* 023AD4 80022ED4 3C068012 */ lui $a2, %hi(playerCount) # $a2, 0x8012 -/* 023AD8 80022ED8 24C6AEF0 */ addiu $a2, %lo(playerCount) # addiu $a2, $a2, -0x5110 +/* 023AD4 80022ED4 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012 +/* 023AD8 80022ED8 24C6AEF0 */ addiu $a2, %lo(gObjectCount) # addiu $a2, $a2, -0x5110 /* 023ADC 80022EDC 240F0001 */ li $t7, 1 /* 023AE0 80022EE0 ADCD0000 */ sw $t5, ($t6) /* 023AE4 80022EE4 ACCF0000 */ sw $t7, ($a2) @@ -56,11 +56,11 @@ glabel func_80022E18 /* 023AEC 80022EEC 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 /* 023AF0 80022EF0 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 023AF4 80022EF4 8CA5AE60 */ lw $a1, %lo(D_8011AE60)($a1) -/* 023AF8 80022EF8 3C188012 */ lui $t8, %hi(objPtrList) # $t8, 0x8012 +/* 023AF8 80022EF8 3C188012 */ lui $t8, %hi(gObjPtrList) # $t8, 0x8012 /* 023AFC 80022EFC 00A3082A */ slt $at, $a1, $v1 /* 023B00 80022F00 10200013 */ beqz $at, .L80022F50 /* 023B04 80022F04 00051080 */ sll $v0, $a1, 2 -/* 023B08 80022F08 8F18AE58 */ lw $t8, %lo(objPtrList)($t8) +/* 023B08 80022F08 8F18AE58 */ lw $t8, %lo(gObjPtrList)($t8) /* 023B0C 80022F0C 00033080 */ sll $a2, $v1, 2 /* 023B10 80022F10 2405003E */ li $a1, 62 /* 023B14 80022F14 03022021 */ addu $a0, $t8, $v0 @@ -91,7 +91,7 @@ glabel func_80022E18 /* 023B6C 80022F6C 00000000 */ nop /* 023B70 80022F70 10800007 */ beqz $a0, .L80022F90 /* 023B74 80022F74 8FAC0030 */ lw $t4, 0x30($sp) -/* 023B78 80022F78 0C003FEE */ jal particlePtrList_addObject +/* 023B78 80022F78 0C003FEE */ jal gParticlePtrList_addObject /* 023B7C 80022F7C AFA30024 */ sw $v1, 0x24($sp) /* 023B80 80022F80 8FA30024 */ lw $v1, 0x24($sp) /* 023B84 80022F84 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800230D0.s b/asm/non_matchings/unknown_00BC20/func_800230D0.s index d165dff0..124160d8 100644 --- a/asm/non_matchings/unknown_00BC20/func_800230D0.s +++ b/asm/non_matchings/unknown_00BC20/func_800230D0.s @@ -14,8 +14,8 @@ glabel func_800230D0 /* 023D00 80023100 00004025 */ move $t0, $zero /* 023D04 80023104 1880002A */ blez $a0, .L800231B0 /* 023D08 80023108 00001025 */ move $v0, $zero -/* 023D0C 8002310C 3C058012 */ lui $a1, %hi(objPtrList) # $a1, 0x8012 -/* 023D10 80023110 24A5AE58 */ addiu $a1, %lo(objPtrList) # addiu $a1, $a1, -0x51a8 +/* 023D0C 8002310C 3C058012 */ lui $a1, %hi(gObjPtrList) # $a1, 0x8012 +/* 023D10 80023110 24A5AE58 */ addiu $a1, %lo(gObjPtrList) # addiu $a1, $a1, -0x51a8 /* 023D14 80023114 2406000B */ li $a2, 11 .L80023118: /* 023D18 80023118 8CAE0000 */ lw $t6, ($a1) diff --git a/asm/non_matchings/unknown_00BC20/func_8002342C.s b/asm/non_matchings/unknown_00BC20/func_8002342C.s index 533087a2..91c1b344 100644 --- a/asm/non_matchings/unknown_00BC20/func_8002342C.s +++ b/asm/non_matchings/unknown_00BC20/func_8002342C.s @@ -23,8 +23,8 @@ glabel func_8002342C /* 024080 80023480 00008825 */ move $s1, $zero /* 024084 80023484 19C00027 */ blez $t6, .L80023524 /* 024088 80023488 0000B025 */ move $s6, $zero -/* 02408C 8002348C 3C148012 */ lui $s4, %hi(objPtrList) # $s4, 0x8012 -/* 024090 80023490 2694AE58 */ addiu $s4, %lo(objPtrList) # addiu $s4, $s4, -0x51a8 +/* 02408C 8002348C 3C148012 */ lui $s4, %hi(gObjPtrList) # $s4, 0x8012 +/* 024090 80023490 2694AE58 */ addiu $s4, %lo(gObjPtrList) # addiu $s4, $s4, -0x51a8 /* 024094 80023494 00009025 */ move $s2, $zero /* 024098 80023498 24150057 */ li $s5, 87 .L8002349C: diff --git a/asm/non_matchings/unknown_00BC20/particlePtrList_flush.s b/asm/non_matchings/unknown_00BC20/gParticlePtrList_flush.s similarity index 89% rename from asm/non_matchings/unknown_00BC20/particlePtrList_flush.s rename to asm/non_matchings/unknown_00BC20/gParticlePtrList_flush.s index ee2f7852..40ba4c2d 100644 --- a/asm/non_matchings/unknown_00BC20/particlePtrList_flush.s +++ b/asm/non_matchings/unknown_00BC20/gParticlePtrList_flush.s @@ -1,9 +1,9 @@ -glabel particlePtrList_flush +glabel gParticlePtrList_flush /* 010C4C 8001004C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 010C50 80010050 AFB70030 */ sw $s7, 0x30($sp) -/* 010C54 80010054 3C178012 */ lui $s7, %hi(particleCount) # $s7, 0x8012 +/* 010C54 80010054 3C178012 */ lui $s7, %hi(gParticleCount) # $s7, 0x8012 /* 010C58 80010058 3C018012 */ lui $at, %hi(D_8011AE88) # $at, 0x8012 -/* 010C5C 8001005C 26F7AEC8 */ addiu $s7, %lo(particleCount) # addiu $s7, $s7, -0x5138 +/* 010C5C 8001005C 26F7AEC8 */ addiu $s7, %lo(gParticleCount) # addiu $s7, $s7, -0x5138 /* 010C60 80010060 AC20AE88 */ sw $zero, %lo(D_8011AE88)($at) /* 010C64 80010064 8EEE0000 */ lw $t6, ($s7) /* 010C68 80010068 AFB30020 */ sw $s3, 0x20($sp) @@ -16,14 +16,14 @@ glabel particlePtrList_flush /* 010C84 80010084 AFB00014 */ sw $s0, 0x14($sp) /* 010C88 80010088 19C0003C */ blez $t6, .L8001017C /* 010C8C 8001008C 00009825 */ move $s3, $zero -/* 010C90 80010090 3C158012 */ lui $s5, %hi(particlePtrList) # $s5, 0x8012 +/* 010C90 80010090 3C158012 */ lui $s5, %hi(gParticlePtrList) # $s5, 0x8012 /* 010C94 80010094 3C148012 */ lui $s4, %hi(D_8011AE7C) # $s4, 0x8012 -/* 010C98 80010098 3C118012 */ lui $s1, %hi(objPtrList) # $s1, 0x8012 +/* 010C98 80010098 3C118012 */ lui $s1, %hi(gObjPtrList) # $s1, 0x8012 /* 010C9C 8001009C 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012 /* 010CA0 800100A0 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4 -/* 010CA4 800100A4 2631AE58 */ addiu $s1, %lo(objPtrList) # addiu $s1, $s1, -0x51a8 +/* 010CA4 800100A4 2631AE58 */ addiu $s1, %lo(gObjPtrList) # addiu $s1, $s1, -0x51a8 /* 010CA8 800100A8 2694AE7C */ addiu $s4, %lo(D_8011AE7C) # addiu $s4, $s4, -0x5184 -/* 010CAC 800100AC 26B5AEC4 */ addiu $s5, %lo(particlePtrList) # addiu $s5, $s5, -0x513c +/* 010CAC 800100AC 26B5AEC4 */ addiu $s5, %lo(gParticlePtrList) # addiu $s5, $s5, -0x513c /* 010CB0 800100B0 00009025 */ move $s2, $zero /* 010CB4 800100B4 2416FFFF */ li $s6, -1 .L800100B8: diff --git a/asm/non_matchings/unknown_0255E0/func_80027568.s b/asm/non_matchings/unknown_0255E0/func_80027568.s index 8883023f..b7edd79d 100644 --- a/asm/non_matchings/unknown_0255E0/func_80027568.s +++ b/asm/non_matchings/unknown_0255E0/func_80027568.s @@ -20,7 +20,7 @@ glabel func_80027568 /* 028194 80027594 E7B6001C */ swc1 $f22, 0x1c($sp) /* 028198 80027598 E7B50010 */ swc1 $f21, 0x10($sp) /* 02819C 8002759C E7B40014 */ swc1 $f20, 0x14($sp) -/* 0281A0 800275A0 0C006E9D */ jal getPlayerStructArray +/* 0281A0 800275A0 0C006E9D */ jal get_object_struct_array /* 0281A4 800275A4 27A400C4 */ addiu $a0, $sp, 0xc4 /* 0281A8 800275A8 8FAE00C4 */ lw $t6, 0xc4($sp) /* 0281AC 800275AC 00403025 */ move $a2, $v0 diff --git a/asm/non_matchings/unknown_0255E0/func_800278E8.s b/asm/non_matchings/unknown_0255E0/func_800278E8.s index 77042650..bb876d07 100644 --- a/asm/non_matchings/unknown_0255E0/func_800278E8.s +++ b/asm/non_matchings/unknown_0255E0/func_800278E8.s @@ -4,7 +4,7 @@ glabel func_800278E8 /* 0284F0 800278F0 AFA40070 */ sw $a0, 0x70($sp) /* 0284F4 800278F4 AFB10018 */ sw $s1, 0x18($sp) /* 0284F8 800278F8 AFB00014 */ sw $s0, 0x14($sp) -/* 0284FC 800278FC 0C006E9D */ jal getPlayerStructArray +/* 0284FC 800278FC 0C006E9D */ jal get_object_struct_array /* 028500 80027900 27A40038 */ addiu $a0, $sp, 0x38 /* 028504 80027904 8FAE0038 */ lw $t6, 0x38($sp) /* 028508 80027908 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/unknown_0255E0/func_80028CD0.s b/asm/non_matchings/unknown_0255E0/func_80028CD0.s index 77917a13..7c070238 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028CD0.s +++ b/asm/non_matchings/unknown_0255E0/func_80028CD0.s @@ -65,7 +65,7 @@ glabel func_80028CD0 /* 0299C4 80028DC4 E42AD31C */ swc1 $f10, %lo(D_8011D31C)($at) /* 0299C8 80028DC8 0C02E2E3 */ jal func_800B8B8C /* 0299CC 80028DCC AFA7003C */ sw $a3, 0x3c($sp) -/* 0299D0 80028DD0 0C006E9D */ jal getPlayerStructArray +/* 0299D0 80028DD0 0C006E9D */ jal get_object_struct_array /* 0299D4 80028DD4 27A40040 */ addiu $a0, $sp, 0x40 /* 0299D8 80028DD8 3C0F8012 */ lui $t7, %hi(D_8011B0B0) # $t7, 0x8012 /* 0299DC 80028DDC 8DEFB0B0 */ lw $t7, %lo(D_8011B0B0)($t7) diff --git a/asm/non_matchings/unknown_0255E0/func_80028FAC.s b/asm/non_matchings/unknown_0255E0/func_80028FAC.s index aab03875..77eaf12a 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028FAC.s +++ b/asm/non_matchings/unknown_0255E0/func_80028FAC.s @@ -122,7 +122,7 @@ glabel func_80028FAC /* 029D58 80029158 26B5B0A8 */ addiu $s5, %lo(D_8011B0A8) # addiu $s5, $s5, -0x4f58 /* 029D5C 8002915C 02402025 */ move $a0, $s2 .L80029160: -/* 029D60 80029160 0C003A52 */ jal getObject +/* 029D60 80029160 0C003A52 */ jal get_object /* 029D64 80029164 241000FF */ li $s0, 255 /* 029D68 80029168 84430006 */ lh $v1, 6($v0) /* 029D6C 8002916C 8FAF0158 */ lw $t7, 0x158($sp) @@ -222,7 +222,7 @@ glabel func_80028FAC /* 029EC0 800292C0 25F8FFFF */ addiu $t8, $t7, -1 /* 029EC4 800292C4 AFB80044 */ sw $t8, 0x44($sp) .L800292C8: -/* 029EC8 800292C8 0C003A52 */ jal getObject +/* 029EC8 800292C8 0C003A52 */ jal get_object /* 029ECC 800292CC 02402025 */ move $a0, $s2 /* 029ED0 800292D0 84430006 */ lh $v1, 6($v0) /* 029ED4 800292D4 8FB90158 */ lw $t9, 0x158($sp) @@ -340,7 +340,7 @@ glabel func_80028FAC /* 02A070 80029470 AFAD0044 */ sw $t5, 0x44($sp) /* 02A074 80029474 02402025 */ move $a0, $s2 .L80029478: -/* 02A078 80029478 0C003A52 */ jal getObject +/* 02A078 80029478 0C003A52 */ jal get_object /* 02A07C 8002947C 241000FF */ li $s0, 255 /* 02A080 80029480 84430006 */ lh $v1, 6($v0) /* 02A084 80029484 8FB80158 */ lw $t8, 0x158($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_8002C7D4.s b/asm/non_matchings/unknown_0255E0/func_8002C7D4.s index 1b633c69..c40ed4f3 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002C7D4.s +++ b/asm/non_matchings/unknown_0255E0/func_8002C7D4.s @@ -84,9 +84,9 @@ glabel func_8002C7D4 /* 02D50C 8002C90C 00000000 */ nop /* 02D510 8002C910 10800005 */ beqz $a0, .L8002C928 /* 02D514 8002C914 00000000 */ nop -/* 02D518 8002C918 0C003FEE */ jal particlePtrList_addObject +/* 02D518 8002C918 0C003FEE */ jal gParticlePtrList_addObject /* 02D51C 8002C91C 00000000 */ nop -/* 02D520 8002C920 0C004013 */ jal particlePtrList_flush +/* 02D520 8002C920 0C004013 */ jal gParticlePtrList_flush /* 02D524 8002C924 00000000 */ nop .L8002C928: /* 02D528 8002C928 0C003181 */ jal func_8000C604 diff --git a/asm/non_matchings/unknown_0255E0/func_80030A74.s b/asm/non_matchings/unknown_0255E0/func_80030A74.s index a4ce0495..b795346d 100644 --- a/asm/non_matchings/unknown_0255E0/func_80030A74.s +++ b/asm/non_matchings/unknown_0255E0/func_80030A74.s @@ -26,7 +26,7 @@ glabel func_80030A74 /* 0316D4 80030AD4 10000005 */ b .L80030AEC /* 0316D8 80030AD8 AFAE0074 */ sw $t6, 0x74($sp) .L80030ADC: -/* 0316DC 80030ADC 0C006E9D */ jal getPlayerStructArray +/* 0316DC 80030ADC 0C006E9D */ jal get_object_struct_array /* 0316E0 80030AE0 AFAB0044 */ sw $t3, 0x44($sp) /* 0316E4 80030AE4 8FAB0044 */ lw $t3, 0x44($sp) /* 0316E8 80030AE8 0040F825 */ move $ra, $v0 diff --git a/asm/non_matchings/unknown_032760/func_80031F88.s b/asm/non_matchings/unknown_032760/func_80031F88.s index f1c60e69..9c1a7bef 100644 --- a/asm/non_matchings/unknown_032760/func_80031F88.s +++ b/asm/non_matchings/unknown_032760/func_80031F88.s @@ -77,7 +77,7 @@ glabel func_80031F88 /* 032CB4 800320B4 1081001C */ beq $a0, $at, .L80032128 /* 032CB8 800320B8 00000000 */ nop /* 032CBC 800320BC AFA50024 */ sw $a1, 0x24($sp) -/* 032CC0 800320C0 0C0078A7 */ jal func_8001E29C +/* 032CC0 800320C0 0C0078A7 */ jal get_misc_asset /* 032CC4 800320C4 AFA60018 */ sw $a2, 0x18($sp) /* 032CC8 800320C8 8FA60018 */ lw $a2, 0x18($sp) /* 032CCC 800320CC 8FA50024 */ lw $a1, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/func_80033F60.s index f16888ac..9b7231a8 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/func_80033F60.s @@ -281,7 +281,7 @@ glabel func_80033F60 /* 034F6C 8003436C 2407002C */ li $a3, 44 /* 034F70 80034370 0C00FF11 */ jal func_8003FC44 /* 034F74 80034374 E7A60014 */ swc1 $f6, 0x14($sp) -/* 034F78 80034378 0C003FEE */ jal particlePtrList_addObject +/* 034F78 80034378 0C003FEE */ jal gParticlePtrList_addObject /* 034F7C 8003437C 02002025 */ move $a0, $s0 /* 034F80 80034380 1000000D */ b .L800343B8 /* 034F84 80034384 86090048 */ lh $t1, 0x48($s0) @@ -317,7 +317,7 @@ glabel func_80033F60 /* 034FF0 800343F0 2401012A */ li $at, 298 /* 034FF4 800343F4 15A1000F */ bne $t5, $at, .L80034434 /* 034FF8 800343F8 00000000 */ nop -/* 034FFC 800343FC 0C003FEE */ jal particlePtrList_addObject +/* 034FFC 800343FC 0C003FEE */ jal gParticlePtrList_addObject /* 035000 80034400 02002025 */ move $a0, $s0 /* 035004 80034404 C60C000C */ lwc1 $f12, 0xc($s0) /* 035008 80034408 C60E0010 */ lwc1 $f14, 0x10($s0) @@ -349,7 +349,7 @@ glabel func_80033F60 /* 03506C 8003446C 00000000 */ nop /* 035070 80034470 4500002C */ bc1f .L80034524 /* 035074 80034474 8FBF002C */ lw $ra, 0x2c($sp) -/* 035078 80034478 0C003FEE */ jal particlePtrList_addObject +/* 035078 80034478 0C003FEE */ jal gParticlePtrList_addObject /* 03507C 8003447C 02002025 */ move $a0, $s0 /* 035080 80034480 10000028 */ b .L80034524 /* 035084 80034484 8FBF002C */ lw $ra, 0x2c($sp) @@ -393,7 +393,7 @@ glabel func_80033F60 /* 03510C 8003450C AFA00014 */ sw $zero, 0x14($sp) /* 035110 80034510 0C002556 */ jal func_80009558 /* 035114 80034514 24040155 */ li $a0, 341 -/* 035118 80034518 0C003FEE */ jal particlePtrList_addObject +/* 035118 80034518 0C003FEE */ jal gParticlePtrList_addObject /* 03511C 8003451C 02002025 */ move $a0, $s0 .L80034520: /* 035120 80034520 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80034860.s b/asm/non_matchings/unknown_032760/func_80034860.s index 15263e57..ea68bddd 100644 --- a/asm/non_matchings/unknown_032760/func_80034860.s +++ b/asm/non_matchings/unknown_032760/func_80034860.s @@ -172,7 +172,7 @@ glabel func_80034860 .L80034AD0: /* 0356D0 80034AD0 11000004 */ beqz $t0, .L80034AE4 /* 0356D4 80034AD4 8FBF002C */ lw $ra, 0x2c($sp) -/* 0356D8 80034AD8 0C003FEE */ jal particlePtrList_addObject +/* 0356D8 80034AD8 0C003FEE */ jal gParticlePtrList_addObject /* 0356DC 80034ADC 02002025 */ move $a0, $s0 /* 0356E0 80034AE0 8FBF002C */ lw $ra, 0x2c($sp) .L80034AE4: diff --git a/asm/non_matchings/unknown_032760/func_80034B74.s b/asm/non_matchings/unknown_032760/func_80034B74.s index 73469250..5a7df6fd 100644 --- a/asm/non_matchings/unknown_032760/func_80034B74.s +++ b/asm/non_matchings/unknown_032760/func_80034B74.s @@ -18,7 +18,7 @@ glabel func_80034B74 /* 0357B4 80034BB4 8C90003C */ lw $s0, 0x3c($a0) /* 0357B8 80034BB8 00803025 */ move $a2, $a0 /* 0357BC 80034BBC AFA60098 */ sw $a2, 0x98($sp) -/* 0357C0 80034BC0 0C006E9D */ jal getPlayerStructArray +/* 0357C0 80034BC0 0C006E9D */ jal get_object_struct_array /* 0357C4 80034BC4 27A4008C */ addiu $a0, $sp, 0x8c /* 0357C8 80034BC8 AFA20094 */ sw $v0, 0x94($sp) /* 0357CC 80034BCC 9204000B */ lbu $a0, 0xb($s0) diff --git a/asm/non_matchings/unknown_032760/func_80034E9C.s b/asm/non_matchings/unknown_032760/func_80034E9C.s index c9088bc4..9a1a3435 100644 --- a/asm/non_matchings/unknown_032760/func_80034E9C.s +++ b/asm/non_matchings/unknown_032760/func_80034E9C.s @@ -70,7 +70,7 @@ glabel func_80034E9C /* 035B8C 80034F8C 8E0D0054 */ lw $t5, 0x54($s0) /* 035B90 80034F90 00002025 */ move $a0, $zero /* 035B94 80034F94 E5A60028 */ swc1 $f6, 0x28($t5) -/* 035B98 80034F98 0C006EB2 */ jal getPlayerStruct +/* 035B98 80034F98 0C006EB2 */ jal get_object_struct /* 035B9C 80034F9C AFA30054 */ sw $v1, 0x54($sp) /* 035BA0 80034FA0 8FA30054 */ lw $v1, 0x54($sp) /* 035BA4 80034FA4 1040009E */ beqz $v0, .L80035220 diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/func_80035260.s index 6531724f..92a4eeeb 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -158,7 +158,7 @@ glabel func_80035260 /* 03609C 8003549C 00000000 */ nop /* 0360A0 800354A0 AC400078 */ sw $zero, 0x78($v0) .L800354A4: -/* 0360A4 800354A4 0C003FEE */ jal particlePtrList_addObject +/* 0360A4 800354A4 0C003FEE */ jal gParticlePtrList_addObject /* 0360A8 800354A8 02002025 */ move $a0, $s0 .L800354AC: /* 0360AC 800354AC 8FAB0034 */ lw $t3, 0x34($sp) @@ -185,7 +185,7 @@ glabel func_80035260 /* 0360F4 800354F4 A22F000A */ sb $t7, 0xa($s1) /* 0360F8 800354F8 24180003 */ li $t8, 3 /* 0360FC 800354FC 8224000A */ lb $a0, 0xa($s1) -/* 036100 80035500 0C006EB2 */ jal getPlayerStruct +/* 036100 80035500 0C006EB2 */ jal get_object_struct /* 036104 80035504 A238000B */ sb $t8, 0xb($s1) /* 036108 80035508 44800000 */ mtc1 $zero, $f0 /* 03610C 8003550C 10400007 */ beqz $v0, .L8003552C @@ -205,7 +205,7 @@ glabel func_80035260 /* 03613C 8003553C 862A0008 */ lh $t2, 8($s1) /* 036140 80035540 8224000A */ lb $a0, 0xa($s1) /* 036144 80035544 01455823 */ subu $t3, $t2, $a1 -/* 036148 80035548 0C006EB2 */ jal getPlayerStruct +/* 036148 80035548 0C006EB2 */ jal get_object_struct /* 03614C 8003554C A62B0008 */ sh $t3, 8($s1) /* 036150 80035550 10400004 */ beqz $v0, .L80035564 /* 036154 80035554 00403825 */ move $a3, $v0 @@ -254,7 +254,7 @@ glabel func_80035260 /* 0361F0 800355F0 A0C801CF */ sb $t0, 0x1cf($a2) .L800355F4: /* 0361F4 800355F4 8224000A */ lb $a0, 0xa($s1) -/* 0361F8 800355F8 0C006EB2 */ jal getPlayerStruct +/* 0361F8 800355F8 0C006EB2 */ jal get_object_struct /* 0361FC 800355FC 00000000 */ nop /* 036200 80035600 10400009 */ beqz $v0, .L80035628 /* 036204 80035604 240B0080 */ li $t3, 128 diff --git a/asm/non_matchings/unknown_032760/func_800357D4.s b/asm/non_matchings/unknown_032760/func_800357D4.s index 3165fa24..165ba83c 100644 --- a/asm/non_matchings/unknown_032760/func_800357D4.s +++ b/asm/non_matchings/unknown_032760/func_800357D4.s @@ -3,7 +3,7 @@ glabel func_800357D4 /* 0363D8 800357D8 AFBF0014 */ sw $ra, 0x14($sp) /* 0363DC 800357DC AFA40020 */ sw $a0, 0x20($sp) /* 0363E0 800357E0 AFA50024 */ sw $a1, 0x24($sp) -/* 0363E4 800357E4 0C006EB2 */ jal getPlayerStruct +/* 0363E4 800357E4 0C006EB2 */ jal get_object_struct /* 0363E8 800357E8 00002025 */ move $a0, $zero /* 0363EC 800357EC 1040001F */ beqz $v0, .L8003586C /* 0363F0 800357F0 8FAC0020 */ lw $t4, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003588C.s b/asm/non_matchings/unknown_032760/func_8003588C.s index d9385931..ac0ef891 100644 --- a/asm/non_matchings/unknown_032760/func_8003588C.s +++ b/asm/non_matchings/unknown_032760/func_8003588C.s @@ -51,7 +51,7 @@ glabel func_8003588C /* 036548 80035948 0002CA80 */ sll $t9, $v0, 0xa /* 03654C 8003594C 07210004 */ bgez $t9, .L80035960 /* 036550 80035950 8FBF0014 */ lw $ra, 0x14($sp) -/* 036554 80035954 0C003FEE */ jal particlePtrList_addObject +/* 036554 80035954 0C003FEE */ jal gParticlePtrList_addObject /* 036558 80035958 00000000 */ nop /* 03655C 8003595C 8FBF0014 */ lw $ra, 0x14($sp) .L80035960: diff --git a/asm/non_matchings/unknown_032760/func_8003596C.s b/asm/non_matchings/unknown_032760/func_8003596C.s index cc1daa30..d01aeab7 100644 --- a/asm/non_matchings/unknown_032760/func_8003596C.s +++ b/asm/non_matchings/unknown_032760/func_8003596C.s @@ -34,7 +34,7 @@ glabel func_8003596C /* 0365E4 800359E4 314B4000 */ andi $t3, $t2, 0x4000 /* 0365E8 800359E8 15600038 */ bnez $t3, .L80035ACC /* 0365EC 800359EC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0365F0 800359F0 0C006E9D */ jal getPlayerStructArray +/* 0365F0 800359F0 0C006E9D */ jal get_object_struct_array /* 0365F4 800359F4 27A40040 */ addiu $a0, $sp, 0x40 /* 0365F8 800359F8 8FAC0040 */ lw $t4, 0x40($sp) /* 0365FC 800359FC 00008825 */ move $s1, $zero diff --git a/asm/non_matchings/unknown_032760/func_80035AE8.s b/asm/non_matchings/unknown_032760/func_80035AE8.s index 21b2a999..5830ac91 100644 --- a/asm/non_matchings/unknown_032760/func_80035AE8.s +++ b/asm/non_matchings/unknown_032760/func_80035AE8.s @@ -87,7 +87,7 @@ glabel func_80035AE8 /* 03682C 80035C2C 0002C280 */ sll $t8, $v0, 0xa /* 036830 80035C30 07010004 */ bgez $t8, .L80035C44 /* 036834 80035C34 8FBF0014 */ lw $ra, 0x14($sp) -/* 036838 80035C38 0C003FEE */ jal particlePtrList_addObject +/* 036838 80035C38 0C003FEE */ jal gParticlePtrList_addObject /* 03683C 80035C3C 00000000 */ nop /* 036840 80035C40 8FBF0014 */ lw $ra, 0x14($sp) .L80035C44: diff --git a/asm/non_matchings/unknown_032760/func_80035C50.s b/asm/non_matchings/unknown_032760/func_80035C50.s index 17b96a9f..2d8cc9f8 100644 --- a/asm/non_matchings/unknown_032760/func_80035C50.s +++ b/asm/non_matchings/unknown_032760/func_80035C50.s @@ -17,7 +17,7 @@ glabel func_80035C50 /* 03688C 80035C8C 00000000 */ nop /* 036890 80035C90 37191000 */ ori $t9, $t8, 0x1000 /* 036894 80035C94 A4990006 */ sh $t9, 6($a0) -/* 036898 80035C98 0C006EB2 */ jal getPlayerStruct +/* 036898 80035C98 0C006EB2 */ jal get_object_struct /* 03689C 80035C9C 00002025 */ move $a0, $zero /* 0368A0 80035CA0 8E48004C */ lw $t0, 0x4c($s2) /* 0368A4 80035CA4 8E4A0078 */ lw $t2, 0x78($s2) @@ -26,7 +26,7 @@ glabel func_80035C50 /* 0368B0 80035CB0 012A082A */ slt $at, $t1, $t2 /* 0368B4 80035CB4 10200051 */ beqz $at, .L80035DFC /* 0368B8 80035CB8 8FBF003C */ lw $ra, 0x3c($sp) -/* 0368BC 80035CBC 0C006E9D */ jal getPlayerStructArray +/* 0368BC 80035CBC 0C006E9D */ jal get_object_struct_array /* 0368C0 80035CC0 27A40054 */ addiu $a0, $sp, 0x54 /* 0368C4 80035CC4 8FAB0054 */ lw $t3, 0x54($sp) /* 0368C8 80035CC8 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/unknown_032760/func_80035E34.s b/asm/non_matchings/unknown_032760/func_80035E34.s index 912e4f7c..9ebe6db0 100644 --- a/asm/non_matchings/unknown_032760/func_80035E34.s +++ b/asm/non_matchings/unknown_032760/func_80035E34.s @@ -21,7 +21,7 @@ glabel func_80035E34 /* 036A7C 80035E7C 8FA50024 */ lw $a1, 0x24($sp) /* 036A80 80035E80 0C02BF0F */ jal func_800AFC3C /* 036A84 80035E84 02002025 */ move $a0, $s0 -/* 036A88 80035E88 0C006EB2 */ jal getPlayerStruct +/* 036A88 80035E88 0C006EB2 */ jal get_object_struct /* 036A8C 80035E8C 00002025 */ move $a0, $zero /* 036A90 80035E90 8E030060 */ lw $v1, 0x60($s0) /* 036A94 80035E94 24050001 */ li $a1, 1 diff --git a/asm/non_matchings/unknown_032760/func_80035F6C.s b/asm/non_matchings/unknown_032760/func_80035F6C.s index bed50f15..eb692ba9 100644 --- a/asm/non_matchings/unknown_032760/func_80035F6C.s +++ b/asm/non_matchings/unknown_032760/func_80035F6C.s @@ -7,7 +7,7 @@ glabel func_80035F6C /* 036B80 80035F80 05C1002C */ bgez $t6, .L80036034 /* 036B84 80035F84 8FBF0014 */ lw $ra, 0x14($sp) /* 036B88 80035F88 8C840078 */ lw $a0, 0x78($a0) -/* 036B8C 80035F8C 0C006EB2 */ jal getPlayerStruct +/* 036B8C 80035F8C 0C006EB2 */ jal get_object_struct /* 036B90 80035F90 AFA60018 */ sw $a2, 0x18($sp) /* 036B94 80035F94 8FA60018 */ lw $a2, 0x18($sp) /* 036B98 80035F98 10400025 */ beqz $v0, .L80036030 diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index 436cd371..e8f6148f 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -55,7 +55,7 @@ glabel func_800361E0 /* 036E80 80036280 E7A00070 */ swc1 $f0, 0x70($sp) /* 036E84 80036284 00002025 */ move $a0, $zero /* 036E88 80036288 E600001C */ swc1 $f0, 0x1c($s0) -/* 036E8C 8003628C 0C006EB2 */ jal getPlayerStruct +/* 036E8C 8003628C 0C006EB2 */ jal get_object_struct /* 036E90 80036290 E6000024 */ swc1 $f0, 0x24($s0) /* 036E94 80036294 00402825 */ move $a1, $v0 /* 036E98 80036298 10400042 */ beqz $v0, .L800363A4 diff --git a/asm/non_matchings/unknown_032760/func_800370D4.s b/asm/non_matchings/unknown_032760/func_800370D4.s index e308df3b..8596ad78 100644 --- a/asm/non_matchings/unknown_032760/func_800370D4.s +++ b/asm/non_matchings/unknown_032760/func_800370D4.s @@ -8,7 +8,7 @@ glabel func_800370D4 /* 037CEC 800370EC AFA50074 */ sw $a1, 0x74($sp) /* 037CF0 800370F0 18400005 */ blez $v0, .L80037108 /* 037CF4 800370F4 00000000 */ nop -/* 037CF8 800370F8 0C003FEE */ jal particlePtrList_addObject +/* 037CF8 800370F8 0C003FEE */ jal gParticlePtrList_addObject /* 037CFC 800370FC 02202025 */ move $a0, $s1 /* 037D00 80037100 10000119 */ b .L80037568 /* 037D04 80037104 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80037A18.s b/asm/non_matchings/unknown_032760/func_80037A18.s index 78024cd3..daa8d388 100644 --- a/asm/non_matchings/unknown_032760/func_80037A18.s +++ b/asm/non_matchings/unknown_032760/func_80037A18.s @@ -178,7 +178,7 @@ glabel func_80037A18 /* 0388A8 80037CA8 11F80004 */ beq $t7, $t8, .L80037CBC /* 0388AC 80037CAC 00000000 */ nop .L80037CB0: -/* 0388B0 80037CB0 0C003FEE */ jal particlePtrList_addObject +/* 0388B0 80037CB0 0C003FEE */ jal gParticlePtrList_addObject /* 0388B4 80037CB4 00A02025 */ move $a0, $a1 /* 0388B8 80037CB8 AE000064 */ sw $zero, 0x64($s0) .L80037CBC: diff --git a/asm/non_matchings/unknown_032760/func_800387CC.s b/asm/non_matchings/unknown_032760/func_800387CC.s index ab4bce5e..c17718d8 100644 --- a/asm/non_matchings/unknown_032760/func_800387CC.s +++ b/asm/non_matchings/unknown_032760/func_800387CC.s @@ -7,7 +7,7 @@ glabel func_800387CC /* 0393E0 800387E0 10400006 */ beqz $v0, .L800387FC /* 0393E4 800387E4 00001825 */ move $v1, $zero /* 0393E8 800387E8 2444FFFF */ addiu $a0, $v0, -1 -/* 0393EC 800387EC 0C006EB2 */ jal getPlayerStruct +/* 0393EC 800387EC 0C006EB2 */ jal get_object_struct /* 0393F0 800387F0 AFA70020 */ sw $a3, 0x20($sp) /* 0393F4 800387F4 8FA70020 */ lw $a3, 0x20($sp) /* 0393F8 800387F8 00401825 */ move $v1, $v0 diff --git a/asm/non_matchings/unknown_032760/func_800389B8.s b/asm/non_matchings/unknown_032760/func_800389B8.s index 406d5c38..7835a9d5 100644 --- a/asm/non_matchings/unknown_032760/func_800389B8.s +++ b/asm/non_matchings/unknown_032760/func_800389B8.s @@ -41,7 +41,7 @@ glabel func_800389B8 /* 03963C 80038A3C E4900010 */ swc1 $f16, 0x10($a0) /* 039640 80038A40 14200006 */ bnez $at, .L80038A5C /* 039644 80038A44 E4880014 */ swc1 $f8, 0x14($a0) -/* 039648 80038A48 0C003FEE */ jal particlePtrList_addObject +/* 039648 80038A48 0C003FEE */ jal gParticlePtrList_addObject /* 03964C 80038A4C AFA40018 */ sw $a0, 0x18($sp) /* 039650 80038A50 8FA40018 */ lw $a0, 0x18($sp) /* 039654 80038A54 240900FF */ li $t1, 255 diff --git a/asm/non_matchings/unknown_032760/func_80038AD4.s b/asm/non_matchings/unknown_032760/func_80038AD4.s index c1bb434f..cbaef2f8 100644 --- a/asm/non_matchings/unknown_032760/func_80038AD4.s +++ b/asm/non_matchings/unknown_032760/func_80038AD4.s @@ -36,7 +36,7 @@ glabel func_80038AD4 /* 039744 80038B44 29010100 */ slti $at, $t0, 0x100 /* 039748 80038B48 14200006 */ bnez $at, .L80038B64 /* 03974C 80038B4C E4900010 */ swc1 $f16, 0x10($a0) -/* 039750 80038B50 0C003FEE */ jal particlePtrList_addObject +/* 039750 80038B50 0C003FEE */ jal gParticlePtrList_addObject /* 039754 80038B54 AFA40018 */ sw $a0, 0x18($sp) /* 039758 80038B58 8FA40018 */ lw $a0, 0x18($sp) /* 03975C 80038B5C 240900FF */ li $t1, 255 diff --git a/asm/non_matchings/unknown_032760/func_80038BF4.s b/asm/non_matchings/unknown_032760/func_80038BF4.s index 4e2576d2..a87a497c 100644 --- a/asm/non_matchings/unknown_032760/func_80038BF4.s +++ b/asm/non_matchings/unknown_032760/func_80038BF4.s @@ -73,7 +73,7 @@ glabel func_80038BF4 /* 039908 80038D08 10000003 */ b .L80038D18 /* 03990C 80038D0C E6100008 */ swc1 $f16, 8($s0) .L80038D10: -/* 039910 80038D10 0C003FEE */ jal particlePtrList_addObject +/* 039910 80038D10 0C003FEE */ jal gParticlePtrList_addObject /* 039914 80038D14 02002025 */ move $a0, $s0 .L80038D18: /* 039918 80038D18 8E190074 */ lw $t9, 0x74($s0) diff --git a/asm/non_matchings/unknown_032760/func_80038F58.s b/asm/non_matchings/unknown_032760/func_80038F58.s index 8a26d60c..d20f655b 100644 --- a/asm/non_matchings/unknown_032760/func_80038F58.s +++ b/asm/non_matchings/unknown_032760/func_80038F58.s @@ -56,7 +56,7 @@ glabel func_80038F58 /* 039C28 80039028 1020003F */ beqz $at, .L80039128 /* 039C2C 8003902C 8FBF0044 */ lw $ra, 0x44($sp) /* 039C30 80039030 44822000 */ mtc1 $v0, $f4 -/* 039C34 80039034 0C006E9D */ jal getPlayerStructArray +/* 039C34 80039034 0C006E9D */ jal get_object_struct_array /* 039C38 80039038 468025A0 */ cvt.s.w $f22, $f4 /* 039C3C 8003903C 8FB80074 */ lw $t8, 0x74($sp) /* 039C40 80039040 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 0a1af36c..d531941a 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -68,7 +68,7 @@ glabel func_80039330 /* 039FDC 800393DC 00002025 */ move $a0, $zero /* 039FE0 800393E0 E7A0009C */ swc1 $f0, 0x9c($sp) /* 039FE4 800393E4 E600001C */ swc1 $f0, 0x1c($s0) -/* 039FE8 800393E8 0C006EB2 */ jal getPlayerStruct +/* 039FE8 800393E8 0C006EB2 */ jal get_object_struct /* 039FEC 800393EC E6000024 */ swc1 $f0, 0x24($s0) /* 039FF0 800393F0 00401825 */ move $v1, $v0 /* 039FF4 800393F4 10400019 */ beqz $v0, .L8003945C @@ -1445,7 +1445,7 @@ glabel L8003A5AC /* 03B3D8 8003A7D8 46204120 */ cvt.s.d $f4, $f8 /* 03B3DC 8003A7DC E6240004 */ swc1 $f4, 4($s1) .L8003A7E0: -/* 03B3E0 8003A7E0 0C006E9D */ jal getPlayerStructArray +/* 03B3E0 8003A7E0 0C006E9D */ jal get_object_struct_array /* 03B3E4 8003A7E4 27A40078 */ addiu $a0, $sp, 0x78 /* 03B3E8 8003A7E8 8C480000 */ lw $t0, ($v0) /* 03B3EC 8003A7EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003AE50.s b/asm/non_matchings/unknown_032760/func_8003AE50.s index 466f4d99..6ae59fe8 100644 --- a/asm/non_matchings/unknown_032760/func_8003AE50.s +++ b/asm/non_matchings/unknown_032760/func_8003AE50.s @@ -23,7 +23,7 @@ glabel func_8003AE50 /* 03BAA4 8003AEA4 1020005D */ beqz $at, .L8003B01C /* 03BAA8 8003AEA8 27A40074 */ addiu $a0, $sp, 0x74 /* 03BAAC 8003AEAC 44822000 */ mtc1 $v0, $f4 -/* 03BAB0 8003AEB0 0C006E9D */ jal getPlayerStructArray +/* 03BAB0 8003AEB0 0C006E9D */ jal get_object_struct_array /* 03BAB4 8003AEB4 468025A0 */ cvt.s.w $f22, $f4 /* 03BAB8 8003AEB8 8FB80074 */ lw $t8, 0x74($sp) /* 03BABC 8003AEBC 0000A025 */ move $s4, $zero diff --git a/asm/non_matchings/unknown_032760/func_8003B174.s b/asm/non_matchings/unknown_032760/func_8003B174.s index 23542d87..eebfe381 100644 --- a/asm/non_matchings/unknown_032760/func_8003B174.s +++ b/asm/non_matchings/unknown_032760/func_8003B174.s @@ -24,7 +24,7 @@ glabel func_8003B174 /* 03BDCC 8003B1CC 10200056 */ beqz $at, .L8003B328 /* 03BDD0 8003B1D0 27A40084 */ addiu $a0, $sp, 0x84 /* 03BDD4 8003B1D4 44822000 */ mtc1 $v0, $f4 -/* 03BDD8 8003B1D8 0C006E9D */ jal getPlayerStructArray +/* 03BDD8 8003B1D8 0C006E9D */ jal get_object_struct_array /* 03BDDC 8003B1DC 468025A0 */ cvt.s.w $f22, $f4 /* 03BDE0 8003B1E0 8FB80084 */ lw $t8, 0x84($sp) /* 03BDE4 8003B1E4 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index 24d3ca79..02afdf05 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -60,7 +60,7 @@ glabel func_8003B4BC /* 03C188 8003B588 1000008B */ b .L8003B7B8 /* 03C18C 8003B58C AE2B007C */ sw $t3, 0x7c($s1) .L8003B590: -/* 03C190 8003B590 0C003FEE */ jal particlePtrList_addObject +/* 03C190 8003B590 0C003FEE */ jal gParticlePtrList_addObject /* 03C194 8003B594 02202025 */ move $a0, $s1 /* 03C198 8003B598 10000088 */ b .L8003B7BC /* 03C19C 8003B59C 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003C7A4.s b/asm/non_matchings/unknown_032760/func_8003C7A4.s index 8e93bde8..83f09c5b 100644 --- a/asm/non_matchings/unknown_032760/func_8003C7A4.s +++ b/asm/non_matchings/unknown_032760/func_8003C7A4.s @@ -47,7 +47,7 @@ glabel func_8003C7A4 /* 03D454 8003C854 44852000 */ mtc1 $a1, $f4 /* 03D458 8003C858 27A4008C */ addiu $a0, $sp, 0x8c /* 03D45C 8003C85C AFA60060 */ sw $a2, 0x60($sp) -/* 03D460 8003C860 0C006E9D */ jal getPlayerStructArray +/* 03D460 8003C860 0C006E9D */ jal get_object_struct_array /* 03D464 8003C864 468025A0 */ cvt.s.w $f22, $f4 /* 03D468 8003C868 8FAD008C */ lw $t5, 0x8c($sp) /* 03D46C 8003C86C 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/func_8003CA68.s index 778100e7..d0170d05 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/func_8003CA68.s @@ -211,7 +211,7 @@ glabel func_8003CA68 .L8003CD6C: /* 03D96C 8003CD6C AE090078 */ sw $t1, 0x78($s0) /* 03D970 8003CD70 AFA8005C */ sw $t0, 0x5c($sp) -/* 03D974 8003CD74 0C006EB2 */ jal getPlayerStruct +/* 03D974 8003CD74 0C006EB2 */ jal get_object_struct /* 03D978 8003CD78 00002025 */ move $a0, $zero /* 03D97C 8003CD7C 8FA8005C */ lw $t0, 0x5c($sp) /* 03D980 8003CD80 10400013 */ beqz $v0, .L8003CDD0 diff --git a/asm/non_matchings/unknown_032760/func_8003D058.s b/asm/non_matchings/unknown_032760/func_8003D058.s index cccee6a1..ea3d27d8 100644 --- a/asm/non_matchings/unknown_032760/func_8003D058.s +++ b/asm/non_matchings/unknown_032760/func_8003D058.s @@ -9,7 +9,7 @@ glabel func_8003D058 /* 03DC60 8003D060 AFA5004C */ sw $a1, 0x4c($sp) /* 03DC64 8003D064 00803025 */ move $a2, $a0 /* 03DC68 8003D068 8C840078 */ lw $a0, 0x78($a0) -/* 03DC6C 8003D06C 0C006EB2 */ jal getPlayerStruct +/* 03DC6C 8003D06C 0C006EB2 */ jal get_object_struct /* 03DC70 8003D070 AFA60048 */ sw $a2, 0x48($sp) /* 03DC74 8003D074 8FA60048 */ lw $a2, 0x48($sp) /* 03DC78 8003D078 10400088 */ beqz $v0, .L8003D29C diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/func_8003D2B8.s index 815b39aa..4b19a198 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/func_8003D2B8.s @@ -64,7 +64,7 @@ glabel func_8003D2B8 /* 03DF98 8003D398 00000000 */ nop /* 03DF9C 8003D39C A04D01D8 */ sb $t5, 0x1d8($v0) .L8003D3A0: -/* 03DFA0 8003D3A0 0C003FEE */ jal particlePtrList_addObject +/* 03DFA0 8003D3A0 0C003FEE */ jal gParticlePtrList_addObject /* 03DFA4 8003D3A4 AFA20020 */ sw $v0, 0x20($sp) /* 03DFA8 8003D3A8 8FA20020 */ lw $v0, 0x20($sp) /* 03DFAC 8003D3AC 2401FFFF */ li $at, -1 diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index 8a9e2ac6..7771afb1 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -56,7 +56,7 @@ glabel func_8003D5A0 /* 03E250 8003D650 00000000 */ nop /* 03E254 8003D654 1D80014F */ bgtz $t4, .L8003DB94 /* 03E258 8003D658 8FBF0024 */ lw $ra, 0x24($sp) -/* 03E25C 8003D65C 0C003FEE */ jal particlePtrList_addObject +/* 03E25C 8003D65C 0C003FEE */ jal gParticlePtrList_addObject /* 03E260 8003D660 02002025 */ move $a0, $s0 /* 03E264 8003D664 1000014B */ b .L8003DB94 /* 03E268 8003D668 8FBF0024 */ lw $ra, 0x24($sp) @@ -396,7 +396,7 @@ glabel func_8003D5A0 /* 03E75C 8003DB5C 28410002 */ slti $at, $v0, 2 /* 03E760 8003DB60 14200005 */ bnez $at, .L8003DB78 /* 03E764 8003DB64 2418FFFF */ li $t8, -1 -/* 03E768 8003DB68 0C003FEE */ jal particlePtrList_addObject +/* 03E768 8003DB68 0C003FEE */ jal gParticlePtrList_addObject /* 03E76C 8003DB6C 02002025 */ move $a0, $s0 /* 03E770 8003DB70 10000008 */ b .L8003DB94 /* 03E774 8003DB74 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003DBA0.s b/asm/non_matchings/unknown_032760/func_8003DBA0.s index 03245723..b80eaa50 100644 --- a/asm/non_matchings/unknown_032760/func_8003DBA0.s +++ b/asm/non_matchings/unknown_032760/func_8003DBA0.s @@ -42,7 +42,7 @@ glabel func_8003DBA0 /* 03E838 8003DC38 848D0006 */ lh $t5, 6($a0) /* 03E83C 8003DC3C 00000000 */ nop /* 03E840 8003DC40 35AE0600 */ ori $t6, $t5, 0x600 -/* 03E844 8003DC44 0C003FEE */ jal particlePtrList_addObject +/* 03E844 8003DC44 0C003FEE */ jal gParticlePtrList_addObject /* 03E848 8003DC48 A48E0006 */ sh $t6, 6($a0) /* 03E84C 8003DC4C 8FBF0014 */ lw $ra, 0x14($sp) .L8003DC50: diff --git a/asm/non_matchings/unknown_032760/func_8003DC5C.s b/asm/non_matchings/unknown_032760/func_8003DC5C.s index 5fa591c1..54ec6413 100644 --- a/asm/non_matchings/unknown_032760/func_8003DC5C.s +++ b/asm/non_matchings/unknown_032760/func_8003DC5C.s @@ -41,7 +41,7 @@ glabel func_8003DC5C /* 03E8F0 8003DCF0 848C0006 */ lh $t4, 6($a0) /* 03E8F4 8003DCF4 00000000 */ nop /* 03E8F8 8003DCF8 358D0600 */ ori $t5, $t4, 0x600 -/* 03E8FC 8003DCFC 0C003FEE */ jal particlePtrList_addObject +/* 03E8FC 8003DCFC 0C003FEE */ jal gParticlePtrList_addObject /* 03E900 8003DD00 A48D0006 */ sh $t5, 6($a0) /* 03E904 8003DD04 8FBF0014 */ lw $ra, 0x14($sp) .L8003DD08: diff --git a/asm/non_matchings/unknown_032760/func_8003DE74.s b/asm/non_matchings/unknown_032760/func_8003DE74.s index a1c21eb4..d3f4cba8 100644 --- a/asm/non_matchings/unknown_032760/func_8003DE74.s +++ b/asm/non_matchings/unknown_032760/func_8003DE74.s @@ -31,7 +31,7 @@ glabel func_8003DE74 /* 03EAE8 8003DEE8 13200004 */ beqz $t9, .L8003DEFC /* 03EAEC 8003DEEC 8FBF0014 */ lw $ra, 0x14($sp) .L8003DEF0: -/* 03EAF0 8003DEF0 0C003FEE */ jal particlePtrList_addObject +/* 03EAF0 8003DEF0 0C003FEE */ jal gParticlePtrList_addObject /* 03EAF4 8003DEF4 00000000 */ nop /* 03EAF8 8003DEF8 8FBF0014 */ lw $ra, 0x14($sp) .L8003DEFC: diff --git a/asm/non_matchings/unknown_032760/func_8003DF08.s b/asm/non_matchings/unknown_032760/func_8003DF08.s index 3dc46079..7f4bf75a 100644 --- a/asm/non_matchings/unknown_032760/func_8003DF08.s +++ b/asm/non_matchings/unknown_032760/func_8003DF08.s @@ -35,7 +35,7 @@ glabel func_8003DF08 /* 03EB8C 8003DF8C 240A0001 */ li $t2, 1 /* 03EB90 8003DF90 012A5804 */ sllv $t3, $t2, $t1 /* 03EB94 8003DF94 010B6025 */ or $t4, $t0, $t3 -/* 03EB98 8003DF98 0C003FEE */ jal particlePtrList_addObject +/* 03EB98 8003DF98 0C003FEE */ jal gParticlePtrList_addObject /* 03EB9C 8003DF9C A44C0008 */ sh $t4, 8($v0) /* 03EBA0 8003DFA0 8FA60018 */ lw $a2, 0x18($sp) /* 03EBA4 8003DFA4 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003DFCC.s b/asm/non_matchings/unknown_032760/func_8003DFCC.s index 0c5b1181..a20f71a6 100644 --- a/asm/non_matchings/unknown_032760/func_8003DFCC.s +++ b/asm/non_matchings/unknown_032760/func_8003DFCC.s @@ -94,7 +94,7 @@ glabel func_8003DFCC /* 03ED1C 8003E11C 30480800 */ andi $t0, $v0, 0x800 /* 03ED20 8003E120 11000004 */ beqz $t0, .L8003E134 /* 03ED24 8003E124 8FBF0014 */ lw $ra, 0x14($sp) -/* 03ED28 8003E128 0C003FEE */ jal particlePtrList_addObject +/* 03ED28 8003E128 0C003FEE */ jal gParticlePtrList_addObject /* 03ED2C 8003E12C 00000000 */ nop /* 03ED30 8003E130 8FBF0014 */ lw $ra, 0x14($sp) .L8003E134: diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/func_8003E140.s index 1700eaf4..76c4efab 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/func_8003E140.s @@ -198,7 +198,7 @@ glabel func_8003E140 /* 03EFF0 8003E3F0 A3A4002D */ sb $a0, 0x2d($sp) .L8003E3F4: /* 03EFF4 8003E3F4 2404000C */ li $a0, 12 -/* 03EFF8 8003E3F8 0C0078A7 */ jal func_8001E29C +/* 03EFF8 8003E3F8 0C0078A7 */ jal get_misc_asset /* 03EFFC 8003E3FC AFA30038 */ sw $v1, 0x38($sp) /* 03F000 8003E400 8FA30038 */ lw $v1, 0x38($sp) /* 03F004 8003E404 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index ca434080..7c3004db 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -299,7 +299,7 @@ glabel func_8003E694 /* 03F6E8 8003EAE8 2407002C */ li $a3, 44 /* 03F6EC 8003EAEC 0C00FF11 */ jal func_8003FC44 /* 03F6F0 8003EAF0 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03F6F4 8003EAF4 0C003FEE */ jal particlePtrList_addObject +/* 03F6F4 8003EAF4 0C003FEE */ jal gParticlePtrList_addObject /* 03F6F8 8003EAF8 02002025 */ move $a0, $s0 /* 03F6FC 8003EAFC 10000041 */ b .L8003EC04 /* 03F700 8003EB00 8FBF002C */ lw $ra, 0x2c($sp) @@ -368,7 +368,7 @@ glabel func_8003E694 /* 03F7EC 8003EBEC AFA80010 */ sw $t0, 0x10($sp) /* 03F7F0 8003EBF0 0C00FF11 */ jal func_8003FC44 /* 03F7F4 8003EBF4 E7B00014 */ swc1 $f16, 0x14($sp) -/* 03F7F8 8003EBF8 0C003FEE */ jal particlePtrList_addObject +/* 03F7F8 8003EBF8 0C003FEE */ jal gParticlePtrList_addObject /* 03F7FC 8003EBFC 02002025 */ move $a0, $s0 .L8003EC00: /* 03F800 8003EC00 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index 44bda8d0..0dac6658 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -206,7 +206,7 @@ glabel func_8003F2E8 /* 0401CC 8003F5CC 1D800007 */ bgtz $t4, .L8003F5EC /* 0401D0 8003F5D0 8FAE0064 */ lw $t6, 0x64($sp) /* 0401D4 8003F5D4 A50D0006 */ sh $t5, 6($t0) -/* 0401D8 8003F5D8 0C003FEE */ jal particlePtrList_addObject +/* 0401D8 8003F5D8 0C003FEE */ jal gParticlePtrList_addObject /* 0401DC 8003F5DC AFA80038 */ sw $t0, 0x38($sp) /* 0401E0 8003F5E0 8FA80038 */ lw $t0, 0x38($sp) /* 0401E4 8003F5E4 00000000 */ nop @@ -352,7 +352,7 @@ glabel func_8003F2E8 /* 0403EC 8003F7EC 1DA00006 */ bgtz $t5, .L8003F808 /* 0403F0 8003F7F0 00000000 */ nop /* 0403F4 8003F7F4 A50F0006 */ sh $t7, 6($t0) -/* 0403F8 8003F7F8 0C003FEE */ jal particlePtrList_addObject +/* 0403F8 8003F7F8 0C003FEE */ jal gParticlePtrList_addObject /* 0403FC 8003F7FC AFA80038 */ sw $t0, 0x38($sp) /* 040400 8003F800 8FA80038 */ lw $t0, 0x38($sp) /* 040404 8003F804 00000000 */ nop @@ -584,7 +584,7 @@ glabel func_8003F2E8 /* 04074C 8003FB4C 2401000A */ li $at, 10 /* 040750 8003FB50 10410005 */ beq $v0, $at, .L8003FB68 /* 040754 8003FB54 00000000 */ nop -/* 040758 8003FB58 0C003FEE */ jal particlePtrList_addObject +/* 040758 8003FB58 0C003FEE */ jal gParticlePtrList_addObject /* 04075C 8003FB5C 02002025 */ move $a0, $s0 /* 040760 8003FB60 10000035 */ b .L8003FC38 /* 040764 8003FB64 8FBF002C */ lw $ra, 0x2c($sp) @@ -640,7 +640,7 @@ glabel func_8003F2E8 /* 040820 8003FC20 AFB80010 */ sw $t8, 0x10($sp) /* 040824 8003FC24 0C00FF11 */ jal func_8003FC44 /* 040828 8003FC28 E7A60014 */ swc1 $f6, 0x14($sp) -/* 04082C 8003FC2C 0C003FEE */ jal particlePtrList_addObject +/* 04082C 8003FC2C 0C003FEE */ jal gParticlePtrList_addObject /* 040830 8003FC30 02002025 */ move $a0, $s0 .L8003FC34: /* 040834 8003FC34 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003FD68.s b/asm/non_matchings/unknown_032760/func_8003FD68.s index eee36cf9..5af695b5 100644 --- a/asm/non_matchings/unknown_032760/func_8003FD68.s +++ b/asm/non_matchings/unknown_032760/func_8003FD68.s @@ -94,7 +94,7 @@ glabel func_8003FD68 /* 040AD4 8003FED4 AFAC0028 */ sw $t4, 0x28($sp) /* 040AD8 8003FED8 8FA40048 */ lw $a0, 0x48($sp) .L8003FEDC: -/* 040ADC 8003FEDC 0C003FEE */ jal particlePtrList_addObject +/* 040ADC 8003FEDC 0C003FEE */ jal gParticlePtrList_addObject /* 040AE0 8003FEE0 00000000 */ nop /* 040AE4 8003FEE4 8FBF003C */ lw $ra, 0x3c($sp) /* 040AE8 8003FEE8 8FB00038 */ lw $s0, 0x38($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003FEF4.s b/asm/non_matchings/unknown_032760/func_8003FEF4.s index d3bfbe82..74cc6059 100644 --- a/asm/non_matchings/unknown_032760/func_8003FEF4.s +++ b/asm/non_matchings/unknown_032760/func_8003FEF4.s @@ -67,7 +67,7 @@ glabel func_8003FEF4 /* 040BF8 8003FFF8 0C002629 */ jal func_800098A4 /* 040BFC 8003FFFC AFAF0030 */ sw $t7, 0x30($sp) /* 040C00 80040000 8FA40048 */ lw $a0, 0x48($sp) -/* 040C04 80040004 0C003FEE */ jal particlePtrList_addObject +/* 040C04 80040004 0C003FEE */ jal gParticlePtrList_addObject /* 040C08 80040008 00000000 */ nop /* 040C0C 8004000C 8FBF0044 */ lw $ra, 0x44($sp) /* 040C10 80040010 8FB00040 */ lw $s0, 0x40($sp) diff --git a/asm/non_matchings/unknown_032760/func_8004001C.s b/asm/non_matchings/unknown_032760/func_8004001C.s index f28fed8f..007d1d7b 100644 --- a/asm/non_matchings/unknown_032760/func_8004001C.s +++ b/asm/non_matchings/unknown_032760/func_8004001C.s @@ -27,7 +27,7 @@ glabel func_8004001C /* 040C80 80040080 0C00265A */ jal func_80009968 /* 040C84 80040084 46802320 */ cvt.s.w $f12, $f4 /* 040C88 80040088 8FA40020 */ lw $a0, 0x20($sp) -/* 040C8C 8004008C 0C003FEE */ jal particlePtrList_addObject +/* 040C8C 8004008C 0C003FEE */ jal gParticlePtrList_addObject /* 040C90 80040090 00000000 */ nop /* 040C94 80040094 8FBF001C */ lw $ra, 0x1c($sp) /* 040C98 80040098 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/unknown_032760/func_80040820.s b/asm/non_matchings/unknown_032760/func_80040820.s index 931c5cf1..10ee2f48 100644 --- a/asm/non_matchings/unknown_032760/func_80040820.s +++ b/asm/non_matchings/unknown_032760/func_80040820.s @@ -5,7 +5,7 @@ glabel func_80040820 /* 04142C 8004082C 0C019888 */ jal func_80066220 /* 041430 80040830 AFA5005C */ sw $a1, 0x5c($sp) /* 041434 80040834 27A40050 */ addiu $a0, $sp, 0x50 -/* 041438 80040838 0C006E9D */ jal getPlayerStructArray +/* 041438 80040838 0C006E9D */ jal get_object_struct_array /* 04143C 8004083C AFA20054 */ sw $v0, 0x54($sp) /* 041440 80040840 8FA50050 */ lw $a1, 0x50($sp) /* 041444 80040844 8FA60054 */ lw $a2, 0x54($sp) diff --git a/asm/non_matchings/unknown_032760/func_80042210.s b/asm/non_matchings/unknown_032760/func_80042210.s index 3ac262b7..9025d3e2 100644 --- a/asm/non_matchings/unknown_032760/func_80042210.s +++ b/asm/non_matchings/unknown_032760/func_80042210.s @@ -47,7 +47,7 @@ glabel func_80042210 /* 042EC4 800422C4 11210007 */ beq $t1, $at, .L800422E4 /* 042EC8 800422C8 8FBF0014 */ lw $ra, 0x14($sp) .L800422CC: -/* 042ECC 800422CC 0C003FEE */ jal particlePtrList_addObject +/* 042ECC 800422CC 0C003FEE */ jal gParticlePtrList_addObject /* 042ED0 800422D0 00000000 */ nop /* 042ED4 800422D4 10000003 */ b .L800422E4 /* 042ED8 800422D8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index 631b2b45..b98f8e69 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -112,7 +112,7 @@ glabel L80042378 /* 043060 80042460 24040002 */ li $a0, 2 /* 043064 80042464 0C01B629 */ jal func_8006D8A4 /* 043068 80042468 00000000 */ nop -/* 04306C 8004246C 0C003FEE */ jal particlePtrList_addObject +/* 04306C 8004246C 0C003FEE */ jal gParticlePtrList_addObject /* 043070 80042470 02202025 */ move $a0, $s1 /* 043074 80042474 10000140 */ b .L80042978 /* 043078 80042478 8FBF0034 */ lw $ra, 0x34($sp) @@ -383,7 +383,7 @@ glabel L800426B8 /* 043454 80042854 24040002 */ li $a0, 2 /* 043458 80042858 0C01B629 */ jal func_8006D8A4 /* 04345C 8004285C 00000000 */ nop -/* 043460 80042860 0C003FEE */ jal particlePtrList_addObject +/* 043460 80042860 0C003FEE */ jal gParticlePtrList_addObject /* 043464 80042864 02202025 */ move $a0, $s1 /* 043468 80042868 10000043 */ b .L80042978 /* 04346C 8004286C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index 7ee0a5c8..f2003926 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -38,10 +38,10 @@ glabel func_80042D20 /* 043934 80042D34 80AE01CA */ lb $t6, 0x1ca($a1) /* 043938 80042D38 00A08025 */ move $s0, $a1 /* 04393C 80042D3C 24040001 */ li $a0, 1 -/* 043940 80042D40 0C0078A7 */ jal func_8001E29C +/* 043940 80042D40 0C0078A7 */ jal get_misc_asset /* 043944 80042D44 A7AE006E */ sh $t6, 0x6e($sp) /* 043948 80042D48 AFA20040 */ sw $v0, 0x40($sp) -/* 04394C 80042D4C 0C0078A7 */ jal func_8001E29C +/* 04394C 80042D4C 0C0078A7 */ jal get_misc_asset /* 043950 80042D50 24040002 */ li $a0, 2 /* 043954 80042D54 0C01AF6C */ jal get_current_level_header /* 043958 80042D58 AFA20044 */ sw $v0, 0x44($sp) @@ -439,7 +439,7 @@ glabel func_80042D20 .L8004331C: /* 043F1C 8004331C AFA9005C */ sw $t1, 0x5c($sp) /* 043F20 80043320 A7AC0034 */ sh $t4, 0x34($sp) -/* 043F24 80043324 0C0078A7 */ jal func_8001E29C +/* 043F24 80043324 0C0078A7 */ jal get_misc_asset /* 043F28 80043328 A7AD0078 */ sh $t5, 0x78($sp) /* 043F2C 8004332C 82080174 */ lb $t0, 0x174($s0) /* 043F30 80043330 8FA9005C */ lw $t1, 0x5c($sp) @@ -1076,13 +1076,13 @@ glabel func_80042D20 /* 044874 80043C74 24040011 */ li $a0, 17 /* 044878 80043C78 11E00006 */ beqz $t7, .L80043C94 /* 04487C 80043C7C 00000000 */ nop -/* 044880 80043C80 0C0078A7 */ jal func_8001E29C +/* 044880 80043C80 0C0078A7 */ jal get_misc_asset /* 044884 80043C84 24040012 */ li $a0, 18 /* 044888 80043C88 87A30070 */ lh $v1, 0x70($sp) /* 04488C 80043C8C 10000006 */ b .L80043CA8 /* 044890 80043C90 0003C880 */ sll $t9, $v1, 2 .L80043C94: -/* 044894 80043C94 0C0078A7 */ jal func_8001E29C +/* 044894 80043C94 0C0078A7 */ jal get_misc_asset /* 044898 80043C98 A7A3007A */ sh $v1, 0x7a($sp) /* 04489C 80043C9C 87A3007A */ lh $v1, 0x7a($sp) /* 0448A0 80043CA0 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80043ECC.s b/asm/non_matchings/unknown_043920/func_80043ECC.s index bc15728a..77123338 100644 --- a/asm/non_matchings/unknown_043920/func_80043ECC.s +++ b/asm/non_matchings/unknown_043920/func_80043ECC.s @@ -92,7 +92,7 @@ glabel func_80043ECC /* 044C18 80044018 A020D5BC */ sb $zero, %lo(D_8011D5BC)($at) .L8004401C: /* 044C1C 8004401C AFA50024 */ sw $a1, 0x24($sp) -/* 044C20 80044020 0C0078A7 */ jal func_8001E29C +/* 044C20 80044020 0C0078A7 */ jal get_misc_asset /* 044C24 80044024 AFA6001C */ sw $a2, 0x1c($sp) /* 044C28 80044028 3C0D8012 */ lui $t5, %hi(D_8011D530) # $t5, 0x8012 /* 044C2C 8004402C 8DADD530 */ lw $t5, %lo(D_8011D530)($t5) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 3bb48eb1..707f9f3f 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -25,7 +25,7 @@ glabel func_8004447C /* 0450B0 800444B0 00A08025 */ move $s0, $a1 /* 0450B4 800444B4 AFA60080 */ sw $a2, 0x80($sp) /* 0450B8 800444B8 AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 0450BC 800444BC 0C006E9D */ jal getPlayerStructArray +/* 0450BC 800444BC 0C006E9D */ jal get_object_struct_array /* 0450C0 800444C0 27A40058 */ addiu $a0, $sp, 0x58 /* 0450C4 800444C4 8FAE0058 */ lw $t6, 0x58($sp) /* 0450C8 800444C8 24010004 */ li $at, 4 @@ -296,7 +296,7 @@ glabel L800446AC /* 045498 80044898 A7A70048 */ sh $a3, 0x48($sp) /* 04549C 8004489C A7A8004A */ sh $t0, 0x4a($sp) /* 0454A0 800448A0 A7A90046 */ sh $t1, 0x46($sp) -/* 0454A4 800448A4 0C006EB2 */ jal getPlayerStruct +/* 0454A4 800448A4 0C006EB2 */ jal get_object_struct /* 0454A8 800448A8 A7AA004C */ sh $t2, 0x4c($sp) /* 0454AC 800448AC 87A90046 */ lh $t1, 0x46($sp) /* 0454B0 800448B0 87A50052 */ lh $a1, 0x52($sp) @@ -356,7 +356,7 @@ glabel L800446AC /* 045580 80044980 87A8004A */ lh $t0, 0x4a($sp) /* 045584 80044984 1440000A */ bnez $v0, .L800449B0 /* 045588 80044988 00C02025 */ move $a0, $a2 -/* 04558C 8004498C 0C006EB2 */ jal getPlayerStruct +/* 04558C 8004498C 0C006EB2 */ jal get_object_struct /* 045590 80044990 A7A8004A */ sh $t0, 0x4a($sp) /* 045594 80044994 8C430064 */ lw $v1, 0x64($v0) /* 045598 80044998 87A8004A */ lh $t0, 0x4a($sp) @@ -654,7 +654,7 @@ glabel L80044ADC /* 0459B4 80044DB4 AFA20058 */ sw $v0, 0x58($sp) .L80044DB8: /* 0459B8 80044DB8 820401CF */ lb $a0, 0x1cf($s0) -/* 0459BC 80044DBC 0C006EB2 */ jal getPlayerStruct +/* 0459BC 80044DBC 0C006EB2 */ jal get_object_struct /* 0459C0 80044DC0 00000000 */ nop /* 0459C4 80044DC4 8C430064 */ lw $v1, 0x64($v0) /* 0459C8 80044DC8 2401FFFF */ li $at, -1 @@ -795,7 +795,7 @@ glabel L80044F54 /* 045BA8 80044FA8 00A02025 */ move $a0, $a1 /* 045BAC 80044FAC 10AC0054 */ beq $a1, $t4, .L80045100 /* 045BB0 80044FB0 00000000 */ nop -/* 045BB4 80044FB4 0C006EB2 */ jal getPlayerStruct +/* 045BB4 80044FB4 0C006EB2 */ jal get_object_struct /* 045BB8 80044FB8 A7A50052 */ sh $a1, 0x52($sp) /* 045BBC 80044FBC 8C430064 */ lw $v1, 0x64($v0) /* 045BC0 80044FC0 87A50052 */ lh $a1, 0x52($sp) diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index e181cdf7..38712808 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -42,7 +42,7 @@ glabel func_800452A0 /* 045F10 80045310 E7B50018 */ swc1 $f21, 0x18($sp) /* 045F14 80045314 E7B4001C */ swc1 $f20, 0x1c($sp) /* 045F18 80045318 AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 045F1C 8004531C 0C006E9D */ jal getPlayerStructArray +/* 045F1C 8004531C 0C006E9D */ jal get_object_struct_array /* 045F20 80045320 27A4009C */ addiu $a0, $sp, 0x9c /* 045F24 80045324 8FAF009C */ lw $t7, 0x9c($sp) /* 045F28 80045328 24010004 */ li $at, 4 @@ -434,7 +434,7 @@ glabel L800456DC /* 046468 80045868 2401FFFF */ li $at, -1 /* 04646C 8004586C 12210004 */ beq $s1, $at, .L80045880 /* 046470 80045870 00000000 */ nop -/* 046474 80045874 0C006EB2 */ jal getPlayerStruct +/* 046474 80045874 0C006EB2 */ jal get_object_struct /* 046478 80045878 02202025 */ move $a0, $s1 /* 04647C 8004587C 0040F025 */ move $fp, $v0 .L80045880: diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index 54c14747..7e4d607f 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -1238,7 +1238,7 @@ glabel func_80046524 /* 048264 80047664 24040020 */ li $a0, 32 /* 048268 80047668 A3A700AD */ sb $a3, 0xad($sp) /* 04826C 8004766C A3A900AF */ sb $t1, 0xaf($sp) -/* 048270 80047670 0C0078A7 */ jal func_8001E29C +/* 048270 80047670 0C0078A7 */ jal get_misc_asset /* 048274 80047674 E7B20104 */ swc1 $f18, 0x104($sp) /* 048278 80047678 83A700AD */ lb $a3, 0xad($sp) /* 04827C 8004767C C7A800FC */ lwc1 $f8, 0xfc($sp) @@ -2401,7 +2401,7 @@ glabel func_80046524 /* 049380 80048780 29E10002 */ slti $at, $t7, 2 /* 049384 80048784 1020003D */ beqz $at, .L8004887C /* 049388 80048788 00000000 */ nop -/* 04938C 8004878C 0C0078A7 */ jal func_8001E29C +/* 04938C 8004878C 0C0078A7 */ jal get_misc_asset /* 049390 80048790 24040014 */ li $a0, 20 /* 049394 80048794 82080203 */ lb $t0, 0x203($s0) /* 049398 80048798 82180002 */ lb $t8, 2($s0) diff --git a/asm/non_matchings/unknown_043920/func_80049794.s b/asm/non_matchings/unknown_043920/func_80049794.s index a68ef66d..ea6a9dfa 100644 --- a/asm/non_matchings/unknown_043920/func_80049794.s +++ b/asm/non_matchings/unknown_043920/func_80049794.s @@ -2759,7 +2759,7 @@ glabel func_80049794 /* 04CAF4 8004BEF4 2B010002 */ slti $at, $t8, 2 /* 04CAF8 8004BEF8 1020003D */ beqz $at, .L8004BFF0 /* 04CAFC 8004BEFC 00000000 */ nop -/* 04CB00 8004BF00 0C0078A7 */ jal func_8001E29C +/* 04CB00 8004BF00 0C0078A7 */ jal get_misc_asset /* 04CB04 8004BF04 24040014 */ li $a0, 20 /* 04CB08 8004BF08 82080203 */ lb $t0, 0x203($s0) /* 04CB0C 8004BF0C 820C0002 */ lb $t4, 2($s0) diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index 12c42ff6..6ca91f3b 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -302,7 +302,7 @@ glabel func_8004DE38 .L8004E21C: /* 04EE1C 8004E21C A600018C */ sh $zero, 0x18c($s0) .L8004E220: -/* 04EE20 8004E220 0C0078A7 */ jal func_8001E29C +/* 04EE20 8004E220 0C0078A7 */ jal get_misc_asset /* 04EE24 8004E224 24040009 */ li $a0, 9 /* 04EE28 8004E228 3C058012 */ lui $a1, %hi(D_8011D564) # $a1, 0x8012 /* 04EE2C 8004E22C 24A5D564 */ addiu $a1, %lo(D_8011D564) # addiu $a1, $a1, -0x2a9c @@ -328,7 +328,7 @@ glabel func_8004DE38 /* 04EE7C 8004E27C 00000000 */ nop /* 04EE80 8004E280 E46A0000 */ swc1 $f10, ($v1) .L8004E284: -/* 04EE84 8004E284 0C0078A7 */ jal func_8001E29C +/* 04EE84 8004E284 0C0078A7 */ jal get_misc_asset /* 04EE88 8004E288 2404000A */ li $a0, 10 /* 04EE8C 8004E28C 3C058012 */ lui $a1, %hi(D_8011D564) # $a1, 0x8012 /* 04EE90 8004E290 24A5D564 */ addiu $a1, %lo(D_8011D564) # addiu $a1, $a1, -0x2a9c @@ -339,7 +339,7 @@ glabel func_8004DE38 /* 04EEA4 8004E2A4 004E7821 */ addu $t7, $v0, $t6 /* 04EEA8 8004E2A8 C5E40000 */ lwc1 $f4, ($t7) /* 04EEAC 8004E2AC 2404000B */ li $a0, 11 -/* 04EEB0 8004E2B0 0C0078A7 */ jal func_8001E29C +/* 04EEB0 8004E2B0 0C0078A7 */ jal get_misc_asset /* 04EEB4 8004E2B4 E424D570 */ swc1 $f4, %lo(D_8011D570)($at) /* 04EEB8 8004E2B8 3C018012 */ lui $at, %hi(D_8011D564) # $at, 0x8012 /* 04EEBC 8004E2BC AC22D564 */ sw $v0, %lo(D_8011D564)($at) @@ -481,14 +481,14 @@ glabel func_8004DE38 /* 04F0C4 8004E4C4 8E2A0040 */ lw $t2, 0x40($s1) /* 04F0C8 8004E4C8 00000000 */ nop /* 04F0CC 8004E4CC 9144005C */ lbu $a0, 0x5c($t2) -/* 04F0D0 8004E4D0 0C0078A7 */ jal func_8001E29C +/* 04F0D0 8004E4D0 0C0078A7 */ jal get_misc_asset /* 04F0D4 8004E4D4 00000000 */ nop /* 04F0D8 8004E4D8 3C018012 */ lui $at, %hi(D_8011D564) # $at, 0x8012 /* 04F0DC 8004E4DC AC22D564 */ sw $v0, %lo(D_8011D564)($at) /* 04F0E0 8004E4E0 8E2B0040 */ lw $t3, 0x40($s1) /* 04F0E4 8004E4E4 00000000 */ nop /* 04F0E8 8004E4E8 9164005D */ lbu $a0, 0x5d($t3) -/* 04F0EC 8004E4EC 0C0078A7 */ jal func_8001E29C +/* 04F0EC 8004E4EC 0C0078A7 */ jal get_misc_asset /* 04F0F0 8004E4F0 00000000 */ nop /* 04F0F4 8004E4F4 3C018012 */ lui $at, %hi(D_8011D568) # $at, 0x8012 /* 04F0F8 8004E4F8 AC22D568 */ sw $v0, %lo(D_8011D568)($at) @@ -1652,7 +1652,7 @@ glabel L8004ED88 /* 050198 8004F598 15A0003A */ bnez $t5, .L8004F684 /* 05019C 8004F59C 240D00FF */ li $t5, 255 /* 0501A0 8004F5A0 C624000C */ lwc1 $f4, 0xc($s1) -/* 0501A4 8004F5A4 0C0078A7 */ jal func_8001E29C +/* 0501A4 8004F5A4 0C0078A7 */ jal get_misc_asset /* 0501A8 8004F5A8 E444000C */ swc1 $f4, 0xc($v0) /* 0501AC 8004F5AC 820B0003 */ lb $t3, 3($s0) /* 0501B0 8004F5B0 C6260010 */ lwc1 $f6, 0x10($s1) diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index e9a9ad65..ed371411 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -905,7 +905,7 @@ glabel func_8004F7F4 /* 0510D0 800504D0 2B010002 */ slti $at, $t8, 2 /* 0510D4 800504D4 1020003E */ beqz $at, .L800505D0 /* 0510D8 800504D8 00000000 */ nop -/* 0510DC 800504DC 0C0078A7 */ jal func_8001E29C +/* 0510DC 800504DC 0C0078A7 */ jal get_misc_asset /* 0510E0 800504E0 24040014 */ li $a0, 20 /* 0510E4 800504E4 82030203 */ lb $v1, 0x203($s0) /* 0510E8 800504E8 82190002 */ lb $t9, 2($s0) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index dc017cb1..855d81ca 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -892,7 +892,7 @@ glabel func_80050A28 /* 05224C 8005164C A3A80057 */ sb $t0, 0x57($sp) /* 052250 80051650 AFA90064 */ sw $t1, 0x64($sp) /* 052254 80051654 E7AE0044 */ swc1 $f14, 0x44($sp) -/* 052258 80051658 0C0078A7 */ jal func_8001E29C +/* 052258 80051658 0C0078A7 */ jal get_misc_asset /* 05225C 8005165C E7B00040 */ swc1 $f16, 0x40($sp) /* 052260 80051660 3C0F8012 */ lui $t7, %hi(D_8011D55C) # $t7, 0x8012 /* 052264 80051664 8DEFD55C */ lw $t7, %lo(D_8011D55C)($t7) @@ -1024,7 +1024,7 @@ glabel func_80050A28 /* 05244C 8005184C 24040020 */ li $a0, 32 /* 052450 80051850 A3A80057 */ sb $t0, 0x57($sp) /* 052454 80051854 AFA90064 */ sw $t1, 0x64($sp) -/* 052458 80051858 0C0078A7 */ jal func_8001E29C +/* 052458 80051858 0C0078A7 */ jal get_misc_asset /* 05245C 8005185C E7AE0044 */ swc1 $f14, 0x44($sp) /* 052460 80051860 83A80057 */ lb $t0, 0x57($sp) /* 052464 80051864 C7B20034 */ lwc1 $f18, 0x34($sp) diff --git a/asm/non_matchings/unknown_043920/func_800521C4.s b/asm/non_matchings/unknown_043920/func_800521C4.s index 2435a474..73af964c 100644 --- a/asm/non_matchings/unknown_043920/func_800521C4.s +++ b/asm/non_matchings/unknown_043920/func_800521C4.s @@ -10,7 +10,7 @@ glabel func_800521C4 /* 052DE4 800521E4 83A3002B */ lb $v1, 0x2b($sp) /* 052DE8 800521E8 1040000C */ beqz $v0, .L8005221C /* 052DEC 800521EC 00000000 */ nop -/* 052DF0 800521F0 0C006EB2 */ jal getPlayerStruct +/* 052DF0 800521F0 0C006EB2 */ jal get_object_struct /* 052DF4 800521F4 24040001 */ li $a0, 1 /* 052DF8 800521F8 8FA40030 */ lw $a0, 0x30($sp) /* 052DFC 800521FC 3C07481C */ lui $a3, (0x481C4000 >> 16) # lui $a3, 0x481c diff --git a/asm/non_matchings/unknown_043920/func_8005250C.s b/asm/non_matchings/unknown_043920/func_8005250C.s index d2d79256..c3a11161 100644 --- a/asm/non_matchings/unknown_043920/func_8005250C.s +++ b/asm/non_matchings/unknown_043920/func_8005250C.s @@ -12,7 +12,7 @@ glabel func_8005250C /* 053120 80052520 00001825 */ move $v1, $zero /* 053124 80052524 19C0000F */ blez $t6, .L80052564 /* 053128 80052528 2404000C */ li $a0, 12 -/* 05312C 8005252C 0C0078A7 */ jal func_8001E29C +/* 05312C 8005252C 0C0078A7 */ jal get_misc_asset /* 053130 80052530 AFA5002C */ sw $a1, 0x2c($sp) /* 053134 80052534 8FA5002C */ lw $a1, 0x2c($sp) /* 053138 80052538 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80055A84.s b/asm/non_matchings/unknown_043920/func_80055A84.s index 8b330f38..d750f7a6 100644 --- a/asm/non_matchings/unknown_043920/func_80055A84.s +++ b/asm/non_matchings/unknown_043920/func_80055A84.s @@ -14,7 +14,7 @@ glabel func_80055A84 /* 0566B4 80055AB4 00000000 */ nop /* 0566B8 80055AB8 E4800010 */ swc1 $f0, 0x10($a0) .L80055ABC: -/* 0566BC 80055ABC 0C0078A7 */ jal func_8001E29C +/* 0566BC 80055ABC 0C0078A7 */ jal get_misc_asset /* 0566C0 80055AC0 24040038 */ li $a0, 56 /* 0566C4 80055AC4 240EFFFF */ li $t6, -1 /* 0566C8 80055AC8 A3AE003F */ sb $t6, 0x3f($sp) diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index eac677bb..eece33f9 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -181,7 +181,7 @@ glabel func_80055EC0 /* 056D44 80056144 100001F7 */ b .L80056924 /* 056D48 80056148 8FBF0024 */ lw $ra, 0x24($sp) .L8005614C: -/* 056D4C 8005614C 0C0078A7 */ jal func_8001E29C +/* 056D4C 8005614C 0C0078A7 */ jal get_misc_asset /* 056D50 80056150 AFA70088 */ sw $a3, 0x88($sp) /* 056D54 80056154 82180172 */ lb $t8, 0x172($s0) /* 056D58 80056158 820C0174 */ lb $t4, 0x174($s0) diff --git a/asm/non_matchings/unknown_043920/func_8005698C.s b/asm/non_matchings/unknown_043920/func_8005698C.s index 0bf77df4..279cd936 100644 --- a/asm/non_matchings/unknown_043920/func_8005698C.s +++ b/asm/non_matchings/unknown_043920/func_8005698C.s @@ -68,7 +68,7 @@ glabel func_8005698C /* 057674 80056A74 E7B000A8 */ swc1 $f16, 0xa8($sp) /* 057678 80056A78 460A4780 */ add.s $f30, $f8, $f10 /* 05767C 80056A7C 4600D687 */ neg.s $f26, $f26 -/* 057680 80056A80 0C006E9D */ jal getPlayerStructArray +/* 057680 80056A80 0C006E9D */ jal get_object_struct_array /* 057684 80056A84 4600F787 */ neg.s $f30, $f30 /* 057688 80056A88 3C01800E */ lui $at, %hi(D_800E68C4) # $at, 0x800e /* 05768C 80056A8C C42C68C4 */ lwc1 $f12, %lo(D_800E68C4)($at) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index 7d23aa83..0f69fde6 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -75,7 +75,7 @@ glabel func_8005A6F0 .L8005A794: /* 05B394 8005A794 A600018C */ sh $zero, 0x18c($s0) .L8005A798: -/* 05B398 8005A798 0C0078A7 */ jal func_8001E29C +/* 05B398 8005A798 0C0078A7 */ jal get_misc_asset /* 05B39C 8005A79C 24040009 */ li $a0, 9 /* 05B3A0 8005A7A0 3C038012 */ lui $v1, %hi(D_8011D564) # $v1, 0x8012 /* 05B3A4 8005A7A4 2463D564 */ addiu $v1, %lo(D_8011D564) # addiu $v1, $v1, -0x2a9c @@ -101,7 +101,7 @@ glabel func_8005A6F0 /* 05B3F4 8005A7F4 00000000 */ nop /* 05B3F8 8005A7F8 E5840000 */ swc1 $f4, ($t4) .L8005A7FC: -/* 05B3FC 8005A7FC 0C0078A7 */ jal func_8001E29C +/* 05B3FC 8005A7FC 0C0078A7 */ jal get_misc_asset /* 05B400 8005A800 2404000A */ li $a0, 10 /* 05B404 8005A804 3C038012 */ lui $v1, %hi(D_8011D564) # $v1, 0x8012 /* 05B408 8005A808 2463D564 */ addiu $v1, %lo(D_8011D564) # addiu $v1, $v1, -0x2a9c @@ -112,7 +112,7 @@ glabel func_8005A6F0 /* 05B41C 8005A81C 004D7021 */ addu $t6, $v0, $t5 /* 05B420 8005A820 C5C60000 */ lwc1 $f6, ($t6) /* 05B424 8005A824 2404000B */ li $a0, 11 -/* 05B428 8005A828 0C0078A7 */ jal func_8001E29C +/* 05B428 8005A828 0C0078A7 */ jal get_misc_asset /* 05B42C 8005A82C E426D570 */ swc1 $f6, %lo(D_8011D570)($at) /* 05B430 8005A830 3C058012 */ lui $a1, %hi(D_8011D564) # $a1, 0x8012 /* 05B434 8005A834 24A5D564 */ addiu $a1, %lo(D_8011D564) # addiu $a1, $a1, -0x2a9c @@ -188,7 +188,7 @@ glabel func_8005A6F0 /* 05B53C 8005A93C C422694C */ lwc1 $f2, %lo(D_800E694C)($at) /* 05B540 8005A940 1700007C */ bnez $t8, .L8005AB34 /* 05B544 8005A944 27A40090 */ addiu $a0, $sp, 0x90 -/* 05B548 8005A948 0C006E9D */ jal getPlayerStructArray +/* 05B548 8005A948 0C006E9D */ jal get_object_struct_array /* 05B54C 8005A94C E7A20078 */ swc1 $f2, 0x78($sp) /* 05B550 8005A950 8FAF0090 */ lw $t7, 0x90($sp) /* 05B554 8005A954 C7A20078 */ lwc1 $f2, 0x78($sp) @@ -507,7 +507,7 @@ glabel func_8005A6F0 /* 05B9CC 8005ADCC 44814000 */ mtc1 $at, $f8 /* 05B9D0 8005ADD0 3C018012 */ lui $at, %hi(D_8011D570) # $at, 0x8012 /* 05B9D4 8005ADD4 24040021 */ li $a0, 33 -/* 05B9D8 8005ADD8 0C0078A7 */ jal func_8001E29C +/* 05B9D8 8005ADD8 0C0078A7 */ jal get_misc_asset /* 05B9DC 8005ADDC E428D570 */ swc1 $f8, %lo(D_8011D570)($at) /* 05B9E0 8005ADE0 8FB900A0 */ lw $t9, 0xa0($sp) /* 05B9E4 8005ADE4 3C018012 */ lui $at, %hi(D_8011D564) # $at, 0x8012 @@ -515,7 +515,7 @@ glabel func_8005A6F0 /* 05B9EC 8005ADEC 8F2D0040 */ lw $t5, 0x40($t9) /* 05B9F0 8005ADF0 00000000 */ nop /* 05B9F4 8005ADF4 91A4005D */ lbu $a0, 0x5d($t5) -/* 05B9F8 8005ADF8 0C0078A7 */ jal func_8001E29C +/* 05B9F8 8005ADF8 0C0078A7 */ jal get_misc_asset /* 05B9FC 8005ADFC 00000000 */ nop /* 05BA00 8005AE00 3C018012 */ lui $at, %hi(D_8011D568) # $at, 0x8012 /* 05BA04 8005AE04 8FAE00A0 */ lw $t6, 0xa0($sp) @@ -1157,7 +1157,7 @@ glabel L8005B1B0 /* 05C324 8005B724 17200034 */ bnez $t9, .L8005B7F8 /* 05C328 8005B728 00002025 */ move $a0, $zero /* 05C32C 8005B72C C5B2000C */ lwc1 $f18, 0xc($t5) -/* 05C330 8005B730 0C0078A7 */ jal func_8001E29C +/* 05C330 8005B730 0C0078A7 */ jal get_misc_asset /* 05C334 8005B734 E452000C */ swc1 $f18, 0xc($v0) /* 05C338 8005B738 820E0003 */ lb $t6, 3($s0) /* 05C33C 8005B73C 8FA300A0 */ lw $v1, 0xa0($sp) diff --git a/asm/non_matchings/unknown_043920/func_8005B818.s b/asm/non_matchings/unknown_043920/func_8005B818.s index 2619afcf..4634d5e8 100644 --- a/asm/non_matchings/unknown_043920/func_8005B818.s +++ b/asm/non_matchings/unknown_043920/func_8005B818.s @@ -41,7 +41,7 @@ glabel func_8005B818 /* 05C464 8005B864 E7B50010 */ swc1 $f21, 0x10($sp) /* 05C468 8005B868 E7B40014 */ swc1 $f20, 0x14($sp) /* 05C46C 8005B86C AFA60130 */ sw $a2, 0x130($sp) -/* 05C470 8005B870 0C0078A7 */ jal func_8001E29C +/* 05C470 8005B870 0C0078A7 */ jal get_misc_asset /* 05C474 8005B874 24040021 */ li $a0, 33 /* 05C478 8005B878 3C018012 */ lui $at, %hi(D_8011D564) # $at, 0x8012 /* 05C47C 8005B87C 0C01AF6C */ jal get_current_level_header diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index c05bce2c..bc5ca848 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -348,7 +348,7 @@ glabel func_8005C364 /* 05D458 8005C858 10000001 */ b .L8005C860 /* 05D45C 8005C85C 24052500 */ li $a1, 9472 .L8005C860: -/* 05D460 8005C860 0C006EB2 */ jal getPlayerStruct +/* 05D460 8005C860 0C006EB2 */ jal get_object_struct /* 05D464 8005C864 AFA50038 */ sw $a1, 0x38($sp) /* 05D468 8005C868 AFA20030 */ sw $v0, 0x30($sp) /* 05D46C 8005C86C C626000C */ lwc1 $f6, 0xc($s1) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s index a8da3b01..a96ee099 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s @@ -12,7 +12,7 @@ glabel func_8005CB68 /* 05D790 8005CB90 03194804 */ sllv $t1, $t9, $t8 /* 05D794 8005CB94 AFA90038 */ sw $t1, 0x38($sp) /* 05D798 8005CB98 AFA20044 */ sw $v0, 0x44($sp) -/* 05D79C 8005CB9C 0C0078A7 */ jal func_8001E29C +/* 05D79C 8005CB9C 0C0078A7 */ jal get_misc_asset /* 05D7A0 8005CBA0 24040044 */ li $a0, 68 /* 05D7A4 8005CBA4 804C0005 */ lb $t4, 5($v0) /* 05D7A8 8005CBA8 24040043 */ li $a0, 67 @@ -21,7 +21,7 @@ glabel func_8005CB68 /* 05D7B4 8005CBB4 00000000 */ nop /* 05D7B8 8005CBB8 AFAD0028 */ sw $t5, 0x28($sp) /* 05D7BC 8005CBBC 804E0007 */ lb $t6, 7($v0) -/* 05D7C0 8005CBC0 0C0078A7 */ jal func_8001E29C +/* 05D7C0 8005CBC0 0C0078A7 */ jal get_misc_asset /* 05D7C4 8005CBC4 AFAE0024 */ sw $t6, 0x24($sp) /* 05D7C8 8005CBC8 8FAA0044 */ lw $t2, 0x44($sp) /* 05D7CC 8005CBCC 804F0000 */ lb $t7, ($v0) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005D048.s b/asm/non_matchings/unknown_05CEF0/func_8005D048.s index 70aad9a2..0ae500b2 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005D048.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005D048.s @@ -4,7 +4,7 @@ glabel func_8005D048 /* 05DC50 8005D050 AFA40020 */ sw $a0, 0x20($sp) /* 05DC54 8005D054 AFA50024 */ sw $a1, 0x24($sp) /* 05DC58 8005D058 AFA60028 */ sw $a2, 0x28($sp) -/* 05DC5C 8005D05C 0C006EB2 */ jal getPlayerStruct +/* 05DC5C 8005D05C 0C006EB2 */ jal get_object_struct /* 05DC60 8005D060 00002025 */ move $a0, $zero /* 05DC64 8005D064 8FAF0024 */ lw $t7, 0x24($sp) /* 05DC68 8005D068 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index 8836a3c2..974cc6f6 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -397,7 +397,7 @@ glabel func_8005D0D0 /* 05E274 8005D674 02002825 */ move $a1, $s0 /* 05E278 8005D678 0C017412 */ jal func_8005D048 /* 05E27C 8005D67C 24060028 */ li $a2, 40 -/* 05E280 8005D680 0C006EB2 */ jal getPlayerStruct +/* 05E280 8005D680 0C006EB2 */ jal get_object_struct /* 05E284 8005D684 00002025 */ move $a0, $zero /* 05E288 8005D688 AFA20034 */ sw $v0, 0x34($sp) /* 05E28C 8005D68C C626000C */ lwc1 $f6, 0xc($s1) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index 86307223..5e0dc154 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -599,7 +599,7 @@ glabel L8005DCE8 /* 05EC70 8005E070 02002825 */ move $a1, $s0 /* 05EC74 8005E074 0C017412 */ jal func_8005D048 /* 05EC78 8005E078 24060028 */ li $a2, 40 -/* 05EC7C 8005E07C 0C006EB2 */ jal getPlayerStruct +/* 05EC7C 8005E07C 0C006EB2 */ jal get_object_struct /* 05EC80 8005E080 00002025 */ move $a0, $zero /* 05EC84 8005E084 AFA20034 */ sw $v0, 0x34($sp) /* 05EC88 8005E088 C62A000C */ lwc1 $f10, 0xc($s1) diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index 8ff41016..3d37abc0 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -291,7 +291,7 @@ glabel func_8005E4C0 /* 05F4EC 8005E8EC 10000001 */ b .L8005E8F4 /* 05F4F0 8005E8F0 24052500 */ li $a1, 9472 .L8005E8F4: -/* 05F4F4 8005E8F4 0C006EB2 */ jal getPlayerStruct +/* 05F4F4 8005E8F4 0C006EB2 */ jal get_object_struct /* 05F4F8 8005E8F8 AFA50038 */ sw $a1, 0x38($sp) /* 05F4FC 8005E8FC AFA20030 */ sw $v0, 0x30($sp) /* 05F500 8005E900 C632000C */ lwc1 $f18, 0xc($s1) diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index 1e7f1d55..fc14cf91 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -571,7 +571,7 @@ glabel L8005EF98 /* 05FE80 8005F280 02002825 */ move $a1, $s0 /* 05FE84 8005F284 0C017412 */ jal func_8005D048 /* 05FE88 8005F288 24060028 */ li $a2, 40 -/* 05FE8C 8005F28C 0C006EB2 */ jal getPlayerStruct +/* 05FE8C 8005F28C 0C006EB2 */ jal get_object_struct /* 05FE90 8005F290 00002025 */ move $a0, $zero /* 05FE94 8005F294 8C43004C */ lw $v1, 0x4c($v0) /* 05FE98 8005F298 8C500064 */ lw $s0, 0x64($v0) diff --git a/asm/non_matchings/unknown_05F690/func_8005F310.s b/asm/non_matchings/unknown_05F690/func_8005F310.s index bc831341..cda2fc49 100644 --- a/asm/non_matchings/unknown_05F690/func_8005F310.s +++ b/asm/non_matchings/unknown_05F690/func_8005F310.s @@ -326,7 +326,7 @@ glabel func_8005F310 /* 0603C4 8005F7C4 0C002DD4 */ jal func_8000B750 /* 0603C8 8005F7C8 24070001 */ li $a3, 1 .L8005F7CC: -/* 0603CC 8005F7CC 0C006EB2 */ jal getPlayerStruct +/* 0603CC 8005F7CC 0C006EB2 */ jal get_object_struct /* 0603D0 8005F7D0 00002025 */ move $a0, $zero /* 0603D4 8005F7D4 8C43004C */ lw $v1, 0x4c($v0) /* 0603D8 8005F7D8 8C470064 */ lw $a3, 0x64($v0) diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index b3279ddd..654f0634 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -129,7 +129,7 @@ glabel func_8006CCF0 /* 06DAA8 8006CEA8 00000000 */ nop /* 06DAAC 8006CEAC A0203515 */ sb $zero, %lo(gIsPaused)($at) .L8006CEB0: -/* 06DAB0 8006CEB0 0C004013 */ jal particlePtrList_flush +/* 06DAB0 8006CEB0 0C004013 */ jal gParticlePtrList_flush /* 06DAB4 8006CEB4 00000000 */ nop /* 06DAB8 8006CEB8 0C006FC8 */ jal func_8001BF20 /* 06DABC 8006CEBC 00000000 */ nop diff --git a/asm/non_matchings/unknown_066AA0/func_8006E770.s b/asm/non_matchings/unknown_066AA0/func_8006E770.s index 63838d5a..9419a91f 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006E770.s +++ b/asm/non_matchings/unknown_066AA0/func_8006E770.s @@ -8,7 +8,7 @@ glabel func_8006E770 /* 06F388 8006E788 27A5003C */ addiu $a1, $sp, 0x3c /* 06F38C 8006E78C 0C01AC89 */ jal func_8006B224 /* 06F390 8006E790 27A40038 */ addiu $a0, $sp, 0x38 -/* 06F394 8006E794 0C0078A7 */ jal func_8001E29C +/* 06F394 8006E794 0C0078A7 */ jal get_misc_asset /* 06F398 8006E798 24040017 */ li $a0, 23 /* 06F39C 8006E79C 00004025 */ move $t0, $zero /* 06F3A0 8006E7A0 240C0003 */ li $t4, 3 diff --git a/asm/non_matchings/unknown_066AA0/load_level.s b/asm/non_matchings/unknown_066AA0/load_level.s index a24c465e..4705d209 100644 --- a/asm/non_matchings/unknown_066AA0/load_level.s +++ b/asm/non_matchings/unknown_066AA0/load_level.s @@ -165,7 +165,7 @@ glabel load_level /* 06C0A0 8006B4A0 3C01800E */ lui $at, %hi(D_800DD330) # $at, 0x800e /* 06C0A4 8006B4A4 A038D330 */ sb $t8, %lo(D_800DD330)($at) .L8006B4A8: -/* 06C0A8 8006B4A8 0C0078A7 */ jal func_8001E29C +/* 06C0A8 8006B4A8 0C0078A7 */ jal get_misc_asset /* 06C0AC 8006B4AC 24040043 */ li $a0, 67 /* 06C0B0 8006B4B0 8FA50060 */ lw $a1, 0x60($sp) /* 06C0B4 8006B4B4 804B0000 */ lb $t3, ($v0) @@ -222,7 +222,7 @@ glabel load_level /* 06C174 8006B574 8C6F0010 */ lw $t7, 0x10($v1) /* 06C178 8006B578 24040044 */ li $a0, 68 /* 06C17C 8006B57C 01E25825 */ or $t3, $t7, $v0 -/* 06C180 8006B580 0C0078A7 */ jal func_8001E29C +/* 06C180 8006B580 0C0078A7 */ jal get_misc_asset /* 06C184 8006B584 AC6B0010 */ sw $t3, 0x10($v1) /* 06C188 8006B588 02025021 */ addu $t2, $s0, $v0 /* 06C18C 8006B58C 814CFFFF */ lb $t4, -1($t2) @@ -263,7 +263,7 @@ glabel load_level /* 06C210 8006B610 8C4A0010 */ lw $t2, 0x10($v0) /* 06C214 8006B614 00000000 */ nop /* 06C218 8006B618 354C2000 */ ori $t4, $t2, 0x2000 -/* 06C21C 8006B61C 0C0078A7 */ jal func_8001E29C +/* 06C21C 8006B61C 0C0078A7 */ jal get_misc_asset /* 06C220 8006B620 AC4C0010 */ sw $t4, 0x10($v0) /* 06C224 8006B624 80590004 */ lb $t9, 4($v0) /* 06C228 8006B628 00000000 */ nop @@ -318,7 +318,7 @@ glabel load_level /* 06C2DC 8006B6DC 00000000 */ nop /* 06C2E0 8006B6E0 10810010 */ beq $a0, $at, .L8006B724 /* 06C2E4 8006B6E4 00000000 */ nop -/* 06C2E8 8006B6E8 0C0078A7 */ jal func_8001E29C +/* 06C2E8 8006B6E8 0C0078A7 */ jal get_misc_asset /* 06C2EC 8006B6EC AFA30038 */ sw $v1, 0x38($sp) /* 06C2F0 8006B6F0 8FA30038 */ lw $v1, 0x38($sp) /* 06C2F4 8006B6F4 8E380000 */ lw $t8, ($s1) @@ -703,7 +703,7 @@ glabel load_level /* 06C86C 8006BC6C 2401FFFF */ li $at, -1 /* 06C870 8006BC70 1081000D */ beq $a0, $at, .L8006BCA8 /* 06C874 8006BC74 00000000 */ nop -/* 06C878 8006BC78 0C0078A7 */ jal func_8001E29C +/* 06C878 8006BC78 0C0078A7 */ jal get_misc_asset /* 06C87C 8006BC7C 00000000 */ nop /* 06C880 8006BC80 8E2A0000 */ lw $t2, ($s1) /* 06C884 8006BC84 00000000 */ nop diff --git a/asm/non_matchings/unknown_072E50/func_80075B18.s b/asm/non_matchings/unknown_072E50/func_80075B18.s index 2c40751a..dcad1204 100644 --- a/asm/non_matchings/unknown_072E50/func_80075B18.s +++ b/asm/non_matchings/unknown_072E50/func_80075B18.s @@ -14,7 +14,7 @@ glabel func_80075B18 /* 076748 80075B48 3C148012 */ lui $s4, %hi(D_80124010) # $s4, 0x8012 /* 07674C 80075B4C 26944010 */ addiu $s4, %lo(D_80124010) # addiu $s4, $s4, 0x4010 /* 076750 80075B50 AE820000 */ sw $v0, ($s4) -/* 076754 80075B54 0C0078A7 */ jal func_8001E29C +/* 076754 80075B54 0C0078A7 */ jal get_misc_asset /* 076758 80075B58 24040013 */ li $a0, 19 /* 07675C 80075B5C 3C018012 */ lui $at, %hi(D_801241E0) # $at, 0x8012 /* 076760 80075B60 AC2241E0 */ sw $v0, %lo(D_801241E0)($at) diff --git a/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s b/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s index 92b548f8..cb3ad7c2 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009ECF0.s @@ -181,7 +181,7 @@ glabel func_8009ECF0 /* 09FBA4 8009EFA4 AC206D44 */ sw $zero, %lo(D_80126D44)($at) /* 09FBA8 8009EFA8 3C018012 */ lui $at, %hi(D_80126CD3) # $at, 0x8012 /* 09FBAC 8009EFAC A0206CD3 */ sb $zero, %lo(D_80126CD3)($at) -/* 09FBB0 8009EFB0 0C0078A7 */ jal func_8001E29C +/* 09FBB0 8009EFB0 0C0078A7 */ jal get_misc_asset /* 09FBB4 8009EFB4 2404003A */ li $a0, 58 /* 09FBB8 8009EFB8 3C038012 */ lui $v1, %hi(D_80127194) # $v1, 0x8012 /* 09FBBC 8009EFBC 24637194 */ addiu $v1, %lo(D_80127194) # addiu $v1, $v1, 0x7194 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A003C.s b/asm/non_matchings/unknown_09F8F0/func_800A003C.s index 22634d1d..9e6098c9 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A003C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A003C.s @@ -46,7 +46,7 @@ glabel func_800A003C .L800A00E4: /* 0A0CE4 800A00E4 11600005 */ beqz $t3, .L800A00FC /* 0A0CE8 800A00E8 00000000 */ nop -/* 0A0CEC 800A00EC 0C003FEE */ jal particlePtrList_addObject +/* 0A0CEC 800A00EC 0C003FEE */ jal gParticlePtrList_addObject /* 0A0CF0 800A00F0 00000000 */ nop /* 0A0CF4 800A00F4 10000004 */ b .L800A0108 /* 0A0CF8 800A00F8 8E4C0000 */ lw $t4, ($s2) @@ -81,7 +81,7 @@ glabel func_800A003C /* 0A0D5C 800A015C 8E440000 */ lw $a0, ($s2) /* 0A0D60 800A0160 0C01C450 */ jal free_from_memory_pool /* 0A0D64 800A0164 00000000 */ nop -/* 0A0D68 800A0168 0C004013 */ jal particlePtrList_flush +/* 0A0D68 800A0168 0C004013 */ jal gParticlePtrList_flush /* 0A0D6C 800A016C 00000000 */ nop /* 0A0D70 800A0170 8FBF002C */ lw $ra, 0x2c($sp) /* 0A0D74 800A0174 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1248.s b/asm/non_matchings/unknown_09F8F0/func_800A1248.s index 0e52959f..9adb479b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1248.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1248.s @@ -17,7 +17,7 @@ glabel func_800A1248 /* 0A1E70 800A1270 8CA70064 */ lw $a3, 0x64($a1) /* 0A1E74 800A1274 00808025 */ move $s0, $a0 /* 0A1E78 800A1278 27A4003C */ addiu $a0, $sp, 0x3c -/* 0A1E7C 800A127C 0C006E9D */ jal getPlayerStructArray +/* 0A1E7C 800A127C 0C006E9D */ jal get_object_struct_array /* 0A1E80 800A1280 AFA70044 */ sw $a3, 0x44($sp) /* 0A1E84 800A1284 00409025 */ move $s2, $v0 /* 0A1E88 800A1288 0C01A142 */ jal func_80068508 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s index 3ab4de32..e341908b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s @@ -10,7 +10,7 @@ glabel func_800A14F0 /* 0A20F4 800A14F4 AFBF0014 */ sw $ra, 0x14($sp) /* 0A20F8 800A14F8 AFA40060 */ sw $a0, 0x60($sp) /* 0A20FC 800A14FC AFA50064 */ sw $a1, 0x64($sp) -/* 0A2100 800A1500 0C006E9D */ jal getPlayerStructArray +/* 0A2100 800A1500 0C006E9D */ jal get_object_struct_array /* 0A2104 800A1504 27A40050 */ addiu $a0, $sp, 0x50 /* 0A2108 800A1508 3C0E8012 */ lui $t6, %hi(D_80126D37) # $t6, 0x8012 /* 0A210C 800A150C 91CE6D37 */ lbu $t6, %lo(D_80126D37)($t6) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1C04.s b/asm/non_matchings/unknown_09F8F0/func_800A1C04.s index ccf3e04c..c4f1a802 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1C04.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1C04.s @@ -25,7 +25,7 @@ glabel func_800A1C04 /* 0A285C 800A1C5C 8FA50048 */ lw $a1, 0x48($sp) /* 0A2860 800A1C60 0C029D48 */ jal func_800A7520 /* 0A2864 800A1C64 00000000 */ nop -/* 0A2868 800A1C68 0C006E9D */ jal getPlayerStructArray +/* 0A2868 800A1C68 0C006E9D */ jal get_object_struct_array /* 0A286C 800A1C6C 27A40034 */ addiu $a0, $sp, 0x34 /* 0A2870 800A1C70 3C038012 */ lui $v1, %hi(D_80126D37) # $v1, 0x8012 /* 0A2874 800A1C74 90636D37 */ lbu $v1, %lo(D_80126D37)($v1) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s index 25869f4a..39e7f297 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s @@ -19,7 +19,7 @@ glabel func_800A1E48 /* 0A2A78 800A1E78 E7B50018 */ swc1 $f21, 0x18($sp) /* 0A2A7C 800A1E7C E7B4001C */ swc1 $f20, 0x1c($sp) /* 0A2A80 800A1E80 AFA5008C */ sw $a1, 0x8c($sp) -/* 0A2A84 800A1E84 0C006E9D */ jal getPlayerStructArray +/* 0A2A84 800A1E84 0C006E9D */ jal get_object_struct_array /* 0A2A88 800A1E88 27A40078 */ addiu $a0, $sp, 0x78 /* 0A2A8C 800A1E8C 12000004 */ beqz $s0, .L800A1EA0 /* 0A2A90 800A1E90 0040A825 */ move $s5, $v0 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s index 5025c724..3c664d16 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s @@ -89,7 +89,7 @@ glabel func_800A3CE4 /* 0A4A34 800A3E34 00000000 */ nop /* 0A4A38 800A3E38 144000C0 */ bnez $v0, .L800A413C /* 0A4A3C 800A3E3C 00000000 */ nop -/* 0A4A40 800A3E40 0C006E9D */ jal getPlayerStructArray +/* 0A4A40 800A3E40 0C006E9D */ jal get_object_struct_array /* 0A4A44 800A3E44 27A40038 */ addiu $a0, $sp, 0x38 /* 0A4A48 800A3E48 8FA50038 */ lw $a1, 0x38($sp) /* 0A4A4C 800A3E4C AFA20044 */ sw $v0, 0x44($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index 01a86f3e..0a9ba68e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -42,7 +42,7 @@ glabel func_800A5F18 /* 0A6B8C 800A5F8C 00000000 */ nop /* 0A6B90 800A5F90 144000AD */ bnez $v0, .L800A6248 /* 0A6B94 800A5F94 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6B98 800A5F98 0C006E9D */ jal getPlayerStructArray +/* 0A6B98 800A5F98 0C006E9D */ jal get_object_struct_array /* 0A6B9C 800A5F9C 27A40024 */ addiu $a0, $sp, 0x24 /* 0A6BA0 800A5FA0 3C0F8012 */ lui $t7, %hi(D_80126D37) # $t7, 0x8012 /* 0A6BA4 800A5FA4 91EF6D37 */ lbu $t7, %lo(D_80126D37)($t7) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index f2b082c2..db4eae10 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -153,7 +153,7 @@ glabel func_800A8474 /* 0A9268 800A8668 00000000 */ nop /* 0A926C 800A866C 01B17021 */ addu $t6, $t5, $s1 /* 0A9270 800A8670 8DC40000 */ lw $a0, ($t6) -/* 0A9274 800A8674 0C003FEE */ jal particlePtrList_addObject +/* 0A9274 800A8674 0C003FEE */ jal gParticlePtrList_addObject /* 0A9278 800A8678 AFA30144 */ sw $v1, 0x144($sp) /* 0A927C 800A867C 8FA30144 */ lw $v1, 0x144($sp) /* 0A9280 800A8680 10000009 */ b .L800A86A8 @@ -943,7 +943,7 @@ glabel func_800A8474 /* 0A9E24 800A9224 460021A4 */ cvt.w.s $f6, $f4 /* 0A9E28 800A9228 440B3000 */ mfc1 $t3, $f6 /* 0A9E2C 800A922C 44CAF800 */ ctc1 $t2, $31 -/* 0A9E30 800A9230 0C006E9D */ jal getPlayerStructArray +/* 0A9E30 800A9230 0C006E9D */ jal get_object_struct_array /* 0A9E34 800A9234 AFAB00BC */ sw $t3, 0xbc($sp) /* 0A9E38 800A9238 8FAC00CC */ lw $t4, 0xcc($sp) /* 0A9E3C 800A923C 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/unknown_0AEE70/func_800AE530.s b/asm/non_matchings/unknown_0AEE70/func_800AE530.s index f8c0c779..4508062b 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800AE530.s +++ b/asm/non_matchings/unknown_0AEE70/func_800AE530.s @@ -110,7 +110,7 @@ glabel func_800AE530 /* 0AF2C4 800AE6C4 00000000 */ nop /* 0AF2C8 800AE6C8 12830009 */ beq $s4, $v1, .L800AE6F0 /* 0AF2CC 800AE6CC 00000000 */ nop -/* 0AF2D0 800AE6D0 0C0078A7 */ jal func_8001E29C +/* 0AF2D0 800AE6D0 0C0078A7 */ jal get_misc_asset /* 0AF2D4 800AE6D4 00602025 */ move $a0, $v1 /* 0AF2D8 800AE6D8 8E6C0000 */ lw $t4, ($s3) /* 0AF2DC 800AE6DC 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B22FC.s b/asm/non_matchings/unknown_0AEE70/func_800B22FC.s index b8ec0e76..9c913543 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B22FC.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B22FC.s @@ -167,7 +167,7 @@ glabel func_800B22FC /* 0B3158 800B2558 00000000 */ nop /* 0B315C 800B255C 1D400005 */ bgtz $t2, .L800B2574 /* 0B3160 800B2560 00000000 */ nop -/* 0B3164 800B2564 0C003FEE */ jal particlePtrList_addObject +/* 0B3164 800B2564 0C003FEE */ jal gParticlePtrList_addObject /* 0B3168 800B2568 02002025 */ move $a0, $s0 /* 0B316C 800B256C 10000030 */ b .L800B2630 /* 0B3170 800B2570 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s index 91327220..2b58dde0 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s @@ -516,7 +516,7 @@ glabel func_800B26E0 /* 0B3A88 800B2E88 1DE00009 */ bgtz $t7, .L800B2EB0 /* 0B3A8C 800B2E8C 00000000 */ nop /* 0B3A90 800B2E90 AFA30038 */ sw $v1, 0x38($sp) -/* 0B3A94 800B2E94 0C003FEE */ jal particlePtrList_addObject +/* 0B3A94 800B2E94 0C003FEE */ jal gParticlePtrList_addObject /* 0B3A98 800B2E98 AFA60050 */ sw $a2, 0x50($sp) /* 0B3A9C 800B2E9C 8FA30038 */ lw $v1, 0x38($sp) /* 0B3AA0 800B2EA0 3C058012 */ lui $a1, %hi(D_80127C80) # $a1, 0x8012 diff --git a/asm/non_matchings/unknown_0B8920/func_800BFFDC.s b/asm/non_matchings/unknown_0B8920/func_800BFFDC.s index 85e5131a..f12c35ef 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BFFDC.s +++ b/asm/non_matchings/unknown_0B8920/func_800BFFDC.s @@ -6,7 +6,7 @@ glabel func_800BFFDC /* 0C0BEC 800BFFEC 00808025 */ move $s0, $a0 /* 0C0BF0 800BFFF0 108E005B */ beq $a0, $t6, .L800C0160 /* 0C0BF4 800BFFF4 AFBF001C */ sw $ra, 0x1c($sp) -/* 0C0BF8 800BFFF8 0C006E9D */ jal getPlayerStructArray +/* 0C0BF8 800BFFF8 0C006E9D */ jal get_object_struct_array /* 0C0BFC 800BFFFC 27A40050 */ addiu $a0, $sp, 0x50 /* 0C0C00 800C0000 8FA50050 */ lw $a1, 0x50($sp) /* 0C0C04 800C0004 00000000 */ nop diff --git a/asm/unknown_0251F0.s b/asm/unknown_0251F0.s index 08d71085..6f710adf 100644 --- a/asm/unknown_0251F0.s +++ b/asm/unknown_0251F0.s @@ -8,4 +8,4 @@ .set gp=64 # 64-bit instructions are used .include "asm/unknown_0251F0/func_800245F0.s" -.include "asm/unknown_0251F0/func_80024744.s" +.include "asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s" diff --git a/asm/unknown_0251F0/func_80024744.s b/asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s similarity index 99% rename from asm/unknown_0251F0/func_80024744.s rename to asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s index b7461d65..79b245e5 100644 --- a/asm/unknown_0251F0/func_80024744.s +++ b/asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s @@ -1,4 +1,4 @@ -glabel func_80024744 +glabel calc_dynamic_lighting_for_object_2 /* 025344 80024744 27BDFF80 */ addiu $sp, $sp, -0x80 /* 025348 80024748 AFB00080 */ sw $s0, 0x80($sp) /* 02534C 8002474C AFBF0078 */ sw $ra, 0x78($sp) diff --git a/gObjectStructArrayPtr b/gObjectStructArrayPtr new file mode 100644 index 00000000..e69de29b diff --git a/include/structs.h b/include/structs.h index 47b40671..f3af0025 100644 --- a/include/structs.h +++ b/include/structs.h @@ -130,7 +130,7 @@ typedef struct Settings { /* 0x003C */ void *courseTimesPtr[3]; /* 0x0048 */ u8 worldId; /* 0x0049 */ u8 courseId; - /* 0x004A */ u8 playerCount; + /* 0x004A */ u8 gObjectCount; /* 0x004B */ u8 newGame; /* 0x004C */ Settings4C *unk4C; /* 0x0050 */ u32 filename; @@ -253,25 +253,25 @@ typedef struct { /* 0x4C */ u32 unk4C; } dkr_wave_t; -typedef struct Player_3C { +typedef struct Object_3C { u8 pad0[0x8]; s8 unk8; u8 pad9[0x4]; u8 unkD; -} Player_3C; +} Object_3C; -typedef struct Player_40 { +typedef struct Object_40 { u8 pad0[0xC]; f32 unkC; u8 pad10[0x43]; s8 unk53; s8 unk54; - s8 unk55; //size of array pointed by Player->unk68 + s8 unk55; //size of array pointed by Object->unk68 u8 pad56[0x02]; u8 pad58[0x18]; u8 unk70; u8 unk71; -} Player_40; +} Object_40; typedef struct Player_4C { u8 pad0[0x10]; @@ -282,7 +282,7 @@ typedef struct Player_4C { u16 unk14; } Player_4C; -typedef struct Player_64 { +typedef struct Object_64 { f32 unk0; s32 unk4; u8 pad8[4]; @@ -339,14 +339,14 @@ typedef struct Player_64 { u8 pad1D8[0x1A]; u8 unk1F2; u8 unk1F3; -} Player_64; +} Object_64; -typedef struct Player_68{ +typedef struct Object_68{ u8 pad00[0x20]; s8 unk20; - } Player_68; + } Object_68; /* Size: 0x0630 bytes */ -typedef struct Player { +typedef struct Object { /* 0x0000 */ s16 y_rotation; /* 0x0002 */ s16 x_rotation; /* 0x0004 */ s16 z_rotation; @@ -372,9 +372,9 @@ typedef struct Player { /* 0x0039 */ u8 unk39; /* 0x003A */ s8 unk3A; /* 0x003B */ s8 unk3B; - /* 0x003C */ Player_3C* unk3C; + /* 0x003C */ Object_3C* unk3C; - /* 0x0040 */ Player_40 *descriptor_ptr; + /* 0x0040 */ Object_40 *descriptor_ptr; /* 0x0044 */ void *unk44; /* 0x0048 */ s16 unk48; /* 0x004A */ s16 unk4A; @@ -385,8 +385,8 @@ typedef struct Player { /* 0x005C */ u32 unk5C; /* 0x0060 */ void *unk60; //player + 0x340 - /* 0x0064 */ Player_64 *unk64; //player + 0x98 - /* 0x0068 */ Player_68 **unk68; //player + 0x80 + /* 0x0064 */ Object_64 *unk64; //player + 0x98 + /* 0x0068 */ Object_68 **unk68; //player + 0x80 /* 0x006C */ void *unk6C; //player + 0x370 /* 0x0070 */ u32 unk70; @@ -409,7 +409,7 @@ typedef struct Player { /* 0x0090 */ u32 unk90; /* 0x0094 */ u32 unk94; - /* 0x0098 */ s16 playerIndex; // -1 = AI Controlled, 0 to 3 = Player controlled + /* 0x0098 */ s16 playerIndex; // -1 = AI Controlled, 0 to 3 = Object controlled /* 0x009A */ u8 unk9A; /* 0x009B */ u8 characterId; // Affects minimap color, horn, voice, etc. @@ -605,6 +605,6 @@ typedef struct Player { /* 0x0374 */ s32 unk374; u32 unk378[174]; // Not an array. Unknown values. -} Player; +} Object; #endif diff --git a/src/menu.c b/src/menu.c index d78b0fd4..306b9201 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1517,7 +1517,7 @@ Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); void func_8008E4B0(void); -s8 *func_8001E29C(s32 arg0); +s8 *get_misc_asset(s32 arg0); void func_80001D04(s32, s32*); void func_800660EC(f32 arg0); void func_8009C508(s32 arg0); @@ -2849,7 +2849,7 @@ void set_active_player_index(s32 controllerIndex) { GLOBAL_ASM("asm/non_matchings/menu/menu_character_select_init.s") /** - * Draws the "Player Select" and "OK?" text in the character select menu. + * Draws the "Object Select" and "OK?" text in the character select menu. */ void draw_character_select_text(s32 arg0) { s32 yPos; @@ -2857,10 +2857,10 @@ void draw_character_select_text(s32 arg0) { set_text_font(2); // Set font to the Big Yellow Text set_text_background_color(0, 0, 0, 0); set_text_color(0, 0, 0, 0xFF, 0x80); - // Draw "Player Select" text drop shadow + // Draw "Object Select" text drop shadow draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC); set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); - // Draw "Player Select" text + // Draw "Object Select" text draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC); if (gNumberOfReadyPlayers == gNumberOfActivePlayers && gNumberOfActivePlayers > 0) { yPos = 0xD0; @@ -3439,7 +3439,7 @@ s32 func_80092BE0(s32 arg0) { s32 index; s32 temp; - trackIdArray = (s8 *)func_8001E29C(0x1C); + trackIdArray = (s8 *)get_misc_asset(0x1C); index = 0; temp = -1; @@ -3798,7 +3798,7 @@ void func_80098208(void) { } extern s32 D_800E0980; -s8* func_8001E29C(s32 arg0); +s8* get_misc_asset(s32 arg0); #if 1 GLOBAL_ASM("asm/non_matchings/menu/menu_trophy_race_round_init.s") @@ -3810,7 +3810,7 @@ void menu_trophy_race_round_init(void) { s8 *temp_t9; settings = get_settings(); - temp_t9 = func_8001E29C(0x1A); // Returns level ids array. + temp_t9 = get_misc_asset(0x1A); // Returns level ids array. if (D_800E0FEC == 0) { for(i = 0; i < 8; i++) { @@ -3845,7 +3845,7 @@ void func_800983C0(s32 arg0) { s32 sp24; s8* sp20; - sp20 = func_8001E29C(0x1A); + sp20 = get_misc_asset(0x1A); if (osTvType == 0) { sp2C = 0x12; } else { @@ -3943,7 +3943,7 @@ void func_8009ABD8(s8 *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { arg0++; } - if ((phi_v1 == 0) && (func_8001E29C(0x19) == arg0)) { + if ((phi_v1 == 0) && (get_misc_asset(0x19) == arg0)) { D_8012684C = 1; } else { D_8012684C = 0; @@ -4309,7 +4309,7 @@ void func_8009C4A8(s16 *arg0) { void func_8007B2BC(u32 arg0); void func_8007CCB0(u32 arg0); -void particlePtrList_addObject(u32 arg0); +void gParticlePtrList_addObject(u32 arg0); void func_8005FF40(u32 arg0); void func_8009C508(s32 arg0) { @@ -4324,7 +4324,7 @@ void func_8009C508(s32 arg0) { func_8007CCB0((u32)D_80126550[arg0]); } else { if ((*D_800DF750)[arg0] & 0x4000) { - particlePtrList_addObject((u32)D_80126550[arg0]); + gParticlePtrList_addObject((u32)D_80126550[arg0]); } else { func_8005FF40((u32)D_80126550[arg0]); } @@ -4334,7 +4334,7 @@ void func_8009C508(s32 arg0) { D_80126550[arg0] = 0; D_80126750[arg0] = 0; D_800DF758--; - particlePtrList_flush(); + gParticlePtrList_flush(); } if (D_800DF758 == 0) { if (D_800DF75C != NULL) { diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 0844e3ea..ba24ea73 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -129,7 +129,7 @@ s32 D_8011AD38; s8 D_8011AD3C; s8 D_8011AD3D; s8 D_8011AD3E; -Player *D_8011AD40; +Object *D_8011AD40; s8 D_8011AD44; s8 D_8011AD45; s16 D_8011AD46; @@ -145,13 +145,13 @@ s32 D_8011AD54; s32 *D_8011AD58; s32 D_8011AD5C; s32 D_8011AD60; -s32 *D_8011AD64; -s32 D_8011AD68; -s32 *D_8011AD6C; -s32 *D_8011AD70; +s32 *gAssetsObjectHeadersTable; +s32 gAssetsObjectHeadersTableLength; +s32 *gAssetsMiscSection; +s32 *gAssetsMiscTable; s32 D_8011AD74; Gfx *D_8011AD78[10]; -s32 D_8011ADA0; +s32 gAssetsMiscTableLength; s16 D_8011ADA4; f32 D_8011ADA8; s32 D_8011ADAC; @@ -177,7 +177,7 @@ s32 (*D_8011AE48)[8]; // Unknown number of entries. u8 (*D_8011AE4C)[8]; // Unknown number of entries. s32 D_8011AE50; s32 D_8011AE54; -Player **objPtrList; // Not sure about the number of elements +Object **gObjPtrList; // Not sure about the number of elements s32 objCount; s32 D_8011AE60; s32 D_8011AE64; @@ -201,11 +201,11 @@ s32 D_8011AEA0; s32 D_8011AEA4; s32 D_8011AEA8[2]; s32 D_8011AEB0[2]; -s16 *D_8011AEB8; -s32 D_8011AEBC; +s16 *gAssetsLvlObjTranslationTable; +s32 gAssetsLvlObjTranslationTableLength; s32 D_8011AEC0; -Player **particlePtrList; -s32 particleCount; +Object **gParticlePtrList; +s32 gParticleCount; /* Size: 0x3C bytes */ typedef struct unknown8011AECC { @@ -219,10 +219,10 @@ s32 D_8011AED4; s16 D_8011AED8; u32 (*D_8011AEDC)[64]; // Not sure about the number of elements s32 D_8011AEE0; -Player *(*playerStructArray_Ptr)[8]; +Object *(*gObjectStructArrayPtr)[8]; s32 *D_8011AEE8; s32 *D_8011AEEC; -s32 playerCount; +s32 gObjectCount; u8 gTimeTrialEnabled; u8 D_8011AEF5; u8 D_8011AEF6; @@ -310,16 +310,16 @@ typedef struct unk8001D6E4_arg1 { /* 0x40 */ unk8001D6E4_arg1_40 *unk40; } unk8001D6E4_arg1; -void func_8001D80C(unk8001D6E4_arg1 *, ObjectModel *, s16, unk8001D6E4_arg1 *, f32, f32); -void func_80024744(unk8001D6E4_arg1 *, ObjectModel *, s16, f32); +void calc_dynamic_lighting_for_object_1(unk8001D6E4_arg1 *, ObjectModel *, s16, unk8001D6E4_arg1 *, f32, f32); +void calc_dynamic_lighting_for_object_2(unk8001D6E4_arg1 *, ObjectModel *, s16, f32); void func_8000C460(void); void *new_sub_memory_pool(s32, u32); void *allocate_from_main_pool_safe(s32, u32); s32 *load_asset_section_from_rom(s32); -void particlePtrList_addObject(Player *); -void particlePtrList_flush(void); +void gParticlePtrList_addObject(Object *); +void gParticlePtrList_flush(void); void func_8001D258(f32, f32, s32, s32, s32); extern void func_800245B4(s16); @@ -332,17 +332,17 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B290.s") #else extern s32 D_800DC754; -extern Player* D_800DC75C; -extern Player* D_800DC764; +extern Object* D_800DC75C; +extern Object* D_800DC764; -s32 *func_8001E29C(s32 arg0); +s32 *get_misc_asset(s32 arg0); void func_8000B290(){ if(D_800DC754){ free_from_memory_pool(); } - func_8001E29C(20); + get_misc_asset(20); /*{ if(D_800DC754->unk7a) func_8007CCB0(); @@ -353,14 +353,14 @@ void func_8000B290(){ D_800DC754->unk7C = 0; }*/ if(D_800DC75C) - particlePtrList_addObject(D_800DC75C); + gParticlePtrList_addObject(D_800DC75C); D_800DC75C = NULL; if(D_800DC764) - particlePtrList_addObject(D_800DC764); + gParticlePtrList_addObject(D_800DC764); D_800DC764 = NULL; - particlePtrList_flush(); + gParticlePtrList_flush(); } #endif @@ -378,51 +378,52 @@ u32* func_8000BF44(s32 arg0) { return D_8011B020[arg0]; } -void func_8000C2D8(u8 *arg0, s32 length); +void decrypt_magic_codes(u8 *arg0, s32 length); void func_8000BF8C(void) { s32 i; func_8001D258(0.67f, 0.33f, 0, -0x2000, 0); D_8011AE68 = (s32*)new_sub_memory_pool(0x15800, 0x200); - particlePtrList = (Player **)allocate_from_main_pool_safe(0x320, COLOR_TAG_BLUE); + gParticlePtrList = (Object **)allocate_from_main_pool_safe(0x320, COLOR_TAG_BLUE); D_8011AE6C = (s32*)allocate_from_main_pool_safe(0x50, COLOR_TAG_BLUE); D_8011AE74 = (s32*)allocate_from_main_pool_safe(0x200, COLOR_TAG_BLUE); D_8011AECC = (unknown8011AECC*)allocate_from_main_pool_safe(0xE10, COLOR_TAG_BLUE); D_8011AEDC = (s32*)allocate_from_main_pool_safe(0x50, COLOR_TAG_BLUE); - playerStructArray_Ptr = (s32*)allocate_from_main_pool_safe(0x28, COLOR_TAG_BLUE); + gObjectStructArrayPtr = (s32*)allocate_from_main_pool_safe(0x28, COLOR_TAG_BLUE); D_8011AEEC = (s32*)allocate_from_main_pool_safe(0x28, COLOR_TAG_BLUE); D_8011AEE8 = (s32*)allocate_from_main_pool_safe(0x28, COLOR_TAG_BLUE); D_8011AF04 = (s32*)allocate_from_main_pool_safe(0x200, COLOR_TAG_BLUE); D_8011ADCC = (s32*)allocate_from_main_pool_safe(8, COLOR_TAG_BLUE); D_8011AFF4 = (s32*)allocate_from_main_pool_safe(0x400, COLOR_TAG_BLUE); - D_8011AEB8 = (s32*)load_asset_section_from_rom(ASSET_LEVEL_OBJECT_TRANSLATION_TABLE); - D_8011AEBC = (get_size_of_asset_section(ASSET_LEVEL_OBJECT_TRANSLATION_TABLE) >> 1) - 1; - while (D_8011AEB8[D_8011AEBC] == 0) { - D_8011AEBC--; + gAssetsLvlObjTranslationTable = (s32*)load_asset_section_from_rom(ASSET_LEVEL_OBJECT_TRANSLATION_TABLE); + gAssetsLvlObjTranslationTableLength = (get_size_of_asset_section(ASSET_LEVEL_OBJECT_TRANSLATION_TABLE) >> 1) - 1; + while (gAssetsLvlObjTranslationTable[gAssetsLvlObjTranslationTableLength] == 0) { + gAssetsLvlObjTranslationTableLength--; } D_8011AD58 = (s32*)allocate_from_main_pool_safe(0x800, COLOR_TAG_BLUE); - D_8011AD64 = load_asset_section_from_rom(ASSET_OBJECT_HEADERS_TABLE); - D_8011AD68 = 0; - while (-1 != D_8011AD64[D_8011AD68]) { - D_8011AD68++; + gAssetsObjectHeadersTable = load_asset_section_from_rom(ASSET_OBJECT_HEADERS_TABLE); + gAssetsObjectHeadersTableLength = 0; + while (-1 != gAssetsObjectHeadersTable[gAssetsObjectHeadersTableLength]) { + gAssetsObjectHeadersTableLength++; } - D_8011AD68--; - D_8011AE48 = (s32*)allocate_from_main_pool_safe(D_8011AD68 << 2, COLOR_TAG_WHITE); - D_8011AE4C = (s32*)allocate_from_main_pool_safe(D_8011AD68, COLOR_TAG_WHITE); + gAssetsObjectHeadersTableLength--; + D_8011AE48 = (s32*)allocate_from_main_pool_safe(gAssetsObjectHeadersTableLength * 4, COLOR_TAG_WHITE); + D_8011AE4C = (s32*)allocate_from_main_pool_safe(gAssetsObjectHeadersTableLength, COLOR_TAG_WHITE); - for (i = 0; i < D_8011AD68; i++) { + for (i = 0; i < gAssetsObjectHeadersTableLength; i++) { (*D_8011AE4C)[i] = 0; } - D_8011AD6C = load_asset_section_from_rom(ASSET_MISC); - D_8011AD70 = load_asset_section_from_rom(ASSET_MISC_TABLE); - D_8011ADA0 = 0; - while (-1 != D_8011AD70[D_8011ADA0]) { - D_8011ADA0++; + gAssetsMiscSection = load_asset_section_from_rom(ASSET_MISC); + gAssetsMiscTable = load_asset_section_from_rom(ASSET_MISC_TABLE); + gAssetsMiscTableLength = 0; + while (-1 != gAssetsMiscTable[gAssetsMiscTableLength]) { + gAssetsMiscTableLength++; } - func_8000C2D8(&D_8011AD6C[D_8011AD70[65]], (D_8011AD70[66] - D_8011AD70[65]) * 4); - objPtrList = (Player**)allocate_from_main_pool_safe(0x800, COLOR_TAG_BLUE); + + decrypt_magic_codes(&gAssetsMiscSection[gAssetsMiscTable[65]], (gAssetsMiscTable[66] - gAssetsMiscTable[65]) * 4); + gObjPtrList = (Object**)allocate_from_main_pool_safe(0x800, COLOR_TAG_BLUE); D_8011ADC4 = 0; gTimeTrialEnabled = 0; D_8011AEF5 = 0; @@ -431,10 +432,10 @@ void func_8000BF8C(void) { } #if 1 -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000C2D8.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/decrypt_magic_codes.s") #else // Decrypts cheats -void func_8000C2D8(u8 *arg0, s32 length) { +void decrypt_magic_codes(u8 *data, s32 length) { u8 sp3; u8 sp2; u8 sp1; @@ -445,14 +446,14 @@ void func_8000C2D8(u8 *arg0, s32 length) { //numWords = length / 4; for (i = 0; i < length; i++) { - sp0 = ((arg0[i + 3] & 0xC0) >> 6) | (arg0[i + 0] & 0xC0) | ((arg0[i + 1] & 0xC0) >> 2) | ((arg0[i + 2] & 0xC0) >> 4); - sp1 = ((arg0[i + 3] & 0x30) >> 4) | ((arg0[i + 0] & 0x30) << 2) | (arg0[i + 1] & 0x30) | ((arg0[i + 2] & 0x30) >> 2); - sp2 = ((arg0[i + 3] & 0xC) >> 2) | ((arg0[i + 0] & 0xC) << 4) | ((arg0[i + 1] & 0xC) << 2) | (arg0[i + 2] & 0xC); - sp3 = (arg0[i + 3] & 3) | (arg0[i + 0] << 6) | ((arg0[i + 1] & 3) << 4) | ((arg0[i + 2] & 3) << 2); - arg0[i + 0] = ((sp0 & 0x55) << 1) | ((sp0 & 0xAA) >> 1); - arg0[i + 1] = ((sp1 & 0x55) << 1) | ((sp1 & 0xAA) >> 1); - arg0[i + 2] = ((sp2 & 0x55) << 1) | ((sp2 & 0xAA) >> 1); - arg0[i + 3] = ((sp3 & 0x55) << 1) | ((sp3 & 0xAA) >> 1); + sp0 = ((data[i + 3] & 0xC0) >> 6) | (data[i + 0] & 0xC0) | ((data[i + 1] & 0xC0) >> 2) | ((data[i + 2] & 0xC0) >> 4); + sp1 = ((data[i + 3] & 0x30) >> 4) | ((data[i + 0] & 0x30) << 2) | (data[i + 1] & 0x30) | ((data[i + 2] & 0x30) >> 2); + sp2 = ((data[i + 3] & 0xC) >> 2) | ((data[i + 0] & 0xC) << 4) | ((data[i + 1] & 0xC) << 2) | (data[i + 2] & 0xC); + sp3 = (data[i + 3] & 3) | (data[i + 0] << 6) | ((data[i + 1] & 3) << 4) | ((data[i + 2] & 3) << 2); + data[i + 0] = ((sp0 & 0x55) << 1) | ((sp0 & 0xAA) >> 1); + data[i + 1] = ((sp1 & 0x55) << 1) | ((sp1 & 0xAA) >> 1); + data[i + 2] = ((sp2 & 0x55) << 1) | ((sp2 & 0xAA) >> 1); + data[i + 3] = ((sp3 & 0x55) << 1) | ((sp3 & 0xAA) >> 1); } } #endif @@ -463,11 +464,11 @@ void func_8000C460(void) { D_8011AD26[0] = 1; D_8011AD5C = 0; D_8011AD60 = 0; - particleCount = 0; + gParticleCount = 0; D_8011AE70 = 0; D_8011AED0 = 0; D_8011AED4 = 0; - playerCount = 0; + gObjectCount = 0; D_8011AE78 = 0; D_8011AD20[1] = 0; D_8011AD22[0] = 0; @@ -515,12 +516,12 @@ void func_8000C604(void) { D_800DC744 = 0; func_8006F398(); } - particlePtrList_flush(); + gParticlePtrList_flush(); len = objCount; for (i = 0; i < len; i++) { - func_800101AC(objPtrList[i], 1); + func_800101AC(gObjPtrList[i], 1); } - particleCount = 0; + gParticleCount = 0; objCount = 0; D_8011AE60 = 0; func_8000C460(); @@ -657,24 +658,30 @@ s8 func_8000E1DC() { return D_8011AE03; } -void func_8000E1EC(Player *arg0, s32 arg1) { - D_8011AD40 = arg0; +void func_8000E1EC(Object *object, s32 arg1) { + D_8011AD40 = object; D_8011AD44 = 4; D_8011AD45 = arg1; - D_8011AD46 = arg0->x_position; - D_8011AD48 = arg0->y_position; - D_8011AD4A = arg0->z_position; - D_8011AD4C = arg0->y_rotation; - particlePtrList_addObject(arg0); - playerCount = 0; + D_8011AD46 = object->x_position; + D_8011AD48 = object->y_position; + D_8011AD4A = object->z_position; + D_8011AD4C = object->y_rotation; + gParticlePtrList_addObject(object); + gObjectCount = 0; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E2B4.s") +/** + * Enables or Disables time trial mode. + */ void set_time_trial_enabled(s32 arg0) { gTimeTrialEnabled = arg0; } +/** + * Returns the value in gTimeTrialEnabled. + */ u8 is_time_trial_enabled() { return gTimeTrialEnabled; } @@ -690,17 +697,17 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E79C.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E898.s") -Player *getObject(s32 indx) { - if (indx < 0 || indx >= objCount) { +Object *get_object(s32 index) { + if (index < 0 || index >= objCount) { return 0; } - return objPtrList[indx]; + return gObjPtrList[index]; } -Player **func_8000E988(s32 *arg0, s32 *cnt) { +Object **func_8000E988(s32 *arg0, s32 *cnt) { *arg0 = D_8011AE60; *cnt = objCount; - return objPtrList; + return gObjPtrList; } // Unused? @@ -713,10 +720,10 @@ s32 func_8000E9C0(void) { return D_8011AE64; } -void func_8000E9D0(Player* arg0){ +void func_8000E9D0(Object* arg0){ arg0->unk6 |= 0x8000; func_800245B4(arg0->unk2C | 0xC000); - objPtrList[objCount++] = arg0; + gObjPtrList[objCount++] = arg0; if(1); D_8011AE64++; } @@ -763,37 +770,36 @@ s32 func_8000FD34(unk8000FD34 *arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000FD54.s") -void particlePtrList_addObject(Player* arg0){ - func_800245B4(arg0->unk4A | 0x8000); - particlePtrList[particleCount] = arg0; - particleCount++; +void gParticlePtrList_addObject(Object* object){ + func_800245B4(object->unk4A | 0x8000); + gParticlePtrList[gParticleCount] = object; + gParticleCount++; } - s32 func_80010018(void){ - return D_8011AEBC; + return gAssetsLvlObjTranslationTableLength; } s32 func_80010028(s32 arg0){ - return (D_8011AEB8[arg0] < D_8011AD68); + return (gAssetsLvlObjTranslationTable[arg0] < gAssetsObjectHeadersTableLength); } #if 1 -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/particlePtrList_flush.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/gParticlePtrList_flush.s") #else //bad regalloc; swap s2 = s3 -/*removes objects in particleList from objPtrList and frees*/ -void particlePtrList_flush(void){ +/*removes objects in particleList from gObjPtrList and frees*/ +void gParticlePtrList_flush(void){ s32 j, i, search_indx, tmp; - Player* searchObj; + Object* searchObj; D_8011AE88 = 0; - for (i = 0; i < particleCount; i++){ + for (i = 0; i < gParticleCount; i++){ search_indx = -1; - searchObj = particlePtrList[i]; + searchObj = gParticlePtrList[i]; for(j = 0; j < objCount; j++){ - if(searchObj == objPtrList[j]) + if(searchObj == gObjPtrList[j]) search_indx = j; } @@ -805,12 +811,12 @@ void particlePtrList_flush(void){ objCount--; for(j = search_indx; j < objCount; j++){ - objPtrList[j] = objPtrList[j+1]; + gObjPtrList[j] = gObjPtrList[j+1]; } } func_800101AC(searchObj,0); } - particleCount = 0; + gParticleCount = 0; } #endif @@ -843,11 +849,11 @@ void func_80011560(void) { } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011570.s") -void func_80011960(Player*, s32, u32, Player_64*, u32, u32, u32, u32, f32); +void func_80011960(Object*, s32, u32, Object_64*, u32, u32, u32, u32, f32); #if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011960.s") #else -void func_80011960(Player* arg0, s32 arg2, u32 arg3, Player_64* arg4 +void func_80011960(Object* arg0, s32 arg2, u32 arg3, Object_64* arg4 , u32 arg5 , u32 arg6 , u32 arg7, u32 arg8, f32 arg9) { @@ -859,7 +865,7 @@ void func_80011960(Player* arg0, s32 arg2, u32 arg3, Player_64* arg4 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011AD0.s") #else extern f32 D_800E5550; -void func_80011AD0(Player* this){ +void func_80011AD0(Object* this){ f32 tmp_f0; u32 offset; switch(this->unk48){ @@ -908,7 +914,7 @@ void func_80011AD0(Player* this){ #if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011C94.s") #else -void func_80011C94(Player* this){ +void func_80011C94(Object* this){ } #endif @@ -919,7 +925,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800120C8.s") extern f32 D_8011AD30; -void func_800120C8(Player* this){ +void func_800120C8(Object* this){ u32 sp_b8; u32 sp_a8; u32 sp_a4; @@ -928,7 +934,7 @@ void func_800120C8(Player* this){ u32 *s0; f32 tmp_f_1; f32 *tmp_fp_s1; - Player_64* tmp_s3; + Object_64* tmp_s3; s0 = ((u32*) this->unk68)[this->unk3A]; if(s0){ @@ -1036,37 +1042,34 @@ void func_80012CE8(Gfx **dlist) { } } -void func_8001348C(Player *); +void func_8001348C(Object *); -func_80012D5C(u32 *arg0, u32 *arg1, u32 *arg2, Player * arg3){ +func_80012D5C(u32 *arg0, u32 *arg1, u32 *arg2, Object *object){ f32 scale; u32 tmp2; u32 tmp3; - if(arg3->unk6 & 0x5000) + if(object->unk6 & 0x5000) return; - - func_800B76B8(2, arg3->unk4A); + func_800B76B8(2, object->unk4A); D_8011AE8C = *arg0; D_8011AE90 = *arg1; D_8011AE94 = *arg2; - scale = arg3->scale; - func_8001348C(arg3); - arg3->scale = scale; + scale = object->scale; + func_8001348C(object); + object->scale = scale; *arg0 = D_8011AE8C; *arg1 = D_8011AE90; *arg2 = D_8011AE94; func_800B76B8(2, -1); - - } extern f32 func_800707F8(s16); #if 1 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012E28.s") #else -void func_80012E28(Player *this){ +void func_80012E28(Object *this){ s32 unused1; - Player_64 *sp_20; + Object_64 *sp_20; f32 tmp_f2; f32 sp_1c; f32 tmp_f0; @@ -1099,12 +1102,12 @@ void func_80012E28(Player *this){ #endif -void func_80012F30(Player *arg0) { +void func_80012F30(Object *arg0) { if (arg0->unk48 == 1) { - Player_64 *player_64 = arg0->unk64; - arg0->y_rotation -= player_64->unk160; - arg0->x_rotation -= player_64->unk162; - arg0->z_rotation -= player_64->unk164; + Object_64 *object_64 = arg0->unk64; + arg0->y_rotation -= object_64->unk160; + arg0->x_rotation -= object_64->unk162; + arg0->z_rotation -= object_64->unk164; arg0->y_position -= D_8011ADD0; } } @@ -1112,11 +1115,9 @@ void func_80012F30(Player *arg0) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012F94.s") +void func_80013548(Object *arg0); - -void func_80013548(Player *arg0); - -void func_8001348C(Player *this){ +void func_8001348C(Object *this){ func_80012F94(this); if(this->unk6 & 0x8000){ func_800B3740(this, &D_8011AE8C, &D_8011AE90, &D_8011AE94, 32768); @@ -1132,7 +1133,7 @@ void func_8001348C(Player *this){ func_80013548(this); } -void func_80013548(Player *arg0) { +void func_80013548(Object *arg0) { if ((arg0->unk6 & 0x8000) == 0 && arg0->descriptor_ptr->unk54 == 1) { arg0->x_position -= arg0->unk64->unk78; arg0->y_position -= arg0->unk64->unk7C; @@ -1149,11 +1150,11 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80014090.s") void func_800142B8(void){ s32 i = D_8011AE60; s32 j; - Player* currObj; - Player_68 *curr_68; + Object* currObj; + Object_68 *curr_68; for(; i < objCount; i++){ - currObj = objPtrList[i]; + currObj = gObjPtrList[i]; if( (currObj->unk6 & 0x8000) == 0 && currObj->descriptor_ptr->unk53 == 0){ for(j=0; jdescriptor_ptr->unk55; j++){ curr_68 = currObj->unk68[j]; @@ -1208,11 +1209,11 @@ s16 func_80017E88(void) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017E98.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800185E4.s") -Player * func_80018C6C(void){ +Object * func_80018C6C(void){ s32 i; - Player* current_obj; + Object* current_obj; for(i=D_8011AE60; i < objCount; i++){ - current_obj = objPtrList[i]; + current_obj = gObjPtrList[i]; if(!(current_obj->unk6 & 0x8000) && (current_obj->unk48 == 62)) return current_obj; } @@ -1312,29 +1313,29 @@ s32 func_8001BA64() { return D_8011AED0; } -Player **getPlayerStructArray(s32 *cnt) { - *cnt = playerCount; - return *playerStructArray_Ptr; +Object **get_object_struct_array(s32 *cnt) { + *cnt = gObjectCount; + return *gObjectStructArrayPtr; } s32 *func_8001BA90(s32 *arg0) { - *arg0 = playerCount; + *arg0 = gObjectCount; return D_8011AEEC; } s32 *func_8001BAAC(s32 *arg0) { - *arg0 = playerCount; + *arg0 = gObjectCount; return D_8011AEE8; } -Player *getPlayerStruct(s32 indx) { - if (playerCount == 0) { +Object *get_object_struct(s32 indx) { + if (gObjectCount == 0) { return NULL; } - if(indx < 0 || indx >= playerCount) { + if(indx < 0 || indx >= gObjectCount) { return NULL; } - return (*playerStructArray_Ptr)[indx]; + return (*gObjectStructArrayPtr)[indx]; } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001BB18.s") @@ -1395,7 +1396,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D2A0.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D4B4.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D5E0.s") -void func_8001D6E4(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) { +void calc_dyn_light_and_env_map_for_object(ObjectModel *model, Object *object, s32 arg2, f32 arg3) { s16 environmentMappingEnabled; s32 dynamicLightingEnabled; s16 i; @@ -1403,11 +1404,11 @@ void func_8001D6E4(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) { dynamicLightingEnabled = 0; environmentMappingEnabled = 0; - for (i = 0; i < arg0->numberOfBatches; i++) { - if (arg0->batches[i].unk6 != 0xFF) { + for (i = 0; i < model->numberOfBatches; i++) { + if (model->batches[i].unk6 != 0xFF) { dynamicLightingEnabled = -1; // This is a bit weird, but I guess it works. } - if (arg0->batches[i].flags & 0x8000) { + if (model->batches[i].flags & 0x8000) { environmentMappingEnabled = -1; } } @@ -1416,28 +1417,32 @@ void func_8001D6E4(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) { // Calculates dynamic lighting for the object if (object->descriptor_ptr->unk71 != 0) { // Dynamic lighting for some objects? (Intro diddy, Taj, T.T., Bosses) - func_8001D80C(object, arg0, arg2, object, arg3, 1.0f); + calc_dynamic_lighting_for_object_1(object, model, arg2, object, arg3, 1.0f); } else { // Dynamic lighting for other objects? (Racers, Rare logo, Wizpig face, etc.) - func_80024744(object, arg0, arg2, arg3); + calc_dynamic_lighting_for_object_2(object, model, arg2, arg3); } } if (environmentMappingEnabled) { // Calculates environment mapping for the object - func_8001DD54(arg0, object->z_rotation, object->x_rotation, object->y_rotation); + calc_env_mapping_for_object(model, object->z_rotation, object->x_rotation, object->y_rotation); } } -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D80C.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001DD54.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001E13C.s") -s32 *func_8001E29C(s32 arg0) { - if (arg0 < 0 || arg0 >= D_8011ADA0) { - return D_8011AD6C; +/** + * Returns a pointer to the asset in the misc. section. If index is out of range, then this + * function just returns the pointer to gAssetsMiscSection. + */ +s32 *get_misc_asset(s32 index) { + if (index < 0 || index >= gAssetsMiscTableLength) { + return gAssetsMiscSection; } - return (s32*)&D_8011AD6C[D_8011AD70[arg0]]; + return (s32*)&gAssetsMiscSection[gAssetsMiscTable[index]]; } s32 func_8001E2EC(s32 arg0) { @@ -1459,12 +1464,12 @@ void func_8001E344(s32 arg0) { void func_8001E36C(s32 arg0, f32* arg1, f32* arg2, f32* arg3){ s32 i; - Player* current_obj; + Object* current_obj; *arg1 = -32000.0f; *arg2 = -32000.0f; *arg3 = -32000.0f; for(i=0; iunk6 & 0x8000) == 0 @@ -1576,14 +1581,14 @@ void func_800228DC(s32 arg0, s32 arg1, s32 arg2) { } void func_800228EC(s32 arg0) { - Player_64 *player_64; + Object_64 *object_64; D_8011AEF7 = 3; - player_64 = getPlayerStruct(0)->unk64; - player_64->unk190 = 0; - player_64->unk192 = 0; - player_64->unk193 = 0; - player_64->unk1BA = 0; + object_64 = get_object_struct(0)->unk64; + object_64->unk190 = 0; + object_64->unk192 = 0; + object_64->unk193 = 0; + object_64->unk1BA = 0; func_80017E74(arg0); func_8006F388(10); } @@ -1604,17 +1609,17 @@ extern f32 sqrtf(f32); //bad regalloc //finds furthest object (with some additional conditions) -Player* func_8002342C(f32 x, f32 z){ - Player* retval = NULL; +Object* func_8002342C(f32 x, f32 z){ + Object* retval = NULL; s32 i; - Player* currObj = NULL; + Object* currObj = NULL; f32 x; f32 z; f32 dist; f32 max = 0.0f; for(i=0; iunk6 & 0x8000) == 0 && currObj->unk48 == 87){ x = currObj->x_position - x; z = currObj->z_position - z; diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index fbf80e99..10305447 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -91,7 +91,7 @@ typedef struct{ unk8011B0B0 *D_8011B0B0; s32 D_8011B0B4; -Player *D_8011B0B8; +Object *D_8011B0B8; s32 D_8011B0BC; s32 D_8011B0C0; s32 D_8011B0C4; diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index da35e695..49259601 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -116,14 +116,14 @@ s16 D_8011D4E2; /******************************/ Settings* get_settings(); -Player_64 *func_800BE654(s16, f32, f32); +Object_64 *func_800BE654(s16, f32, f32); void func_80000FDC(s32, s32, f32); GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80033CC0.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80033DD0.s") -void func_80033F44(Player *arg0, s32 arg1) { +void func_80033F44(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; } @@ -140,8 +140,8 @@ typedef struct unk80034530 { u8 unkD; } unk80034530; -void func_80034530(Player *arg0, unk80034530 *arg1) { - Player_64* temp; +void func_80034530(Object *arg0, unk80034530 *arg1) { + Object_64* temp; arg0->unk4C->unk14 = 0x22; arg0->unk4C->unk11 = 0; temp = arg0->unk64; @@ -157,7 +157,7 @@ void func_80034530(Player *arg0, unk80034530 *arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800345A0.s") // Literally the same function as func_80033F44() -void func_80034844(Player *arg0, s32 arg1) { +void func_80034844(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; } @@ -168,7 +168,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034860.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034AF0.s") #else // regalloc issues -void func_80034AF0(Player *arg0, u8 *arg1) { +void func_80034AF0(Object *arg0, u8 *arg1) { f32 phi_f0 = (s32)arg1[9]; if (phi_f0 < 10.0f) { phi_f0 = 10.0f; @@ -196,7 +196,7 @@ void func_80034B68(s32 arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034B74.s") -void func_80034E70(Player *arg0, u8 *arg1) { +void func_80034E70(Object *arg0, u8 *arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 2; arg0->y_rotation = arg1[8] << 6 << 4; // Not sure about the values here. @@ -204,7 +204,7 @@ void func_80034E70(Player *arg0, u8 *arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034E9C.s") -void func_8003522C(Player *arg0, s32 arg1) { +void func_8003522C(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x14; @@ -247,7 +247,7 @@ typedef struct unk80035EF8 { s16 unkE; } unk80035EF8; -void func_80035EF8(Player *arg0, unk80035EF8 *arg1) { +void func_80035EF8(Object *arg0, unk80035EF8 *arg1) { f32 phi_f0; arg0->unk78 = (s32) arg1->unkE; arg0->unk7C.word = -1; @@ -263,8 +263,8 @@ void func_80035EF8(Player *arg0, unk80035EF8 *arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80035F6C.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80036040.s") -void func_80036194(Player *arg0, s32 arg1) { - Player_64* temp; +void func_80036194(Object *arg0, s32 arg1) { + Object_64* temp; arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x1E; @@ -359,7 +359,7 @@ void func_80037D6C(s32 arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80037D78.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800380F8.s") -void func_8003818C(Player *arg0, s32 arg1) { +void func_8003818C(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 0x81; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; @@ -371,7 +371,7 @@ void func_800381C0(s32 arg0, s32 arg1) { func_8001F460(arg0, arg1, arg0); } -void func_800381E0(Player *arg0, s32 arg1) { +void func_800381E0(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; @@ -379,7 +379,7 @@ void func_800381E0(Player *arg0, s32 arg1) { } // Literally the same as func_8003818C() -void func_80038214(Player *arg0, s32 arg1) { +void func_80038214(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 0x81; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; @@ -387,7 +387,7 @@ void func_80038214(Player *arg0, s32 arg1) { } // Literally the same as func_800381E0() -void func_80038248(Player *arg0, s32 arg1) { +void func_80038248(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; @@ -399,7 +399,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003833C.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038710.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800387CC.s") -void func_80038854(Player *arg0, u8 *arg1) { +void func_80038854(Object *arg0, u8 *arg1) { if (arg1[9] != 0) { arg0->unk4C->unk14 = 0x21; } else { @@ -433,7 +433,7 @@ typedef struct unk80038A78 { void func_80038A78(unk80038A78 *arg0, s32 arg1) { arg0->unk18 += arg1 * 8; if (arg0->unk18 >= 0x100) { - particlePtrList_addObject(); + gParticlePtrList_addObject(); arg0->unk18 = 0xFF; } } @@ -446,7 +446,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038AD4.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038B74.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038BF4.s") -void func_80038D58(Player *arg0, s32 arg1) { +void func_80038D58(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0xF; @@ -456,9 +456,9 @@ void func_80038D58(Player *arg0, s32 arg1) { } } -void func_80038DC4(Player *arg0, s32 arg1) { +void func_80038DC4(Object *arg0, s32 arg1) { if (arg0->unk78 != 0) { - Player_3C* temp = arg0->unk3C; + Object_3C* temp = arg0->unk3C; if(arg0->unk4C->unk13 < 0x78) { func_8006F338(temp->unk8); arg0->unk78 = 0; @@ -503,7 +503,7 @@ void func_800391BC(s32 arg0, s32 arg1) { } -void func_800391C8(Player *arg0, s32 arg1) { +void func_800391C8(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 3; arg0->unk4C->unk10 = 0x14; @@ -512,8 +512,8 @@ void func_800391C8(Player *arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800391FC.s") -void func_800392B8(Player *arg0, s32 arg1) { - Player_64* temp; +void func_800392B8(Object *arg0, s32 arg1) { + Object_64* temp; arg0->unk4C->unk14 = (u16)1; arg0->unk4C->unk11 = (u8)0; arg0->unk4C->unk10 = (u8)0x1E; @@ -557,7 +557,7 @@ f32 func_8003ACAC(void) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003ACBC.s") #else -void func_8003ACBC(Player *arg0, u8 *arg1, s32 arg2) { +void func_8003ACBC(Object *arg0, u8 *arg1, s32 arg2) { f32 phi_f0 = (s32)arg1[8]; // Regalloc issue here if (phi_f0 < 5.0f) { phi_f0 = 5.0f; @@ -586,8 +586,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003C2E4.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003C644.s") GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003C7A4.s") -void func_8003C9EC(Player *arg0, u8 *arg1) { - Player_64 *temp = arg0->unk64; +void func_8003C9EC(Object *arg0, u8 *arg1) { + Object_64 *temp = arg0->unk64; arg0->unk3A = arg1[8]; arg0->y_rotation = arg1[9] << 6 << 4; temp->unk0 = arg0->y_position; @@ -603,7 +603,7 @@ void func_8003C9EC(Player *arg0, u8 *arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003CA68.s") -void func_8003CE64(Player *arg0, u8 *arg1) { +void func_8003CE64(Object *arg0, u8 *arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x14; @@ -611,7 +611,7 @@ void func_8003CE64(Player *arg0, u8 *arg1) { arg0->unk78 = arg1[8]; } -void func_8003CEA0(Player *arg0, s32 arg1) { +void func_8003CEA0(Object *arg0, s32 arg1) { if (arg0->unk4C->unk13 < 0x2D) { func_8001E344(arg0->unk78, arg0); } @@ -638,7 +638,7 @@ void func_8003CF18(unk8003CF18 *arg0, u8 *arg1) { arg0->unk78 = temp_f0; } -void func_8003CF58(Player *arg0, u8 *arg1) { +void func_8003CF58(Object *arg0, u8 *arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = arg1[9]; @@ -646,7 +646,7 @@ void func_8003CF58(Player *arg0, u8 *arg1) { arg0->unk7C.word = arg1[9]; } -void func_8003CF98(Player *arg0, s32 arg1) { +void func_8003CF98(Object *arg0, s32 arg1) { if (arg0->unk4C->unk13 < arg0->unk7C.word) { func_80028044(arg0->unk78); } @@ -695,14 +695,14 @@ void func_8003D3EC(unk8003D3EC *arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003D3FC.s") -void func_8003D534(Player *arg0, s32 arg1) { +void func_8003D534(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x1E; arg0->unk7C.half.upper = 0x14; arg0->unk7C.half.lower = 0x10; if (get_filtered_cheats() & 0x1000) { - particlePtrList_addObject(arg0); + gParticlePtrList_addObject(arg0); } } @@ -723,7 +723,7 @@ void func_8003E5BC(s32 arg0, s32 arg1) { } -void func_8003E5C8(Player *arg0, s32 arg1) { +void func_8003E5C8(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x18; @@ -763,7 +763,7 @@ void func_800403A8(unk800403A8 *arg0, s32 arg1, s32 arg2) { arg0->unk64 = func_80031CAC(arg0, arg1); } -void func_800403D8(Player *arg0, s32 arg1, s32 arg2) { +void func_800403D8(Object *arg0, s32 arg1, s32 arg2) { arg0->unk64 = func_800BE654(arg0->unk2E, arg0->x_position, arg0->z_position); arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 0; @@ -771,9 +771,9 @@ void func_800403D8(Player *arg0, s32 arg1, s32 arg2) { arg0->unk4C->unk12 = 0; } -f32 func_800BEEB4(Player_64*); +f32 func_800BEEB4(Object_64*); -void func_80040448(Player *arg0, s32 arg1) { +void func_80040448(Object *arg0, s32 arg1) { if (arg0->unk64 != NULL) { arg0->y_position = func_800BEEB4(arg0->unk64); } @@ -800,7 +800,7 @@ void func_8004092C(s32 arg0, s32 arg1) { func_800AC8A8(arg0); } -void func_8004094C(Player *arg0, s16 *arg1, s32 arg2) { +void func_8004094C(Object *arg0, s16 *arg1, s32 arg2) { func_800ACF60(); arg0->scale = arg1[4]; arg0->scale /= 40.0f; @@ -847,12 +847,12 @@ typedef struct unk8004203C_arg1 { u16 unkA; } unk8004203C_arg1; -void func_8004203C(Player *arg0, unk8004203C_arg1 *arg1) { +void func_8004203C(Object *arg0, unk8004203C_arg1 *arg1) { func_800AF134(arg0->unk6C, arg1->unk9, arg1->unk8, 0, 0, 0); arg0->unk78 = arg1->unkA; } -void func_80042090(Player *arg0, s32 arg1) { +void func_80042090(Object *arg0, s32 arg1) { if (arg0->unk78 >= get_random_number_from_range(0, 0x400)) { arg0->unk74 = 1; } else { @@ -871,7 +871,7 @@ typedef struct unk8004210C { } unk8004210C; void func_8004210C(unk8004210C *arg0, s8 *arg1) { - arg0->unk64 = func_8001E29C(0x14) + (arg1[8] << 7); + arg0->unk64 = get_misc_asset(0x14) + (arg1[8] << 7); arg0->unk3C = 0; } @@ -905,7 +905,7 @@ void func_80042A1C(unk80042A1C *arg0, s8 *arg1) { arg0->unk7C = arg1[8]; arg0->unk7E = 0; if (is_in_tracks_mode()) { - particlePtrList_addObject(arg0); + gParticlePtrList_addObject(arg0); } func_800C56D0(4); } diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 64510221..c9fa0aa6 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -287,7 +287,7 @@ void func_8005234C(unk8005234C *arg0) { GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052388.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005250C.s") -void func_80052988(Player* arg0, Player_64* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { +void func_80052988(Object* arg0, Object_64* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { arg5 *= arg7; if ((D_8011D55C == -1) && (arg2 >= 3)) { @@ -394,7 +394,7 @@ void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1) { func_8006F64C(&sp30, 0, -1, 0, &arg1->unkA0, &arg1->unkA4, &arg1->unk9C); } -void func_80053664(Player_64 *arg0) { +void func_80053664(Object_64 *arg0) { if (arg0->throttle > 0.0) { arg0->throttle -= 0.1; } diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 995cdcf5..f7e27d24 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -147,7 +147,7 @@ s16 D_800DD304 = -1; /************ .bss ************/ -/* Size: 0x44 bytes, might just be Player? */ +/* Size: 0x44 bytes, might just be Object? */ typedef struct unk80120AC0 { s16 unk0; s16 unk2; @@ -224,7 +224,7 @@ extern s32 SP_IMEM; unk80120AC0 *func_80069D20(void); void func_800014BC(f32 arg0); -s8* func_8001E29C(s32 arg0); +s8* get_misc_asset(s32 arg0); s32 func_8006A624(s8 arg0); void func_8006F64C(s32*, f32, f32, f32, f32*, f32*, f32*); void guPerspectiveF(s32*, s32*, f32, f32, f32, f32, f32); diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index fffabbf8..f25978d0 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -185,7 +185,7 @@ extern s32 osTvType; void func_8006F43C(void); void func_800014BC(f32 arg0); -s8 *func_8001E29C(s32 arg0); +s8 *get_misc_asset(s32 arg0); s32 func_8006A624(s8 arg0); void func_8006F64C(s32*, f32, f32, f32, f32*, f32*, f32*); void guPerspectiveF(s32*, s32*, f32, f32, f32, f32, f32); @@ -246,7 +246,7 @@ s32 func_8006B1D4(s32 arg0) { if (arg0 < 0 || arg0 >= D_80121174) { arg0 = 0; } - temp = func_8001E29C(0x1B); + temp = get_misc_asset(0x1B); return temp[arg0]; } @@ -354,7 +354,7 @@ void load_level(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { D_800DD330 = (u8)2; } } - temp_v0_4 = func_8001E29C(0x43); + temp_v0_4 = get_misc_asset(0x43); phi_s0 = 0; while(arg0 != temp_v0_4[phi_s0 + 1]) { phi_s0++; @@ -373,7 +373,7 @@ void load_level(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { settings->cutsceneFlags |= temp_v0_5; arg2 = 0; arg4 = 5; - arg0 = func_8001E29C(0x44)[gCurrentLevelHeader->world - 1]; + arg0 = get_misc_asset(0x44)[gCurrentLevelHeader->world - 1]; } } } @@ -385,7 +385,7 @@ void load_level(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { arg2 = 0; func_8006C1AC(arg0, temp_a1, arg3, temp_a3); settings->cutsceneFlags |= 0x2000; - arg0 = (s32) func_8001E29C(0x44)[1]; + arg0 = (s32) get_misc_asset(0x44)[1]; } } } @@ -403,7 +403,7 @@ void load_level(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { D_80121164 = arg0; for (phi_v1_5 = 0; phi_v1_5 < 7; phi_v1_5++) { if ((s32)gCurrentLevelHeader->unk74[phi_v1_5] != -1) { - gCurrentLevelHeader->unk74[phi_v1_5] = func_8001E29C((s32)gCurrentLevelHeader->unk74[phi_v1_5]); + gCurrentLevelHeader->unk74[phi_v1_5] = get_misc_asset((s32)gCurrentLevelHeader->unk74[phi_v1_5]); func_8007F1E8(gCurrentLevelHeader->unk74[phi_v1_5]); } } @@ -520,7 +520,7 @@ void load_level(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { gCurrentLevelHeader->unkAA = (u16)0; } if ((s32)gCurrentLevelHeader->unkAC != -1) { - gCurrentLevelHeader->unkAC = func_8001E29C((s32)gCurrentLevelHeader->unkAC); + gCurrentLevelHeader->unkAC = get_misc_asset((s32)gCurrentLevelHeader->unkAC); func_8007F414(gCurrentLevelHeader->unkAC); } func_800660EC((f32)gCurrentLevelHeader->unk9C); @@ -1074,7 +1074,7 @@ void func_8006DBE4(void) { void func_8006DC58(s32 arg0) { if (func_800C73E0() == 0) { func_80010994(arg0); - particlePtrList_flush(); + gParticlePtrList_flush(); func_8001BF20(); func_80024D54(&D_801211F8, &D_80121208, &D_80121218, &D_80121228, arg0); func_800C3440(arg0); @@ -1108,11 +1108,11 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E3BC.s") void func_8006E5BC(void) { s32 i, j; - gSettingsPtr->playerCount = get_number_of_active_players(); + gSettingsPtr->gObjectCount = get_number_of_active_players(); for (i = 0; i < 8; i++) { gSettingsPtr->racers[i].best_times = 0; gSettingsPtr->racers[i].character = get_character_id_from_slot(i); - if (gSettingsPtr->playerCount >= 2) { + if (gSettingsPtr->gObjectCount >= 2) { gSettingsPtr->racers[i].starting_position = i; } else if (is_in_two_player_adventure()) { gSettingsPtr->racers[i].starting_position = 5 - i; diff --git a/tools/python/check_if_need_to_extract.py b/tools/python/check_if_need_to_extract.py index f3037513..17ff53fc 100644 --- a/tools/python/check_if_need_to_extract.py +++ b/tools/python/check_if_need_to_extract.py @@ -1,6 +1,7 @@ import argparse import hashlib import subprocess +import time from file_util import FileUtil parser = argparse.ArgumentParser(description="") @@ -17,27 +18,34 @@ configChecksumFilename = extractConfigFilename + '.md5' needToExtract = False +def do_extraction(reason): + global needToExtract + needToExtract = True + print(reason) + if not FileUtil.does_file_exist(assetsDirectory): - needToExtract = True + do_extraction("Extracting because /assets/ directory does not exist.") elif not FileUtil.does_file_exist(ucodeDirectory): - needToExtract = True + do_extraction("Extracting because /ucode/ directory does not exist.") elif not FileUtil.does_file_exist(configChecksumFilename): - needToExtract = True + do_extraction('Extracting because "' + configChecksumFilename + '" does not exist.') else: md5Calculated = hashlib.md5(FileUtil.get_bytes_from_file(extractConfigFilename)).hexdigest() md5Saved = FileUtil.get_text_from_file(configChecksumFilename) if md5Calculated != md5Saved: - needToExtract = True + do_extraction('Extracting because "' + extractConfigFilename + '" has changed.') -def run_until_done(args): - subprocess.run(args) +def run_until_done(args, hide=False): + if hide: + subprocess.run(args, stdout=subprocess.DEVNULL) + else: + subprocess.run(args) if needToExtract: md5Calculated = hashlib.md5(FileUtil.get_bytes_from_file(extractConfigFilename)).hexdigest() FileUtil.write_text_to_file(configChecksumFilename, md5Calculated) - print('Extracting...') run_until_done(['make', 'clean']) run_until_done(['rm', '-Rf', 'assets']) run_until_done(['rm', '-Rf', 'ucode']) - run_until_done(['./extract.sh', version]) + run_until_done(['./extract.sh', version], True) \ No newline at end of file