diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index d116c61e..27b18dad 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -752,7 +752,7 @@ glabel L8000EDE0 .L8000F500: /* 010100 8000F500 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012 /* 010104 8000F504 8FA50068 */ lw $a1, 0x68($sp) -/* 010108 8000F508 0C008E2F */ jal func_800238BC +/* 010108 8000F508 0C008E2F */ jal run_object_init_func /* 01010C 8000F50C 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4 /* 010110 8000F510 8E42004C */ lw $v0, 0x4c($s2) /* 010114 8000F514 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_80030A74.s b/asm/non_matchings/unknown_0255E0/obj_loop_fogchanger.s similarity index 99% rename from asm/non_matchings/unknown_0255E0/func_80030A74.s rename to asm/non_matchings/unknown_0255E0/obj_loop_fogchanger.s index 8f39fd06..193f4179 100644 --- a/asm/non_matchings/unknown_0255E0/func_80030A74.s +++ b/asm/non_matchings/unknown_0255E0/obj_loop_fogchanger.s @@ -1,4 +1,4 @@ -glabel func_80030A74 +glabel obj_loop_fogchanger /* 031674 80030A74 27BDFF80 */ addiu $sp, $sp, -0x80 /* 031678 80030A78 AFBF0024 */ sw $ra, 0x24($sp) /* 03167C 80030A7C AFB30020 */ sw $s3, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_80037A18.s b/asm/non_matchings/unknown_032760/obj_init_animation.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80037A18.s rename to asm/non_matchings/unknown_032760/obj_init_animation.s index d0e45cf3..f5b4067c 100644 --- a/asm/non_matchings/unknown_032760/func_80037A18.s +++ b/asm/non_matchings/unknown_032760/obj_init_animation.s @@ -1,4 +1,4 @@ -glabel func_80037A18 +glabel obj_init_animation /* 038618 80037A18 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 03861C 80037A1C AFBF001C */ sw $ra, 0x1c($sp) /* 038620 80037A20 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003FD68.s b/asm/non_matchings/unknown_032760/obj_init_audio.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003FD68.s rename to asm/non_matchings/unknown_032760/obj_init_audio.s index 5af695b5..dfcb8d2b 100644 --- a/asm/non_matchings/unknown_032760/func_8003FD68.s +++ b/asm/non_matchings/unknown_032760/obj_init_audio.s @@ -1,4 +1,4 @@ -glabel func_8003FD68 +glabel obj_init_audio /* 040968 8003FD68 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 04096C 8003FD6C AFBF003C */ sw $ra, 0x3c($sp) /* 040970 8003FD70 AFB00038 */ sw $s0, 0x38($sp) diff --git a/asm/non_matchings/unknown_032760/func_80038B74.s b/asm/non_matchings/unknown_032760/obj_init_bombexplosion.s similarity index 98% rename from asm/non_matchings/unknown_032760/func_80038B74.s rename to asm/non_matchings/unknown_032760/obj_init_bombexplosion.s index dc4f57e3..8baeaa00 100644 --- a/asm/non_matchings/unknown_032760/func_80038B74.s +++ b/asm/non_matchings/unknown_032760/obj_init_bombexplosion.s @@ -1,4 +1,4 @@ -glabel func_80038B74 +glabel obj_init_bombexplosion /* 039774 80038B74 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 039778 80038B78 3C013F00 */ li $at, 0x3F000000 # 0.500000 /* 03977C 80038B7C 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/unknown_032760/func_800409C8.s b/asm/non_matchings/unknown_032760/obj_init_butterfly.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_800409C8.s rename to asm/non_matchings/unknown_032760/obj_init_butterfly.s index a50b41c4..0c4babe6 100644 --- a/asm/non_matchings/unknown_032760/func_800409C8.s +++ b/asm/non_matchings/unknown_032760/obj_init_butterfly.s @@ -3,7 +3,7 @@ glabel D_800E6218 .float 0.01 .text -glabel func_800409C8 +glabel obj_init_butterfly /* 0415C8 800409C8 AFA50004 */ sw $a1, 4($sp) /* 0415CC 800409CC 8C820064 */ lw $v0, 0x64($a0) /* 0415D0 800409D0 14C0003B */ bnez $a2, .L80040AC0 diff --git a/asm/non_matchings/unknown_032760/func_8003B7CC.s b/asm/non_matchings/unknown_032760/obj_init_door.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003B7CC.s rename to asm/non_matchings/unknown_032760/obj_init_door.s index 5b106911..2e9c57a0 100644 --- a/asm/non_matchings/unknown_032760/func_8003B7CC.s +++ b/asm/non_matchings/unknown_032760/obj_init_door.s @@ -3,7 +3,7 @@ glabel D_800E5FB4 .asciz "Illegal door no!!!\n" .text -glabel func_8003B7CC +glabel obj_init_door /* 03C3CC 8003B7CC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 03C3D0 8003B7D0 AFBF001C */ sw $ra, 0x1c($sp) /* 03C3D4 8003B7D4 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_80036C30.s b/asm/non_matchings/unknown_032760/obj_init_fish.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80036C30.s rename to asm/non_matchings/unknown_032760/obj_init_fish.s index c964abab..7ad7af13 100644 --- a/asm/non_matchings/unknown_032760/func_80036C30.s +++ b/asm/non_matchings/unknown_032760/obj_init_fish.s @@ -3,7 +3,7 @@ glabel D_800E6048 .float 0.01 .text -glabel func_80036C30 +glabel obj_init_fish /* 037830 80036C30 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 037834 80036C34 AFBF0024 */ sw $ra, 0x24($sp) /* 037838 80036C38 AFB20020 */ sw $s2, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003B368.s b/asm/non_matchings/unknown_032760/obj_init_goldenballoon.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003B368.s rename to asm/non_matchings/unknown_032760/obj_init_goldenballoon.s index 574faaf5..33d6d4db 100644 --- a/asm/non_matchings/unknown_032760/func_8003B368.s +++ b/asm/non_matchings/unknown_032760/obj_init_goldenballoon.s @@ -3,7 +3,7 @@ glabel D_800E5FA0 .asciz "Illegal door no!!!\n" .text -glabel func_8003B368 +glabel obj_init_goldenballoon /* 03BF68 8003B368 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 03BF6C 8003B36C AFBF001C */ sw $ra, 0x1c($sp) /* 03BF70 8003B370 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_80035AE8.s b/asm/non_matchings/unknown_032760/obj_init_groundzipper.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80035AE8.s rename to asm/non_matchings/unknown_032760/obj_init_groundzipper.s index 5830ac91..87b5d5bd 100644 --- a/asm/non_matchings/unknown_032760/func_80035AE8.s +++ b/asm/non_matchings/unknown_032760/obj_init_groundzipper.s @@ -1,4 +1,4 @@ -glabel func_80035AE8 +glabel obj_init_groundzipper /* 0366E8 80035AE8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0366EC 80035AEC AFBF0014 */ sw $ra, 0x14($sp) /* 0366F0 80035AF0 90AF0009 */ lbu $t7, 9($a1) diff --git a/asm/non_matchings/unknown_032760/func_80041A90.s b/asm/non_matchings/unknown_032760/obj_init_midifade.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80041A90.s rename to asm/non_matchings/unknown_032760/obj_init_midifade.s index 2b5341fb..d99b7675 100644 --- a/asm/non_matchings/unknown_032760/func_80041A90.s +++ b/asm/non_matchings/unknown_032760/obj_init_midifade.s @@ -1,4 +1,4 @@ -glabel func_80041A90 +glabel obj_init_midifade /* 042690 80041A90 27BDFF00 */ addiu $sp, $sp, -0x100 /* 042694 80041A94 AFBF003C */ sw $ra, 0x3c($sp) /* 042698 80041A98 AFB00038 */ sw $s0, 0x38($sp) diff --git a/asm/non_matchings/unknown_032760/func_80041E80.s b/asm/non_matchings/unknown_032760/obj_init_midifadepoint.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80041E80.s rename to asm/non_matchings/unknown_032760/obj_init_midifadepoint.s index 01140733..fe5e581c 100644 --- a/asm/non_matchings/unknown_032760/func_80041E80.s +++ b/asm/non_matchings/unknown_032760/obj_init_midifadepoint.s @@ -1,4 +1,4 @@ -glabel func_80041E80 +glabel obj_init_midifadepoint /* 042A80 80041E80 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 042A84 80041E84 AFBF001C */ sw $ra, 0x1c($sp) /* 042A88 80041E88 AFB10018 */ sw $s1, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_80033CC0.s b/asm/non_matchings/unknown_032760/obj_init_scenery.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80033CC0.s rename to asm/non_matchings/unknown_032760/obj_init_scenery.s index d4602c15..1dcdd562 100644 --- a/asm/non_matchings/unknown_032760/func_80033CC0.s +++ b/asm/non_matchings/unknown_032760/obj_init_scenery.s @@ -1,4 +1,4 @@ -glabel func_80033CC0 +glabel obj_init_scenery /* 0348C0 80033CC0 848E0006 */ lh $t6, 6($a0) /* 0348C4 80033CC4 3C014120 */ li $at, 0x41200000 # 10.000000 /* 0348C8 80033CC8 35CF0002 */ ori $t7, $t6, 2 diff --git a/asm/non_matchings/unknown_032760/func_8003C644.s b/asm/non_matchings/unknown_032760/obj_init_trigger.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003C644.s rename to asm/non_matchings/unknown_032760/obj_init_trigger.s index f8af78a0..bbe58d9e 100644 --- a/asm/non_matchings/unknown_032760/func_8003C644.s +++ b/asm/non_matchings/unknown_032760/obj_init_trigger.s @@ -3,7 +3,7 @@ glabel D_800E5FC8 .asciz "Illegal door no!!!\n" .text -glabel func_8003C644 +glabel obj_init_trigger /* 03D244 8003C644 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 03D248 8003C648 AFBF001C */ sw $ra, 0x1c($sp) /* 03D24C 8003C64C AFB10018 */ sw $s1, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003596C.s b/asm/non_matchings/unknown_032760/obj_loop_airzippers_waterzippers.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003596C.s rename to asm/non_matchings/unknown_032760/obj_loop_airzippers_waterzippers.s index d01aeab7..c1b5fdcc 100644 --- a/asm/non_matchings/unknown_032760/func_8003596C.s +++ b/asm/non_matchings/unknown_032760/obj_loop_airzippers_waterzippers.s @@ -1,4 +1,4 @@ -glabel func_8003596C +glabel obj_loop_airzippers_waterzippers /* 03656C 8003596C 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 036570 80035970 AFBF002C */ sw $ra, 0x2c($sp) /* 036574 80035974 AFB30024 */ sw $s3, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_800377E4.s b/asm/non_matchings/unknown_032760/obj_loop_animator.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_800377E4.s rename to asm/non_matchings/unknown_032760/obj_loop_animator.s index 0bcfe4ca..87f282a7 100644 --- a/asm/non_matchings/unknown_032760/func_800377E4.s +++ b/asm/non_matchings/unknown_032760/obj_loop_animator.s @@ -1,4 +1,4 @@ -glabel func_800377E4 +glabel obj_loop_animator /* 0383E4 800377E4 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 0383E8 800377E8 AFBF0014 */ sw $ra, 0x14($sp) /* 0383EC 800377EC 8C830064 */ lw $v1, 0x64($a0) diff --git a/asm/non_matchings/unknown_032760/func_80038BF4.s b/asm/non_matchings/unknown_032760/obj_loop_bombexplosion.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80038BF4.s rename to asm/non_matchings/unknown_032760/obj_loop_bombexplosion.s index a87a497c..bf70385d 100644 --- a/asm/non_matchings/unknown_032760/func_80038BF4.s +++ b/asm/non_matchings/unknown_032760/obj_loop_bombexplosion.s @@ -1,4 +1,4 @@ -glabel func_80038BF4 +glabel obj_loop_bombexplosion /* 0397F4 80038BF4 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0397F8 80038BF8 AFBF002C */ sw $ra, 0x2c($sp) /* 0397FC 80038BFC AFB00028 */ sw $s0, 0x28($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003B174.s b/asm/non_matchings/unknown_032760/obj_loop_bonus.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003B174.s rename to asm/non_matchings/unknown_032760/obj_loop_bonus.s index eebfe381..d40e9d3a 100644 --- a/asm/non_matchings/unknown_032760/func_8003B174.s +++ b/asm/non_matchings/unknown_032760/obj_loop_bonus.s @@ -1,4 +1,4 @@ -glabel func_8003B174 +glabel obj_loop_bonus /* 03BD74 8003B174 27BDFF70 */ addiu $sp, $sp, -0x90 /* 03BD78 8003B178 AFBF0054 */ sw $ra, 0x54($sp) /* 03BD7C 8003B17C AFB60050 */ sw $s6, 0x50($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/obj_loop_bridge_whaleramp.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003CA68.s rename to asm/non_matchings/unknown_032760/obj_loop_bridge_whaleramp.s index d0170d05..d41b84b6 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/obj_loop_bridge_whaleramp.s @@ -3,7 +3,7 @@ glabel D_800E6178 .double 1.2 .text -glabel func_8003CA68 +glabel obj_loop_bridge_whaleramp /* 03D668 8003CA68 27BDFF90 */ addiu $sp, $sp, -0x70 /* 03D66C 8003CA6C 44852000 */ mtc1 $a1, $f4 /* 03D670 8003CA70 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_80040C54.s b/asm/non_matchings/unknown_032760/obj_loop_butterfly.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80040C54.s rename to asm/non_matchings/unknown_032760/obj_loop_butterfly.s index 89d95d0b..86fc3b4a 100644 --- a/asm/non_matchings/unknown_032760/func_80040C54.s +++ b/asm/non_matchings/unknown_032760/obj_loop_butterfly.s @@ -17,7 +17,7 @@ glabel D_800E6248 .float 1.6 .text -glabel func_80040C54 +glabel obj_loop_butterfly /* 041854 80040C54 27BDFF68 */ addiu $sp, $sp, -0x98 /* 041858 80040C58 AFBF0024 */ sw $ra, 0x24($sp) /* 04185C 80040C5C AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003833C.s b/asm/non_matchings/unknown_032760/obj_loop_char_select.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003833C.s rename to asm/non_matchings/unknown_032760/obj_loop_char_select.s index d768009c..a737a858 100644 --- a/asm/non_matchings/unknown_032760/func_8003833C.s +++ b/asm/non_matchings/unknown_032760/obj_loop_char_select.s @@ -1,4 +1,4 @@ -glabel func_8003833C +glabel obj_loop_char_select /* 038F3C 8003833C 27BDFF88 */ addiu $sp, $sp, -0x78 /* 038F40 80038340 AFBF0024 */ sw $ra, 0x24($sp) /* 038F44 80038344 AFB2001C */ sw $s2, 0x1c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/obj_loop_coin.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003D5A0.s rename to asm/non_matchings/unknown_032760/obj_loop_coin.s index 7771afb1..7f427159 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/obj_loop_coin.s @@ -7,7 +7,7 @@ glabel D_800E61A0 .float -10000.0 .text -glabel func_8003D5A0 +glabel obj_loop_coin /* 03E1A0 8003D5A0 44852000 */ mtc1 $a1, $f4 /* 03E1A4 8003D5A4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 03E1A8 8003D5A8 468020A0 */ cvt.s.w $f2, $f4 diff --git a/asm/non_matchings/unknown_032760/func_8003D3FC.s b/asm/non_matchings/unknown_032760/obj_loop_coincreator.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003D3FC.s rename to asm/non_matchings/unknown_032760/obj_loop_coincreator.s index bdb194dc..f347fcb6 100644 --- a/asm/non_matchings/unknown_032760/func_8003D3FC.s +++ b/asm/non_matchings/unknown_032760/obj_loop_coincreator.s @@ -1,4 +1,4 @@ -glabel func_8003D3FC +glabel obj_loop_coincreator /* 03DFFC 8003D3FC 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 03E000 8003D400 AFBF002C */ sw $ra, 0x2c($sp) /* 03E004 8003D404 AFB00028 */ sw $s0, 0x28($sp) diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/obj_loop_collectegg.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80035260.s rename to asm/non_matchings/unknown_032760/obj_loop_collectegg.s index 92a4eeeb..22a2eb0b 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/obj_loop_collectegg.s @@ -7,7 +7,7 @@ glabel D_800E6020 .double 0.95 .text -glabel func_80035260 +glabel obj_loop_collectegg /* 035E60 80035260 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 035E64 80035264 44852000 */ mtc1 $a1, $f4 /* 035E68 80035268 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 diff --git a/asm/non_matchings/unknown_032760/func_8003B988.s b/asm/non_matchings/unknown_032760/obj_loop_door.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003B988.s rename to asm/non_matchings/unknown_032760/obj_loop_door.s index dd0f6c00..4a99eee0 100644 --- a/asm/non_matchings/unknown_032760/func_8003B988.s +++ b/asm/non_matchings/unknown_032760/obj_loop_door.s @@ -5,7 +5,7 @@ glabel D_800E6170 .double 130.0 .text -glabel func_8003B988 +glabel obj_loop_door /* 03C588 8003B988 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 03C58C 8003B98C 44852000 */ mtc1 $a1, $f4 /* 03C590 8003B990 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_80034B74.s b/asm/non_matchings/unknown_032760/obj_loop_effectbox.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80034B74.s rename to asm/non_matchings/unknown_032760/obj_loop_effectbox.s index 5a7df6fd..86220401 100644 --- a/asm/non_matchings/unknown_032760/func_80034B74.s +++ b/asm/non_matchings/unknown_032760/obj_loop_effectbox.s @@ -1,4 +1,4 @@ -glabel func_80034B74 +glabel obj_loop_effectbox /* 035774 80034B74 27BDFF68 */ addiu $sp, $sp, -0x98 /* 035778 80034B78 AFBF004C */ sw $ra, 0x4c($sp) /* 03577C 80034B7C AFB00048 */ sw $s0, 0x48($sp) diff --git a/asm/non_matchings/unknown_032760/func_80038F58.s b/asm/non_matchings/unknown_032760/obj_loop_exit.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80038F58.s rename to asm/non_matchings/unknown_032760/obj_loop_exit.s index d20f655b..e2d5a882 100644 --- a/asm/non_matchings/unknown_032760/func_80038F58.s +++ b/asm/non_matchings/unknown_032760/obj_loop_exit.s @@ -1,4 +1,4 @@ -glabel func_80038F58 +glabel obj_loop_exit /* 039B58 80038F58 27BDFF80 */ addiu $sp, $sp, -0x80 /* 039B5C 80038F5C AFBF0044 */ sw $ra, 0x44($sp) /* 039B60 80038F60 AFB70040 */ sw $s7, 0x40($sp) diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80033F60.s rename to asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s index 9b7231a8..e6cc1576 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s @@ -7,7 +7,7 @@ glabel D_800E5FF0 .double 0.9 .text -glabel func_80033F60 +glabel obj_loop_fireball_octoweapon /* 034B60 80033F60 27BDFF78 */ addiu $sp, $sp, -0x88 /* 034B64 80033F64 44852000 */ mtc1 $a1, $f4 /* 034B68 80033F68 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 diff --git a/asm/non_matchings/unknown_032760/func_800370D4.s b/asm/non_matchings/unknown_032760/obj_loop_fish.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_800370D4.s rename to asm/non_matchings/unknown_032760/obj_loop_fish.s index 38f62ca9..5b2a52c0 100644 --- a/asm/non_matchings/unknown_032760/func_800370D4.s +++ b/asm/non_matchings/unknown_032760/obj_loop_fish.s @@ -1,4 +1,4 @@ -glabel func_800370D4 +glabel obj_loop_fish /* 037CD4 800370D4 27BDFF90 */ addiu $sp, $sp, -0x70 /* 037CD8 800370D8 AFBF001C */ sw $ra, 0x1c($sp) /* 037CDC 800370DC AFB10018 */ sw $s1, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/obj_loop_flycoin.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003D2B8.s rename to asm/non_matchings/unknown_032760/obj_loop_flycoin.s index 4b19a198..db5fce08 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/obj_loop_flycoin.s @@ -3,7 +3,7 @@ glabel D_800E6188 .double 1.2 .text -glabel func_8003D2B8 +glabel obj_loop_flycoin /* 03DEB8 8003D2B8 44852000 */ mtc1 $a1, $f4 /* 03DEBC 8003D2BC 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 03DEC0 8003D2C0 468020A0 */ cvt.s.w $f2, $f4 diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/obj_loop_frog.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_800422F0.s rename to asm/non_matchings/unknown_032760/obj_loop_frog.s index cb7162a8..2487f15a 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/obj_loop_frog.s @@ -13,7 +13,7 @@ glabel D_800E6278 .float 0.15 .text -glabel func_800422F0 +glabel obj_loop_frog /* 042EF0 800422F0 27BDFEF0 */ addiu $sp, $sp, -0x110 /* 042EF4 800422F4 44852000 */ mtc1 $a1, $f4 /* 042EF8 800422F8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003B4BC.s rename to asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s index 02afdf05..0089d37a 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s @@ -3,7 +3,7 @@ glabel D_800E6160 .double 1.2 .text -glabel func_8003B4BC +glabel obj_loop_goldenballoon /* 03C0BC 8003B4BC 44852000 */ mtc1 $a1, $f4 /* 03C0C0 8003B4C0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 03C0C4 8003B4C4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 diff --git a/asm/non_matchings/unknown_032760/func_80035C50.s b/asm/non_matchings/unknown_032760/obj_loop_groundzipper.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80035C50.s rename to asm/non_matchings/unknown_032760/obj_loop_groundzipper.s index 2d8cc9f8..4e4dda29 100644 --- a/asm/non_matchings/unknown_032760/func_80035C50.s +++ b/asm/non_matchings/unknown_032760/obj_loop_groundzipper.s @@ -1,4 +1,4 @@ -glabel func_80035C50 +glabel obj_loop_groundzipper /* 036850 80035C50 27BDFF98 */ addiu $sp, $sp, -0x68 /* 036854 80035C54 AFBF003C */ sw $ra, 0x3c($sp) /* 036858 80035C58 AFB60038 */ sw $s6, 0x38($sp) diff --git a/asm/non_matchings/unknown_032760/func_800345A0.s b/asm/non_matchings/unknown_032760/obj_loop_lasergun.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_800345A0.s rename to asm/non_matchings/unknown_032760/obj_loop_lasergun.s index 4c46f8b0..a77ab058 100644 --- a/asm/non_matchings/unknown_032760/func_800345A0.s +++ b/asm/non_matchings/unknown_032760/obj_loop_lasergun.s @@ -1,4 +1,4 @@ -glabel func_800345A0 +glabel obj_loop_lasergun /* 0351A0 800345A0 27BDFF38 */ addiu $sp, $sp, -0xc8 /* 0351A4 800345A4 AFBF003C */ sw $ra, 0x3c($sp) /* 0351A8 800345A8 AFB10038 */ sw $s1, 0x38($sp) diff --git a/asm/non_matchings/unknown_032760/func_80042A90.s b/asm/non_matchings/unknown_032760/obj_loop_levelname.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80042A90.s rename to asm/non_matchings/unknown_032760/obj_loop_levelname.s index 94204ac9..8d02cbd6 100644 --- a/asm/non_matchings/unknown_032760/func_80042A90.s +++ b/asm/non_matchings/unknown_032760/obj_loop_levelname.s @@ -1,4 +1,4 @@ -glabel func_80042A90 +glabel obj_loop_levelname /* 043690 80042A90 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 043694 80042A94 AFBF0024 */ sw $ra, 0x24($sp) /* 043698 80042A98 00803025 */ move $a2, $a0 diff --git a/asm/non_matchings/unknown_032760/func_80040570.s b/asm/non_matchings/unknown_032760/obj_loop_log.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80040570.s rename to asm/non_matchings/unknown_032760/obj_loop_log.s index 86286164..339eaf7f 100644 --- a/asm/non_matchings/unknown_032760/func_80040570.s +++ b/asm/non_matchings/unknown_032760/obj_loop_log.s @@ -1,4 +1,4 @@ -glabel func_80040570 +glabel obj_loop_log /* 041170 80040570 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 041174 80040574 AFBF0014 */ sw $ra, 0x14($sp) /* 041178 80040578 AFA5002C */ sw $a1, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003AE50.s b/asm/non_matchings/unknown_032760/obj_loop_modechange.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003AE50.s rename to asm/non_matchings/unknown_032760/obj_loop_modechange.s index 6ae59fe8..b444a17f 100644 --- a/asm/non_matchings/unknown_032760/func_8003AE50.s +++ b/asm/non_matchings/unknown_032760/obj_loop_modechange.s @@ -1,4 +1,4 @@ -glabel func_8003AE50 +glabel obj_loop_modechange /* 03BA50 8003AE50 27BDFF80 */ addiu $sp, $sp, -0x80 /* 03BA54 8003AE54 AFBF0044 */ sw $ra, 0x44($sp) /* 03BA58 8003AE58 AFB70040 */ sw $s7, 0x40($sp) diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80039330.s rename to asm/non_matchings/unknown_032760/obj_loop_parkwarden.s index 606a17af..0c14f44f 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s @@ -19,7 +19,7 @@ glabel D_800E6158 .double 2.2 .text -glabel func_80039330 +glabel obj_loop_parkwarden /* 039F30 80039330 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 039F34 80039334 44853000 */ mtc1 $a1, $f6 /* 039F38 80039338 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003763C.s b/asm/non_matchings/unknown_032760/obj_loop_posarrow.s similarity index 98% rename from asm/non_matchings/unknown_032760/func_8003763C.s rename to asm/non_matchings/unknown_032760/obj_loop_posarrow.s index 45287811..515b9cae 100644 --- a/asm/non_matchings/unknown_032760/func_8003763C.s +++ b/asm/non_matchings/unknown_032760/obj_loop_posarrow.s @@ -1,4 +1,4 @@ -glabel func_8003763C +glabel obj_loop_posarrow /* 03823C 8003763C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 038240 80037640 AFBF0014 */ sw $ra, 0x14($sp) /* 038244 80037644 AFA40030 */ sw $a0, 0x30($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003DD14.s b/asm/non_matchings/unknown_032760/obj_loop_silvercoin.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003DD14.s rename to asm/non_matchings/unknown_032760/obj_loop_silvercoin.s index a5200d01..7024ae22 100644 --- a/asm/non_matchings/unknown_032760/func_8003DD14.s +++ b/asm/non_matchings/unknown_032760/obj_loop_silvercoin.s @@ -1,4 +1,4 @@ -glabel func_8003DD14 +glabel obj_loop_silvercoin /* 03E914 8003DD14 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 03E918 8003DD18 AFBF0014 */ sw $ra, 0x14($sp) /* 03E91C 8003DD1C AFA50024 */ sw $a1, 0x24($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003827C.s b/asm/non_matchings/unknown_032760/obj_loop_snowball.s similarity index 98% rename from asm/non_matchings/unknown_032760/func_8003827C.s rename to asm/non_matchings/unknown_032760/obj_loop_snowball.s index 72f6a460..12d740d1 100644 --- a/asm/non_matchings/unknown_032760/func_8003827C.s +++ b/asm/non_matchings/unknown_032760/obj_loop_snowball.s @@ -1,4 +1,4 @@ -glabel func_8003827C +glabel obj_loop_snowball /* 038E7C 8003827C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 038E80 80038280 AFBF0024 */ sw $ra, 0x24($sp) /* 038E84 80038284 AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_800361E0.s rename to asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s index 9c50ab97..32e66350 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s @@ -9,7 +9,7 @@ glabel D_800E6040 .double 0.05 .text -glabel func_800361E0 +glabel obj_loop_stopwatchman /* 036DE0 800361E0 27BDFF80 */ addiu $sp, $sp, -0x80 /* 036DE4 800361E4 44853000 */ mtc1 $a1, $f6 /* 036DE8 800361E8 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80040148.s b/asm/non_matchings/unknown_032760/obj_loop_texscroll.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80040148.s rename to asm/non_matchings/unknown_032760/obj_loop_texscroll.s index 8d32dfac..65e2b1d6 100644 --- a/asm/non_matchings/unknown_032760/func_80040148.s +++ b/asm/non_matchings/unknown_032760/obj_loop_texscroll.s @@ -1,4 +1,4 @@ -glabel func_80040148 +glabel obj_loop_texscroll /* 040D48 80040148 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 040D4C 8004014C AFBF001C */ sw $ra, 0x1c($sp) /* 040D50 80040150 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003D058.s b/asm/non_matchings/unknown_032760/obj_loop_treasuresucker.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003D058.s rename to asm/non_matchings/unknown_032760/obj_loop_treasuresucker.s index ea3d27d8..a836035e 100644 --- a/asm/non_matchings/unknown_032760/func_8003D058.s +++ b/asm/non_matchings/unknown_032760/obj_loop_treasuresucker.s @@ -3,7 +3,7 @@ glabel D_800E6180 .float 50625.0 .text -glabel func_8003D058 +glabel obj_loop_treasuresucker /* 03DC58 8003D058 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 03DC5C 8003D05C AFBF0014 */ sw $ra, 0x14($sp) /* 03DC60 8003D060 AFA5004C */ sw $a1, 0x4c($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003C7A4.s b/asm/non_matchings/unknown_032760/obj_loop_trigger.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003C7A4.s rename to asm/non_matchings/unknown_032760/obj_loop_trigger.s index 83f09c5b..c744bf5f 100644 --- a/asm/non_matchings/unknown_032760/func_8003C7A4.s +++ b/asm/non_matchings/unknown_032760/obj_loop_trigger.s @@ -1,4 +1,4 @@ -glabel func_8003C7A4 +glabel obj_loop_trigger /* 03D3A4 8003C7A4 27BDFF68 */ addiu $sp, $sp, -0x98 /* 03D3A8 8003C7A8 AFBF004C */ sw $ra, 0x4c($sp) /* 03D3AC 8003C7AC AFBE0048 */ sw $fp, 0x48($sp) diff --git a/asm/non_matchings/unknown_032760/func_80034E9C.s b/asm/non_matchings/unknown_032760/obj_loop_trophycab.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80034E9C.s rename to asm/non_matchings/unknown_032760/obj_loop_trophycab.s index 95679003..25c4cdbc 100644 --- a/asm/non_matchings/unknown_032760/func_80034E9C.s +++ b/asm/non_matchings/unknown_032760/obj_loop_trophycab.s @@ -5,7 +5,7 @@ glabel D_800E6008 .float 0.552 .text -glabel func_80034E9C +glabel obj_loop_trophycab /* 035A9C 80034E9C 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 035AA0 80034EA0 AFBF001C */ sw $ra, 0x1c($sp) /* 035AA4 80034EA4 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003C2E4.s b/asm/non_matchings/unknown_032760/obj_loop_ttdoor.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003C2E4.s rename to asm/non_matchings/unknown_032760/obj_loop_ttdoor.s index 4ca7b9e4..a093e418 100644 --- a/asm/non_matchings/unknown_032760/func_8003C2E4.s +++ b/asm/non_matchings/unknown_032760/obj_loop_ttdoor.s @@ -1,4 +1,4 @@ -glabel func_8003C2E4 +glabel obj_loop_ttdoor /* 03CEE4 8003C2E4 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 03CEE8 8003C2E8 AFBF0024 */ sw $ra, 0x24($sp) /* 03CEEC 8003C2EC AFB10020 */ sw $s1, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_8003E140.s rename to asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s index 76c4efab..902f5dc6 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s @@ -8,7 +8,7 @@ glabel D_800E61B8 .double 0.1 .text -glabel func_8003E140 +glabel obj_loop_weaponballoon /* 03ED40 8003E140 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 03ED44 8003E144 AFBF0024 */ sw $ra, 0x24($sp) /* 03ED48 8003E148 AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/func_80040820.s b/asm/non_matchings/unknown_032760/obj_loop_weather.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80040820.s rename to asm/non_matchings/unknown_032760/obj_loop_weather.s index 10ee2f48..649a0680 100644 --- a/asm/non_matchings/unknown_032760/func_80040820.s +++ b/asm/non_matchings/unknown_032760/obj_loop_weather.s @@ -1,4 +1,4 @@ -glabel func_80040820 +glabel obj_loop_weather /* 041420 80040820 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 041424 80040824 AFBF001C */ sw $ra, 0x1c($sp) /* 041428 80040828 AFA40058 */ sw $a0, 0x58($sp) diff --git a/asm/non_matchings/unknown_032760/func_80037D78.s b/asm/non_matchings/unknown_032760/obj_loop_wizpigship.s similarity index 99% rename from asm/non_matchings/unknown_032760/func_80037D78.s rename to asm/non_matchings/unknown_032760/obj_loop_wizpigship.s index 5df349fa..fbdb2039 100644 --- a/asm/non_matchings/unknown_032760/func_80037D78.s +++ b/asm/non_matchings/unknown_032760/obj_loop_wizpigship.s @@ -1,4 +1,4 @@ -glabel func_80037D78 +glabel obj_loop_wizpigship /* 038978 80037D78 27BDFED8 */ addiu $sp, $sp, -0x128 /* 03897C 80037D7C AFB00038 */ sw $s0, 0x38($sp) /* 038980 80037D80 00808025 */ move $s0, $a0 diff --git a/asm/non_matchings/unknown_043920/func_8004DAB0.s b/asm/non_matchings/unknown_043920/obj_init_racer.s similarity index 99% rename from asm/non_matchings/unknown_043920/func_8004DAB0.s rename to asm/non_matchings/unknown_043920/obj_init_racer.s index d1ba1b8a..b46ba17c 100644 --- a/asm/non_matchings/unknown_043920/func_8004DAB0.s +++ b/asm/non_matchings/unknown_043920/obj_init_racer.s @@ -1,4 +1,4 @@ -glabel func_8004DAB0 +glabel obj_init_racer /* 04E6B0 8004DAB0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 04E6B4 8004DAB4 44811000 */ mtc1 $at, $f2 /* 04E6B8 8004DAB8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/waves/func_800BFFDC.s b/asm/non_matchings/waves/obj_loop_wavepower.s similarity index 99% rename from asm/non_matchings/waves/func_800BFFDC.s rename to asm/non_matchings/waves/obj_loop_wavepower.s index f12c35ef..eec7976d 100644 --- a/asm/non_matchings/waves/func_800BFFDC.s +++ b/asm/non_matchings/waves/obj_loop_wavepower.s @@ -1,4 +1,4 @@ -glabel func_800BFFDC +glabel obj_loop_wavepower /* 0C0BDC 800BFFDC 3C0E800E */ lui $t6, %hi(D_800E3198) # $t6, 0x800e /* 0C0BE0 800BFFE0 8DCE3198 */ lw $t6, %lo(D_800E3198)($t6) /* 0C0BE4 800BFFE4 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/include/structs.h b/include/structs.h index cdff7e69..02d1f170 100644 --- a/include/structs.h +++ b/include/structs.h @@ -463,7 +463,7 @@ typedef struct Object_3C { u8 unkD; } Object_3C; -typedef struct Object_40 { +typedef struct ObjectHeader { u8 pad0[0x4]; f32 unk4; f32 unk8; @@ -476,13 +476,13 @@ typedef struct Object_40 { u8 pad3E[0x15]; s8 unk53; s8 unk54; - s8 unk55; //size of array pointed by Object->unk68 + s8 unk55; // size of array pointed by Object->unk68 u8 pad56; s8 unk57; u8 pad58[0x18]; u8 unk70; u8 unk71; -} Object_40; +} ObjectHeader; typedef struct Object_44_0 { u8 unk0; @@ -678,7 +678,7 @@ typedef struct Object { /* 0x003C */ f32 unk3C_f; } unk3C_a; - /* 0x0040 */ Object_40 *descriptor_ptr; + /* 0x0040 */ ObjectHeader *descriptor_ptr; /* 0x0044 */ void *unk44; /* 0x0048 */ s16 unk48; /* 0x004A */ s16 unk4A; diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 5ab0f9b5..ce785a40 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -1508,264 +1508,264 @@ void func_800235D0(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800235DC.s") -void func_800238BC(Object *arg0, void *arg1) { +void run_object_init_func(Object *arg0, void *arg1) { arg0->unk48 = arg0->descriptor_ptr->unk54; switch (arg0->unk48 - 1) { case 0: - func_8004DAB0(arg0, arg1); + obj_init_racer(arg0, arg1); break; case 1: - func_80033CC0(arg0, arg1); + obj_init_scenery(arg0, arg1); break; case 2: - func_80036C30(arg0, arg1); + obj_init_fish(arg0, arg1); break; case 3: - func_800376E0(arg0, arg1); + obj_init_animator(arg0, arg1); break; case 5: - func_800389AC(arg0, arg1); + obj_init_smoke(arg0, arg1); break; case 24: - func_80038A6C(arg0, arg1); + obj_init_unknown25(arg0, arg1); break; case 21: - func_80038B74(arg0, arg1); + obj_init_bombexplosion(arg0, arg1); break; case 6: - func_80038E3C(arg0, arg1); + obj_init_exit(arg0, arg1); break; case 7: - func_8003FD68(arg0, arg1); + obj_init_audio(arg0, arg1); break; case 8: case 18: - func_8003FEF4(arg0, arg1); + obj_init_audioline(arg0, arg1); break; case 26: - func_8004001C(arg0, arg1); + obj_init_audioreverb(arg0, arg1); break; case 9: - func_80039160(arg0, arg1); + obj_init_cameracontrol(arg0, arg1); break; case 10: - func_80039190(arg0, arg1); + obj_init_setuppoint(arg0, arg1); break; case 11: - func_800391C8(arg0, arg1); + obj_init_dino_whale(arg0, arg1); break; case 12: - func_8003ACBC(arg0, arg1); + obj_init_checkpoint(arg0, arg1); break; case 29: - func_8003AD34(arg0, arg1); + obj_init_modechange(arg0, arg1); break; case 40: - func_8003B058(arg0, arg1); + obj_init_bonus(arg0, arg1); break; case 13: - func_8003B7CC(arg0, arg1); + obj_init_door(arg0, arg1); break; case 110: - func_8003C1E0(arg0, arg1); + obj_init_ttdoor(arg0, arg1); break; case 14: - func_8003CF18(arg0, arg1); + obj_init_fogchanger(arg0, arg1); break; case 15: - func_8003CFE0(arg0, arg1); + obj_init_ainode(arg0, arg1); break; case 16: - func_8003DFCC(arg0, arg1); + obj_init_weaponballoon(arg0, arg1); break; case 22: - func_8003E5B0(arg0, arg1); + obj_init_wballoonpop(arg0, arg1); break; case 4: case 17: - func_8003E5C8(arg0, arg1); + obj_init_weapon(arg0, arg1); break; case 25: - func_8003CF58(arg0, arg1); + obj_init_skycontrol(arg0, arg1); break; case 27: - func_80034AF0(arg0, arg1); + obj_init_torch_mist(arg0, arg1); break; case 28: - func_800400A4(arg0, arg1); + obj_init_texscroll(arg0, arg1); break; case 30: - func_80036194(arg0, arg1); + obj_init_stopwatchman(arg0, arg1); break; case 31: - func_8003D534(arg0, arg1); + obj_init_coin(arg0, arg1); break; case 32: - func_800403A8(arg0, arg1); + obj_init_rgbalight(arg0, arg1); break; case 35: - func_800403D8(arg0, arg1); + obj_init_buoy_pirateship(arg0, arg1); break; case 66: - func_8004049C(arg0, arg1); + obj_init_log(arg0, arg1); break; case 36: - func_80040800(arg0, arg1); + obj_init_weather(arg0, arg1); break; case 37: - func_8003C9EC(arg0, arg1); + obj_init_bridge_whaleramp(arg0, arg1); break; case 38: - func_8003CE64(arg0, arg1); + obj_init_rampswitch(arg0, arg1); break; case 39: - func_8003CF00(arg0, arg1); + obj_init_seamonster(arg0, arg1); break; case 42: - func_8004092C(arg0, arg1); + obj_init_lensflare(arg0, arg1); break; case 43: - func_8004094C(arg0, arg1); + obj_init_lensflareswitch(arg0, arg1); break; case 44: - func_8003522C(arg0, arg1); + obj_init_collectegg(arg0, arg1); break; case 45: - func_80035640(arg0, arg1); + obj_init_eggcreator(arg0, arg1); break; case 46: - func_80035EF8(arg0, arg1); + obj_init_characterflag(arg0, arg1); break; case 48: - func_80037A18(arg0, arg1); + obj_init_animation(arg0, arg1); break; case 51: - func_80038854(arg0, arg1); + obj_init_infopoint(arg0, arg1); break; case 54: - func_8003C644(arg0, arg1); + obj_init_trigger(arg0, arg1); break; case 56: case 92: - func_8003588C(arg0, arg1); + obj_init_airzippers_waterzippers(arg0, arg1); break; case 57: - func_80035E20(arg0, arg1); + obj_init_unknown58(arg0, arg1); break; case 58: - func_800409A4(arg0, arg1); + obj_init_wavegenerator(arg0, arg1); break; case 60: - func_800409C8(arg0, arg1); + obj_init_butterfly(arg0, arg1); break; case 61: - func_800392B8(arg0, arg1); + obj_init_parkwarden(arg0, arg1); break; case 63: - func_8003DE74(arg0, arg1); + obj_init_worldkey(arg0, arg1); break; case 64: - func_8003D3EC(arg0, arg1); + obj_init_coincreator(arg0, arg1); break; case 65: - func_8003D038(arg0, arg1); + obj_init_treasuresucker(arg0, arg1); break; case 67: - func_80037578(arg0, arg1); + obj_init_lavaspurt(arg0, arg1); break; case 68: - func_80037624(arg0, arg1); + obj_init_posarrow(arg0, arg1); break; case 69: case 102: - func_8003818C(arg0, arg1); + obj_init_hittester(arg0, arg1); break; case 71: case 94: case 103: - func_800381E0(arg0, arg1); + obj_init_dynamic_lighting_object(arg0, arg1); break; case 95: case 100: - func_80038214(arg0, arg1); + obj_init_unknown96(arg0, arg1); break; case 96: case 101: - func_80038248(arg0, arg1); + obj_init_snowball(arg0, arg1); break; case 70: - func_80041A90(arg0, arg1); + obj_init_midifade(arg0, arg1); break; case 111: - func_80041E80(arg0, arg1); + obj_init_midifadepoint(arg0, arg1); break; case 117: - func_80042014(arg0, arg1); + obj_init_midichset(arg0, arg1); break; case 72: - func_80034B68(arg0, arg1); + obj_init_effectbox(arg0, arg1); break; case 73: - func_80034E70(arg0, arg1); + obj_init_trophycab(arg0, arg1); break; case 74: - func_8004203C(arg0, arg1); + obj_init_bubbler(arg0, arg1); break; case 75: - func_8003D2AC(arg0, arg1); + obj_init_flycoin(arg0, arg1); break; case 76: - func_8003B368(arg0, arg1); + obj_init_goldenballoon(arg0, arg1); break; case 77: - func_80034844(arg0, arg1); + obj_init_laserbolt(arg0, arg1); break; case 78: - func_80034530(arg0, arg1); + obj_init_lasergun(arg0, arg1); break; case 81: - func_80035AE8(arg0, arg1); + obj_init_groundzipper(arg0, arg1); break; case 82: - func_80037D54(arg0, arg1); + obj_init_overridepos(arg0, arg1); break; case 83: - func_80037D6C(arg0, arg1); + obj_init_wizpigship(arg0, arg1); break; case 88: - func_8004210C(arg0, arg1); + obj_init_boost(arg0, arg1); break; case 87: - func_8003DC5C(arg0, arg1); + obj_init_silvercoin(arg0, arg1); break; case 89: - func_80038AC8(arg0, arg1); + obj_init_wardensmoke(arg0, arg1); break; case 93: - func_80042150(arg0, arg1); + obj_init_unknown94(arg0, arg1); break; case 97: - func_80038D58(arg0, arg1); + obj_init_teleport(arg0, arg1); break; case 98: case 99: - func_8003572C(arg0, arg1); + obj_init_lighthouse_rocketsignpost(arg0, arg1); break; case 104: - func_8004216C(arg0, arg1); + obj_init_rangetrigger(arg0, arg1); break; case 107: case 115: - func_80033F44(arg0, arg1); + obj_init_fireball_octoweapon(arg0, arg1); break; case 108: - func_80042210(arg0, arg1); + obj_init_frog(arg0, arg1); break; case 109: - func_8003DBA0(arg0, arg1); + obj_init_silvercoin_adv2(arg0, arg1); break; case 116: - func_80042A1C(arg0, arg1); + obj_init_levelname(arg0, arg1); break; } } @@ -1905,242 +1905,242 @@ void run_object_loop_func(Object *obj, s32 arg1) { func_800B76B8(1, obj->unk4A); switch (obj->unk48) { case 2: - func_80033DD0(obj, arg1); + obj_loop_scenery(obj, arg1); break; case 3: - func_800370D4(obj, arg1); + obj_loop_fish(obj, arg1); break; case 4: - func_800377E4(obj, arg1); + obj_loop_animator(obj, arg1); break; case 6: - func_800389B8(obj, arg1); + obj_loop_smoke(obj, arg1); break; case 25: - func_80038A78(obj, arg1); + obj_loop_unknown25(obj, arg1); break; case 22: - func_80038BF4(obj, arg1); + obj_loop_bombexplosion(obj, arg1); break; case 7: - func_80038F58(obj, arg1); + obj_loop_exit(obj, arg1); break; case 10: - func_80039184(obj, arg1); + obj_loop_cameracontrol(obj, arg1); break; case 11: - func_800391BC(obj, arg1); + obj_loop_setuppoint(obj, arg1); break; case 12: - func_800391FC(obj, arg1); + obj_loop_dino_whale(obj, arg1); break; case 13: - func_8003AD28(obj, arg1); + obj_loop_checkpoint(obj, arg1); break; case 30: - func_8003AE50(obj, arg1); + obj_loop_modechange(obj, arg1); break; case 41: - func_8003B174(obj, arg1); + obj_loop_bonus(obj, arg1); break; case 14: - func_8003B988(obj, arg1); + obj_loop_door(obj, arg1); break; case 15: - func_80030A74(obj); + obj_loop_fogchanger(obj); break; case 16: - func_8003D02C(obj, arg1); + obj_loop_ainode(obj, arg1); break; case 17: - func_8003E140(obj, arg1); + obj_loop_weaponballoon(obj, arg1); break; case 23: - func_8003E5BC(obj, arg1); + obj_loop_wballoonpop(obj, arg1); break; case 5: case 18: - func_8003E630(obj, arg1); + obj_loop_weapon(obj, arg1); break; case 26: - func_8003CF98(obj, arg1); + obj_loop_skycontrol(obj, arg1); break; case 28: - func_80034B4C(obj, arg1); + obj_loop_torch_mist(obj, arg1); break; case 29: - func_80040148(obj, arg1); + obj_loop_texscroll(obj, arg1); break; case 31: - func_800361E0(obj, arg1); + obj_loop_stopwatchman(obj, arg1); break; case 32: - func_8003D5A0(obj, arg1); + obj_loop_coin(obj, arg1); break; case 36: - func_80040448(obj, arg1); + obj_loop_buoy_pirateship(obj, arg1); break; case 67: - func_80040570(obj, arg1); + obj_loop_log(obj, arg1); break; case 37: - func_80040820(obj, arg1); + obj_loop_weather(obj, arg1); break; case 38: - func_8003CA68(obj, arg1); + obj_loop_bridge_whaleramp(obj, arg1); break; case 39: - func_8003CEA0(obj, arg1); + obj_loop_rampswitch(obj, arg1); break; case 40: - func_8003CF0C(obj, arg1); + obj_loop_seamonster(obj, arg1); break; case 45: - func_80035260(obj, arg1); + obj_loop_collectegg(obj, arg1); break; case 46: - func_8003564C(obj, arg1); + obj_loop_eggcreator(obj, arg1); break; case 47: - func_80035F6C(obj, arg1); + obj_loop_characterflag(obj, arg1); break; case 50: case 81: case 85: case 86: - func_80037CE8(obj, arg1); + obj_loop_animobject(obj, arg1); break; case 119: - func_80042CD0(obj, arg1); + obj_init_wizghosts(obj, arg1); break; case 51: - func_80038710(obj, arg1); + obj_loop_animcamera(obj, arg1); break; case 52: - func_800388D4(obj, arg1); + obj_loop_infopoint(obj, arg1); break; case 53: - func_800387CC(obj, arg1); + obj_loop_animcar(obj, arg1); break; case 54: - func_8003833C(obj, arg1); + obj_loop_char_select(obj, arg1); break; case 55: - func_8003C7A4(obj, arg1); + obj_loop_trigger(obj, arg1); break; case 56: - func_800380F8(obj, arg1); + obj_loop_vehicleanim(obj, arg1); break; case 57: case 93: - func_8003596C(obj, arg1); + obj_loop_airzippers_waterzippers(obj, arg1); break; case 58: - func_80035E34(obj, arg1); + obj_loop_unknown58(obj, arg1); break; case 60: - func_800BFFDC(obj); + obj_loop_wavepower(obj); break; case 61: - func_80040C54(obj, arg1); + obj_loop_butterfly(obj, arg1); break; case 62: - func_80039330(obj, arg1); + obj_loop_parkwarden(obj, arg1); break; case 64: - obj_loop_world_key(obj, arg1); //arg1=speed + obj_loop_worldkey(obj, arg1); //arg1=speed break; case 65: - func_8003D3FC(obj, arg1); + obj_loop_coincreator(obj, arg1); break; case 66: - func_8003D058(obj, arg1); + obj_loop_treasuresucker(obj, arg1); break; case 68: - func_80037594(obj, arg1); + obj_loop_lavaspurt(obj, arg1); break; case 69: - func_8003763C(obj, arg1); + obj_loop_posarrow(obj, arg1); break; case 70: case 72: case 103: case 104: - func_800381C0(obj, arg1); + obj_loop_hittester(obj, arg1); break; case 96: case 97: case 101: case 102: - func_8003827C(obj, arg1); + obj_loop_snowball(obj, arg1); break; case 73: - func_80034B74(obj, arg1); + obj_loop_effectbox(obj, arg1); break; case 74: - func_80034E9C(obj, arg1); + obj_loop_trophycab(obj, arg1); break; case 75: - func_80042090(obj, arg1); + obj_loop_bubbler(obj, arg1); break; case 76: - func_8003D2B8(obj, arg1); + obj_loop_flycoin(obj, arg1); break; case 77: - func_8003B4BC(obj, arg1); + obj_loop_goldenballoon(obj, arg1); break; case 78: - func_80034860(obj, arg1); + obj_loop_laserbolt(obj, arg1); break; case 79: - func_800345A0(obj, arg1); + obj_loop_lasergun(obj, arg1); break; case 80: - func_8003ACA0(obj, arg1); + obj_loop_gbparkwarden(obj, arg1); break; case 82: - func_80035C50(obj, arg1); + obj_loop_groundzipper(obj, arg1); break; case 84: - func_80037D78(obj, arg1); + obj_loop_wizpigship(obj, arg1); break; case 88: case 110: - func_8003DD14(obj, arg1); + obj_loop_silvercoin(obj, arg1); break; case 90: - func_80038AD4(obj, arg1); + obj_loop_wardensmoke(obj, arg1); break; case 94: - func_80042160(obj, arg1); + obj_loop_unknown94(obj, arg1); break; case 98: - func_80038DC4(obj, arg1); + obj_loop_teleport(obj, arg1); break; case 105: - func_80042178(obj, arg1); + obj_loop_rangetrigger(obj, arg1); break; case 100: - func_800357D4(obj, arg1); + obj_loop_rocketsignpost(obj, arg1); break; case 108: case 116: - func_80033F60(obj, arg1); + obj_loop_fireball_octoweapon(obj, arg1); break; case 109: - func_800422F0(obj, arg1); + obj_loop_frog(obj, arg1); break; case 111: - func_8003C2E4(obj, arg1); + obj_loop_ttdoor(obj, arg1); break; case 113: - func_80037D08(obj, arg1); + obj_loop_dooropener(obj, arg1); break; case 115: - func_80042998(obj, arg1); + obj_loop_pigrocketeer(obj, arg1); break; case 117: - func_80042A90(obj, arg1); + obj_loop_levelname(obj, arg1); break; } func_800B76B8(1, -1); diff --git a/src/unknown_00BC20.h b/src/unknown_00BC20.h index 519c977c..95b6a414 100644 --- a/src/unknown_00BC20.h +++ b/src/unknown_00BC20.h @@ -211,7 +211,7 @@ s8 func_8002341C(void); s32 func_80023568(void); s8 func_800235C0(void); void func_800235D0(s32 arg0); -void func_800238BC(Object *arg0, void *arg1); +void run_object_init_func(Object *arg0, void *arg1); void run_object_loop_func(Object *obj, s32 arg1); void func_8002458C(s32 arg0); s16 *func_80024594(s32 *arg0, s32 *arg1); diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index dccfdaf5..befe1621 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -1054,7 +1054,7 @@ void func_8003093C(s32 arg0) { gDPSetFogColor(D_8011B0A0++, D_8011D388[arg0].unk0 >> 0x10, D_8011D388[arg0].unk4 >> 0x10, D_8011D388[arg0].unk8 >> 0x10, 0xFF); gSPFogPosition(D_8011B0A0++, D_8011D388[arg0].unkC >> 0x10, D_8011D388[arg0].unk10 >> 0x10); } -GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80030A74.s") +GLOBAL_ASM("asm/non_matchings/unknown_0255E0/obj_loop_fogchanger.s") GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80030DE0.s") void func_80031018(void) { diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 6a7c8e4f..9623e996 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -143,7 +143,7 @@ typedef struct Object_50_80033CC0 { f32 unk0; } Object_50_80033CC0; -void func_80033CC0(Object *arg0, LevelObjectEntry80033CC0 *arg1) { +void obj_init_scenery(Object *arg0, LevelObjectEntry80033CC0 *arg1) { f32 phi_f0; arg0->unk6 |= 2; phi_f0 = arg1->unk9 & 0xFF; @@ -171,10 +171,10 @@ void func_80033CC0(Object *arg0, LevelObjectEntry80033CC0 *arg1) { arg0->unk7C.word = 0; } #else -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80033CC0.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_scenery.s") #endif -void func_80033DD0(Object *obj, s32 arg1) { +void obj_loop_scenery(Object *obj, s32 arg1) { Object78_80033DD0 *obj78; s32 temp_v0; @@ -207,7 +207,7 @@ void func_80033DD0(Object *obj, s32 arg1) { } } -void func_80033F44(Object *arg0, s32 arg1) { +void obj_init_fireball_octoweapon(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; } @@ -241,7 +241,7 @@ void func_800AFC3C(Object *, s32); void gParticlePtrList_addObject(Object *); f32 sqrtf(f32); -void func_80033F60(Object *obj, s32 arg1) { +void obj_loop_fireball_octoweapon(Object *obj, s32 arg1) { Object *obj78; Object_4C *obj4C; f32 sp7C; @@ -356,10 +356,10 @@ void func_80033F60(Object *obj, s32 arg1) { } } #else -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80033F60.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s") #endif -void func_80034530(Object *arg0, unk80034530 *arg1) { +void obj_init_lasergun(Object *arg0, unk80034530 *arg1) { Object_64 *temp; arg0->unk4C->unk14 = 0x22; arg0->unk4C->unk11 = 0; @@ -373,10 +373,10 @@ void func_80034530(Object *arg0, unk80034530 *arg1) { arg0->x_rotation = arg1->unk9 << 4 << 4; // just needs to be 2 left shifts that add up to 8. } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800345A0.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_lasergun.s") -// Literally the same function as func_80033F44() -void func_80034844(Object *arg0, s32 arg1) { +// Literally the same function as obj_init_fireball_octoweapon() +void obj_init_laserbolt(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; } @@ -396,7 +396,7 @@ typedef struct Object_64_80034860 { s8 unk187; } Object_64_80034860; -void func_80034860(Object *obj, s32 arg1) { +void obj_loop_laserbolt(Object *obj, s32 arg1) { f32 sp5C; Object *obj4C_obj; @@ -464,7 +464,7 @@ void func_80034860(Object *obj, s32 arg1) { } } -void func_80034AF0(Object *arg0, u8 *arg1) { +void obj_init_torch_mist(Object *arg0, u8 *arg1) { f32 phi_f0 = (s32)(arg1[9] & 0xFF); if (phi_f0 < 10.0f) { phi_f0 = 10.0f; @@ -474,11 +474,11 @@ void func_80034AF0(Object *arg0, u8 *arg1) { arg0->unk78 = arg1[8]; } -void func_80034B4C(unk80034B4C *arg0, s32 arg1) { +void obj_loop_torch_mist(unk80034B4C *arg0, s32 arg1) { arg0->unk18 += arg0->unk78 * arg1; } -void func_80034B68(s32 arg0, s32 arg1) { +void obj_init_effectbox(s32 arg0, s32 arg1) { } #ifdef NON_EQUIVALENT @@ -489,7 +489,7 @@ f32 func_800707C4(s16); f32 func_800707F8(s16); Object **get_object_struct_array(s32 *count); -void func_80034B74(Object *obj, s32 arg1) { +void obj_loop_effectbox(Object *obj, s32 arg1) { Object **objList; Object_3C_80034B74 *obj3C; Object_64_80034B74 *curObj64; @@ -546,10 +546,10 @@ void func_80034B74(Object *obj, s32 arg1) { } } #else -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034B74.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_effectbox.s") #endif -void func_80034E70(Object *arg0, u8 *arg1) { +void obj_init_trophycab(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. @@ -594,7 +594,7 @@ typedef struct Object_54_80034E9C { // Has regalloc & stack issues. // Trophy Cabinet behavior loop -void func_80034E9C(Object *obj, s32 arg1) { +void obj_loop_trophycab(Object *obj, s32 arg1) { s32 sp34; s32 isTrophyRaceAvaliable; s32 raceType; @@ -715,22 +715,22 @@ void func_80034E9C(Object *obj, s32 arg1) { } } #else -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034E9C.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_trophycab.s") #endif -void func_8003522C(Object *arg0, s32 arg1) { +void obj_init_collectegg(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x14; arg0->unk4C->unk12 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80035260.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_collectegg.s") -void func_80035640(s32 arg0, s32 arg1) { +void obj_init_eggcreator(s32 arg0, s32 arg1) { } -void func_8003564C(Object *arg0, s32 arg1) { +void obj_loop_eggcreator(Object *arg0, s32 arg1) { unk8003564C sp20; Object *someObj; @@ -750,7 +750,7 @@ void func_8003564C(Object *arg0, s32 arg1) { } } -void func_8003572C(Object *arg0, LevelObjectEntry8003572C *arg1) { +void obj_init_lighthouse_rocketsignpost(Object *arg0, LevelObjectEntry8003572C *arg1) { f32 phi_f0 = arg1->unk9 & 0xFF; if (phi_f0 < 10) { phi_f0 = 10; @@ -767,7 +767,7 @@ void func_8003572C(Object *arg0, LevelObjectEntry8003572C *arg1) { arg0->unk4C->unk12 = 0; } -void func_800357D4(Object *obj, s32 arg1) { +void obj_loop_rocketsignpost(Object *obj, s32 arg1) { Object *someObj; Object_4C *temp_v1; @@ -785,8 +785,8 @@ void func_800357D4(Object *obj, s32 arg1) { obj->unk4C->unk13 = 0xFF; } -void func_8003588C(Object *arg0, LevelObjectEntry8003588C *arg1) { - Object_40 *obj40; +void obj_init_airzippers_waterzippers(Object *arg0, LevelObjectEntry8003588C *arg1) { + ObjectHeader *obj40; f32 phi_f0; phi_f0 = arg1->unk9 & 0xFF; @@ -809,16 +809,16 @@ void func_8003588C(Object *arg0, LevelObjectEntry8003588C *arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003596C.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80035AE8.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80035C50.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_airzippers_waterzippers.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_groundzipper.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_groundzipper.s") -void func_80035E20(unk80035E20 *arg0, s32 arg1) { +void obj_init_unknown58(unk80035E20 *arg0, s32 arg1) { arg0->unk78 = 0; arg0->unk7C = arg0->unk40; } -void func_80035E34(Object *obj, s32 arg1) { +void obj_loop_unknown58(Object *obj, s32 arg1) { Object *someObj; Object *someOtherObj; Object_64_80035E34 *someOtherObj64; @@ -845,7 +845,7 @@ void func_80035E34(Object *obj, s32 arg1) { } } -void func_80035EF8(Object *arg0, unk80035EF8 *arg1) { +void obj_init_characterflag(Object *arg0, unk80035EF8 *arg1) { f32 phi_f0; arg0->unk78 = (s32)arg1->unkE; arg0->unk7C.word = -1; @@ -858,7 +858,7 @@ void func_80035EF8(Object *arg0, unk80035EF8 *arg1) { arg0->scale = (f32)(arg0->descriptor_ptr->unkC * phi_f0); } -void func_80035F6C(Object *obj, s32 arg1) { +void obj_loop_characterflag(Object *obj, s32 arg1) { s32 temp_t4; s32 temp_t5; Object *someObj; @@ -892,7 +892,7 @@ void func_80035F6C(Object *obj, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80036040.s") -void func_80036194(Object *arg0, s32 arg1) { +void obj_init_stopwatchman(Object *arg0, s32 arg1) { Object_64 *temp; arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 0; @@ -904,7 +904,7 @@ void func_80036194(Object *arg0, s32 arg1) { D_8011D4D8 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800361E0.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s") void func_80036BCC(u16 arg0, s32 arg1) { if ((D_8011D4D8 != 0) && (arg1 & 1)) { @@ -916,15 +916,15 @@ void func_80036BCC(u16 arg0, s32 arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80036C30.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800370D4.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_fish.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_fish.s") -void func_80037578(unk80037578 *arg0, u8 *arg1) { +void obj_init_lavaspurt(unk80037578 *arg0, u8 *arg1) { arg0->unk78 = arg1[9] * 2; arg0->unk7C = arg1[8]; } -void func_80037594(Object *obj, s32 arg1) { +void obj_loop_lavaspurt(Object *obj, s32 arg1) { if (obj->unk78 > 0) { obj->unk78 -= arg1; obj->unk6 |= 0x4000; @@ -938,13 +938,13 @@ void func_80037594(Object *obj, s32 arg1) { } } -void func_80037624(unk80037624 *arg0, s32 arg1) { +void obj_init_posarrow(unk80037624 *arg0, s32 arg1) { arg0->unk6 |= 0x4000; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003763C.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_posarrow.s") -void func_800376E0(Object *arg0, LevelObjectEntry800376E0 *arg1, s32 arg2) { +void obj_init_animator(Object *arg0, LevelObjectEntry800376E0 *arg1, s32 arg2) { Object_64_800376E0 *obj64; LevelModel *levelModel; s16 segmentBatchCount; @@ -968,17 +968,17 @@ void func_800376E0(Object *arg0, LevelObjectEntry800376E0 *arg1, s32 arg2) { obj64->unk2 = segmentBatchCount - 1; } } - func_800377E4(arg0, 0x20000); + obj_loop_animator(arg0, 0x20000); } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800377E4.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80037A18.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_animator.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_animation.s") -void func_80037CE8(s32 arg0, s32 arg1) { +void obj_loop_animobject(s32 arg0, s32 arg1) { func_8001F460(arg0, arg1, arg0); } -void func_80037D08(unk80037D08_arg0 *arg0, s32 arg1) { +void obj_loop_dooropener(unk80037D08_arg0 *arg0, s32 arg1) { s32 phi_a0; unk80037D08_arg0_64 *sp18; @@ -990,19 +990,19 @@ void func_80037D08(unk80037D08_arg0 *arg0, s32 arg1) { func_800235D0(phi_a0); } -void func_80037D54(s32 arg0, s32 arg1) { +void obj_init_overridepos(s32 arg0, s32 arg1) { } /* Unused? */ void func_80037D60(s32 arg0, s32 arg1) { } -void func_80037D6C(s32 arg0, s32 arg1) { +void obj_init_wizpigship(s32 arg0, s32 arg1) { } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80037D78.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_wizpigship.s") -void func_800380F8(Object *obj, s32 arg1) { +void obj_loop_vehicleanim(Object *obj, s32 arg1) { Object_60_800380F8 *obj60; Object *someObj; @@ -1020,35 +1020,35 @@ void func_800380F8(Object *obj, s32 arg1) { } } -void func_8003818C(Object *arg0, s32 arg1) { +void obj_init_hittester(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 0x81; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; arg0->unk4C->unk12 = 0; } -// Literally the same as func_80037CE8() -void func_800381C0(s32 arg0, s32 arg1) { +// Literally the same as obj_loop_animobject() +void obj_loop_hittester(s32 arg0, s32 arg1) { func_8001F460(arg0, arg1, arg0); } -void func_800381E0(Object *arg0, s32 arg1) { +void obj_init_dynamic_lighting_object(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; arg0->unk4C->unk12 = 0; } -// Literally the same as func_8003818C() -void func_80038214(Object *arg0, s32 arg1) { +// Literally the same as obj_init_hittester() +void obj_init_unknown96(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 0x81; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; arg0->unk4C->unk12 = 0; } -// Literally the same as func_800381E0() -void func_80038248(Object *arg0, s32 arg1) { +// Literally the same as obj_init_dynamic_lighting_object() +void obj_init_snowball(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 2; arg0->unk4C->unk10 = 0x14; @@ -1057,7 +1057,7 @@ void func_80038248(Object *arg0, s32 arg1) { #ifdef NON_EQUIVALENT // Regalloc issues -void func_8003827C(Object *obj, s32 arg1) { +void obj_loop_snowball(Object *obj, s32 arg1) { Object_64_8003827C *obj64 = obj->unk64; if (obj64->unk24 == 0) { if (obj64->unk38 != 0) { @@ -1075,16 +1075,16 @@ void func_8003827C(Object *obj, s32 arg1) { } #else -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003827C.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_snowball.s") #endif // Unused void func_80038330(Object *obj, s32 arg1) { } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003833C.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_char_select.s") -void func_80038710(Object *obj, s32 arg1) { +void obj_loop_animcamera(Object *obj, s32 arg1) { s32 temp_v0; s32 phi_v1; Object_64_80038710 *obj64; @@ -1108,7 +1108,7 @@ void func_80038710(Object *obj, s32 arg1) { void func_800387C0(Object *obj, s32 arg1) { } -void func_800387CC(Object *obj, s32 arg1) { +void obj_loop_animcar(Object *obj, s32 arg1) { Object *someObj; s32 temp_v0; temp_v0 = obj->unk78; @@ -1124,7 +1124,7 @@ void func_800387CC(Object *obj, s32 arg1) { } } -void func_80038854(Object *arg0, u8 *arg1) { +void obj_init_infopoint(Object *arg0, u8 *arg1) { if (arg1[9] != 0) { arg0->unk4C->unk14 = 0x21; } else { @@ -1138,7 +1138,7 @@ void func_80038854(Object *arg0, u8 *arg1) { arg0->y_rotation = arg1[11] << 10; // Not sure about the values here. } -void func_800388D4(Object *arg0, s32 arg1) { +void obj_loop_infopoint(Object *arg0, s32 arg1) { s16 temp_a0; Object_4C *obj4C; Object *playerObj; @@ -1162,10 +1162,10 @@ void func_800388D4(Object *arg0, s32 arg1) { } } -void func_800389AC(s32 arg0, s32 arg1) { +void obj_init_smoke(s32 arg0, s32 arg1) { } -void func_800389B8(Object *obj, s32 arg1) { +void obj_loop_smoke(Object *obj, s32 arg1) { f32 temp_f2 = arg1; if (osTvType == TV_TYPE_PAL) { temp_f2 *= 1.2; @@ -1180,10 +1180,10 @@ void func_800389B8(Object *obj, s32 arg1) { } } -void func_80038A6C(s32 arg0, s32 arg1) { +void obj_init_unknown25(s32 arg0, s32 arg1) { } -void func_80038A78(Object *arg0, s32 arg1) { +void obj_loop_unknown25(Object *arg0, s32 arg1) { arg0->unk18 += arg1 * 8; if (arg0->unk18 >= 256) { gParticlePtrList_addObject(arg0); @@ -1191,10 +1191,10 @@ void func_80038A78(Object *arg0, s32 arg1) { } } -void func_80038AC8(s32 arg0, s32 arg1) { +void obj_init_wardensmoke(s32 arg0, s32 arg1) { } -void func_80038AD4(Object *arg0, s32 arg1) { +void obj_loop_wardensmoke(Object *arg0, s32 arg1) { f32 temp_f2; temp_f2 = (f32)arg1; @@ -1211,7 +1211,7 @@ void func_80038AD4(Object *arg0, s32 arg1) { #ifdef NON_EQUIVALENT // regalloc issues -void func_80038B74(Object *obj, unk80038B74 *arg1) { +void obj_init_bombexplosion(Object *obj, unk80038B74 *arg1) { s32 temp; obj->unk18 = 0; obj->scale = 0.5f; @@ -1226,12 +1226,12 @@ void func_80038B74(Object *obj, unk80038B74 *arg1) { } #else -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038B74.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_bombexplosion.s") #endif -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038BF4.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_bombexplosion.s") -void func_80038D58(Object *arg0, s32 arg1) { +void obj_init_teleport(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0xF; @@ -1241,7 +1241,7 @@ void func_80038D58(Object *arg0, s32 arg1) { } } -void func_80038DC4(Object *arg0, s32 arg1) { +void obj_loop_teleport(Object *arg0, s32 arg1) { if (arg0->unk78 != 0) { Object_3C_80038DC4 *temp = arg0->unk3C_a.unk3C; if (arg0->unk4C->unk13 < 0x78) { @@ -1253,7 +1253,7 @@ void func_80038DC4(Object *arg0, s32 arg1) { } } -void func_80038E3C(Object *obj, LevelObjectEntry80038E3C *arg1) { +void obj_init_exit(Object *obj, LevelObjectEntry80038E3C *arg1) { f32 phi_f0; Object_64_80038E3C *obj64; phi_f0 = arg1->unk10 & 0xFF; @@ -1276,34 +1276,34 @@ void func_80038E3C(Object *obj, LevelObjectEntry80038E3C *arg1) { obj->unk4C->unk12 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038F58.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_exit.s") -void func_80039160(unk80039160 *arg0, s8 *arg1) { +void obj_init_cameracontrol(unk80039160 *arg0, s8 *arg1) { arg0->unk78 = arg1[8]; func_80011390(); } -void func_80039184(s32 arg0, s32 arg1) { +void obj_loop_cameracontrol(s32 arg0, s32 arg1) { } -void func_80039190(unk80039190 *arg0, u8 *arg1) { +void obj_init_setuppoint(unk80039190 *arg0, u8 *arg1) { s32 temp; arg0->unk78 = arg1[8]; arg0->unk7C = arg1[9]; arg0->unk0 = arg1[10] << 6 << 4; // Not sure about the values here. } -void func_800391BC(s32 arg0, s32 arg1) { +void obj_loop_setuppoint(s32 arg0, s32 arg1) { } -void func_800391C8(Object *arg0, s32 arg1) { +void obj_init_dino_whale(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 1; arg0->unk4C->unk11 = 3; arg0->unk4C->unk10 = 0x14; arg0->unk4C->unk12 = 0; } -void func_800391FC(Object *obj, s32 arg1) { +void obj_loop_dino_whale(Object *obj, s32 arg1) { s32 sp2C; if (obj->unk78 > 0) { @@ -1323,7 +1323,7 @@ void func_800391FC(Object *obj, s32 arg1) { } } -void func_800392B8(Object *arg0, s32 arg1) { +void obj_init_parkwarden(Object *arg0, s32 arg1) { Object_64 *temp; arg0->unk4C->unk14 = (u16)1; arg0->unk4C->unk11 = (u8)0; @@ -1344,7 +1344,7 @@ void func_80039320(s16 arg0) { D_8011D4E2 = arg0; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80039330.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_parkwarden.s") void func_8003AC3C(u16 arg0, s32 arg1) { if ((D_8011D4D4 != 0) && (arg1 & 1)) { @@ -1356,14 +1356,14 @@ void func_8003AC3C(u16 arg0, s32 arg1) { } } -void func_8003ACA0(s32 arg0, s32 arg1) { +void obj_loop_gbparkwarden(s32 arg0, s32 arg1) { } f32 func_8003ACAC(void) { return D_8011D4D0; } -void func_8003ACBC(Object *arg0, u8 *arg1, s32 arg2) { +void obj_init_checkpoint(Object *arg0, u8 *arg1, s32 arg2) { f32 phi_f0 = (s32)(arg1[8] & 0xFF); if (phi_f0 < 5.0f) { phi_f0 = 5.0f; @@ -1374,10 +1374,10 @@ void func_8003ACBC(Object *arg0, u8 *arg1, s32 arg2) { func_80011390(); } -void func_8003AD28(s32 arg0, s32 arg1) { +void obj_loop_checkpoint(s32 arg0, s32 arg1) { } -void func_8003AD34(Object *obj, LevelObjectEntry8003AD34 *arg1) { +void obj_init_modechange(Object *obj, LevelObjectEntry8003AD34 *arg1) { f32 phi_f0; Object_64_8003AD34 *obj64; phi_f0 = arg1->unk8 & 0xFF; @@ -1400,10 +1400,10 @@ void func_8003AD34(Object *obj, LevelObjectEntry8003AD34 *arg1) { obj->unk4C->unk12 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003AE50.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_modechange.s") -// Exactly the same as func_8003AD34 -void func_8003B058(Object *obj, LevelObjectEntry8003AD34 *arg1) { +// Exactly the same as obj_init_modechange +void obj_init_bonus(Object *obj, LevelObjectEntry8003AD34 *arg1) { f32 phi_f0; Object_64_8003AD34 *obj64; phi_f0 = arg1->unk8 & 0xFF; @@ -1426,13 +1426,13 @@ void func_8003B058(Object *obj, LevelObjectEntry8003AD34 *arg1) { obj->unk4C->unk12 = 0; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003B174.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003B368.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003B4BC.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003B7CC.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003B988.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_bonus.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_goldenballoon.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_door.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_door.s") -void func_8003C1E0(Object *obj, LevelObjectEntry8003C1E0 *arg1) { +void obj_init_ttdoor(Object *obj, LevelObjectEntry8003C1E0 *arg1) { f32 temp_f0; Object_64_8003C1E0 *obj64; f32 phi_f0; @@ -1462,11 +1462,11 @@ void func_8003C1E0(Object *obj, LevelObjectEntry8003C1E0 *arg1) { } } -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") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_ttdoor.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_trigger.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_trigger.s") -void func_8003C9EC(Object *arg0, u8 *arg1) { +void obj_init_bridge_whaleramp(Object *arg0, u8 *arg1) { Object_64 *temp = arg0->unk64; arg0->unk3A = arg1[8]; arg0->y_rotation = arg1[9] << 6 << 4; @@ -1481,9 +1481,9 @@ void func_8003C9EC(Object *arg0, u8 *arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003CA68.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_bridge_whaleramp.s") -void func_8003CE64(Object *arg0, u8 *arg1) { +void obj_init_rampswitch(Object *arg0, u8 *arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x14; @@ -1491,27 +1491,27 @@ void func_8003CE64(Object *arg0, u8 *arg1) { arg0->unk78 = arg1[8]; } -void func_8003CEA0(Object *arg0, s32 arg1) { +void obj_loop_rampswitch(Object *arg0, s32 arg1) { if (arg0->unk4C->unk13 < 0x2D) { func_8001E344(arg0->unk78); } arg0->unk4C->unk13 = (u8)0xFF; } -void func_8003CF00(s32 arg0, s32 arg1) { +void obj_init_seamonster(s32 arg0, s32 arg1) { } -void func_8003CF0C(s32 arg0, s32 arg1) { +void obj_loop_seamonster(s32 arg0, s32 arg1) { } -void func_8003CF18(unk8003CF18 *arg0, u8 *arg1) { +void obj_init_fogchanger(unk8003CF18 *arg0, u8 *arg1) { f32 temp_f0; temp_f0 = arg1[8] * 8.0f; temp_f0 = temp_f0 * temp_f0; arg0->unk78 = temp_f0; } -void func_8003CF58(Object *arg0, u8 *arg1) { +void obj_init_skycontrol(Object *arg0, u8 *arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = arg1[9]; @@ -1519,13 +1519,13 @@ void func_8003CF58(Object *arg0, u8 *arg1) { arg0->unk7C.word = arg1[9]; } -void func_8003CF98(Object *arg0, s32 arg1) { +void obj_loop_skycontrol(Object *arg0, s32 arg1) { if (arg0->unk4C->unk13 < arg0->unk7C.word) { func_80028044(arg0->unk78); } } -void func_8003CFE0(s32 arg0, u8 *arg1) { +void obj_init_ainode(s32 arg0, u8 *arg1) { if (arg1[9] == 0xFF) { arg1[9] = func_8001C48C(arg0) & 0xFF; } @@ -1533,28 +1533,28 @@ void func_8003CFE0(s32 arg0, u8 *arg1) { func_8001D1AC(); } -void func_8003D02C(s32 arg0, s32 arg1) { +void obj_loop_ainode(s32 arg0, s32 arg1) { } -void func_8003D038(unk8003D038 *arg0, s8 *arg1) { +void obj_init_treasuresucker(unk8003D038 *arg0, s8 *arg1) { arg0->unk18 = 0x78; arg0->unk78 = (arg1[8] - 1) & 3; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003D058.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_treasuresucker.s") -void func_8003D2AC(s32 arg0, s32 arg1) { +void obj_init_flycoin(s32 arg0, s32 arg1) { } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003D2B8.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_flycoin.s") -void func_8003D3EC(unk8003D3EC *arg0, s32 arg1) { +void obj_init_coincreator(unk8003D3EC *arg0, s32 arg1) { arg0->unk18 = 0x64; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003D3FC.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_coincreator.s") -void func_8003D534(Object *arg0, s32 arg1) { +void obj_init_coin(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x1E; @@ -1565,9 +1565,9 @@ void func_8003D534(Object *arg0, s32 arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003D5A0.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_coin.s") -void func_8003DBA0(Object *obj, s32 arg1) { +void obj_init_silvercoin_adv2(Object *obj, s32 arg1) { obj->unk4C->unk14 = 2; obj->unk4C->unk11 = 0; obj->unk4C->unk10 = 0x1E; @@ -1586,7 +1586,7 @@ void func_8003DBA0(Object *obj, s32 arg1) { } } -void func_8003DC5C(Object *obj, s32 arg1) { +void obj_init_silvercoin(Object *obj, s32 arg1) { obj->unk4C->unk14 = 2; obj->unk4C->unk11 = 0; obj->unk4C->unk10 = 0x1E; @@ -1605,9 +1605,9 @@ void func_8003DC5C(Object *obj, s32 arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003DD14.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_silvercoin.s") -void func_8003DE74(Object *obj, unk8003DE74 *arg1) { +void obj_init_worldkey(Object *obj, unk8003DE74 *arg1) { Settings *settings; obj->unk4C->unk14 = 2; obj->unk4C->unk11 = 0; @@ -1624,7 +1624,7 @@ void func_8003DE74(Object *obj, unk8003DE74 *arg1) { /** * Rotates the key and checks to see if the player grabbed it. */ -void obj_loop_world_key(Object *worldKeyObj, s32 speed) { +void obj_loop_worldkey(Object *worldKeyObj, s32 speed) { Settings *settings; Object *playerObj; @@ -1661,7 +1661,7 @@ typedef struct Object_64_8003DFCC { u8 unkA; } Object_64_8003DFCC; -void func_8003DFCC(Object *arg0, Object_64_8003DFCC *arg1) { +void obj_init_weaponballoon(Object *arg0, Object_64_8003DFCC *arg1) { s32 cheats; Object_64_8003DFCC *obj; f32 temp; @@ -1713,15 +1713,15 @@ void func_8003DFCC(Object *arg0, Object_64_8003DFCC *arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003E140.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s") -void func_8003E5B0(s32 arg0, s32 arg1) { +void obj_init_wballoonpop(s32 arg0, s32 arg1) { } -void func_8003E5BC(s32 arg0, s32 arg1) { +void obj_loop_wballoonpop(s32 arg0, s32 arg1) { } -void func_8003E5C8(Object *arg0, s32 arg1) { +void obj_init_weapon(Object *arg0, s32 arg1) { arg0->unk4C->unk14 = 2; arg0->unk4C->unk11 = 0; arg0->unk4C->unk10 = 0x18; @@ -1730,7 +1730,7 @@ void func_8003E5C8(Object *arg0, s32 arg1) { arg0->unk7C.word = 0; } -void func_8003E630(Object *arg0) { +void obj_loop_weapon(Object *arg0) { Object_64 *temp = arg0->unk64; switch (temp->unk18) { case 0: @@ -1790,9 +1790,9 @@ void func_8003FC44(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4, f32 arg5, s GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003FC44.s") #endif -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003FD68.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_audio.s") -void func_8003FEF4(Object *arg0, LevelObjectEntry8003FEF4 *arg1) { +void obj_init_audioline(Object *arg0, LevelObjectEntry8003FEF4 *arg1) { Object_64_8003FEF4 *obj64; obj64 = arg0->unk64; @@ -1813,7 +1813,7 @@ void func_8003FEF4(Object *arg0, LevelObjectEntry8003FEF4 *arg1) { gParticlePtrList_addObject(arg0); } -void func_8004001C(Object *arg0, LevelObjectEntry8004001C *entry) { +void obj_init_audioreverb(Object *arg0, LevelObjectEntry8004001C *entry) { s32 temp; Object_64_8004001C *obj64 = (Object_64_8004001C *)arg0->unk64; obj64->unk2 = entry->unk8; @@ -1824,7 +1824,7 @@ void func_8004001C(Object *arg0, LevelObjectEntry8004001C *entry) { gParticlePtrList_addObject(arg0); } -void func_800400A4(Object *obj, LevelObjectEntry800400A4 *arg1, s32 arg2) { +void obj_init_texscroll(Object *obj, LevelObjectEntry800400A4 *arg1, s32 arg2) { Object_64_800400A4 *obj64; LevelModel *levelModel; s16 numberOfTexturesInLevel; @@ -1847,13 +1847,13 @@ void func_800400A4(Object *obj, LevelObjectEntry800400A4 *arg1, s32 arg2) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80040148.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_texscroll.s") -void func_800403A8(Object *arg0, s32 arg1, s32 arg2) { +void obj_init_rgbalight(Object *arg0, s32 arg1, s32 arg2) { arg0->unk64 = func_80031CAC(arg0, arg1); } -void func_800403D8(Object *arg0, s32 arg1, s32 arg2) { +void obj_init_buoy_pirateship(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; @@ -1861,14 +1861,14 @@ void func_800403D8(Object *arg0, s32 arg1, s32 arg2) { arg0->unk4C->unk12 = 0; } -void func_80040448(Object *arg0, s32 arg1) { +void obj_loop_buoy_pirateship(Object *arg0, s32 arg1) { if (arg0->unk64 != NULL) { arg0->y_position = func_800BEEB4(arg0->unk64); } arg0->unk18 += arg1 * 8; } -void func_8004049C(Object *arg0, LevelObjectEntry8004049C *arg1, s32 arg2) { +void obj_init_log(Object *arg0, LevelObjectEntry8004049C *arg1, s32 arg2) { f32 phi_f0; arg0->unk64 = func_800BE654(arg0->unk2E, arg0->x_position, arg0->z_position); arg0->unk4C->unk14 = 1; @@ -1884,48 +1884,48 @@ void func_8004049C(Object *arg0, LevelObjectEntry8004049C *arg1, s32 arg2) { arg0->y_rotation = arg1->unkA << 6 << 4; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80040570.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_log.s") -void func_80040800(unk80040800 *arg0, s16 *arg1) { +void obj_init_weather(unk80040800 *arg0, s16 *arg1) { f32 temp = arg1[4]; temp *= temp; arg0->unk78 = temp; } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80040820.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_weather.s") -void func_8004092C(s32 arg0, s32 arg1) { +void obj_init_lensflare(s32 arg0, s32 arg1) { func_800AC8A8(arg0); } -void func_8004094C(Object *arg0, s16 *arg1, s32 arg2) { +void obj_init_lensflareswitch(Object *arg0, s16 *arg1, s32 arg2) { func_800ACF60(arg0); arg0->scale = arg1[4]; arg0->scale /= 40.0f; } -void func_800409A4(s32 arg0, s32 arg1, s32 arg2) { +void obj_init_wavegenerator(s32 arg0, s32 arg1, s32 arg2) { func_800BF524(arg0); //waves.c } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800409C8.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80040C54.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80041A90.s") -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80041E80.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_butterfly.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_butterfly.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_midifade.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_init_midifadepoint.s") -void func_80042014(unk80042014_arg0 *arg0, unk80042014_arg1 *arg1) { +void obj_init_midichset(unk80042014_arg0 *arg0, unk80042014_arg1 *arg1) { unk80042014_arg0_64 *temp = arg0->unk64; temp->unk0 = arg1->unk8; temp->unk2 = arg1->unkA; temp->unk3 = arg1->unkB; } -void func_8004203C(Object *arg0, unk8004203C_arg1 *arg1) { +void obj_init_bubbler(Object *arg0, unk8004203C_arg1 *arg1) { func_800AF134(arg0->unk6C, arg1->unk9, arg1->unk8, 0, 0, 0); arg0->unk78 = arg1->unkA; } -void func_80042090(Object *arg0, s32 arg1) { +void obj_loop_bubbler(Object *arg0, s32 arg1) { if (arg0->unk78 >= get_random_number_from_range(0, 0x400)) { arg0->unk74 = 1; } else { @@ -1936,21 +1936,21 @@ void func_80042090(Object *arg0, s32 arg1) { } } -void func_8004210C(unk8004210C *arg0, s8 *arg1) { +void obj_init_boost(unk8004210C *arg0, s8 *arg1) { arg0->unk64 = (s32)get_misc_asset(0x14) + (arg1[8] << 7); arg0->unk3C = 0; } -void func_80042150(s32 arg0, s32 arg1, s32 arg2) { +void obj_init_unknown94(s32 arg0, s32 arg1, s32 arg2) { } -void func_80042160(s32 arg0, s32 arg1) { +void obj_loop_unknown94(s32 arg0, s32 arg1) { } -void func_8004216C(s32 arg0, s32 arg1) { +void obj_init_rangetrigger(s32 arg0, s32 arg1) { } -void func_80042178(Object *obj, s32 arg1) { +void obj_loop_rangetrigger(Object *obj, s32 arg1) { s32 temp; Object_3C_80042178 *obj3C; unk80042178 sp20; @@ -1964,7 +1964,7 @@ void func_80042178(Object *obj, s32 arg1) { func_800AFC3C(obj, arg1); } -void func_80042210(Object *obj, LevelObjectEntry80042210 *arg1) { +void obj_init_frog(Object *obj, LevelObjectEntry80042210 *arg1) { Object_64_80042210 *obj64; obj64 = (Object_64_80042210 *)obj->unk64; @@ -1990,9 +1990,9 @@ void func_80042210(Object *obj, LevelObjectEntry80042210 *arg1) { } } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800422F0.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_frog.s") -void func_80042998(s32 arg0, s32 arg1) { +void obj_loop_pigrocketeer(s32 arg0, s32 arg1) { Object *obj; Object_64_80042998 *obj64; @@ -2011,7 +2011,7 @@ void func_80042998(s32 arg0, s32 arg1) { } } -void func_80042A1C(unk80042A1C *arg0, s8 *arg1) { +void obj_init_levelname(unk80042A1C *arg0, s8 *arg1) { arg0->unk78 = arg1[9] * 8.0f; arg0->unk78 *= arg0->unk78; arg0->unk7C = arg1[8]; @@ -2022,9 +2022,10 @@ void func_80042A1C(unk80042A1C *arg0, s8 *arg1) { func_800C56D0(4); } -GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80042A90.s") +GLOBAL_ASM("asm/non_matchings/unknown_032760/obj_loop_levelname.s") -void func_80042CD0(unk80042CD0 *arg0, s32 arg1) { +void obj_init_wizghosts(unk80042CD0 *arg0, s32 arg1) { func_8001F460(arg0, arg1, arg0); arg0->unk18 = (arg0->unk18 + (arg1 * 8)) & 0xFF; } + diff --git a/src/unknown_0348C0.h b/src/unknown_0348C0.h index 4bd2c12d..926f9ad3 100644 --- a/src/unknown_0348C0.h +++ b/src/unknown_0348C0.h @@ -486,119 +486,119 @@ f32 func_800707F8(s16); // No idea where it's located s32 get_random_number_from_range(s32, s32); // Non Matching src/unknown_070110.c s32 func_8007066C(s32, s32); // Non Matching src/unknown_070110.c -void func_80033F44(Object *arg0, s32 arg1); -void func_80034530(Object *arg0, unk80034530 *arg1); -void func_80034844(Object *arg0, s32 arg1); -void func_80034AF0(Object *arg0, u8 *arg1); -void func_80034B4C(unk80034B4C *arg0, s32 arg1); -void func_80034B68(s32 arg0, s32 arg1); -void func_80034E70(Object *arg0, u8 *arg1); -void func_8003522C(Object *arg0, s32 arg1); -void func_80035640(s32 arg0, s32 arg1); -void func_8003564C(Object *arg0, s32 arg1); -void func_8003572C(Object *arg0, LevelObjectEntry8003572C *arg1); -void func_800357D4(Object *obj, s32 arg1); -void func_8003588C(Object *arg0, LevelObjectEntry8003588C *arg1); -void func_80035E20(unk80035E20 *arg0, s32 arg1); -void func_80035E34(Object *obj, s32 arg1); -void func_80035EF8(Object *arg0, unk80035EF8 *arg1); -void func_80035F6C(Object *obj, s32 arg1); -void func_80036194(Object *arg0, s32 arg1); +void obj_init_fireball_octoweapon(Object *arg0, s32 arg1); +void obj_init_lasergun(Object *arg0, unk80034530 *arg1); +void obj_init_laserbolt(Object *arg0, s32 arg1); +void obj_init_torch_mist(Object *arg0, u8 *arg1); +void obj_loop_torch_mist(unk80034B4C *arg0, s32 arg1); +void obj_init_effectbox(s32 arg0, s32 arg1); +void obj_init_trophycab(Object *arg0, u8 *arg1); +void obj_init_collectegg(Object *arg0, s32 arg1); +void obj_init_eggcreator(s32 arg0, s32 arg1); +void obj_loop_eggcreator(Object *arg0, s32 arg1); +void obj_init_lighthouse_rocketsignpost(Object *arg0, LevelObjectEntry8003572C *arg1); +void obj_loop_rocketsignpost(Object *obj, s32 arg1); +void obj_init_airzippers_waterzippers(Object *arg0, LevelObjectEntry8003588C *arg1); +void obj_init_unknown58(unk80035E20 *arg0, s32 arg1); +void obj_loop_unknown58(Object *obj, s32 arg1); +void obj_init_characterflag(Object *arg0, unk80035EF8 *arg1); +void obj_loop_characterflag(Object *obj, s32 arg1); +void obj_init_stopwatchman(Object *arg0, s32 arg1); void func_80036BCC(u16 arg0, s32 arg1); -void func_80037578(unk80037578 *arg0, u8 *arg1); -void func_80037624(unk80037624 *arg0, s32 arg1); -void func_800376E0(Object *arg0, LevelObjectEntry800376E0 *arg1, s32 arg2); -void func_80037CE8(s32 arg0, s32 arg1); -void func_80037D08(unk80037D08_arg0 *arg0, s32 arg1); -void func_80037D54(s32 arg0, s32 arg1); +void obj_init_lavaspurt(unk80037578 *arg0, u8 *arg1); +void obj_init_posarrow(unk80037624 *arg0, s32 arg1); +void obj_init_animator(Object *arg0, LevelObjectEntry800376E0 *arg1, s32 arg2); +void obj_loop_animobject(s32 arg0, s32 arg1); +void obj_loop_dooropener(unk80037D08_arg0 *arg0, s32 arg1); +void obj_init_overridepos(s32 arg0, s32 arg1); void func_80037D60(s32 arg0, s32 arg1); -void func_80037D6C(s32 arg0, s32 arg1); -void func_8003818C(Object *arg0, s32 arg1); -void func_800381C0(s32 arg0, s32 arg1); -void func_800381E0(Object *arg0, s32 arg1); -void func_80038214(Object *arg0, s32 arg1); -void func_80038248(Object *arg0, s32 arg1); +void obj_init_wizpigship(s32 arg0, s32 arg1); +void obj_init_hittester(Object *arg0, s32 arg1); +void obj_loop_hittester(s32 arg0, s32 arg1); +void obj_init_dynamic_lighting_object(Object *arg0, s32 arg1); +void obj_init_unknown96(Object *arg0, s32 arg1); +void obj_init_snowball(Object *arg0, s32 arg1); void func_80038330(Object *obj, s32 arg1); -void func_80038710(Object *obj, s32 arg1); +void obj_loop_animcamera(Object *obj, s32 arg1); void func_800387C0(Object *obj, s32 arg1); -void func_800387CC(Object *obj, s32 arg1); -void func_80038854(Object *arg0, u8 *arg1); -void func_800388D4(Object *arg0, s32 arg1); -void func_800389AC(s32 arg0, s32 arg1); -void func_800389B8(Object *obj, s32 arg1); -void func_80038A6C(s32 arg0, s32 arg1); -void func_80038A78(Object *arg0, s32 arg1); -void func_80038AC8(s32 arg0, s32 arg1); -void func_80038AD4(Object *arg0, s32 arg1); -void func_80038D58(Object *arg0, s32 arg1); -void func_80038DC4(Object *arg0, s32 arg1); -void func_80038E3C(Object *obj, LevelObjectEntry80038E3C *arg1); -void func_80039160(unk80039160 *arg0, s8 *arg1); -void func_80039184(s32 arg0, s32 arg1); -void func_80039190(unk80039190 *arg0, u8 *arg1); -void func_800391BC(s32 arg0, s32 arg1); -void func_800391C8(Object *arg0, s32 arg1); -void func_800391FC(Object *obj, s32 arg1); -void func_800392B8(Object *arg0, s32 arg1); +void obj_loop_animcar(Object *obj, s32 arg1); +void obj_init_infopoint(Object *arg0, u8 *arg1); +void obj_loop_infopoint(Object *arg0, s32 arg1); +void obj_init_smoke(s32 arg0, s32 arg1); +void obj_loop_smoke(Object *obj, s32 arg1); +void obj_init_unknown25(s32 arg0, s32 arg1); +void obj_loop_unknown25(Object *arg0, s32 arg1); +void obj_init_wardensmoke(s32 arg0, s32 arg1); +void obj_loop_wardensmoke(Object *arg0, s32 arg1); +void obj_init_teleport(Object *arg0, s32 arg1); +void obj_loop_teleport(Object *arg0, s32 arg1); +void obj_init_exit(Object *obj, LevelObjectEntry80038E3C *arg1); +void obj_init_cameracontrol(unk80039160 *arg0, s8 *arg1); +void obj_loop_cameracontrol(s32 arg0, s32 arg1); +void obj_init_setuppoint(unk80039190 *arg0, u8 *arg1); +void obj_loop_setuppoint(s32 arg0, s32 arg1); +void obj_init_dino_whale(Object *arg0, s32 arg1); +void obj_loop_dino_whale(Object *obj, s32 arg1); +void obj_init_parkwarden(Object *arg0, s32 arg1); void func_80039320(s16 arg0); void func_8003AC3C(u16 arg0, s32 arg1); -void func_8003ACA0(s32 arg0, s32 arg1); +void obj_loop_gbparkwarden(s32 arg0, s32 arg1); f32 func_8003ACAC(void); -void func_8003ACBC(Object *arg0, u8 *arg1, s32 arg2); -void func_8003AD28(s32 arg0, s32 arg1); -void func_8003AD34(Object *obj, LevelObjectEntry8003AD34 *arg1); -void func_8003B058(Object *obj, LevelObjectEntry8003AD34 *arg1); -void func_8003C1E0(Object *obj, LevelObjectEntry8003C1E0 *arg1); -void func_8003C9EC(Object *arg0, u8 *arg1); -void func_8003CE64(Object *arg0, u8 *arg1); -void func_8003CEA0(Object *arg0, s32 arg1); -void func_8003CF00(s32 arg0, s32 arg1); -void func_8003CF0C(s32 arg0, s32 arg1); -void func_8003CF18(unk8003CF18 *arg0, u8 *arg1); -void func_8003CF58(Object *arg0, u8 *arg1); -void func_8003CF98(Object *arg0, s32 arg1); -void func_8003CFE0(s32 arg0, u8 *arg1); -void func_8003D02C(s32 arg0, s32 arg1); -void func_8003D038(unk8003D038 *arg0, s8 *arg1); -void func_8003D2AC(s32 arg0, s32 arg1); -void func_8003D3EC(unk8003D3EC *arg0, s32 arg1); -void func_8003D534(Object *arg0, s32 arg1); -void func_8003DBA0(Object *obj, s32 arg1); -void func_8003DC5C(Object *obj, s32 arg1); -void func_8003DE74(Object *obj, unk8003DE74 *arg1); -void obj_loop_world_key(Object *worldKeyObj, s32 speed); -void func_8003E5B0(s32 arg0, s32 arg1); -void func_8003E5BC(s32 arg0, s32 arg1); -void func_8003E5C8(Object *arg0, s32 arg1); -void func_8003E630(Object *arg0); +void obj_init_checkpoint(Object *arg0, u8 *arg1, s32 arg2); +void obj_loop_checkpoint(s32 arg0, s32 arg1); +void obj_init_modechange(Object *obj, LevelObjectEntry8003AD34 *arg1); +void obj_init_bonus(Object *obj, LevelObjectEntry8003AD34 *arg1); +void obj_init_ttdoor(Object *obj, LevelObjectEntry8003C1E0 *arg1); +void obj_init_bridge_whaleramp(Object *arg0, u8 *arg1); +void obj_init_rampswitch(Object *arg0, u8 *arg1); +void obj_loop_rampswitch(Object *arg0, s32 arg1); +void obj_init_seamonster(s32 arg0, s32 arg1); +void obj_loop_seamonster(s32 arg0, s32 arg1); +void obj_init_fogchanger(unk8003CF18 *arg0, u8 *arg1); +void obj_init_skycontrol(Object *arg0, u8 *arg1); +void obj_loop_skycontrol(Object *arg0, s32 arg1); +void obj_init_ainode(s32 arg0, u8 *arg1); +void obj_loop_ainode(s32 arg0, s32 arg1); +void obj_init_treasuresucker(unk8003D038 *arg0, s8 *arg1); +void obj_init_flycoin(s32 arg0, s32 arg1); +void obj_init_coincreator(unk8003D3EC *arg0, s32 arg1); +void obj_init_coin(Object *arg0, s32 arg1); +void obj_init_silvercoin_adv2(Object *obj, s32 arg1); +void obj_init_silvercoin(Object *obj, s32 arg1); +void obj_init_worldkey(Object *obj, unk8003DE74 *arg1); +void obj_loop_worldkey(Object *worldKeyObj, s32 speed); +void obj_init_wballoonpop(s32 arg0, s32 arg1); +void obj_loop_wballoonpop(s32 arg0, s32 arg1); +void obj_init_weapon(Object *arg0, s32 arg1); +void obj_loop_weapon(Object *arg0); void func_8003F0D0(void); void func_8003F0DC(void); -void func_8003FEF4(Object *arg0, LevelObjectEntry8003FEF4 *arg1); -void func_8004001C(Object *arg0, LevelObjectEntry8004001C *entry); -void func_800400A4(Object *obj, LevelObjectEntry800400A4 *arg1, s32 arg2); -void func_800403A8(Object *arg0, s32 arg1, s32 arg2); -void func_800403D8(Object *arg0, s32 arg1, s32 arg2); -void func_80040448(Object *arg0, s32 arg1); -void func_8004049C(Object *arg0, LevelObjectEntry8004049C *arg1, s32 arg2); -void func_800409A4(s32 arg0, s32 arg1, s32 arg2); -void func_80042014(unk80042014_arg0 *arg0, unk80042014_arg1 *arg1); -void func_8004203C(Object *arg0, unk8004203C_arg1 *arg1); -void func_80042090(Object *arg0, s32 arg1); -void func_8004210C(unk8004210C *arg0, s8 *arg1); -void func_80042150(s32 arg0, s32 arg1, s32 arg2); -void func_80042160(s32 arg0, s32 arg1); -void func_8004216C(s32 arg0, s32 arg1); -void func_80042178(Object *obj, s32 arg1); -void func_80042210(Object *obj, LevelObjectEntry80042210 *arg1); -void func_80042998(s32 arg0, s32 arg1); -void func_80042A1C(unk80042A1C *arg0, s8 *arg1); -void func_80042CD0(unk80042CD0 *arg0, s32 arg1); +void obj_init_audioline(Object *arg0, LevelObjectEntry8003FEF4 *arg1); +void obj_init_audioreverb(Object *arg0, LevelObjectEntry8004001C *entry); +void obj_init_texscroll(Object *obj, LevelObjectEntry800400A4 *arg1, s32 arg2); +void obj_init_rgbalight(Object *arg0, s32 arg1, s32 arg2); +void obj_init_buoy_pirateship(Object *arg0, s32 arg1, s32 arg2); +void obj_loop_buoy_pirateship(Object *arg0, s32 arg1); +void obj_init_log(Object *arg0, LevelObjectEntry8004049C *arg1, s32 arg2); +void obj_init_wavegenerator(s32 arg0, s32 arg1, s32 arg2); +void obj_init_midichset(unk80042014_arg0 *arg0, unk80042014_arg1 *arg1); +void obj_init_bubbler(Object *arg0, unk8004203C_arg1 *arg1); +void obj_loop_bubbler(Object *arg0, s32 arg1); +void obj_init_boost(unk8004210C *arg0, s8 *arg1); +void obj_init_unknown94(s32 arg0, s32 arg1, s32 arg2); +void obj_loop_unknown94(s32 arg0, s32 arg1); +void obj_init_rangetrigger(s32 arg0, s32 arg1); +void obj_loop_rangetrigger(Object *obj, s32 arg1); +void obj_init_frog(Object *obj, LevelObjectEntry80042210 *arg1); +void obj_loop_pigrocketeer(s32 arg0, s32 arg1); +void obj_init_levelname(unk80042A1C *arg0, s8 *arg1); +void obj_init_wizghosts(unk80042CD0 *arg0, s32 arg1); //Non Matching -void func_80037594(Object *obj, s32 arg1); -void func_800377E4(Object *obj, s32 arg1); -void func_800380F8(Object *obj, s32 arg1); -void func_8003827C(Object *obj, s32 arg1); -void func_8003B4BC(s32 arg0); +void obj_loop_lavaspurt(Object *obj, s32 arg1); +void obj_loop_animator(Object *obj, s32 arg1); +void obj_loop_vehicleanim(Object *obj, s32 arg1); +void obj_loop_snowball(Object *obj, s32 arg1); +void obj_loop_goldenballoon(s32 arg0); #endif diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 075b9bdc..69650a4f 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -21,7 +21,7 @@ /************ .data ************/ -s32 gFunc8003B4BCLength = 0x310; +s32 gObjLoopGoldenBalloonLength = 0x310; s16 D_800DCB54 = 0; s32 D_800DCB58 = 0; // Currently unknown, might be a different type. s32 D_800DCB5C = 0; // Currently unknown, might be a different type. @@ -110,8 +110,8 @@ s16 D_800DCDB0[16] = { 0x02FA, 0x02FE, 0x08F8, 0x03FD, }; -// Checksum count for func_8003B4BC -s32 gFunc8003B4BCChecksum = 42391; +// Checksum count for obj_loop_goldenballoon +s32 gObjLoopGoldenBalloonChecksum = 42391; s16 D_800DCDD4[4] = { 0, 0, 0x32, -1 @@ -421,7 +421,7 @@ void func_8004D95C(s32 arg0, s32 arg1, Object *obj, Object_64_8004D95C *obj64) { } } -GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8004DAB0.s") +GLOBAL_ASM("asm/non_matchings/unknown_043920/obj_init_racer.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8004DE38.s") void func_8004F77C(unk8004F77C *arg0) { @@ -920,13 +920,13 @@ void func_8005A3C0(void) { void func_8005A3D0(void) { s32 i; s32 count = 0; - u8 *temp = (u8 *)&func_8003B4BC; + u8 *temp = (u8 *)&obj_loop_goldenballoon; - for (i = 0; i < gFunc8003B4BCLength; i++) { + for (i = 0; i < gObjLoopGoldenBalloonLength; i++) { count += temp[i]; } - if (count != gFunc8003B4BCChecksum) { + if (count != gObjLoopGoldenBalloonChecksum) { D_800DCB54 = 0x800; } } diff --git a/src/unknown_043920.h b/src/unknown_043920.h index a1e5e036..892d9eb6 100644 --- a/src/unknown_043920.h +++ b/src/unknown_043920.h @@ -147,7 +147,7 @@ typedef struct unk8005C270 { s8 unk193; } unk8005C270; -extern s32 gFunc8003B4BCLength; +extern s32 gObjLoopGoldenBalloonLength; extern s16 D_800DCB54; extern s32 D_800DCB58; extern s32 D_800DCB5C; @@ -185,7 +185,7 @@ extern s8 D_800DCDA8[8]; // Unused? extern s16 D_800DCDB0[16]; -extern s32 gFunc8003B4BCChecksum; +extern s32 gObjLoopGoldenBalloonChecksum; extern s16 D_800DCDD4[4]; diff --git a/src/waves.c b/src/waves.c index 3a7be0b6..30a5f224 100644 --- a/src/waves.c +++ b/src/waves.c @@ -248,4 +248,4 @@ GLOBAL_ASM("asm/non_matchings/waves/func_800BF3E4.s") GLOBAL_ASM("asm/non_matchings/waves/func_800BF524.s") GLOBAL_ASM("asm/non_matchings/waves/func_800BF634.s") GLOBAL_ASM("asm/non_matchings/waves/func_800BFE98.s") -GLOBAL_ASM("asm/non_matchings/waves/func_800BFFDC.s") +GLOBAL_ASM("asm/non_matchings/waves/obj_loop_wavepower.s") diff --git a/tools/python/calc_func_checksums.py b/tools/python/calc_func_checksums.py index 1bca8970..ac121757 100644 --- a/tools/python/calc_func_checksums.py +++ b/tools/python/calc_func_checksums.py @@ -14,7 +14,7 @@ FUNCTIONS_TO_CALC = [ # function checksum variable func size variable ('func_80019808', 'gFunc80019808Checksum', 'gFunc80019808Length'), ('func_80024D54', 'gFunc80024D54Checksum', 'gFunc80024D54Length'), - ('func_8003B4BC', 'gFunc8003B4BCChecksum', 'gFunc8003B4BCLength'), + ('obj_loop_goldenballoon', 'gObjLoopGoldenBalloonChecksum', 'gObjLoopGoldenBalloonLength'), ('func_80068158', 'gFunc80068158Checksum', 'gFunc80068158Length') ]