Skip to content

Commit

Permalink
some rename in code_8006e9c0 (#512)
Browse files Browse the repository at this point in the history
* some basic function renames

* Renaming player hud related variables.
  • Loading branch information
coco875 authored Dec 25, 2023
1 parent 371516f commit 3638f19
Show file tree
Hide file tree
Showing 32 changed files with 805 additions and 873 deletions.
75 changes: 12 additions & 63 deletions asm/bss_8001C4D0.s
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ glabel gObjectList
glabel D_80183D58
.skip 4

glabel D_80183D5C
glabel objectListSize
.skip 4

glabel D_80183D60
Expand Down Expand Up @@ -667,76 +667,25 @@ glabel gItemWindowObjectByPlayerId
glabel D_80183E98
.skip 8

glabel D_80183EA0
.skip 4

glabel D_80183EA4
.skip 4

glabel D_80183EA8
.skip 4

glabel D_80183EAC
.skip 4

glabel D_80183EB0
.skip 16

glabel D_80183EC0
.skip 8

glabel D_80183EC8
.skip 20

glabel D_80183EDC
.skip 16

glabel D_80183EEC
.skip 60

glabel D_80183F28
.skip 4

glabel D_80183F2C
.skip 8
glabel indexObjectList1
.skip 128

glabel D_80183F34
glabel D_80183F20
.skip 8

glabel D_80183F3C
.skip 20

glabel D_80183F50
.skip 4

glabel D_80183F54
.skip 16

glabel D_80183F64
.skip 16

glabel D_80183F74
.skip 52
glabel indexObjectList2
.skip 128

glabel D_80183FA8
.skip 32768

glabel D_8018BFA8
.skip 16

glabel D_8018BFB8
.skip 24

glabel D_8018BFD0
.skip 8

glabel D_8018BFD8
.skip 80
glabel indexObjectList3
.skip 128

glabel D_8018C028
.skip 8

glabel D_8018C030
glabel indexObjectList4
.skip 128

# Array of (4) Collisions?
Expand Down Expand Up @@ -795,9 +744,9 @@ glabel D_8018C970
.skip 256

# some hud related list begin
# D_8018CA70 should be of size 528 (0x84 * 0x4)
# playerHUD should be of size 528 (0x84 * 0x4)
# D_8018CA74 through D_8018CC7D are all fake
glabel D_8018CA70
glabel playerHUD
.skip 4

glabel D_8018CA74
Expand Down Expand Up @@ -1022,7 +971,7 @@ glabel D_8018D010
glabel D_8018D018
.skip 4

glabel D_8018D01C
glabel xOrientation
.skip 4

glabel D_8018D020
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/code_80057C60/func_8005CB60.s
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
glabel func_8005CB60
/* 05D760 8005CB60 0004C140 */ sll $t8, $a0, 5
/* 05D764 8005CB64 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 05D768 8005CB68 3C068019 */ lui $a2, %hi(D_8018CA70) # $a2, 0x8019
/* 05D768 8005CB68 3C068019 */ lui $a2, %hi(playerHUD) # $a2, 0x8019
/* 05D76C 8005CB6C 000470C0 */ sll $t6, $a0, 3
/* 05D770 8005CB70 0304C021 */ addu $t8, $t8, $a0
/* 05D774 8005CB74 24C6CA70 */ addiu $a2, %lo(D_8018CA70) # addiu $a2, $a2, -0x3590
/* 05D774 8005CB74 24C6CA70 */ addiu $a2, %lo(playerHUD) # addiu $a2, $a2, -0x3590
/* 05D778 8005CB78 AFB00018 */ sw $s0, 0x18($sp)
/* 05D77C 8005CB7C 01C47023 */ subu $t6, $t6, $a0
/* 05D780 8005CB80 0018C080 */ sll $t8, $t8, 2
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/code_8006E9C0/func_8006F008.s
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ glabel func_8006F008
/* 06FC0C 8006F00C AC2055C8 */ sw $zero, %lo(D_801655C8)($at)
/* 06FC10 8006F010 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 06FC14 8006F014 44812000 */ mtc1 $at, $f4
/* 06FC18 8006F018 3C028019 */ lui $v0, %hi(D_8018D01C) # $v0, 0x8019
/* 06FC1C 8006F01C 2442D01C */ addiu $v0, %lo(D_8018D01C) # addiu $v0, $v0, -0x2fe4
/* 06FC18 8006F018 3C028019 */ lui $v0, %hi(xOrientation) # $v0, 0x8019
/* 06FC1C 8006F01C 2442D01C */ addiu $v0, %lo(xOrientation) # addiu $v0, $v0, -0x2fe4
/* 06FC20 8006F020 3C0E800E */ lui $t6, %hi(gIsMirrorMode) # $t6, 0x800e
/* 06FC24 8006F024 E4440000 */ swc1 $f4, ($v0)
/* 06FC28 8006F028 8DCEC604 */ lw $t6, %lo(gIsMirrorMode)($t6)
Expand Down
12 changes: 6 additions & 6 deletions asm/non_matchings/code_8006E9C0/init_hud_one_player.s
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ glabel init_hud_one_player
/* 072080 80071480 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018
/* 072084 80071484 0C01C7C0 */ jal find_unused_obj_index
/* 072088 80071488 24843E8C */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 4) # addiu $a0, $a0, 0x3e8c
/* 07208C 8007148C 0C01C064 */ jal func_80070190
/* 07208C 8007148C 0C01C064 */ jal init_object_list_index
/* 072090 80071490 00000000 */ nop
/* 072094 80071494 0C01C157 */ jal func_8007055C
/* 072098 80071498 00000000 */ nop
/* 07209C 8007149C 0C01C157 */ jal func_8007055C
/* 0720A0 800714A0 00000000 */ nop
/* 0720A4 800714A4 0C01C1E0 */ jal func_80070780
/* 0720A4 800714A4 0C01C1E0 */ jal init_course_object
/* 0720A8 800714A8 00000000 */ nop
/* 0720AC 800714AC 3C088019 */ lui $t0, %hi(D_8018CA70) # $t0, 0x8019
/* 0720B0 800714B0 2508CA70 */ addiu $t0, %lo(D_8018CA70) # addiu $t0, $t0, -0x3590
/* 0720AC 800714AC 3C088019 */ lui $t0, %hi(playerHUD) # $t0, 0x8019
/* 0720B0 800714B0 2508CA70 */ addiu $t0, %lo(playerHUD) # addiu $t0, $t0, -0x3590
/* 0720B4 800714B4 240E0156 */ li $t6, 342
/* 0720B8 800714B8 A50E003E */ sh $t6, 0x3e($t0)
/* 0720BC 800714BC 8518003E */ lh $t8, 0x3e($t0)
Expand Down Expand Up @@ -90,7 +90,7 @@ glabel init_hud_one_player
/* 072188 80071588 3C014220 */ li $at, 0x42200000 # 40.000000
/* 07218C 8007158C 44817000 */ mtc1 $at, $f14
/* 072190 80071590 3C014040 */ li $at, 0x40400000 # 3.000000
/* 072194 80071594 3C088019 */ lui $t0, %hi(D_8018CA70) # $t0, 0x8019
/* 072194 80071594 3C088019 */ lui $t0, %hi(playerHUD) # $t0, 0x8019
/* 072198 80071598 3C038019 */ lui $v1, %hi(D_8018D0C8) # $v1, 0x8019
/* 07219C 8007159C 3C048019 */ lui $a0, %hi(D_8018D028) # $a0, 0x8019
/* 0721A0 800715A0 3C058019 */ lui $a1, %hi(D_8018D050) # $a1, 0x8019
Expand All @@ -101,7 +101,7 @@ glabel init_hud_one_player
/* 0721B4 800715B4 44816800 */ mtc1 $at, $f13
/* 0721B8 800715B8 44806000 */ mtc1 $zero, $f12
/* 0721BC 800715BC 44801000 */ mtc1 $zero, $f2
/* 0721C0 800715C0 2508CA70 */ addiu $t0, %lo(D_8018CA70) # addiu $t0, $t0, -0x3590
/* 0721C0 800715C0 2508CA70 */ addiu $t0, %lo(playerHUD) # addiu $t0, $t0, -0x3590
/* 0721C4 800715C4 240A00A0 */ li $t2, 160
/* 0721C8 800715C8 2529D098 */ addiu $t1, %lo(D_8018D098) # addiu $t1, $t1, -0x2f68
/* 0721CC 800715CC 2442D078 */ addiu $v0, %lo(D_8018D078) # addiu $v0, $v0, -0x2f88
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/code_80071F00/func_8007DB44.s
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ glabel func_8007DB44
/* 07E780 8007DB80 3C088019 */ lui $t0, %hi(D_8018D000) # $t0, 0x8019
/* 07E784 8007DB84 2508D000 */ addiu $t0, %lo(D_8018D000) # addiu $t0, $t0, -0x3000
/* 07E788 8007DB88 85020000 */ lh $v0, ($t0)
/* 07E78C 8007DB8C 3C108018 */ lui $s0, %hi(D_80183EA0) # $s0, 0x8018
/* 07E78C 8007DB8C 3C108018 */ lui $s0, %hi(indexObjectList1) # $s0, 0x8018
/* 07E790 8007DB90 00002825 */ move $a1, $zero
/* 07E794 8007DB94 10400003 */ beqz $v0, .L8007DBA4
/* 07E798 8007DB98 24060003 */ li $a2, 3
/* 07E79C 8007DB9C 244FFFFF */ addiu $t7, $v0, -1
/* 07E7A0 8007DBA0 A50F0000 */ sh $t7, ($t0)
.L8007DBA4:
/* 07E7A4 8007DBA4 8E103EA0 */ lw $s0, %lo(D_80183EA0)($s0)
/* 07E7A4 8007DBA4 8E103EA0 */ lw $s0, %lo(indexObjectList1)($s0)
/* 07E7A8 8007DBA8 2418FFFF */ li $t8, -1
/* 07E7AC 8007DBAC AFB80014 */ sw $t8, 0x14($sp)
/* 07E7B0 8007DBB0 24070001 */ li $a3, 1
Expand Down
2 changes: 1 addition & 1 deletion asm/non_matchings/code_80071F00/func_80080E8C.s
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ glabel func_80080E8C
/* 081A9C 80080E9C AFB00014 */ sw $s0, 0x14($sp)
/* 081AA0 80080EA0 AFA40040 */ sw $a0, 0x40($sp)
/* 081AA4 80080EA4 AFA60048 */ sw $a2, 0x48($sp)
/* 081AA8 80080EA8 0C01C8E9 */ jal func_800723A4
/* 081AA8 80080EA8 0C01C8E9 */ jal init_object
/* 081AAC 80080EAC 00C02825 */ move $a1, $a2
/* 081AB0 80080EB0 8FAE0040 */ lw $t6, 0x40($sp)
/* 081AB4 80080EB4 240700E0 */ li $a3, 224
Expand Down
6 changes: 3 additions & 3 deletions asm/non_matchings/code_80071F00/func_80081FF4.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ glabel func_80081FF4
/* 082BF8 80081FF8 AFBF0014 */ sw $ra, 0x14($sp)
/* 082BFC 80081FFC AFA5003C */ sw $a1, 0x3c($sp)
/* 082C00 80082000 AFA40038 */ sw $a0, 0x38($sp)
/* 082C04 80082004 0C01C8E9 */ jal func_800723A4
/* 082C04 80082004 0C01C8E9 */ jal init_object
/* 082C08 80082008 00002825 */ move $a1, $zero
/* 082C0C 8008200C 0C0ADF8D */ jal random_int
/* 082C10 80082010 2404001E */ li $a0, 30
Expand Down Expand Up @@ -96,8 +96,8 @@ glabel func_80081FF4
/* 082D48 80082148 254A6360 */ addiu $t2, %lo(gMoleSpawns) # addiu $t2, $t2, 0x6360
/* 082D4C 8008214C 012A1021 */ addu $v0, $t1, $t2
/* 082D50 80082150 844B0000 */ lh $t3, ($v0)
/* 082D54 80082154 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019
/* 082D58 80082158 C428D01C */ lwc1 $f8, %lo(D_8018D01C)($at)
/* 082D54 80082154 3C018019 */ lui $at, %hi(xOrientation) # $at, 0x8019
/* 082D58 80082158 C428D01C */ lwc1 $f8, %lo(xOrientation)($at)
/* 082D5C 8008215C 448B2000 */ mtc1 $t3, $f4
/* 082D60 80082160 844C0002 */ lh $t4, 2($v0)
/* 082D64 80082164 844D0004 */ lh $t5, 4($v0)
Expand Down
8 changes: 4 additions & 4 deletions asm/non_matchings/code_80071F00/func_80082870.s
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ glabel func_80082870
/* 08348C 8008288C AFB60038 */ sw $s6, 0x38($sp)
/* 083490 80082890 AFB3002C */ sw $s3, 0x2c($sp)
/* 083494 80082894 3C128018 */ lui $s2, %hi(D_80183E40) # $s2, 0x8018
/* 083498 80082898 3C148018 */ lui $s4, %hi(D_80183F28) # $s4, 0x8018
/* 083498 80082898 3C148018 */ lui $s4, %hi(indexObjectList2) # $s4, 0x8018
/* 08349C 8008289C 3C158016 */ lui $s5, %hi(gObjectList) # $s5, 0x8016
/* 0834A0 800828A0 3C171901 */ lui $s7, (0x19017043 >> 16) # lui $s7, 0x1901
/* 0834A4 800828A4 3C1E8016 */ lui $fp, %hi(D_80165A90) # $fp, 0x8016
Expand All @@ -20,7 +20,7 @@ glabel func_80082870
/* 0834B8 800828B8 27DE5A90 */ addiu $fp, %lo(D_80165A90) # addiu $fp, $fp, 0x5a90
/* 0834BC 800828BC 36F77043 */ ori $s7, (0x19017043 & 0xFFFF) # ori $s7, $s7, 0x7043
/* 0834C0 800828C0 26B55C18 */ addiu $s5, %lo(gObjectList) # addiu $s5, $s5, 0x5c18
/* 0834C4 800828C4 26943F28 */ addiu $s4, %lo(D_80183F28) # addiu $s4, $s4, 0x3f28
/* 0834C4 800828C4 26943F28 */ addiu $s4, %lo(indexObjectList2) # addiu $s4, $s4, 0x3f28
/* 0834C8 800828C8 26523E40 */ addiu $s2, %lo(D_80183E40) # addiu $s2, $s2, 0x3e40
/* 0834CC 800828CC 00009825 */ move $s3, $zero
/* 0834D0 800828D0 241600E0 */ li $s6, 224
Expand Down Expand Up @@ -64,8 +64,8 @@ glabel func_80082870
/* 083564 80082964 26730001 */ addiu $s3, $s3, 1
.L80082968:
/* 083568 80082968 850876D2 */ lh $t0, %lo(gCutsceneShotTimer)($t0)
/* 08356C 8008296C 3C108018 */ lui $s0, %hi(D_80183F2C) # $s0, 0x8018
/* 083570 80082970 8E103F2C */ lw $s0, %lo(D_80183F2C)($s0)
/* 08356C 8008296C 3C108018 */ lui $s0, %hi(indexObjectList2+4) # $s0, 0x8018
/* 083570 80082970 8E103F2C */ lw $s0, %lo(indexObjectList2+4)($s0)
/* 083574 80082974 29010097 */ slti $at, $t0, 0x97
/* 083578 80082978 50200009 */ beql $at, $zero, .L800829A0
/* 08357C 8008297C 26730001 */ addiu $s3, $s3, 1
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/code_80071F00/func_80082F1C.s
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ glabel func_80082F1C
/* 083B88 80082F88 844D0002 */ lh $t5, 2($v0)
/* 083B8C 80082F8C 844E0004 */ lh $t6, 4($v0)
/* 083B90 80082F90 448C3000 */ mtc1 $t4, $f6
/* 083B94 80082F94 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019
/* 083B98 80082F98 C42AD01C */ lwc1 $f10, %lo(D_8018D01C)($at)
/* 083B94 80082F94 3C018019 */ lui $at, %hi(xOrientation) # $at, 0x8019
/* 083B98 80082F98 C42AD01C */ lwc1 $f10, %lo(xOrientation)($at)
/* 083B9C 80082F9C 46803220 */ cvt.s.w $f8, $f6
/* 083BA0 80082FA0 448D9000 */ mtc1 $t5, $f18
/* 083BA4 80082FA4 448E2000 */ mtc1 $t6, $f4
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/code_80071F00/func_80086074.s
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ glabel func_80086074
/* 086C80 80086080 27396734 */ addiu $t9, %lo(D_800E6734) # addiu $t9, $t9, 0x6734
/* 086C84 80086084 000FC080 */ sll $t8, $t7, 2
/* 086C88 80086088 03191021 */ addu $v0, $t8, $t9
/* 086C8C 8008608C 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019
/* 086C90 80086090 C426D01C */ lwc1 $f6, %lo(D_8018D01C)($at)
/* 086C8C 8008608C 3C018019 */ lui $at, %hi(xOrientation) # $at, 0x8019
/* 086C90 80086090 C426D01C */ lwc1 $f6, %lo(xOrientation)($at)
/* 086C94 80086094 C4440000 */ lwc1 $f4, ($v0)
/* 086C98 80086098 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 086C9C 8008609C AFA50024 */ sw $a1, 0x24($sp)
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/hud_renderer/func_8004FA78.s
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ glabel func_8004FA78
/* 0506AC 8004FAAC 10410069 */ beq $v0, $at, .L8004FC54
/* 0506B0 8004FAB0 00047140 */ sll $t6, $a0, 5
/* 0506B4 8004FAB4 01C47021 */ addu $t6, $t6, $a0
/* 0506B8 8004FAB8 3C0F8019 */ lui $t7, %hi(D_8018CA70) # $t7, 0x8019
/* 0506BC 8004FABC 25EFCA70 */ addiu $t7, %lo(D_8018CA70) # addiu $t7, $t7, -0x3590
/* 0506B8 8004FAB8 3C0F8019 */ lui $t7, %hi(playerHUD) # $t7, 0x8019
/* 0506BC 8004FABC 25EFCA70 */ addiu $t7, %lo(playerHUD) # addiu $t7, $t7, -0x3590
/* 0506C0 8004FAC0 000E7080 */ sll $t6, $t6, 2
/* 0506C4 8004FAC4 01CFA021 */ addu $s4, $t6, $t7
/* 0506C8 8004FAC8 3C188019 */ lui $t8, %hi(D_8018D320) # $t8, 0x8019
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/hud_renderer/func_80052590.s
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
glabel func_80052590
/* 053190 80052590 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 053194 80052594 3C028018 */ lui $v0, %hi(D_80183EA0) # $v0, 0x8018
/* 053198 80052598 8C423EA0 */ lw $v0, %lo(D_80183EA0)($v0)
/* 053194 80052594 3C028018 */ lui $v0, %hi(indexObjectList1) # $v0, 0x8018
/* 053198 80052598 8C423EA0 */ lw $v0, %lo(indexObjectList1)($v0)
/* 05319C 8005259C 00047080 */ sll $t6, $a0, 2
/* 0531A0 800525A0 AFBE0040 */ sw $fp, 0x40($sp)
/* 0531A4 800525A4 01C47023 */ subu $t6, $t6, $a0
Expand Down
8 changes: 4 additions & 4 deletions asm/non_matchings/save/func_800B5218.s
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ glabel func_800B5218
/* 0B5E30 800B5230 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 0B5E34 800B5234 000E7880 */ sll $t7, $t6, 2
/* 0B5E38 800B5238 3C058019 */ lui $a1, %hi(D_8018CA74) # $a1, 0x8019
/* 0B5E3C 800B523C 3C068019 */ lui $a2, %hi(D_8018CA70) # $a2, 0x8019
/* 0B5E3C 800B523C 3C068019 */ lui $a2, %hi(playerHUD) # $a2, 0x8019
/* 0B5E40 800B5240 01F8C821 */ addu $t9, $t7, $t8
/* 0B5E44 800B5244 AFBF0014 */ sw $ra, 0x14($sp)
/* 0B5E48 800B5248 AFB90038 */ sw $t9, 0x38($sp)
/* 0B5E4C 800B524C 24070001 */ li $a3, 1
/* 0B5E50 800B5250 24C6CA70 */ addiu $a2, %lo(D_8018CA70) # addiu $a2, $a2, -0x3590
/* 0B5E50 800B5250 24C6CA70 */ addiu $a2, %lo(playerHUD) # addiu $a2, $a2, -0x3590
/* 0B5E54 800B5254 24A5CA74 */ addiu $a1, %lo(D_8018CA74) # addiu $a1, $a1, -0x358c
/* 0B5E58 800B5258 24020001 */ li $v0, 1
/* 0B5E5C 800B525C 24080003 */ li $t0, 3
Expand All @@ -25,8 +25,8 @@ glabel func_800B5218
/* 0B5E70 800B5270 00025880 */ sll $t3, $v0, 2
/* 0B5E74 800B5274 0064082A */ slt $at, $v1, $a0
/* 0B5E78 800B5278 10200005 */ beqz $at, .L800B5290
/* 0B5E7C 800B527C 3C0C8019 */ lui $t4, %hi(D_8018CA70) # $t4, 0x8019
/* 0B5E80 800B5280 258CCA70 */ addiu $t4, %lo(D_8018CA70) # addiu $t4, $t4, -0x3590
/* 0B5E7C 800B527C 3C0C8019 */ lui $t4, %hi(playerHUD) # $t4, 0x8019
/* 0B5E80 800B5280 258CCA70 */ addiu $t4, %lo(playerHUD) # addiu $t4, $t4, -0x3590
/* 0B5E84 800B5284 004A3804 */ sllv $a3, $t2, $v0
/* 0B5E88 800B5288 10000005 */ b .L800B52A0
/* 0B5E8C 800B528C 016C3021 */ addu $a2, $t3, $t4
Expand Down
4 changes: 2 additions & 2 deletions include/common_structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ typedef struct {
/* 0x81 */ u8 unk_81;
/* 0x82 */ s8 unk_82;
/* 0x83 */ s8 unk_83;
} struct_8018CA70_entry; // size = 0x84
} hud_player; // size = 0x84

#define D_8018CA70_SIZE 4
#define HUD_PLAYERS_SIZE 4

#endif
22 changes: 12 additions & 10 deletions include/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ extern s32 D_80183DB8[];
// Appears to be a list of object list indices for the Item Window part of the HUD
extern s32 gItemWindowObjectByPlayerId[];

// Used for loop bounds when accessing D_80183EA0
// Used for loop bounds when accessing indexObjectList1
extern s16 D_80165750;
// These seem to be limits on different object types in Moo Moo Farm
// See func_80070780 in code_8006E9C0.c
// See init_course_object in code_8006E9C0.c
// Maybe max number of active moles in a given group of moles?
extern s32 D_8018D1C8;
extern s32 D_8018D1D0;
Expand All @@ -189,9 +189,9 @@ extern s32 D_8018D3C0;
extern Collision D_8018C0B0[];

/**
* D_80183EA0, D_80183F28, D_8018BFA8, and D_8018C030 are all lists of indices in gObjectList.
* func_80070190 initializes them in such a way that the indicies in each list are not adjacent.
* First D_80183EA0 gets an unused index, then D_80183F28, then D_8018BFA8, then D_8018C030, and then it loops.
* indexObjectList1, indexObjectList2, indexObjectList3, and indexObjectList4 are all lists of indices in gObjectList.
* init_object_list_index initializes them in such a way that the indicies in each list are not adjacent.
* First indexObjectList1 gets an unused index, then indexObjectList2, then indexObjectList3, then indexObjectList4, and then it loops.
*
* The objects found at the indices in each list appears to be course dependent
**/
Expand Down Expand Up @@ -250,7 +250,7 @@ extern s16 gNumActiveThwomps;
* Penguins in Sherbet Land?
* Flag Poles in Yoshi Valley?
**/
extern s32 D_80183EA0[];
extern s32 indexObjectList1[];


#define NUM_SEAGULLS 10
Expand Down Expand Up @@ -280,7 +280,7 @@ extern Vec3s gHedgehogPatrolPoints[];
* Hedgehogs in Yoshi Valley?
* Spawn for big fire breath in Bowser's Castle
**/
extern s32 D_80183F28[];
extern s32 indexObjectList2[];

#define NUM_BOOS 0xA
#define NUM_FIRE_BREATHS 4
Expand All @@ -291,10 +291,12 @@ extern Vec3s gFireBreathsSpawns[];
* Boos in Banshee Boardwalk
* Spawners for the 4 small fire breaths inside Bowser's Castle
**/
extern s32 D_8018BFA8[];
extern s32 indexObjectList3[];

// Appears to go entirely unused?
extern s32 D_8018C030[];
/**
* Unused list of object indices
*/
extern s32 indexObjectList4[];

#define D_8018C1B0_SIZE 128
#define NUM_MAX_MOLES 0x1F
Expand Down
Loading

0 comments on commit 3638f19

Please sign in to comment.