From d292d819587f795a0562590239f539c8b726c7be Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Wed, 30 Sep 2020 20:11:04 +0100 Subject: [PATCH 1/6] Decompiled En_Holl (#253) * Decompile most of En_Holl * Two nonmatchings left * Rename some variables, use EnHollActionFunc * Minor cleanups * Only regalloc issues left * General cleanups * 1 nonmatching left * Delete data.s file * Added some more documentation * Improved nonmatching but OK still elusive, some cleanups * Review changes * Ran formatter * More review changes * Flip conditions that were previously missed * DISP macros --- .../actors/ovl_En_Holl/EnHoll_Destroy.s | 12 - .../overlays/actors/ovl_En_Holl/EnHoll_Draw.s | 112 ------ .../overlays/actors/ovl_En_Holl/EnHoll_Init.s | 17 - .../actors/ovl_En_Holl/EnHoll_Update.s | 10 - .../actors/ovl_En_Holl/func_80A58C10.s | 3 - .../actors/ovl_En_Holl/func_80A58C18.s | 14 - .../actors/ovl_En_Holl/func_80A58C48.s | 29 -- .../actors/ovl_En_Holl/func_80A58D18.s | 48 --- .../actors/ovl_En_Holl/func_80A58DD4.s | 155 -------- .../actors/ovl_En_Holl/func_80A59014.s | 8 +- .../actors/ovl_En_Holl/func_80A591C0.s | 136 ------- .../actors/ovl_En_Holl/func_80A593A4.s | 107 ------ .../actors/ovl_En_Holl/func_80A59520.s | 66 ---- .../actors/ovl_En_Holl/func_80A59618.s | 146 -------- .../actors/ovl_En_Holl/func_80A59828.s | 32 -- data/overlays/actors/z_en_holl.data.s | 36 -- spec | 5 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 352 +++++++++++++++++- src/overlays/actors/ovl_En_Holl/z_en_holl.h | 7 +- 19 files changed, 350 insertions(+), 945 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s delete mode 100644 data/overlays/actors/z_en_holl.data.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s deleted file mode 100644 index 04b9a6548b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnHoll_Destroy -/* 000DC 80A58CEC 9482001C */ lhu $v0, 0x001C($a0) ## 0000001C -/* 000E0 80A58CF0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 000E4 80A58CF4 01C57021 */ addu $t6, $t6, $a1 -/* 000E8 80A58CF8 8DCE1D38 */ lw $t6, 0x1D38($t6) ## 00011D38 -/* 000EC 80A58CFC 00021283 */ sra $v0, $v0, 10 -/* 000F0 80A58D00 00027900 */ sll $t7, $v0, 4 -/* 000F4 80A58D04 01CF1821 */ addu $v1, $t6, $t7 -/* 000F8 80A58D08 84780004 */ lh $t8, 0x0004($v1) ## 00000004 -/* 000FC 80A58D0C 0018C823 */ subu $t9, $zero, $t8 -/* 00100 80A58D10 03E00008 */ jr $ra -/* 00104 80A58D14 A4790004 */ sh $t9, 0x0004($v1) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s deleted file mode 100644 index dd3b55d5a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s +++ /dev/null @@ -1,112 +0,0 @@ -.rdata -glabel D_80A59AF0 - .asciz "../z_en_holl.c" - .balign 4 - -glabel D_80A59B00 - .asciz "../z_en_holl.c" - .balign 4 - -glabel D_80A59B10 - .asciz "../z_en_holl.c" - .balign 4 - -.late_rodata -glabel D_80A59B2C - .float 3.14159274101 - -.text -glabel EnHoll_Draw -/* 00CB0 80A598C0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00CB4 80A598C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CB8 80A598C8 AFA40048 */ sw $a0, 0x0048($sp) -/* 00CBC 80A598CC AFA5004C */ sw $a1, 0x004C($sp) -/* 00CC0 80A598D0 848F014C */ lh $t7, 0x014C($a0) ## 0000014C -/* 00CC4 80A598D4 3C0680A6 */ lui $a2, %hi(D_80A59AF0) ## $a2 = 80A60000 -/* 00CC8 80A598D8 24C69AF0 */ addiu $a2, $a2, %lo(D_80A59AF0) ## $a2 = 80A59AF0 -/* 00CCC 80A598DC 11E0004C */ beq $t7, $zero, .L80A59A10 -/* 00CD0 80A598E0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 00CD4 80A598E4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00CD8 80A598E8 24070325 */ addiu $a3, $zero, 0x0325 ## $a3 = 00000325 -/* 00CDC 80A598EC 0C031AB1 */ jal Graph_OpenDisps -/* 00CE0 80A598F0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00CE4 80A598F4 8FB90048 */ lw $t9, 0x0048($sp) -/* 00CE8 80A598F8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00CEC 80A598FC 8FA90038 */ lw $t1, 0x0038($sp) -/* 00CF0 80A59900 8728014C */ lh $t0, 0x014C($t9) ## 0000014C -/* 00CF4 80A59904 8FAA0038 */ lw $t2, 0x0038($sp) -/* 00CF8 80A59908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00CFC 80A5990C 55010005 */ bnel $t0, $at, .L80A59924 -/* 00D00 80A59910 8D4702D0 */ lw $a3, 0x02D0($t2) ## 000002D0 -/* 00D04 80A59914 8D2702C0 */ lw $a3, 0x02C0($t1) ## 000002C0 -/* 00D08 80A59918 10000002 */ beq $zero, $zero, .L80A59924 -/* 00D0C 80A5991C 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 00D10 80A59920 8D4702D0 */ lw $a3, 0x02D0($t2) ## 000002D0 -.L80A59924: -/* 00D14 80A59924 0C024DDD */ jal Gfx_CallSetupDL -/* 00D18 80A59928 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D1C 80A5992C 8FAB0048 */ lw $t3, 0x0048($sp) -/* 00D20 80A59930 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 00D24 80A59934 3C0180A6 */ lui $at, %hi(D_80A59B2C) ## $at = 80A60000 -/* 00D28 80A59938 916C014E */ lbu $t4, 0x014E($t3) ## 0000014E -/* 00D2C 80A5993C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00D30 80A59940 55800006 */ bnel $t4, $zero, .L80A5995C -/* 00D34 80A59944 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 00D38 80A59948 C42C9B2C */ lwc1 $f12, %lo(D_80A59B2C)($at) -/* 00D3C 80A5994C 0C034348 */ jal Matrix_RotateY -/* 00D40 80A59950 AFA20040 */ sw $v0, 0x0040($sp) -/* 00D44 80A59954 8FA70040 */ lw $a3, 0x0040($sp) -/* 00D48 80A59958 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -.L80A5995C: -/* 00D4C 80A5995C 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 00D50 80A59960 00E01825 */ or $v1, $a3, $zero ## $v1 = 00000000 -/* 00D54 80A59964 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 00D58 80A59968 8FAE004C */ lw $t6, 0x004C($sp) -/* 00D5C 80A5996C 24E70008 */ addiu $a3, $a3, 0x0008 ## $a3 = 00000008 -/* 00D60 80A59970 3C0580A6 */ lui $a1, %hi(D_80A59B00) ## $a1 = 80A60000 -/* 00D64 80A59974 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 00D68 80A59978 AFA70040 */ sw $a3, 0x0040($sp) -/* 00D6C 80A5997C AFA30024 */ sw $v1, 0x0024($sp) -/* 00D70 80A59980 24A59B00 */ addiu $a1, $a1, %lo(D_80A59B00) ## $a1 = 80A59B00 -/* 00D74 80A59984 0C0346A2 */ jal Matrix_NewMtx -/* 00D78 80A59988 24060338 */ addiu $a2, $zero, 0x0338 ## $a2 = 00000338 -/* 00D7C 80A5998C 8FA30024 */ lw $v1, 0x0024($sp) -/* 00D80 80A59990 8FA70040 */ lw $a3, 0x0040($sp) -/* 00D84 80A59994 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 00D88 80A59998 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00D8C 80A5999C 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000000 -/* 00D90 80A599A0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00D94 80A599A4 8FB80048 */ lw $t8, 0x0048($sp) -/* 00D98 80A599A8 24E70008 */ addiu $a3, $a3, 0x0008 ## $a3 = 00000008 -/* 00D9C 80A599AC 3C0A80A6 */ lui $t2, %hi(D_80A59AC8) ## $t2 = 80A60000 -/* 00DA0 80A599B0 9308014D */ lbu $t0, 0x014D($t8) ## 0000014D -/* 00DA4 80A599B4 254A9AC8 */ addiu $t2, $t2, %lo(D_80A59AC8) ## $t2 = 80A59AC8 -/* 00DA8 80A599B8 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 00DAC 80A599BC AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 00DB0 80A599C0 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000008 -/* 00DB4 80A599C4 AC490000 */ sw $t1, 0x0000($v0) ## 00000008 -/* 00DB8 80A599C8 AC4A0004 */ sw $t2, 0x0004($v0) ## 0000000C -/* 00DBC 80A599CC 8FAB0048 */ lw $t3, 0x0048($sp) -/* 00DC0 80A599D0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00DC4 80A599D4 3C0680A6 */ lui $a2, %hi(D_80A59B10) ## $a2 = 80A60000 -/* 00DC8 80A599D8 856C014C */ lh $t4, 0x014C($t3) ## 0000014C -/* 00DCC 80A599DC 24E70008 */ addiu $a3, $a3, 0x0008 ## $a3 = 00000010 -/* 00DD0 80A599E0 24C69B10 */ addiu $a2, $a2, %lo(D_80A59B10) ## $a2 = 80A59B10 -/* 00DD4 80A599E4 15810004 */ bne $t4, $at, .L80A599F8 -/* 00DD8 80A599E8 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 00DDC 80A599EC 8FAD0038 */ lw $t5, 0x0038($sp) -/* 00DE0 80A599F0 10000003 */ beq $zero, $zero, .L80A59A00 -/* 00DE4 80A599F4 ADA702C0 */ sw $a3, 0x02C0($t5) ## 000002C0 -.L80A599F8: -/* 00DE8 80A599F8 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00DEC 80A599FC ADC702D0 */ sw $a3, 0x02D0($t6) ## 000002D0 -.L80A59A00: -/* 00DF0 80A59A00 8FAF004C */ lw $t7, 0x004C($sp) -/* 00DF4 80A59A04 2407033F */ addiu $a3, $zero, 0x033F ## $a3 = 0000033F -/* 00DF8 80A59A08 0C031AD5 */ jal Graph_CloseDisps -/* 00DFC 80A59A0C 8DE50000 */ lw $a1, 0x0000($t7) ## FA000000 -.L80A59A10: -/* 00E00 80A59A10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E04 80A59A14 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00E08 80A59A18 03E00008 */ jr $ra -/* 00E0C 80A59A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s deleted file mode 100644 index cc0bd8e104..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel EnHoll_Init -/* 000A0 80A58CB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000A4 80A58CB4 AFA5001C */ sw $a1, 0x001C($sp) -/* 000A8 80A58CB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000AC 80A58CBC 3C0580A6 */ lui $a1, %hi(D_80A59A5C) ## $a1 = 80A60000 -/* 000B0 80A58CC0 AFA40018 */ sw $a0, 0x0018($sp) -/* 000B4 80A58CC4 0C01E037 */ jal Actor_ProcessInitChain - -/* 000B8 80A58CC8 24A59A5C */ addiu $a1, $a1, %lo(D_80A59A5C) ## $a1 = 80A59A5C -/* 000BC 80A58CCC 0C296312 */ jal func_80A58C48 -/* 000C0 80A58CD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 000C4 80A58CD4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000C8 80A58CD8 A1C0014F */ sb $zero, 0x014F($t6) ## 0000014F -/* 000CC 80A58CDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000D0 80A58CE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000D4 80A58CE4 03E00008 */ jr $ra -/* 000D8 80A58CE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s deleted file mode 100644 index c73ab1006e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel EnHoll_Update -/* 00C8C 80A5989C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C90 80A598A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C94 80A598A4 8C990150 */ lw $t9, 0x0150($a0) ## 00000150 -/* 00C98 80A598A8 0320F809 */ jalr $ra, $t9 -/* 00C9C 80A598AC 00000000 */ nop -/* 00CA0 80A598B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CA4 80A598B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CA8 80A598B8 03E00008 */ jr $ra -/* 00CAC 80A598BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s deleted file mode 100644 index 362e6b2f16..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A58C10 -/* 00000 80A58C10 03E00008 */ jr $ra -/* 00004 80A58C14 AC850150 */ sw $a1, 0x0150($a0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s deleted file mode 100644 index 77d69f3f92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80A58C18 -/* 00008 80A58C18 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0000C 80A58C1C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00010 80A58C20 8C620000 */ lw $v0, 0x0000($v1) ## 8015E660 -/* 00014 80A58C24 384200EE */ xori $v0, $v0, 0x00EE ## $v0 = 000000EE -/* 00018 80A58C28 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 0001C 80A58C2C 10400004 */ beq $v0, $zero, .L80A58C40 -/* 00020 80A58C30 00000000 */ nop -/* 00024 80A58C34 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 -/* 00028 80A58C38 38420008 */ xori $v0, $v0, 0x0008 ## $v0 = 000000E6 -/* 0002C 80A58C3C 2C420001 */ sltiu $v0, $v0, 0x0001 -.L80A58C40: -/* 00030 80A58C40 03E00008 */ jr $ra -/* 00034 80A58C44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s deleted file mode 100644 index 955a0b73ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A58C48 -/* 00038 80A58C48 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0003C 80A58C4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00040 80A58C50 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00044 80A58C54 3C0F80A6 */ lui $t7, %hi(D_80A59A40) ## $t7 = 80A60000 -/* 00048 80A58C58 25EF9A40 */ addiu $t7, $t7, %lo(D_80A59A40) ## $t7 = 80A59A40 -/* 0004C 80A58C5C 00021183 */ sra $v0, $v0, 6 -/* 00050 80A58C60 30420007 */ andi $v0, $v0, 0x0007 ## $v0 = 00000000 -/* 00054 80A58C64 00027080 */ sll $t6, $v0, 2 -/* 00058 80A58C68 01CF1821 */ addu $v1, $t6, $t7 -/* 0005C 80A58C6C 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00060 80A58C70 AFA30018 */ sw $v1, 0x0018($sp) -/* 00064 80A58C74 0C296304 */ jal func_80A58C10 -/* 00068 80A58C78 AFA40020 */ sw $a0, 0x0020($sp) -/* 0006C 80A58C7C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00070 80A58C80 3C1880A6 */ lui $t8, %hi(D_80A59A40) ## $t8 = 80A60000 -/* 00074 80A58C84 27189A40 */ addiu $t8, $t8, %lo(D_80A59A40) ## $t8 = 80A59A40 -/* 00078 80A58C88 10780003 */ beq $v1, $t8, .L80A58C98 -/* 0007C 80A58C8C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00080 80A58C90 10000003 */ beq $zero, $zero, .L80A58CA0 -/* 00084 80A58C94 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -.L80A58C98: -/* 00088 80A58C98 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0008C 80A58C9C A499014C */ sh $t9, 0x014C($a0) ## 0000014C -.L80A58CA0: -/* 00090 80A58CA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00094 80A58CA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00098 80A58CA8 03E00008 */ jr $ra -/* 0009C 80A58CAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s deleted file mode 100644 index d37537af4e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A58D18 -/* 00108 80A58D18 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0010C 80A58D1C 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00110 80A58D20 00811021 */ addu $v0, $a0, $at -/* 00114 80A58D24 8C4F0000 */ lw $t7, 0x0000($v0) ## 00000000 -/* 00118 80A58D28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0011C 80A58D2C 27A50004 */ addiu $a1, $sp, 0x0004 ## $a1 = FFFFFFEC -/* 00120 80A58D30 ACAF0000 */ sw $t7, 0x0000($a1) ## FFFFFFEC -/* 00124 80A58D34 8C4E0004 */ lw $t6, 0x0004($v0) ## 00000004 -/* 00128 80A58D38 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0012C 80A58D3C 34211CD0 */ ori $at, $at, 0x1CD0 ## $at = 00011CD0 -/* 00130 80A58D40 ACAE0004 */ sw $t6, 0x0004($a1) ## FFFFFFF0 -/* 00134 80A58D44 8C4F0008 */ lw $t7, 0x0008($v0) ## 00000008 -/* 00138 80A58D48 00811821 */ addu $v1, $a0, $at -/* 0013C 80A58D4C 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00140 80A58D50 ACAF0008 */ sw $t7, 0x0008($a1) ## FFFFFFF4 -/* 00144 80A58D54 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00148 80A58D58 01445021 */ addu $t2, $t2, $a0 -/* 0014C 80A58D5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00150 80A58D60 ACAE000C */ sw $t6, 0x000C($a1) ## FFFFFFF8 -/* 00154 80A58D64 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00158 80A58D68 00240821 */ addu $at, $at, $a0 -/* 0015C 80A58D6C ACAF0010 */ sw $t7, 0x0010($a1) ## FFFFFFFC -/* 00160 80A58D70 8C790000 */ lw $t9, 0x0000($v1) ## 00000000 -/* 00164 80A58D74 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00168 80A58D78 8C780004 */ lw $t8, 0x0004($v1) ## 00000004 -/* 0016C 80A58D7C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00170 80A58D80 8C790008 */ lw $t9, 0x0008($v1) ## 00000008 -/* 00174 80A58D84 AC590008 */ sw $t9, 0x0008($v0) ## 00000008 -/* 00178 80A58D88 8C78000C */ lw $t8, 0x000C($v1) ## 0000000C -/* 0017C 80A58D8C AC58000C */ sw $t8, 0x000C($v0) ## 0000000C -/* 00180 80A58D90 8C790010 */ lw $t9, 0x0010($v1) ## 00000010 -/* 00184 80A58D94 AC590010 */ sw $t9, 0x0010($v0) ## 00000010 -/* 00188 80A58D98 8CA90000 */ lw $t1, 0x0000($a1) ## FFFFFFEC -/* 0018C 80A58D9C AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 00190 80A58DA0 8CA80004 */ lw $t0, 0x0004($a1) ## FFFFFFF0 -/* 00194 80A58DA4 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 00198 80A58DA8 8CA90008 */ lw $t1, 0x0008($a1) ## FFFFFFF4 -/* 0019C 80A58DAC AC690008 */ sw $t1, 0x0008($v1) ## 00000008 -/* 001A0 80A58DB0 8CA8000C */ lw $t0, 0x000C($a1) ## FFFFFFF8 -/* 001A4 80A58DB4 AC68000C */ sw $t0, 0x000C($v1) ## 0000000C -/* 001A8 80A58DB8 8CA90010 */ lw $t1, 0x0010($a1) ## FFFFFFFC -/* 001AC 80A58DBC AC690010 */ sw $t1, 0x0010($v1) ## 00000010 -/* 001B0 80A58DC0 914A1CEC */ lbu $t2, 0x1CEC($t2) ## 00011CEC -/* 001B4 80A58DC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001B8 80A58DC8 394B0001 */ xori $t3, $t2, 0x0001 ## $t3 = 00010001 -/* 001BC 80A58DCC 03E00008 */ jr $ra -/* 001C0 80A58DD0 A02B1CEC */ sb $t3, 0x1CEC($at) ## 00011CEC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s deleted file mode 100644 index 6ec141cfaf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s +++ /dev/null @@ -1,155 +0,0 @@ -glabel func_80A58DD4 -/* 001C4 80A58DD4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 001C8 80A58DD8 AFBF001C */ sw $ra, 0x001C($sp) -/* 001CC 80A58DDC AFB00018 */ sw $s0, 0x0018($sp) -/* 001D0 80A58DE0 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 001D4 80A58DE4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 001D8 80A58DE8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 001DC 80A58DEC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001E0 80A58DF0 15C10003 */ bne $t6, $at, .L80A58E00 -/* 001E4 80A58DF4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 001E8 80A58DF8 10000002 */ beq $zero, $zero, .L80A58E04 -/* 001EC 80A58DFC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -.L80A58E00: -/* 001F0 80A58E00 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -.L80A58E04: -/* 001F4 80A58E04 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 001F8 80A58E08 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFEC -/* 001FC 80A58E0C 24460024 */ addiu $a2, $v0, 0x0024 ## $a2 = 00000024 -/* 00200 80A58E10 AFA70050 */ sw $a3, 0x0050($sp) -/* 00204 80A58E14 0C00B6F4 */ jal func_8002DBD0 -/* 00208 80A58E18 AFA80030 */ sw $t0, 0x0030($sp) -/* 0020C 80A58E1C C7A40044 */ lwc1 $f4, 0x0044($sp) -/* 00210 80A58E20 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00214 80A58E24 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 00218 80A58E28 44814000 */ mtc1 $at, $f8 ## $f8 = -50.00 -/* 0021C 80A58E2C 4606203C */ c.lt.s $f4, $f6 -/* 00220 80A58E30 8FA70050 */ lw $a3, 0x0050($sp) -/* 00224 80A58E34 8FA80030 */ lw $t0, 0x0030($sp) -/* 00228 80A58E38 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0022C 80A58E3C 45000003 */ bc1f .L80A58E4C -/* 00230 80A58E40 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00234 80A58E44 10000002 */ beq $zero, $zero, .L80A58E50 -/* 00238 80A58E48 A0E0014E */ sb $zero, 0x014E($a3) ## 0000014E -.L80A58E4C: -/* 0023C 80A58E4C A0EF014E */ sb $t7, 0x014E($a3) ## 0000014E -.L80A58E50: -/* 00240 80A58E50 C7AC0040 */ lwc1 $f12, 0x0040($sp) -/* 00244 80A58E54 C7A00044 */ lwc1 $f0, 0x0044($sp) -/* 00248 80A58E58 460C403C */ c.lt.s $f8, $f12 -/* 0024C 80A58E5C 46000085 */ abs.s $f2, $f0 -/* 00250 80A58E60 45020068 */ bc1fl .L80A59004 -/* 00254 80A58E64 8FBF001C */ lw $ra, 0x001C($sp) -/* 00258 80A58E68 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 0025C 80A58E6C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00260 80A58E70 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 00264 80A58E74 460A603C */ c.lt.s $f12, $f10 -/* 00268 80A58E78 00000000 */ nop -/* 0026C 80A58E7C 45020061 */ bc1fl .L80A59004 -/* 00270 80A58E80 8FBF001C */ lw $ra, 0x001C($sp) -/* 00274 80A58E84 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 00278 80A58E88 46000005 */ abs.s $f0, $f0 -/* 0027C 80A58E8C 3C1980A6 */ lui $t9, %hi(D_80A59A68) ## $t9 = 80A60000 -/* 00280 80A58E90 4610003C */ c.lt.s $f0, $f16 -/* 00284 80A58E94 27399A68 */ addiu $t9, $t9, %lo(D_80A59A68) ## $t9 = 80A59A68 -/* 00288 80A58E98 0008C100 */ sll $t8, $t0, 4 -/* 0028C 80A58E9C 03191021 */ addu $v0, $t8, $t9 -/* 00290 80A58EA0 45020058 */ bc1fl .L80A59004 -/* 00294 80A58EA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00298 80A58EA8 C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 -/* 0029C 80A58EAC 4612103C */ c.lt.s $f2, $f18 -/* 002A0 80A58EB0 00000000 */ nop -/* 002A4 80A58EB4 45020053 */ bc1fl .L80A59004 -/* 002A8 80A58EB8 8FBF001C */ lw $ra, 0x001C($sp) -/* 002AC 80A58EBC C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 -/* 002B0 80A58EC0 94E5001C */ lhu $a1, 0x001C($a3) ## 0000001C -/* 002B4 80A58EC4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002B8 80A58EC8 4602203C */ c.lt.s $f4, $f2 -/* 002BC 80A58ECC 02011821 */ addu $v1, $s0, $at -/* 002C0 80A58ED0 00052A83 */ sra $a1, $a1, 10 -/* 002C4 80A58ED4 4502001B */ bc1fl .L80A58F44 -/* 002C8 80A58ED8 90EC014E */ lbu $t4, 0x014E($a3) ## 0000014E -/* 002CC 80A58EDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002D0 80A58EE0 02011821 */ addu $v1, $s0, $at -/* 002D4 80A58EE4 80691CD0 */ lb $t1, 0x1CD0($v1) ## 00001CD0 -/* 002D8 80A58EE8 05220046 */ bltzl $t1, .L80A59004 -/* 002DC 80A58EEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 002E0 80A58EF0 806A1CED */ lb $t2, 0x1CED($v1) ## 00001CED -/* 002E4 80A58EF4 55400043 */ bnel $t2, $zero, .L80A59004 -/* 002E8 80A58EF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 002EC 80A58EFC 8C6B1D38 */ lw $t3, 0x1D38($v1) ## 00001D38 -/* 002F0 80A58F00 90EE014E */ lbu $t6, 0x014E($a3) ## 0000014E -/* 002F4 80A58F04 00056100 */ sll $t4, $a1, 4 -/* 002F8 80A58F08 016C6821 */ addu $t5, $t3, $t4 -/* 002FC 80A58F0C 000E7840 */ sll $t7, $t6, 1 -/* 00300 80A58F10 01AFC021 */ addu $t8, $t5, $t7 -/* 00304 80A58F14 83190000 */ lb $t9, 0x0000($t8) ## 00000000 -/* 00308 80A58F18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0030C 80A58F1C 0C296346 */ jal func_80A58D18 -/* 00310 80A58F20 A0F90003 */ sb $t9, 0x0003($a3) ## 00000003 -/* 00314 80A58F24 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00318 80A58F28 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 0031C 80A58F2C 02012821 */ addu $a1, $s0, $at -/* 00320 80A58F30 0C025D4D */ jal func_80097534 -/* 00324 80A58F34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00328 80A58F38 10000032 */ beq $zero, $zero, .L80A59004 -/* 0032C 80A58F3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00330 80A58F40 90EC014E */ lbu $t4, 0x014E($a3) ## 0000014E -.L80A58F44: -/* 00334 80A58F44 8C691D38 */ lw $t1, 0x1D38($v1) ## 00001D38 -/* 00338 80A58F48 00055100 */ sll $t2, $a1, 4 -/* 0033C 80A58F4C 398E0001 */ xori $t6, $t4, 0x0001 ## $t6 = 00000001 -/* 00340 80A58F50 000E6840 */ sll $t5, $t6, 1 -/* 00344 80A58F54 012A5821 */ addu $t3, $t1, $t2 -/* 00348 80A58F58 016D7821 */ addu $t7, $t3, $t5 -/* 0034C 80A58F5C 81F80000 */ lb $t8, 0x0000($t7) ## 00000000 -/* 00350 80A58F60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00354 80A58F64 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00358 80A58F68 A0F80003 */ sb $t8, 0x0003($a3) ## 00000003 -/* 0035C 80A58F6C 80791CD0 */ lb $t9, 0x1CD0($v1) ## 00001CD0 -/* 00360 80A58F70 02012821 */ addu $a1, $s0, $at -/* 00364 80A58F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00368 80A58F78 07230006 */ bgezl $t9, .L80A58F94 -/* 0036C 80A58F7C C440000C */ lwc1 $f0, 0x000C($v0) ## 0000000C -/* 00370 80A58F80 0C025CA3 */ jal func_8009728C -/* 00374 80A58F84 80E60003 */ lb $a2, 0x0003($a3) ## 00000003 -/* 00378 80A58F88 1000001E */ beq $zero, $zero, .L80A59004 -/* 0037C 80A58F8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00380 80A58F90 C440000C */ lwc1 $f0, 0x000C($v0) ## 0000000C -.L80A58F94: -/* 00384 80A58F94 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 00388 80A58F98 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0038C 80A58F9C 44813000 */ mtc1 $at, $f6 ## $f6 = 255.00 -/* 00390 80A58FA0 46004281 */ sub.s $f10, $f8, $f0 -/* 00394 80A58FA4 46001481 */ sub.s $f18, $f2, $f0 -/* 00398 80A58FA8 460A3403 */ div.s $f16, $f6, $f10 -/* 0039C 80A58FAC 46109102 */ mul.s $f4, $f18, $f16 -/* 003A0 80A58FB0 4600220D */ trunc.w.s $f8, $f4 -/* 003A4 80A58FB4 440A4000 */ mfc1 $t2, $f8 -/* 003A8 80A58FB8 00000000 */ nop -/* 003AC 80A58FBC A4EA014C */ sh $t2, 0x014C($a3) ## 0000014C -/* 003B0 80A58FC0 84E4014C */ lh $a0, 0x014C($a3) ## 0000014C -/* 003B4 80A58FC4 04810003 */ bgez $a0, .L80A58FD4 -/* 003B8 80A58FC8 28810100 */ slti $at, $a0, 0x0100 -/* 003BC 80A58FCC 10000006 */ beq $zero, $zero, .L80A58FE8 -/* 003C0 80A58FD0 A4E0014C */ sh $zero, 0x014C($a3) ## 0000014C -.L80A58FD4: -/* 003C4 80A58FD4 14200003 */ bne $at, $zero, .L80A58FE4 -/* 003C8 80A58FD8 00804025 */ or $t0, $a0, $zero ## $t0 = 00000000 -/* 003CC 80A58FDC 10000001 */ beq $zero, $zero, .L80A58FE4 -/* 003D0 80A58FE0 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -.L80A58FE4: -/* 003D4 80A58FE4 A4E8014C */ sh $t0, 0x014C($a3) ## 0000014C -.L80A58FE8: -/* 003D8 80A58FE8 80EC0003 */ lb $t4, 0x0003($a3) ## 00000003 -/* 003DC 80A58FEC 806E1CBC */ lb $t6, 0x1CBC($v1) ## 00001CBC -/* 003E0 80A58FF0 518E0004 */ beql $t4, $t6, .L80A59004 -/* 003E4 80A58FF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 003E8 80A58FF8 0C296346 */ jal func_80A58D18 -/* 003EC 80A58FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F0 80A59000 8FBF001C */ lw $ra, 0x001C($sp) -.L80A59004: -/* 003F4 80A59004 8FB00018 */ lw $s0, 0x0018($sp) -/* 003F8 80A59008 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 003FC 80A5900C 03E00008 */ jr $ra -/* 00400 80A59010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s index f4fce97b46..d4da2ac21d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s @@ -36,7 +36,7 @@ glabel func_80A59014 /* 0047C 80A5908C 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 /* 00480 80A59090 00000000 */ nop .L80A59094: -/* 00484 80A59094 0C296306 */ jal func_80A58C18 +/* 00484 80A59094 0C296306 */ jal EnHoll_IsKokiriSetup8 /* 00488 80A59098 E7A2003C */ swc1 $f2, 0x003C($sp) /* 0048C 80A5909C 14400022 */ bne $v0, $zero, .L80A59128 /* 00490 80A590A0 C7A2003C */ lwc1 $f2, 0x003C($sp) @@ -107,9 +107,9 @@ glabel func_80A59014 /* 00588 80A59198 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 /* 0058C 80A5919C 10400004 */ beq $v0, $zero, .L80A591B0 /* 00590 80A591A0 8FA40058 */ lw $a0, 0x0058($sp) -/* 00594 80A591A4 3C0580A6 */ lui $a1, %hi(func_80A59828) ## $a1 = 80A60000 -/* 00598 80A591A8 0C296304 */ jal func_80A58C10 -/* 0059C 80A591AC 24A59828 */ addiu $a1, $a1, %lo(func_80A59828) ## $a1 = 80A59828 +/* 00594 80A591A4 3C0580A6 */ lui $a1, %hi(EnHoll_NextAction) ## $a1 = 80A60000 +/* 00598 80A591A8 0C296304 */ jal EnHoll_SetupAction +/* 0059C 80A591AC 24A59828 */ addiu $a1, $a1, %lo(EnHoll_NextAction) ## $a1 = 80A59828 .L80A591B0: /* 005A0 80A591B0 8FBF0014 */ lw $ra, 0x0014($sp) .L80A591B4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s deleted file mode 100644 index a8c08129c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s +++ /dev/null @@ -1,136 +0,0 @@ -.late_rodata -glabel D_80A59B20 - .word 0x44174000 - -.text -glabel func_80A591C0 -/* 005B0 80A591C0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 005B4 80A591C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 005B8 80A591C8 AFB10020 */ sw $s1, 0x0020($sp) -/* 005BC 80A591CC AFB0001C */ sw $s0, 0x001C($sp) -/* 005C0 80A591D0 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 005C4 80A591D4 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 -/* 005C8 80A591D8 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 005CC 80A591DC C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 005D0 80A591E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005D4 80A591E4 4606203C */ c.lt.s $f4, $f6 -/* 005D8 80A591E8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 005DC 80A591EC 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 005E0 80A591F0 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 005E4 80A591F4 4500005F */ bc1f .L80A59374 -/* 005E8 80A591F8 46000005 */ abs.s $f0, $f0 -/* 005EC 80A591FC 44814000 */ mtc1 $at, $f8 ## $f8 = 700.00 -/* 005F0 80A59200 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 005F4 80A59204 4608003C */ c.lt.s $f0, $f8 -/* 005F8 80A59208 00000000 */ nop -/* 005FC 80A5920C 4502005A */ bc1fl .L80A59378 -/* 00600 80A59210 920B014F */ lbu $t3, 0x014F($s0) ## 0000014F -/* 00604 80A59214 44816000 */ mtc1 $at, $f12 ## $f12 = 95.00 -/* 00608 80A59218 9483001C */ lhu $v1, 0x001C($a0) ## 0000001C -/* 0060C 80A5921C 3C0180A6 */ lui $at, %hi(D_80A59B20) ## $at = 80A60000 -/* 00610 80A59220 460C003C */ c.lt.s $f0, $f12 -/* 00614 80A59224 00031A83 */ sra $v1, $v1, 10 -/* 00618 80A59228 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 0061C 80A5922C 00036900 */ sll $t5, $v1, 4 -/* 00620 80A59230 45000005 */ bc1f .L80A59248 -/* 00624 80A59234 25040024 */ addiu $a0, $t0, 0x0024 ## $a0 = 00000024 -/* 00628 80A59238 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0062C 80A5923C 00250821 */ addu $at, $at, $a1 -/* 00630 80A59240 1000001C */ beq $zero, $zero, .L80A592B4 -/* 00634 80A59244 A42E1E18 */ sh $t6, 0x1E18($at) ## 00011E18 -.L80A59248: -/* 00638 80A59248 C4229B20 */ lwc1 $f2, %lo(D_80A59B20)($at) -/* 0063C 80A5924C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00640 80A59250 00310821 */ addu $at, $at, $s1 -/* 00644 80A59254 4600103C */ c.lt.s $f2, $f0 -/* 00648 80A59258 00000000 */ nop -/* 0064C 80A5925C 45020004 */ bc1fl .L80A59270 -/* 00650 80A59260 46001281 */ sub.s $f10, $f2, $f0 -/* 00654 80A59264 10000013 */ beq $zero, $zero, .L80A592B4 -/* 00658 80A59268 A4201E18 */ sh $zero, 0x1E18($at) ## 00011E18 -/* 0065C 80A5926C 46001281 */ sub.s $f10, $f2, $f0 -.L80A59270: -/* 00660 80A59270 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00664 80A59274 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00668 80A59278 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0066C 80A5927C 4600540D */ trunc.w.s $f16, $f10 -/* 00670 80A59280 00310821 */ addu $at, $at, $s1 -/* 00674 80A59284 44188000 */ mfc1 $t8, $f16 -/* 00678 80A59288 00000000 */ nop -/* 0067C 80A5928C 0018CC00 */ sll $t9, $t8, 16 -/* 00680 80A59290 00194C03 */ sra $t1, $t9, 16 -/* 00684 80A59294 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 00688 80A59298 00000000 */ nop -/* 0068C 80A5929C 46809120 */ cvt.s.w $f4, $f18 -/* 00690 80A592A0 46062202 */ mul.s $f8, $f4, $f6 -/* 00694 80A592A4 4600428D */ trunc.w.s $f10, $f8 -/* 00698 80A592A8 440B5000 */ mfc1 $t3, $f10 -/* 0069C 80A592AC 00000000 */ nop -/* 006A0 80A592B0 A42B1E18 */ sh $t3, 0x1E18($at) ## 00011E18 -.L80A592B4: -/* 006A4 80A592B4 460C003C */ c.lt.s $f0, $f12 -/* 006A8 80A592B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006AC 80A592BC 02211021 */ addu $v0, $s1, $at -/* 006B0 80A592C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006B4 80A592C4 45020033 */ bc1fl .L80A59394 -/* 006B8 80A592C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006BC 80A592CC 8C4C1D38 */ lw $t4, 0x1D38($v0) ## 00001D38 -/* 006C0 80A592D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006C4 80A592D4 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 006C8 80A592D8 018D7021 */ addu $t6, $t4, $t5 -/* 006CC 80A592DC 81CF0002 */ lb $t7, 0x0002($t6) ## 00000101 -/* 006D0 80A592E0 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 -/* 006D4 80A592E4 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 006D8 80A592E8 A20F0003 */ sb $t7, 0x0003($s0) ## 00000003 -/* 006DC 80A592EC AFA80034 */ sw $t0, 0x0034($sp) -/* 006E0 80A592F0 AFA20028 */ sw $v0, 0x0028($sp) -/* 006E4 80A592F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 006E8 80A592F8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 006EC 80A592FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006F0 80A59300 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 006F4 80A59304 8FA40034 */ lw $a0, 0x0034($sp) -/* 006F8 80A59308 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C -/* 006FC 80A5930C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00700 80A59310 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00704 80A59314 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00708 80A59318 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0070C 80A5931C 2484002C */ addiu $a0, $a0, 0x002C ## $a0 = 0000002C -/* 00710 80A59320 8FB80028 */ lw $t8, 0x0028($sp) -/* 00714 80A59324 82060003 */ lb $a2, 0x0003($s0) ## 00000003 -/* 00718 80A59328 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0071C 80A5932C 83191CBC */ lb $t9, 0x1CBC($t8) ## 00001CBC -/* 00720 80A59330 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00724 80A59334 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00728 80A59338 53260016 */ beql $t9, $a2, .L80A59394 -/* 0072C 80A5933C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00730 80A59340 0C025CA3 */ jal func_8009728C -/* 00734 80A59344 02212821 */ addu $a1, $s1, $at -/* 00738 80A59348 10400011 */ beq $v0, $zero, .L80A59390 -/* 0073C 80A5934C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00740 80A59350 3C0580A6 */ lui $a1, %hi(func_80A59828) ## $a1 = 80A60000 -/* 00744 80A59354 0C296304 */ jal func_80A58C10 -/* 00748 80A59358 24A59828 */ addiu $a1, $a1, %lo(func_80A59828) ## $a1 = 80A59828 -/* 0074C 80A5935C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00750 80A59360 A209014F */ sb $t1, 0x014F($s0) ## 0000014F -/* 00754 80A59364 8FAA0034 */ lw $t2, 0x0034($sp) -/* 00758 80A59368 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0075C 80A5936C 10000008 */ beq $zero, $zero, .L80A59390 -/* 00760 80A59370 E5440068 */ swc1 $f4, 0x0068($t2) ## 00000068 -.L80A59374: -/* 00764 80A59374 920B014F */ lbu $t3, 0x014F($s0) ## 0000014F -.L80A59378: -/* 00768 80A59378 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0076C 80A5937C 00310821 */ addu $at, $at, $s1 -/* 00770 80A59380 51600004 */ beql $t3, $zero, .L80A59394 -/* 00774 80A59384 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00778 80A59388 A4201E18 */ sh $zero, 0x1E18($at) ## 00011E18 -/* 0077C 80A5938C A200014F */ sb $zero, 0x014F($s0) ## 0000014F -.L80A59390: -/* 00780 80A59390 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A59394: -/* 00784 80A59394 8FB0001C */ lw $s0, 0x001C($sp) -/* 00788 80A59398 8FB10020 */ lw $s1, 0x0020($sp) -/* 0078C 80A5939C 03E00008 */ jr $ra -/* 00790 80A593A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s deleted file mode 100644 index 99ffe8e184..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s +++ /dev/null @@ -1,107 +0,0 @@ -.late_rodata -glabel D_80A59B24 - .float 1.7 - -.text -glabel func_80A593A4 -/* 00794 80A593A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00798 80A593A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0079C 80A593AC AFB00018 */ sw $s0, 0x0018($sp) -/* 007A0 80A593B0 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 007A4 80A593B4 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 007A8 80A593B8 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 007AC 80A593BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007B0 80A593C0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 007B4 80A593C4 4606203C */ c.lt.s $f4, $f6 -/* 007B8 80A593C8 00000000 */ nop -/* 007BC 80A593CC 45020049 */ bc1fl .L80A594F4 -/* 007C0 80A593D0 90EF014F */ lbu $t7, 0x014F($a3) ## 0000014F -/* 007C4 80A593D4 C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 007C8 80A593D8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 007CC 80A593DC 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 007D0 80A593E0 46000005 */ abs.s $f0, $f0 -/* 007D4 80A593E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 007D8 80A593E8 4602003C */ c.lt.s $f0, $f2 -/* 007DC 80A593EC 00000000 */ nop -/* 007E0 80A593F0 45020040 */ bc1fl .L80A594F4 -/* 007E4 80A593F4 90EF014F */ lbu $t7, 0x014F($a3) ## 0000014F -/* 007E8 80A593F8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 007EC 80A593FC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 007F0 80A59400 3C0180A6 */ lui $at, %hi(D_80A59B24) ## $at = 80A60000 -/* 007F4 80A59404 460C003C */ c.lt.s $f0, $f12 -/* 007F8 80A59408 00000000 */ nop -/* 007FC 80A5940C 45020006 */ bc1fl .L80A59428 -/* 00800 80A59410 46001201 */ sub.s $f8, $f2, $f0 -/* 00804 80A59414 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00808 80A59418 00250821 */ addu $at, $at, $a1 -/* 0080C 80A5941C 1000000A */ beq $zero, $zero, .L80A59448 -/* 00810 80A59420 A42E1E18 */ sh $t6, 0x1E18($at) ## 00011E18 -/* 00814 80A59424 46001201 */ sub.s $f8, $f2, $f0 -.L80A59428: -/* 00818 80A59428 C42A9B24 */ lwc1 $f10, %lo(D_80A59B24)($at) -/* 0081C 80A5942C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00820 80A59430 00300821 */ addu $at, $at, $s0 -/* 00824 80A59434 460A4402 */ mul.s $f16, $f8, $f10 -/* 00828 80A59438 4600848D */ trunc.w.s $f18, $f16 -/* 0082C 80A5943C 44189000 */ mfc1 $t8, $f18 -/* 00830 80A59440 00000000 */ nop -/* 00834 80A59444 A4381E18 */ sh $t8, 0x1E18($at) ## 00011E18 -.L80A59448: -/* 00838 80A59448 4600603C */ c.lt.s $f12, $f0 -/* 0083C 80A5944C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00840 80A59450 02011021 */ addu $v0, $s0, $at -/* 00844 80A59454 4502002E */ bc1fl .L80A59510 -/* 00848 80A59458 8FBF001C */ lw $ra, 0x001C($sp) -/* 0084C 80A5945C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00850 80A59460 C4E60094 */ lwc1 $f6, 0x0094($a3) ## 00000094 -/* 00854 80A59464 94E4001C */ lhu $a0, 0x001C($a3) ## 0000001C -/* 00858 80A59468 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0085C 80A5946C 4606203C */ c.lt.s $f4, $f6 -/* 00860 80A59470 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00864 80A59474 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00868 80A59478 02012821 */ addu $a1, $s0, $at -/* 0086C 80A5947C 45000003 */ bc1f .L80A5948C -/* 00870 80A59480 00042283 */ sra $a0, $a0, 10 -/* 00874 80A59484 10000001 */ beq $zero, $zero, .L80A5948C -/* 00878 80A59488 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A5948C: -/* 0087C 80A5948C 8C591D38 */ lw $t9, 0x1D38($v0) ## 00001D38 -/* 00880 80A59490 00044100 */ sll $t0, $a0, 4 -/* 00884 80A59494 00035040 */ sll $t2, $v1, 1 -/* 00888 80A59498 03284821 */ addu $t1, $t9, $t0 -/* 0088C 80A5949C 012A5821 */ addu $t3, $t1, $t2 -/* 00890 80A594A0 816C0000 */ lb $t4, 0x0000($t3) ## 00000000 -/* 00894 80A594A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00898 80A594A8 A0EC0003 */ sb $t4, 0x0003($a3) ## 00000003 -/* 0089C 80A594AC 804D1CBC */ lb $t5, 0x1CBC($v0) ## 00001CBC -/* 008A0 80A594B0 80E60003 */ lb $a2, 0x0003($a3) ## 00000003 -/* 008A4 80A594B4 51A60016 */ beql $t5, $a2, .L80A59510 -/* 008A8 80A594B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 008AC 80A594BC 0C025CA3 */ jal func_8009728C -/* 008B0 80A594C0 AFA70020 */ sw $a3, 0x0020($sp) -/* 008B4 80A594C4 10400011 */ beq $v0, $zero, .L80A5950C -/* 008B8 80A594C8 8FA70020 */ lw $a3, 0x0020($sp) -/* 008BC 80A594CC 3C0580A6 */ lui $a1, %hi(func_80A59828) ## $a1 = 80A60000 -/* 008C0 80A594D0 24A59828 */ addiu $a1, $a1, %lo(func_80A59828) ## $a1 = 80A59828 -/* 008C4 80A594D4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 008C8 80A594D8 0C296304 */ jal func_80A58C10 -/* 008CC 80A594DC AFA70020 */ sw $a3, 0x0020($sp) -/* 008D0 80A594E0 8FA70020 */ lw $a3, 0x0020($sp) -/* 008D4 80A594E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 008D8 80A594E8 10000008 */ beq $zero, $zero, .L80A5950C -/* 008DC 80A594EC A0EE014F */ sb $t6, 0x014F($a3) ## 0000014F -/* 008E0 80A594F0 90EF014F */ lbu $t7, 0x014F($a3) ## 0000014F -.L80A594F4: -/* 008E4 80A594F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008E8 80A594F8 00300821 */ addu $at, $at, $s0 -/* 008EC 80A594FC 51E00004 */ beql $t7, $zero, .L80A59510 -/* 008F0 80A59500 8FBF001C */ lw $ra, 0x001C($sp) -/* 008F4 80A59504 A0E0014F */ sb $zero, 0x014F($a3) ## 0000014F -/* 008F8 80A59508 A4201E18 */ sh $zero, 0x1E18($at) ## 00011E18 -.L80A5950C: -/* 008FC 80A5950C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A59510: -/* 00900 80A59510 8FB00018 */ lw $s0, 0x0018($sp) -/* 00904 80A59514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00908 80A59518 03E00008 */ jr $ra -/* 0090C 80A5951C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s deleted file mode 100644 index 83474fa15f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80A59520 -/* 00910 80A59520 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00914 80A59524 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00918 80A59528 AFA5001C */ sw $a1, 0x001C($sp) -/* 0091C 80A5952C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00920 80A59530 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 00924 80A59534 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00928 80A59538 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0092C 80A5953C 4606203C */ c.lt.s $f4, $f6 -/* 00930 80A59540 00000000 */ nop -/* 00934 80A59544 45020031 */ bc1fl .L80A5960C -/* 00938 80A59548 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0093C 80A5954C C4820094 */ lwc1 $f2, 0x0094($a0) ## 00000094 -/* 00940 80A59550 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00944 80A59554 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 00948 80A59558 46001005 */ abs.s $f0, $f2 -/* 0094C 80A5955C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00950 80A59560 4608003C */ c.lt.s $f0, $f8 -/* 00954 80A59564 00000000 */ nop -/* 00958 80A59568 45020028 */ bc1fl .L80A5960C -/* 0095C 80A5956C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00960 80A59570 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 00964 80A59574 8FA2001C */ lw $v0, 0x001C($sp) -/* 00968 80A59578 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0096C 80A5957C 4600503C */ c.lt.s $f10, $f0 -/* 00970 80A59580 00411021 */ addu $v0, $v0, $at -/* 00974 80A59584 45020021 */ bc1fl .L80A5960C -/* 00978 80A59588 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0097C 80A5958C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00980 80A59590 9484001C */ lhu $a0, 0x001C($a0) ## 0000001C -/* 00984 80A59594 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00988 80A59598 4602803C */ c.lt.s $f16, $f2 -/* 0098C 80A5959C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00990 80A595A0 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00994 80A595A4 00042283 */ sra $a0, $a0, 10 -/* 00998 80A595A8 45000003 */ bc1f .L80A595B8 -/* 0099C 80A595AC 00000000 */ nop -/* 009A0 80A595B0 10000001 */ beq $zero, $zero, .L80A595B8 -/* 009A4 80A595B4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A595B8: -/* 009A8 80A595B8 8C4E1D38 */ lw $t6, 0x1D38($v0) ## 00001D38 -/* 009AC 80A595BC 00047900 */ sll $t7, $a0, 4 -/* 009B0 80A595C0 0003C840 */ sll $t9, $v1, 1 -/* 009B4 80A595C4 01CFC021 */ addu $t8, $t6, $t7 -/* 009B8 80A595C8 03194021 */ addu $t0, $t8, $t9 -/* 009BC 80A595CC 81090000 */ lb $t1, 0x0000($t0) ## 00000000 -/* 009C0 80A595D0 A0E90003 */ sb $t1, 0x0003($a3) ## 00000003 -/* 009C4 80A595D4 804A1CBC */ lb $t2, 0x1CBC($v0) ## 00001CBC -/* 009C8 80A595D8 80E60003 */ lb $a2, 0x0003($a3) ## 00000003 -/* 009CC 80A595DC 8FA4001C */ lw $a0, 0x001C($sp) -/* 009D0 80A595E0 11460009 */ beq $t2, $a2, .L80A59608 -/* 009D4 80A595E4 00812821 */ addu $a1, $a0, $at -/* 009D8 80A595E8 0C025CA3 */ jal func_8009728C -/* 009DC 80A595EC AFA70018 */ sw $a3, 0x0018($sp) -/* 009E0 80A595F0 10400005 */ beq $v0, $zero, .L80A59608 -/* 009E4 80A595F4 8FA70018 */ lw $a3, 0x0018($sp) -/* 009E8 80A595F8 3C0580A6 */ lui $a1, %hi(func_80A59828) ## $a1 = 80A60000 -/* 009EC 80A595FC 24A59828 */ addiu $a1, $a1, %lo(func_80A59828) ## $a1 = 80A59828 -/* 009F0 80A59600 0C296304 */ jal func_80A58C10 -/* 009F4 80A59604 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80A59608: -/* 009F8 80A59608 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A5960C: -/* 009FC 80A5960C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A00 80A59610 03E00008 */ jr $ra -/* 00A04 80A59614 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s deleted file mode 100644 index 42927e995f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s +++ /dev/null @@ -1,146 +0,0 @@ -.late_rodata -glabel D_80A59B28 - .word 0x40BCCCCD - -.text -glabel func_80A59618 -/* 00A08 80A59618 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00A0C 80A5961C AFBF001C */ sw $ra, 0x001C($sp) -/* 00A10 80A59620 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A14 80A59624 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00A18 80A59628 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A1C 80A5962C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00A20 80A59630 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00A24 80A59634 AFAE0044 */ sw $t6, 0x0044($sp) -/* 00A28 80A59638 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00A2C 80A5963C AFA7004C */ sw $a3, 0x004C($sp) -/* 00A30 80A59640 0C00B2D0 */ jal Flags_GetSwitch - -/* 00A34 80A59644 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00A38 80A59648 14400009 */ bne $v0, $zero, .L80A59670 -/* 00A3C 80A5964C 8FA7004C */ lw $a3, 0x004C($sp) -/* 00A40 80A59650 920F014F */ lbu $t7, 0x014F($s0) ## 0000014F -/* 00A44 80A59654 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A48 80A59658 00270821 */ addu $at, $at, $a3 -/* 00A4C 80A5965C 51E0006E */ beql $t7, $zero, .L80A59818 -/* 00A50 80A59660 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A54 80A59664 A4201E18 */ sh $zero, 0x1E18($at) ## 00011E18 -/* 00A58 80A59668 1000006A */ beq $zero, $zero, .L80A59814 -/* 00A5C 80A5966C A200014F */ sb $zero, 0x014F($s0) ## 0000014F -.L80A59670: -/* 00A60 80A59670 8FA60044 */ lw $a2, 0x0044($sp) -/* 00A64 80A59674 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A68 80A59678 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 -/* 00A6C 80A5967C AFA7004C */ sw $a3, 0x004C($sp) -/* 00A70 80A59680 0C00B6F4 */ jal func_8002DBD0 -/* 00A74 80A59684 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 00000024 -/* 00A78 80A59688 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 00A7C 80A5968C C7AC003C */ lwc1 $f12, 0x003C($sp) -/* 00A80 80A59690 44812000 */ mtc1 $at, $f4 ## $f4 = -50.00 -/* 00A84 80A59694 C7A00040 */ lwc1 $f0, 0x0040($sp) -/* 00A88 80A59698 8FA7004C */ lw $a3, 0x004C($sp) -/* 00A8C 80A5969C 460C203C */ c.lt.s $f4, $f12 -/* 00A90 80A596A0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00A94 80A596A4 46000085 */ abs.s $f2, $f0 -/* 00A98 80A596A8 45020054 */ bc1fl .L80A597FC -/* 00A9C 80A596AC 9219014F */ lbu $t9, 0x014F($s0) ## 0000014F -/* 00AA0 80A596B0 44817000 */ mtc1 $at, $f14 ## $f14 = 200.00 -/* 00AA4 80A596B4 C7A00038 */ lwc1 $f0, 0x0038($sp) -/* 00AA8 80A596B8 460E603C */ c.lt.s $f12, $f14 -/* 00AAC 80A596BC 00000000 */ nop -/* 00AB0 80A596C0 4502004E */ bc1fl .L80A597FC -/* 00AB4 80A596C4 9219014F */ lbu $t9, 0x014F($s0) ## 0000014F -/* 00AB8 80A596C8 46000005 */ abs.s $f0, $f0 -/* 00ABC 80A596CC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00AC0 80A596D0 460E003C */ c.lt.s $f0, $f14 -/* 00AC4 80A596D4 00000000 */ nop -/* 00AC8 80A596D8 45020048 */ bc1fl .L80A597FC -/* 00ACC 80A596DC 9219014F */ lbu $t9, 0x014F($s0) ## 0000014F -/* 00AD0 80A596E0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00AD4 80A596E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00AD8 80A596E8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00ADC 80A596EC 4606103C */ c.lt.s $f2, $f6 -/* 00AE0 80A596F0 00000000 */ nop -/* 00AE4 80A596F4 45020041 */ bc1fl .L80A597FC -/* 00AE8 80A596F8 9219014F */ lbu $t9, 0x014F($s0) ## 0000014F -/* 00AEC 80A596FC 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 00AF0 80A59700 A218014F */ sb $t8, 0x014F($s0) ## 0000014F -/* 00AF4 80A59704 3C0180A6 */ lui $at, %hi(D_80A59B28) ## $at = 80A60000 -/* 00AF8 80A59708 46001201 */ sub.s $f8, $f2, $f0 -/* 00AFC 80A5970C C42A9B28 */ lwc1 $f10, %lo(D_80A59B28)($at) -/* 00B00 80A59710 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00B04 80A59714 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B08 80A59718 460A4402 */ mul.s $f16, $f8, $f10 -/* 00B0C 80A5971C 9604001C */ lhu $a0, 0x001C($s0) ## 0000001C -/* 00B10 80A59720 00270821 */ addu $at, $at, $a3 -/* 00B14 80A59724 00042283 */ sra $a0, $a0, 10 -/* 00B18 80A59728 4600848D */ trunc.w.s $f18, $f16 -/* 00B1C 80A5972C 44089000 */ mfc1 $t0, $f18 -/* 00B20 80A59730 00000000 */ nop -/* 00B24 80A59734 00A84823 */ subu $t1, $a1, $t0 -/* 00B28 80A59738 A4291E18 */ sh $t1, 0x1E18($at) ## 00011E18 -/* 00B2C 80A5973C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B30 80A59740 00E11821 */ addu $v1, $a3, $at -/* 00B34 80A59744 84621E18 */ lh $v0, 0x1E18($v1) ## 00001E18 -/* 00B38 80A59748 28410100 */ slti $at, $v0, 0x0100 -/* 00B3C 80A5974C 14200004 */ bne $at, $zero, .L80A59760 -/* 00B40 80A59750 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B44 80A59754 00270821 */ addu $at, $at, $a3 -/* 00B48 80A59758 10000005 */ beq $zero, $zero, .L80A59770 -/* 00B4C 80A5975C A4251E18 */ sh $a1, 0x1E18($at) ## 00011E18 -.L80A59760: -/* 00B50 80A59760 04410003 */ bgez $v0, .L80A59770 -/* 00B54 80A59764 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B58 80A59768 00270821 */ addu $at, $at, $a3 -/* 00B5C 80A5976C A4201E18 */ sh $zero, 0x1E18($at) ## 00011E18 -.L80A59770: -/* 00B60 80A59770 4600103C */ c.lt.s $f2, $f0 -/* 00B64 80A59774 C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 00B68 80A59778 45020027 */ bc1fl .L80A59818 -/* 00B6C 80A5977C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B70 80A59780 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00B74 80A59784 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B78 80A59788 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00B7C 80A5978C 4606203C */ c.lt.s $f4, $f6 -/* 00B80 80A59790 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00B84 80A59794 00E12821 */ addu $a1, $a3, $at -/* 00B88 80A59798 45000003 */ bc1f .L80A597A8 -/* 00B8C 80A5979C 00000000 */ nop -/* 00B90 80A597A0 10000001 */ beq $zero, $zero, .L80A597A8 -/* 00B94 80A597A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A597A8: -/* 00B98 80A597A8 8C6A1D38 */ lw $t2, 0x1D38($v1) ## 00001D38 -/* 00B9C 80A597AC 00045900 */ sll $t3, $a0, 4 -/* 00BA0 80A597B0 00026840 */ sll $t5, $v0, 1 -/* 00BA4 80A597B4 014B6021 */ addu $t4, $t2, $t3 -/* 00BA8 80A597B8 018D7021 */ addu $t6, $t4, $t5 -/* 00BAC 80A597BC 81CF0000 */ lb $t7, 0x0000($t6) ## 00000000 -/* 00BB0 80A597C0 A20F0003 */ sb $t7, 0x0003($s0) ## 00000003 -/* 00BB4 80A597C4 80781CBC */ lb $t8, 0x1CBC($v1) ## 00001CBC -/* 00BB8 80A597C8 82060003 */ lb $a2, 0x0003($s0) ## 00000003 -/* 00BBC 80A597CC 53060012 */ beql $t8, $a2, .L80A59818 -/* 00BC0 80A597D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BC4 80A597D4 0C025CA3 */ jal func_8009728C -/* 00BC8 80A597D8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00BCC 80A597DC 1040000D */ beq $v0, $zero, .L80A59814 -/* 00BD0 80A597E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BD4 80A597E4 3C0580A6 */ lui $a1, %hi(func_80A59828) ## $a1 = 80A60000 -/* 00BD8 80A597E8 0C296304 */ jal func_80A58C10 -/* 00BDC 80A597EC 24A59828 */ addiu $a1, $a1, %lo(func_80A59828) ## $a1 = 80A59828 -/* 00BE0 80A597F0 10000009 */ beq $zero, $zero, .L80A59818 -/* 00BE4 80A597F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BE8 80A597F8 9219014F */ lbu $t9, 0x014F($s0) ## 0000014F -.L80A597FC: -/* 00BEC 80A597FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BF0 80A59800 00270821 */ addu $at, $at, $a3 -/* 00BF4 80A59804 53200004 */ beql $t9, $zero, .L80A59818 -/* 00BF8 80A59808 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BFC 80A5980C A4201E18 */ sh $zero, 0x1E18($at) ## 00011E18 -/* 00C00 80A59810 A200014F */ sb $zero, 0x014F($s0) ## 0000014F -.L80A59814: -/* 00C04 80A59814 8FBF001C */ lw $ra, 0x001C($sp) -.L80A59818: -/* 00C08 80A59818 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C0C 80A5981C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00C10 80A59820 03E00008 */ jr $ra -/* 00C14 80A59824 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s deleted file mode 100644 index 3b08694ac4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A59828 -/* 00C18 80A59828 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C1C 80A5982C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C20 80A59830 AFA40020 */ sw $a0, 0x0020($sp) -/* 00C24 80A59834 0C296306 */ jal func_80A58C18 -/* 00C28 80A59838 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C2C 80A5983C 14400013 */ bne $v0, $zero, .L80A5988C -/* 00C30 80A59840 8FA60024 */ lw $a2, 0x0024($sp) -/* 00C34 80A59844 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C38 80A59848 00C11021 */ addu $v0, $a2, $at -/* 00C3C 80A5984C 804E1CED */ lb $t6, 0x1CED($v0) ## 00001CED -/* 00C40 80A59850 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C44 80A59854 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 00C48 80A59858 15C0000C */ bne $t6, $zero, .L80A5988C -/* 00C4C 80A5985C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00C50 80A59860 00C12821 */ addu $a1, $a2, $at -/* 00C54 80A59864 0C025D4D */ jal func_80097534 -/* 00C58 80A59868 AFA2001C */ sw $v0, 0x001C($sp) -/* 00C5C 80A5986C 8FA2001C */ lw $v0, 0x001C($sp) -/* 00C60 80A59870 8FB80020 */ lw $t8, 0x0020($sp) -/* 00C64 80A59874 844F1E18 */ lh $t7, 0x1E18($v0) ## 00001E18 -/* 00C68 80A59878 15E00002 */ bne $t7, $zero, .L80A59884 -/* 00C6C 80A5987C 00000000 */ nop -/* 00C70 80A59880 A300014F */ sb $zero, 0x014F($t8) ## 0000014F -.L80A59884: -/* 00C74 80A59884 0C296312 */ jal func_80A58C48 -/* 00C78 80A59888 8FA40020 */ lw $a0, 0x0020($sp) -.L80A5988C: -/* 00C7C 80A5988C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C80 80A59890 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C84 80A59894 03E00008 */ jr $ra -/* 00C88 80A59898 00000000 */ nop diff --git a/data/overlays/actors/z_en_holl.data.s b/data/overlays/actors/z_en_holl.data.s deleted file mode 100644 index 3f1498ac20..0000000000 --- a/data/overlays/actors/z_en_holl.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Holl_InitVars - .word 0x00230A00, 0x00000010, 0x00010000, 0x00000154 -.word EnHoll_Init -.word EnHoll_Destroy -.word EnHoll_Update -.word EnHoll_Draw -glabel D_80A59A40 - .word func_80A58DD4 -.word func_80A591C0 -.word func_80A59520 -.word func_80A59618 -.word func_80A59014 -.word func_80A593A4 -.word func_80A59014 -glabel D_80A59A5C - .word 0xB0F40FA0, 0xB0F80190, 0x30FC0190 -glabel D_80A59A68 - .word 0x43480000, 0x43160000, 0x42C80000, 0x42480000, 0x42C80000, 0x42960000, 0x42480000, 0x41C80000 -glabel D_80A59A88 - .word 0x55F04E20, 0x00000000, 0x08000800, 0xFFFFFFFF, 0xAA104E20, 0x00000000, 0x00000800, 0xFFFFFFFF, 0xAA10B1E0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x55F0B1E0, 0x00000000, 0x08000000, 0xFFFFFFFF -glabel D_80A59AC8 - .word 0xD7000000, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFDF638, 0x01004008 -.word D_80A59A88 -.word 0x06000204, 0x00000406, 0xDF000000, 0x00000000 - diff --git a/spec b/spec index 51187d28f9..9530fb8ae8 100644 --- a/spec +++ b/spec @@ -2505,8 +2505,11 @@ endseg beginseg name "ovl_En_Holl" include "build/src/overlays/actors/ovl_En_Holl/z_en_holl.o" - include "build/data/overlays/actors/z_en_holl.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Holl/ovl_En_Holl_reloc.o" +#else include "build/data/overlays/actors/z_en_holl.reloc.o" +#endif endseg beginseg diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index e2d6d8b018..ab905325bd 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -4,12 +4,27 @@ #define THIS ((EnHoll*)thisx) +// Horizontal Plane parameters + +#define PLANE_Y_MIN -50.0f +#define PLANE_Y_MAX 200.0f + +#define PLANE_HALFWIDTH 100.0f +#define PLANE_HALFWIDTH_2 200.0f + void EnHoll_Init(Actor* thisx, GlobalContext* globalCtx); void EnHoll_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHoll_Update(Actor* thisx, GlobalContext* globalCtx); void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnHoll_NextAction(EnHoll* this, GlobalContext* globalCtx); +void func_80A58DD4(EnHoll* this, GlobalContext* globalCtx); +void func_80A59014(EnHoll* this, GlobalContext* globalCtx); +void func_80A591C0(EnHoll* this, GlobalContext* globalCtx); +void func_80A593A4(EnHoll* this, GlobalContext* globalCtx); +void func_80A59520(EnHoll* this, GlobalContext* globalCtx); +void func_80A59618(EnHoll* this, GlobalContext* globalCtx); + const ActorInit En_Holl_InitVars = { ACTOR_EN_HOLL, ACTORTYPE_DOOR, @@ -21,33 +36,338 @@ const ActorInit En_Holl_InitVars = { (ActorFunc)EnHoll_Update, (ActorFunc)EnHoll_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C10.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C18.s") +static EnHollActionFunc sActionFuncs[] = { + func_80A58DD4, func_80A591C0, func_80A59520, func_80A59618, func_80A59014, func_80A593A4, func_80A59014, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58C48.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Init.s") +/** + * These are all absolute distances in the relative z direction. That is, moving + * towards or away from the "face" of the loading plane regardless of orientation. + * Moving within these distances of the load plane have the following effects: + * [0] : Load the room on this side of the loading plane if not already loaded + * [1] : Load the room on the other side of the loading plane + * [2] : Fade Region (opaque -> transparent if approaching, transparent -> opaque if receding) + * [3] : Transparent Region + * + * When traversing a loading plane of this kind, it attempts to: + * Load Current Room (fails as it is already loaded) + * Load Next Room + * Load Previous Room + * Load Next Room + * + * @bug The striped nature of loading planes can cause some actors to unload due to + * conflicting Object Lists between the two rooms + * + * @bug If you can get around to the other side of the loading plane without triggering it, + * you can load the room on the other side multiple times + */ +static f32 sHorizTriggerDists[2][4] = { + { 200.0f, 150.0f, 100.0f, 50.0f }, + { 100.0f, 75.0f, 50.0f, 25.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Destroy.s") +static Vtx sVertices[] = { + VTX(0x55F0, 0x4E20, 0x0000, 0x0800, 0x0800, 255, 255, 255, 255), + VTX(0xAA10, 0x4E20, 0x0000, 0x0000, 0x0800, 255, 255, 255, 255), + VTX(0xAA10, 0xB1E0, 0x0000, 0x0000, 0x0000, 255, 255, 255, 255), + VTX(0x55F0, 0xB1E0, 0x0000, 0x0800, 0x0000, 255, 255, 255, 255), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58D18.s") +static Gfx sPlaneDlist[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PASS2), + gsSPVertex(sVertices, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A58DD4.s") +void EnHoll_SetupAction(EnHoll* this, EnHollActionFunc func) { + this->actionFunc = func; +} +s32 EnHoll_IsKokiriSetup8() { + return gSaveContext.entranceIndex == 0x00EE && gSaveContext.sceneSetupIndex == 8; +} + +void EnHoll_ChooseAction(EnHoll* this) { + s32 action; + + action = (this->actor.params >> 6) & 7; + EnHoll_SetupAction(this, sActionFuncs[action]); + if (action != 0) { + this->actor.draw = NULL; + } else { + this->planeAlpha = 255; + } +} + +void EnHoll_Init(Actor* thisx, GlobalContext* globalCtx) { + EnHoll* this = THIS; + + Actor_ProcessInitChain(&this->actor, sInitChain); + EnHoll_ChooseAction(this); + this->unk_14F = 0; +} + +void EnHoll_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 transitionActorIdx = (u16)thisx->params >> 0xA; + TransitionActorEntry* transitionEntry = &globalCtx->transitionActorList[transitionActorIdx]; + + transitionEntry->id = -transitionEntry->id; +} + +void EnHoll_SwapRooms(GlobalContext* globalCtx) { + Room tempRoom; + RoomContext* roomCtx = &globalCtx->roomCtx; + + tempRoom = roomCtx->curRoom; + roomCtx->curRoom = roomCtx->prevRoom; + roomCtx->prevRoom = tempRoom; + globalCtx->roomCtx.unk_30 ^= 1; +} + +// Horizontal Planes +void func_80A58DD4(EnHoll* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 phi_t0 = ((globalCtx->sceneNum == SCENE_JYASINZOU) ? 1 : 0) & 0xFFFFFFFF; + Vec3f vec; + f32 absZ; + s32 transitionActorIdx; + + func_8002DBD0(&this->actor, &vec, &player->actor.posRot.pos); + this->side = (vec.z < 0.0f) ? 0 : 1; + absZ = fabsf(vec.z); + if (vec.y > PLANE_Y_MIN && vec.y < PLANE_Y_MAX && fabsf(vec.x) < PLANE_HALFWIDTH && + absZ < sHorizTriggerDists[phi_t0][0]) { + transitionActorIdx = (u16)this->actor.params >> 0xA; + if (absZ > sHorizTriggerDists[phi_t0][1]) { + if (globalCtx->roomCtx.prevRoom.num >= 0 && globalCtx->roomCtx.status == 0) { + this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[this->side].room; + EnHoll_SwapRooms(globalCtx); + func_80097534(globalCtx, &globalCtx->roomCtx); + } + } else { + this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[this->side ^ 1].room; + if (globalCtx->roomCtx.prevRoom.num < 0) { + func_8009728C(globalCtx, &globalCtx->roomCtx, this->actor.room); + } else { + this->planeAlpha = (255.0f / (sHorizTriggerDists[phi_t0][2] - sHorizTriggerDists[phi_t0][3])) * + (absZ - sHorizTriggerDists[phi_t0][3]); + this->planeAlpha = CLAMP(this->planeAlpha, 0, 255); + if (globalCtx->roomCtx.curRoom.num != this->actor.room) { + EnHoll_SwapRooms(globalCtx); + } + } + } + } +} + +// Horizontal Planes +#ifdef NON_MATCHING +// Small regalloc near the end +void func_80A59014(EnHoll* this, GlobalContext* globalCtx) { + s32 pad; + s32 pad1; + Vec3f vec; + TransitionActorEntry* transitionEntry; + f32 planeHalfWidth; + s32 pad2; + s32 useViewEye = D_8011D394 != 0 || globalCtx->csCtx.state != 0; + s32 transitionActorIdx; + f32 absZ; + s32 side; + Player* player = PLAYER; + + func_8002DBD0(&this->actor, &vec, (useViewEye) ? &globalCtx->view.eye : &player->actor.posRot.pos); + planeHalfWidth = (((this->actor.params >> 6) & 7) == 6) ? PLANE_HALFWIDTH : PLANE_HALFWIDTH_2; + if (EnHoll_IsKokiriSetup8() || (vec.y > PLANE_Y_MIN && vec.y < PLANE_Y_MAX && fabsf(vec.x) < planeHalfWidth && + (absZ = fabsf(vec.z), (absZ < 100.0f && absZ > 50.0f)))) { + transitionActorIdx = (u16)this->actor.params >> 0xA; + side = (vec.z < 0.0f) ? 0 : 1; + transitionEntry = &globalCtx->transitionActorList[transitionActorIdx]; + this->actor.room = transitionEntry->sides[side].room; + if (this->actor.room != globalCtx->roomCtx.curRoom.num && + func_8009728C(globalCtx, &globalCtx->roomCtx, (u32)this->actor.room) != 0) { + EnHoll_SetupAction(this, EnHoll_NextAction); + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59014.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A591C0.s") +// Vertical Planes +void func_80A591C0(EnHoll* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 absY = fabsf(this->actor.yDistFromLink); + s32 transitionActorIdx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A593A4.s") + if (this->actor.xzDistFromLink < 500.0f && absY < 700.0f) { + transitionActorIdx = (u16)this->actor.params >> 0xA; + if (absY < 95.0f) { + globalCtx->unk_11E18 = 0xFF; + } else if (absY > 605.0f) { + globalCtx->unk_11E18 = 0; + } else { + globalCtx->unk_11E18 = (s16)(605.0f - absY) * 0.5f; + } + if (absY < 95.0f) { + this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[1].room; + Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.x, this->actor.posRot.pos.x, 1.0f, 50.0f, 10.0f); + Math_SmoothScaleMaxMinF(&player->actor.posRot.pos.z, this->actor.posRot.pos.z, 1.0f, 50.0f, 10.0f); + if (this->actor.room != globalCtx->roomCtx.curRoom.num && + func_8009728C(globalCtx, &globalCtx->roomCtx, this->actor.room) != 0) { + EnHoll_SetupAction(this, EnHoll_NextAction); + this->unk_14F = 1; + player->actor.speedXZ = 0.0f; + } + } + } else if (this->unk_14F != 0) { + globalCtx->unk_11E18 = 0; + this->unk_14F = 0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59520.s") +// Vertical Planes +void func_80A593A4(EnHoll* this, GlobalContext* globalCtx) { + f32 absY; + s32 side; + s32 transitionActorIdx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59618.s") + if ((this->actor.xzDistFromLink < 120.0f) && (absY = fabsf(this->actor.yDistFromLink), absY < 200.0f)) { + if (absY < 50.0f) { + globalCtx->unk_11E18 = 0xFF; + } else { + globalCtx->unk_11E18 = (200.0f - absY) * 1.7f; + } + if (absY > 50.0f) { + transitionActorIdx = (u16)this->actor.params >> 0xA; + side = (0.0f < this->actor.yDistFromLink) ? 0 : 1; + this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[side].room; + if (this->actor.room != globalCtx->roomCtx.curRoom.num && + func_8009728C(globalCtx, &globalCtx->roomCtx, this->actor.room) != 0) { + EnHoll_SetupAction(this, EnHoll_NextAction); + this->unk_14F = 1; + } + } + } else if (this->unk_14F != 0) { + this->unk_14F = 0; + globalCtx->unk_11E18 = 0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/func_80A59828.s") +// Vertical Planes +void func_80A59520(EnHoll* this, GlobalContext* globalCtx) { + f32 absY; + s8 side; + s32 transitionActorIdx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Update.s") + if (this->actor.xzDistFromLink < 120.0f) { + absY = fabsf(this->actor.yDistFromLink); + if (absY < 200.0f && absY > 50.0f) { + transitionActorIdx = (u16)this->actor.params >> 0xA; + side = (0.0f < this->actor.yDistFromLink) ? 0 : 1; + this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[side].room; + if (this->actor.room != globalCtx->roomCtx.curRoom.num && + func_8009728C(globalCtx, &globalCtx->roomCtx, this->actor.room) != 0) { + EnHoll_SetupAction(this, EnHoll_NextAction); + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s") +// Horizontal Planes +void func_80A59618(EnHoll* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Vec3f vec; + f32 absZ; + s32 side; + s32 transitionActorIdx; + + if (!Flags_GetSwitch(globalCtx, this->actor.params & 0x3F)) { + if (this->unk_14F != 0) { + globalCtx->unk_11E18 = 0; + this->unk_14F = 0; + } + } else { + func_8002DBD0(&this->actor, &vec, &player->actor.posRot.pos); + absZ = fabsf(vec.z); + if (PLANE_Y_MIN < vec.y && vec.y < PLANE_Y_MAX && fabsf(vec.x) < PLANE_HALFWIDTH_2 && absZ < 100.0f) { + this->unk_14F = 1; + transitionActorIdx = (u16)this->actor.params >> 0xA; + globalCtx->unk_11E18 = 0xFF - (s32)((absZ - 50.0f) * 5.9f); + if (globalCtx->unk_11E18 >= 0x100) { + globalCtx->unk_11E18 = 0xFF; + } else if (globalCtx->unk_11E18 < 0) { + globalCtx->unk_11E18 = 0; + } + if (absZ < 50.0f) { + side = (vec.z < 0.0f) ? 0 : 1; + this->actor.room = globalCtx->transitionActorList[transitionActorIdx].sides[side].room; + if (this->actor.room != globalCtx->roomCtx.curRoom.num && + func_8009728C(globalCtx, &globalCtx->roomCtx, this->actor.room) != 0) { + EnHoll_SetupAction(this, EnHoll_NextAction); + } + } + } else if (this->unk_14F != 0) { + globalCtx->unk_11E18 = 0; + this->unk_14F = 0; + } + } +} + +void EnHoll_NextAction(EnHoll* this, GlobalContext* globalCtx) { + if (!EnHoll_IsKokiriSetup8() && globalCtx->roomCtx.status == 0) { + func_80097534(globalCtx, &globalCtx->roomCtx); + if (globalCtx->unk_11E18 == 0) { + this->unk_14F = 0; + } + EnHoll_ChooseAction(this); + } +} + +void EnHoll_Update(Actor* thisx, GlobalContext* globalCtx) { + EnHoll* this = THIS; + this->actionFunc(this, globalCtx); +} + +void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnHoll* this = THIS; + Gfx* gfxP; + u32 setupDLIdx; + + // Only draw the plane if not invisible + if (this->planeAlpha != 0) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 805); + if (this->planeAlpha == 255) { + gfxP = oGfxCtx->polyOpa.p; + setupDLIdx = 37; + } else { + gfxP = oGfxCtx->polyXlu.p; + setupDLIdx = 0; + } + gfxP = Gfx_CallSetupDL(gfxP, setupDLIdx); + if (this->side == 0) { + Matrix_RotateY(M_PI, MTXMODE_APPLY); + } + + gSPMatrix(gfxP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_holl.c", 824), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gfxP++, 0, 0, 0, 0, 0, (u8)this->planeAlpha); + gSPDisplayList(gfxP++, sPlaneDlist); + + if (this->planeAlpha == 255) { + oGfxCtx->polyOpa.p = gfxP; + } else { + oGfxCtx->polyXlu.p = gfxP; + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 831); + } +} diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h index b56735c8a5..d96d81a515 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h @@ -6,9 +6,14 @@ struct EnHoll; +typedef void (*EnHollActionFunc)(struct EnHoll*, GlobalContext*); + typedef struct EnHoll { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8]; + /* 0x014C */ s16 planeAlpha; + /* 0x014E */ u8 side; + /* 0x014F */ u8 unk_14F; + /* 0x0150 */ EnHollActionFunc actionFunc; } EnHoll; // size = 0x0154 extern const ActorInit En_Holl_InitVars; From 024d5d69bf21144956ffd59d92f0009369eff69d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 30 Sep 2020 16:09:52 -0400 Subject: [PATCH 2/6] Decompiled ovl_Bg_Jya_Zurerukabe (#424) * Decompiled ovl_Bg_Jya_Zurerukabe * PR suggestions, cleanup * PR suggestion --- .../BgJyaZurerukabe_Destroy.s | 20 -- .../BgJyaZurerukabe_Draw.s | 14 -- .../BgJyaZurerukabe_Init.s | 103 ---------- .../BgJyaZurerukabe_Update.s | 25 --- .../ovl_Bg_Jya_Zurerukabe/func_8089B440.s | 52 ------ .../ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s | 121 ------------ .../ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s | 5 - .../ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s | 20 -- .../ovl_Bg_Jya_Zurerukabe/func_8089B80C.s | 29 --- .../ovl_Bg_Jya_Zurerukabe/func_8089B870.s | 53 ------ .../actors/z_bg_jya_zurerukabe.data.s | 34 ---- .../actors/z_bg_jya_zurerukabe.reloc.s | 13 -- spec | 3 +- .../z_bg_jya_zurerukabe.c | 176 ++++++++++++++++-- .../z_bg_jya_zurerukabe.h | 10 +- undefined_syms.txt | 4 + 16 files changed, 177 insertions(+), 505 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s delete mode 100644 data/overlays/actors/z_bg_jya_zurerukabe.data.s delete mode 100644 data/overlays/actors/z_bg_jya_zurerukabe.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s deleted file mode 100644 index 5cef987be0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel BgJyaZurerukabe_Destroy -/* 0032C 8089B76C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 8089B770 AFA40018 */ sw $a0, 0x0018($sp) -/* 00334 8089B774 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00338 8089B778 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0033C 8089B77C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00340 8089B780 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00344 8089B784 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00348 8089B788 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 0034C 8089B78C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00350 8089B790 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00354 8089B794 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00358 8089B798 85F80168 */ lh $t8, 0x0168($t7) ## 00000168 -/* 0035C 8089B79C 3C01808A */ lui $at, %hi(D_8089B9C0) ## $at = 808A0000 -/* 00360 8089B7A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00364 8089B7A4 0018C880 */ sll $t9, $t8, 2 -/* 00368 8089B7A8 00390821 */ addu $at, $at, $t9 -/* 0036C 8089B7AC 03E00008 */ jr $ra -/* 00370 8089B7B0 E424B9C0 */ swc1 $f4, %lo(D_8089B9C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s deleted file mode 100644 index 60ec165db0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgJyaZurerukabe_Draw -/* 00550 8089B990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00554 8089B994 AFA40018 */ sw $a0, 0x0018($sp) -/* 00558 8089B998 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0055C 8089B99C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00560 8089B9A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00564 8089B9A4 0C00D498 */ jal Gfx_DrawDListOpa - -/* 00568 8089B9A8 24A52340 */ addiu $a1, $a1, 0x2340 ## $a1 = 06012340 -/* 0056C 8089B9AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00570 8089B9B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00574 8089B9B4 03E00008 */ jr $ra -/* 00578 8089B9B8 00000000 */ nop -/* 0057C 8089B9BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s deleted file mode 100644 index 3e203790ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s +++ /dev/null @@ -1,103 +0,0 @@ -.rdata -glabel D_8089BAAC - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_8089BAB8 - .asciz "home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_8089BAF0 - .asciz "../z_bg_jya_zurerukabe.c" - .balign 4 - -glabel D_8089BB0C - .asciz "\x1b[m" - .balign 4 - -glabel D_8089BB10 - .asciz "(jya ずれる壁)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -.text -glabel BgJyaZurerukabe_Init -/* 00220 8089B660 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00224 8089B664 AFBF001C */ sw $ra, 0x001C($sp) -/* 00228 8089B668 AFB00018 */ sw $s0, 0x0018($sp) -/* 0022C 8089B66C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00230 8089B670 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00234 8089B674 24C62508 */ addiu $a2, $a2, 0x2508 ## $a2 = 06012508 -/* 00238 8089B678 0C226D10 */ jal func_8089B440 -/* 0023C 8089B67C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00240 8089B680 3C05808A */ lui $a1, %hi(D_8089BA3C) ## $a1 = 808A0000 -/* 00244 8089B684 24A5BA3C */ addiu $a1, $a1, %lo(D_8089BA3C) ## $a1 = 8089BA3C -/* 00248 8089B688 0C01E037 */ jal Actor_ProcessInitChain - -/* 0024C 8089B68C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00250 8089B690 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00254 8089B694 3C03808A */ lui $v1, %hi(D_8089B9F0) ## $v1 = 808A0000 -/* 00258 8089B698 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0025C 8089B69C 2463B9F0 */ addiu $v1, $v1, %lo(D_8089B9F0) ## $v1 = 8089B9F0 -/* 00260 8089B6A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00264 8089B6A4 C602000C */ lwc1 $f2, 0x000C($s0) ## 0000000C -/* 00268 8089B6A8 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -.L8089B6AC: -/* 0026C 8089B6AC 846E0000 */ lh $t6, 0x0000($v1) ## 8089B9F0 -/* 00270 8089B6B0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00274 8089B6B4 00000000 */ nop -/* 00278 8089B6B8 468021A0 */ cvt.s.w $f6, $f4 -/* 0027C 8089B6BC 46023001 */ sub.s $f0, $f6, $f2 -/* 00280 8089B6C0 46000005 */ abs.s $f0, $f0 -/* 00284 8089B6C4 460C003C */ c.lt.s $f0, $f12 -/* 00288 8089B6C8 00000000 */ nop -/* 0028C 8089B6CC 45020004 */ bc1fl .L8089B6E0 -/* 00290 8089B6D0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00294 8089B6D4 10000004 */ beq $zero, $zero, .L8089B6E8 -/* 00298 8089B6D8 A6020168 */ sh $v0, 0x0168($s0) ## 00000168 -/* 0029C 8089B6DC 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000002 -.L8089B6E0: -/* 002A0 8089B6E0 1444FFF2 */ bne $v0, $a0, .L8089B6AC -/* 002A4 8089B6E4 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 8089B9F2 -.L8089B6E8: -/* 002A8 8089B6E8 3C0F808A */ lui $t7, %hi(D_8089B9F8) ## $t7 = 808A0000 -/* 002AC 8089B6EC 25EFB9F8 */ addiu $t7, $t7, %lo(D_8089B9F8) ## $t7 = 8089B9F8 -/* 002B0 8089B6F0 146F000D */ bne $v1, $t7, .L8089B728 -/* 002B4 8089B6F4 3C04808A */ lui $a0, %hi(D_8089BAAC) ## $a0 = 808A0000 -/* 002B8 8089B6F8 0C00084C */ jal osSyncPrintf - -/* 002BC 8089B6FC 2484BAAC */ addiu $a0, $a0, %lo(D_8089BAAC) ## $a0 = 8089BAAC -/* 002C0 8089B700 3C04808A */ lui $a0, %hi(D_8089BAB8) ## $a0 = 808A0000 -/* 002C4 8089B704 3C05808A */ lui $a1, %hi(D_8089BAF0) ## $a1 = 808A0000 -/* 002C8 8089B708 24A5BAF0 */ addiu $a1, $a1, %lo(D_8089BAF0) ## $a1 = 8089BAF0 -/* 002CC 8089B70C 2484BAB8 */ addiu $a0, $a0, %lo(D_8089BAB8) ## $a0 = 8089BAB8 -/* 002D0 8089B710 2406012B */ addiu $a2, $zero, 0x012B ## $a2 = 0000012B -/* 002D4 8089B714 0C00084C */ jal osSyncPrintf - -/* 002D8 8089B718 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 002DC 8089B71C 3C04808A */ lui $a0, %hi(D_8089BB0C) ## $a0 = 808A0000 -/* 002E0 8089B720 0C00084C */ jal osSyncPrintf - -/* 002E4 8089B724 2484BB0C */ addiu $a0, $a0, %lo(D_8089BB0C) ## $a0 = 8089BB0C -.L8089B728: -/* 002E8 8089B728 86180168 */ lh $t8, 0x0168($s0) ## 00000168 -/* 002EC 8089B72C 3C08808A */ lui $t0, %hi(D_8089B9F8) ## $t0 = 808A0000 -/* 002F0 8089B730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002F4 8089B734 0018C840 */ sll $t9, $t8, 1 -/* 002F8 8089B738 01194021 */ addu $t0, $t0, $t9 -/* 002FC 8089B73C 8508B9F8 */ lh $t0, %lo(D_8089B9F8)($t0) -/* 00300 8089B740 0C226DED */ jal func_8089B7B4 -/* 00304 8089B744 A608016E */ sh $t0, 0x016E($s0) ## 0000016E -/* 00308 8089B748 3C04808A */ lui $a0, %hi(D_8089BB10) ## $a0 = 808A0000 -/* 0030C 8089B74C 2484BB10 */ addiu $a0, $a0, %lo(D_8089BB10) ## $a0 = 8089BB10 -/* 00310 8089B750 0C00084C */ jal osSyncPrintf - -/* 00314 8089B754 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00318 8089B758 8FBF001C */ lw $ra, 0x001C($sp) -/* 0031C 8089B75C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00320 8089B760 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00324 8089B764 03E00008 */ jr $ra -/* 00328 8089B768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s deleted file mode 100644 index 2c3051b217..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel BgJyaZurerukabe_Update -/* 004F8 8089B938 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004FC 8089B93C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00500 8089B940 AFA5001C */ sw $a1, 0x001C($sp) -/* 00504 8089B944 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 00508 8089B948 18400002 */ blez $v0, .L8089B954 -/* 0050C 8089B94C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00510 8089B950 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -.L8089B954: -/* 00514 8089B954 AFA40018 */ sw $a0, 0x0018($sp) -/* 00518 8089B958 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 0051C 8089B95C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00520 8089B960 0320F809 */ jalr $ra, $t9 -/* 00524 8089B964 00000000 */ nop -/* 00528 8089B968 8FA40018 */ lw $a0, 0x0018($sp) -/* 0052C 8089B96C 848F0168 */ lh $t7, 0x0168($a0) ## 00000168 -/* 00530 8089B970 55E00004 */ bnel $t7, $zero, .L8089B984 -/* 00534 8089B974 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00538 8089B978 0C226D32 */ jal func_8089B4C8 -/* 0053C 8089B97C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00540 8089B980 8FBF0014 */ lw $ra, 0x0014($sp) -.L8089B984: -/* 00544 8089B984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00548 8089B988 03E00008 */ jr $ra -/* 0054C 8089B98C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s deleted file mode 100644 index 7702c30993..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s +++ /dev/null @@ -1,52 +0,0 @@ -.rdata -glabel D_8089BA50 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_8089BA90 - .asciz "../z_bg_jya_zurerukabe.c" - .balign 4 - -.text -glabel func_8089B440 -/* 00000 8089B440 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 8089B444 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 8089B448 AFB00020 */ sw $s0, 0x0020($sp) -/* 0000C 8089B44C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 8089B450 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 8089B454 AFA60040 */ sw $a2, 0x0040($sp) -/* 00018 8089B458 AFA00030 */ sw $zero, 0x0030($sp) -/* 0001C 8089B45C 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00020 8089B460 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 8089B464 8FA40040 */ lw $a0, 0x0040($sp) -/* 00028 8089B468 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 8089B46C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00030 8089B470 8FA4003C */ lw $a0, 0x003C($sp) -/* 00034 8089B474 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 8089B478 8FA70030 */ lw $a3, 0x0030($sp) -/* 0003C 8089B47C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 8089B480 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 8089B484 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00048 8089B488 1441000A */ bne $v0, $at, .L8089B4B4 -/* 0004C 8089B48C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00050 8089B490 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00054 8089B494 3C04808A */ lui $a0, %hi(D_8089BA50) ## $a0 = 808A0000 -/* 00058 8089B498 3C05808A */ lui $a1, %hi(D_8089BA90) ## $a1 = 808A0000 -/* 0005C 8089B49C 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00060 8089B4A0 24A5BA90 */ addiu $a1, $a1, %lo(D_8089BA90) ## $a1 = 8089BA90 -/* 00064 8089B4A4 2484BA50 */ addiu $a0, $a0, %lo(D_8089BA50) ## $a0 = 8089BA50 -/* 00068 8089B4A8 240600C2 */ addiu $a2, $zero, 0x00C2 ## $a2 = 000000C2 -/* 0006C 8089B4AC 0C00084C */ jal osSyncPrintf - -/* 00070 8089B4B0 AFAE0010 */ sw $t6, 0x0010($sp) -.L8089B4B4: -/* 00074 8089B4B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00078 8089B4B8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0007C 8089B4BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 8089B4C0 03E00008 */ jr $ra -/* 00084 8089B4C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s deleted file mode 100644 index 793dbe47f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel jtbl_8089BB34 -.word L8089B574 -.word L8089B5D8 -.word L8089B574 -.word L8089B574 -.word L8089B5D8 -.word L8089B574 -.word 0x00000000 - -.text -glabel func_8089B4C8 -/* 00088 8089B4C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0008C 8089B4CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00090 8089B4D0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00094 8089B4D4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00098 8089B4D8 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 0009C 8089B4DC 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 000A0 8089B4E0 8CCF067C */ lw $t7, 0x067C($a2) ## 0000067C -/* 000A4 8089B4E4 55E1005B */ bnel $t7, $at, .L8089B654 -/* 000A8 8089B4E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 000AC 8089B4EC 8CD80074 */ lw $t8, 0x0074($a2) ## 00000074 -/* 000B0 8089B4F0 3C02808A */ lui $v0, %hi(D_8089BA18) ## $v0 = 808A0000 -/* 000B4 8089B4F4 2442BA18 */ addiu $v0, $v0, %lo(D_8089BA18) ## $v0 = 8089BA18 -/* 000B8 8089B4F8 13000055 */ beq $t8, $zero, .L8089B650 -/* 000BC 8089B4FC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 000C0 8089B500 C4C00028 */ lwc1 $f0, 0x0028($a2) ## 00000028 -/* 000C4 8089B504 24040006 */ addiu $a0, $zero, 0x0006 ## $a0 = 00000006 -.L8089B508: -/* 000C8 8089B508 84590000 */ lh $t9, 0x0000($v0) ## 8089BA18 -/* 000CC 8089B50C 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 000D0 8089B510 00000000 */ nop -/* 000D4 8089B514 468021A0 */ cvt.s.w $f6, $f4 -/* 000D8 8089B518 4600303E */ c.le.s $f6, $f0 -/* 000DC 8089B51C 00000000 */ nop -/* 000E0 8089B520 4502000A */ bc1fl .L8089B54C -/* 000E4 8089B524 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 000E8 8089B528 84480002 */ lh $t0, 0x0002($v0) ## 8089BA1A -/* 000EC 8089B52C 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 000F0 8089B530 00000000 */ nop -/* 000F4 8089B534 468042A0 */ cvt.s.w $f10, $f8 -/* 000F8 8089B538 460A003E */ c.le.s $f0, $f10 -/* 000FC 8089B53C 00000000 */ nop -/* 00100 8089B540 45030005 */ bc1tl .L8089B558 -/* 00104 8089B544 2C610006 */ sltiu $at, $v1, 0x0006 -/* 00108 8089B548 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000002 -.L8089B54C: -/* 0010C 8089B54C 1464FFEE */ bne $v1, $a0, .L8089B508 -/* 00110 8089B550 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 8089BA1C -/* 00114 8089B554 2C610006 */ sltiu $at, $v1, 0x0006 -.L8089B558: -/* 00118 8089B558 1020003D */ beq $at, $zero, .L8089B650 -/* 0011C 8089B55C 00034880 */ sll $t1, $v1, 2 -/* 00120 8089B560 3C01808A */ lui $at, %hi(jtbl_8089BB34) ## $at = 808A0000 -/* 00124 8089B564 00290821 */ addu $at, $at, $t1 -/* 00128 8089B568 8C29BB34 */ lw $t1, %lo(jtbl_8089BB34)($at) -/* 0012C 8089B56C 01200008 */ jr $t1 -/* 00130 8089B570 00000000 */ nop -glabel L8089B574 -/* 00134 8089B574 00035040 */ sll $t2, $v1, 1 -/* 00138 8089B578 3C0B808A */ lui $t3, %hi(D_8089BA30) ## $t3 = 808A0000 -/* 0013C 8089B57C 016A5821 */ addu $t3, $t3, $t2 -/* 00140 8089B580 856BBA30 */ lh $t3, %lo(D_8089BA30)($t3) -/* 00144 8089B584 3C04808A */ lui $a0, %hi(D_8089B9C0) ## $a0 = 808A0000 -/* 00148 8089B588 2484B9C0 */ addiu $a0, $a0, %lo(D_8089B9C0) ## $a0 = 8089B9C0 -/* 0014C 8089B58C 000B6080 */ sll $t4, $t3, 2 -/* 00150 8089B590 008C6821 */ addu $t5, $a0, $t4 -/* 00154 8089B594 C5A00000 */ lwc1 $f0, 0x0000($t5) ## 00000000 -/* 00158 8089B598 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0015C 8089B59C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00160 8089B5A0 46000005 */ abs.s $f0, $f0 -/* 00164 8089B5A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00168 8089B5A8 4600803C */ c.lt.s $f16, $f0 -/* 0016C 8089B5AC 8FA50020 */ lw $a1, 0x0020($sp) -/* 00170 8089B5B0 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00174 8089B5B4 45020027 */ bc1fl .L8089B654 -/* 00178 8089B5B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0017C 8089B5BC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00180 8089B5C0 84A700B6 */ lh $a3, 0x00B6($a1) ## 000000B6 -/* 00184 8089B5C4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00188 8089B5C8 0C00BDB5 */ jal func_8002F6D4 -/* 0018C 8089B5CC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00190 8089B5D0 10000020 */ beq $zero, $zero, .L8089B654 -/* 00194 8089B5D4 8FBF001C */ lw $ra, 0x001C($sp) -glabel L8089B5D8 -/* 00198 8089B5D8 3C18808A */ lui $t8, %hi(D_8089BA30) ## $t8 = 808A0000 -/* 0019C 8089B5DC 2718BA30 */ addiu $t8, $t8, %lo(D_8089BA30) ## $t8 = 8089BA30 -/* 001A0 8089B5E0 00037840 */ sll $t7, $v1, 1 -/* 001A4 8089B5E4 01F81021 */ addu $v0, $t7, $t8 -/* 001A8 8089B5E8 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 001AC 8089B5EC 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 -/* 001B0 8089B5F0 3C04808A */ lui $a0, %hi(D_8089B9C0) ## $a0 = 808A0000 -/* 001B4 8089B5F4 2484B9C0 */ addiu $a0, $a0, %lo(D_8089B9C0) ## $a0 = 8089B9C0 -/* 001B8 8089B5F8 00194080 */ sll $t0, $t9, 2 -/* 001BC 8089B5FC 000A5880 */ sll $t3, $t2, 2 -/* 001C0 8089B600 008B6021 */ addu $t4, $a0, $t3 -/* 001C4 8089B604 00884821 */ addu $t1, $a0, $t0 -/* 001C8 8089B608 C5240000 */ lwc1 $f4, 0x0000($t1) ## 00000000 -/* 001CC 8089B60C C5860000 */ lwc1 $f6, 0x0000($t4) ## 00000000 -/* 001D0 8089B610 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001D4 8089B614 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 001D8 8089B618 46062001 */ sub.s $f0, $f4, $f6 -/* 001DC 8089B61C 8FA40024 */ lw $a0, 0x0024($sp) -/* 001E0 8089B620 8FA50020 */ lw $a1, 0x0020($sp) -/* 001E4 8089B624 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 001E8 8089B628 46000005 */ abs.s $f0, $f0 -/* 001EC 8089B62C 4600403C */ c.lt.s $f8, $f0 -/* 001F0 8089B630 00000000 */ nop -/* 001F4 8089B634 45020007 */ bc1fl .L8089B654 -/* 001F8 8089B638 8FBF001C */ lw $ra, 0x001C($sp) -/* 001FC 8089B63C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00200 8089B640 84A700B6 */ lh $a3, 0x00B6($a1) ## 000000B6 -/* 00204 8089B644 AFA00014 */ sw $zero, 0x0014($sp) -/* 00208 8089B648 0C00BDB5 */ jal func_8002F6D4 -/* 0020C 8089B64C E7AA0010 */ swc1 $f10, 0x0010($sp) -.L8089B650: -/* 00210 8089B650 8FBF001C */ lw $ra, 0x001C($sp) -.L8089B654: -/* 00214 8089B654 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00218 8089B658 03E00008 */ jr $ra -/* 0021C 8089B65C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s deleted file mode 100644 index 190df34dd4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_8089B7B4 -/* 00374 8089B7B4 3C0E808A */ lui $t6, %hi(func_8089B7C4) ## $t6 = 808A0000 -/* 00378 8089B7B8 25CEB7C4 */ addiu $t6, $t6, %lo(func_8089B7C4) ## $t6 = 8089B7C4 -/* 0037C 8089B7BC 03E00008 */ jr $ra -/* 00380 8089B7C0 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s deleted file mode 100644 index b684205dec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8089B7C4 -/* 00384 8089B7C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00388 8089B7C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0038C 8089B7CC AFA5001C */ sw $a1, 0x001C($sp) -/* 00390 8089B7D0 848E016A */ lh $t6, 0x016A($a0) ## 0000016A -/* 00394 8089B7D4 5DC00005 */ bgtzl $t6, .L8089B7EC -/* 00398 8089B7D8 848F0168 */ lh $t7, 0x0168($a0) ## 00000168 -/* 0039C 8089B7DC 0C226E03 */ jal func_8089B80C -/* 003A0 8089B7E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 003A4 8089B7E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 003A8 8089B7E8 848F0168 */ lh $t7, 0x0168($a0) ## 00000168 -.L8089B7EC: -/* 003AC 8089B7EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003B0 8089B7F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 003B4 8089B7F4 3C01808A */ lui $at, %hi(D_8089B9C0) ## $at = 808A0000 -/* 003B8 8089B7F8 000FC080 */ sll $t8, $t7, 2 -/* 003BC 8089B7FC 00380821 */ addu $at, $at, $t8 -/* 003C0 8089B800 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C4 8089B804 03E00008 */ jr $ra -/* 003C8 8089B808 E424B9C0 */ swc1 $f4, %lo(D_8089B9C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s deleted file mode 100644 index 7f83e9dde9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8089B80C -/* 003CC 8089B80C 848F0168 */ lh $t7, 0x0168($a0) ## 00000168 -/* 003D0 8089B810 3C0E808A */ lui $t6, %hi(func_8089B870) ## $t6 = 808A0000 -/* 003D4 8089B814 25CEB870 */ addiu $t6, $t6, %lo(func_8089B870) ## $t6 = 8089B870 -/* 003D8 8089B818 3C19808A */ lui $t9, %hi(D_8089BA00) ## $t9 = 808A0000 -/* 003DC 8089B81C 000FC040 */ sll $t8, $t7, 1 -/* 003E0 8089B820 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 003E4 8089B824 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 003E8 8089B828 0338C821 */ addu $t9, $t9, $t8 -/* 003EC 8089B82C 8739BA00 */ lh $t9, %lo(D_8089BA00)($t9) -/* 003F0 8089B830 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 003F4 8089B834 04400003 */ bltz $v0, .L8089B844 -/* 003F8 8089B838 A499016A */ sh $t9, 0x016A($a0) ## 0000016A -/* 003FC 8089B83C 10000002 */ beq $zero, $zero, .L8089B848 -/* 00400 8089B840 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8089B844: -/* 00404 8089B844 00021823 */ subu $v1, $zero, $v0 -.L8089B848: -/* 00408 8089B848 54610006 */ bnel $v1, $at, .L8089B864 -/* 0040C 8089B84C 848A016E */ lh $t2, 0x016E($a0) ## 0000016E -/* 00410 8089B850 8488016E */ lh $t0, 0x016E($a0) ## 0000016E -/* 00414 8089B854 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 00418 8089B858 00084823 */ subu $t1, $zero, $t0 -/* 0041C 8089B85C A489016E */ sh $t1, 0x016E($a0) ## 0000016E -/* 00420 8089B860 848A016E */ lh $t2, 0x016E($a0) ## 0000016E -.L8089B864: -/* 00424 8089B864 004A5821 */ addu $t3, $v0, $t2 -/* 00428 8089B868 03E00008 */ jr $ra -/* 0042C 8089B86C A48B016C */ sh $t3, 0x016C($a0) ## 0000016C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s deleted file mode 100644 index 33572b933f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_8089B870 -/* 00430 8089B870 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00434 8089B874 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00438 8089B878 AFA5001C */ sw $a1, 0x001C($sp) -/* 0043C 8089B87C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00440 8089B880 84EE016C */ lh $t6, 0x016C($a3) ## 0000016C -/* 00444 8089B884 C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 00448 8089B888 84F80168 */ lh $t8, 0x0168($a3) ## 00000168 -/* 0044C 8089B88C 000E7880 */ sll $t7, $t6, 2 -/* 00450 8089B890 01EE7821 */ addu $t7, $t7, $t6 -/* 00454 8089B894 000F7880 */ sll $t7, $t7, 2 -/* 00458 8089B898 01EE7823 */ subu $t7, $t7, $t6 -/* 0045C 8089B89C 000F7880 */ sll $t7, $t7, 2 -/* 00460 8089B8A0 01EE7823 */ subu $t7, $t7, $t6 -/* 00464 8089B8A4 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00468 8089B8A8 3C06808A */ lui $a2, %hi(D_8089BA08) ## $a2 = 808A0000 -/* 0046C 8089B8AC 0018C880 */ sll $t9, $t8, 2 -/* 00470 8089B8B0 46803220 */ cvt.s.w $f8, $f6 -/* 00474 8089B8B4 00D93021 */ addu $a2, $a2, $t9 -/* 00478 8089B8B8 8CC6BA08 */ lw $a2, %lo(D_8089BA08)($a2) -/* 0047C 8089B8BC AFA70018 */ sw $a3, 0x0018($sp) -/* 00480 8089B8C0 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00484 8089B8C4 46082280 */ add.s $f10, $f4, $f8 -/* 00488 8089B8C8 44055000 */ mfc1 $a1, $f10 -/* 0048C 8089B8CC 0C01DE80 */ jal Math_ApproxF - -/* 00490 8089B8D0 00000000 */ nop -/* 00494 8089B8D4 10400005 */ beq $v0, $zero, .L8089B8EC -/* 00498 8089B8D8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0049C 8089B8DC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004A0 8089B8E0 0C226DED */ jal func_8089B7B4 -/* 004A4 8089B8E4 AFA70018 */ sw $a3, 0x0018($sp) -/* 004A8 8089B8E8 8FA70018 */ lw $a3, 0x0018($sp) -.L8089B8EC: -/* 004AC 8089B8EC 84E8016E */ lh $t0, 0x016E($a3) ## 0000016E -/* 004B0 8089B8F0 84E20168 */ lh $v0, 0x0168($a3) ## 00000168 -/* 004B4 8089B8F4 3C01808A */ lui $at, %hi(D_8089BA08) ## $at = 808A0000 -/* 004B8 8089B8F8 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 004BC 8089B8FC 00021080 */ sll $v0, $v0, 2 -/* 004C0 8089B900 00220821 */ addu $at, $at, $v0 -/* 004C4 8089B904 468091A0 */ cvt.s.w $f6, $f18 -/* 004C8 8089B908 C430BA08 */ lwc1 $f16, %lo(D_8089BA08)($at) -/* 004CC 8089B90C 3C01808A */ lui $at, %hi(D_8089B9C0) ## $at = 808A0000 -/* 004D0 8089B910 00220821 */ addu $at, $at, $v0 -/* 004D4 8089B914 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004D8 8089B918 24052024 */ addiu $a1, $zero, 0x2024 ## $a1 = 00002024 -/* 004DC 8089B91C 46068102 */ mul.s $f4, $f16, $f6 -/* 004E0 8089B920 0C00BE5D */ jal func_8002F974 -/* 004E4 8089B924 E424B9C0 */ swc1 $f4, %lo(D_8089B9C0)($at) -/* 004E8 8089B928 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004EC 8089B92C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F0 8089B930 03E00008 */ jr $ra -/* 004F4 8089B934 00000000 */ nop diff --git a/data/overlays/actors/z_bg_jya_zurerukabe.data.s b/data/overlays/actors/z_bg_jya_zurerukabe.data.s deleted file mode 100644 index ba98bdc3d4..0000000000 --- a/data/overlays/actors/z_bg_jya_zurerukabe.data.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_8089B9C0 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel Bg_Jya_Zurerukabe_InitVars - .word 0x00FA0100, 0x00000010, 0x00F10000, 0x00000170 -.word BgJyaZurerukabe_Init -.word BgJyaZurerukabe_Destroy -.word BgJyaZurerukabe_Update -.word BgJyaZurerukabe_Draw -glabel D_8089B9F0 - .word 0x03AF0413, 0x04DB053F -glabel D_8089B9F8 - .word 0xFFFF0001, 0xFFFF0001 -glabel D_8089BA00 - .word 0x00300030, 0x00240024 -glabel D_8089BA08 - .word 0x41000000, 0x41000000, 0x41200000, 0x41200000 -glabel D_8089BA18 - .word 0x03880395, 0x03EA03FF, 0x04540467, 0x04B404C1, 0x05180528, 0x05810590 -glabel D_8089BA30 - .word 0x00000000, 0x00010002, 0x00020003 -glabel D_8089BA3C - .word 0xC8500064, 0xB0F403E8, 0xB0F804B0, 0x30FC03E8, 0x00000000 - diff --git a/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s b/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s deleted file mode 100644 index 10232b23a2..0000000000 --- a/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_8089BB50 - .incbin "baserom/ovl_Bg_Jya_Zurerukabe", 0x710, 0x00000120 diff --git a/spec b/spec index 9530fb8ae8..abb6ded04b 100644 --- a/spec +++ b/spec @@ -1032,8 +1032,7 @@ endseg beginseg name "ovl_Bg_Jya_Zurerukabe" include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.o" - include "build/data/overlays/actors/z_bg_jya_zurerukabe.data.o" - include "build/data/overlays/actors/z_bg_jya_zurerukabe.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/ovl_Bg_Jya_Zurerukabe_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 295c2a86fa..436e4c0c8b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -1,5 +1,13 @@ +/* + * File: z_bg_jya_zurerukabe.c + * Overlay: ovl_Bg_Jya_Zurerukabe + * Description: + */ + #include "z_bg_jya_zurerukabe.h" +#include + #define FLAGS 0x00000010 #define THIS ((BgJyaZurerukabe*)thisx) @@ -9,7 +17,14 @@ void BgJyaZurerukabe_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgJyaZurerukabe_Update(Actor* thisx, GlobalContext* globalCtx); void BgJyaZurerukabe_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_8089B4C8(BgJyaZurerukabe* this, GlobalContext* globalCtx); +void func_8089B7B4(BgJyaZurerukabe* this); +void func_8089B7C4(BgJyaZurerukabe* this, GlobalContext* globalCtx); +void func_8089B80C(BgJyaZurerukabe* this); +void func_8089B870(BgJyaZurerukabe* this, GlobalContext* globalCtx); + +static f32 D_8089B9C0[4] = { 0.0f, 0.0f, 0.0f, 0.0f }; + const ActorInit Bg_Jya_Zurerukabe_InitVars = { ACTOR_BG_JYA_ZURERUKABE, ACTORTYPE_BG, @@ -21,23 +36,160 @@ const ActorInit Bg_Jya_Zurerukabe_InitVars = { (ActorFunc)BgJyaZurerukabe_Update, (ActorFunc)BgJyaZurerukabe_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B440.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B4C8.s") +static s16 D_8089B9F0[4] = { 943, 1043, 1243, 1343 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Init.s") +static s16 D_8089B9F8[4] = { -1, 1, -1, 1 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Destroy.s") +static s16 D_8089BA00[4] = { 48, 48, 36, 36 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7B4.s") +static f32 D_8089BA08[4] = { 8.0f, 8.0f, 10.0f, 10.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B7C4.s") +static s16 D_8089BA18[6][2] = { + { 0x0388, 0x0395 }, { 0x03EA, 0x03FF }, { 0x0454, 0x0467 }, + { 0x04B4, 0x04C1 }, { 0x0518, 0x0528 }, { 0x0581, 0x0590 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B80C.s") +static s16 D_8089BA30[6] = { + 0, 0, 1, 2, 2, 3, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/func_8089B870.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Update.s") +extern Gfx D_06012340[]; +extern UNK_PTR D_06012508; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s") +void func_8089B440(BgJyaZurerukabe* this, GlobalContext* globalCtx, void* arg2, s32 flags) { + s32 pad; + s32 localC = 0; + s32 pad2; + + DynaPolyInfo_SetActorMove(&this->dyna, flags); + DynaPolyInfo_Alloc(arg2, &localC); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localC); + + if (this->dyna.dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 194, + this->dyna.actor.id, this->dyna.actor.params); + } +} + +void func_8089B4C8(BgJyaZurerukabe* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((player->stateFlags1 == 0x200000) && (player->actor.wallPoly != NULL)) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_8089BA18); i++) { + f32 posY = player->actor.posRot.pos.y; + if ((posY >= D_8089BA18[i][0]) && (posY <= D_8089BA18[i][1])) { + break; + } + } + + switch (i) { + case 0: + case 2: + case 3: + case 5: + if (fabsf(D_8089B9C0[D_8089BA30[i]]) > 1.0f) { + func_8002F6D4(globalCtx, &this->dyna.actor, 1.5f, this->dyna.actor.shape.rot.y, 0.0f, 0); + } + break; + case 1: + case 4: + if (fabsf(D_8089B9C0[D_8089BA30[i]] - D_8089B9C0[D_8089BA30[i + 1]]) > 1.0f) { + func_8002F6D4(globalCtx, &this->dyna.actor, 1.5f, this->dyna.actor.shape.rot.y, 0.0f, 0); + } + break; + } + } +} + +void BgJyaZurerukabe_Init(Actor* thisx, GlobalContext* globalCtx) { + BgJyaZurerukabe* this = THIS; + s32 i; + + func_8089B440(this, globalCtx, &D_06012508, DPM_UNK); + Actor_ProcessInitChain(thisx, sInitChain); + + for (i = 0; i < ARRAY_COUNT(D_8089B9F0); i++) { + if (fabsf(D_8089B9F0[i] - this->dyna.actor.initPosRot.pos.y) < 1.0f) { + this->unk_168 = i; + break; + } + } + + if (i == ARRAY_COUNT(D_8089B9F0)) { + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 299, + this->dyna.actor.params); + osSyncPrintf(VT_RST); + } + + this->unk_16E = D_8089B9F8[this->unk_168]; + func_8089B7B4(this); + osSyncPrintf("(jya ずれる壁)(arg_data 0x%04x)\n", this->dyna.actor.params); +} + +void BgJyaZurerukabe_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgJyaZurerukabe* this = THIS; + + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + D_8089B9C0[this->unk_168] = 0.0f; +} + +void func_8089B7B4(BgJyaZurerukabe* this) { + this->actionFunc = func_8089B7C4; +} + +void func_8089B7C4(BgJyaZurerukabe* this, GlobalContext* globalCtx) { + if (this->unk_16A <= 0) { + func_8089B80C(this); + } + D_8089B9C0[this->unk_168] = 0.0f; +} + +void func_8089B80C(BgJyaZurerukabe* this) { + this->actionFunc = func_8089B870; + this->unk_16A = D_8089BA00[this->unk_168]; + + if (ABS(this->unk_16C) == 4) { + this->unk_16E = -this->unk_16E; + } + + this->unk_16C += this->unk_16E; +} + +void func_8089B870(BgJyaZurerukabe* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x + (this->unk_16C * 75), + D_8089BA08[this->unk_168])) { + func_8089B7B4(this); + } + + D_8089B9C0[this->unk_168] = D_8089BA08[this->unk_168] * this->unk_16E; + func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); +} + +void BgJyaZurerukabe_Update(Actor* thisx, GlobalContext* globalCtx) { + BgJyaZurerukabe* this = THIS; + + if (this->unk_16A > 0) { + this->unk_16A--; + } + + this->actionFunc(this, globalCtx); + + if (this->unk_168 == 0) { + func_8089B4C8(this, globalCtx); + } +} + +void BgJyaZurerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, D_06012340); +} diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h index db554852b9..da59223c72 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h @@ -6,9 +6,15 @@ struct BgJyaZurerukabe; +typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, GlobalContext*); + typedef struct BgJyaZurerukabe { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgJyaZurerukabeActionFunc actionFunc; + /* 0x0168 */ s16 unk_168; + /* 0x016A */ s16 unk_16A; + /* 0x016C */ s16 unk_16C; + /* 0x016E */ s16 unk_16E; } BgJyaZurerukabe; // size = 0x0170 extern const ActorInit Bg_Jya_Zurerukabe_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 2159cc4deb..01ac4a1946 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -389,6 +389,10 @@ D_0600F208 = 0x0600F208; D_0600D7E8 = 0x0600D7E8; D_0600CCE0 = 0x0600CCE0; +// z_bg_jya_zurerukabe +D_06012340 = 0x06012340; +D_06012508 = 0x06012508; + // z_bg_menkuri_kaiten D_060038D0 = 0x060038D0; D_060042D8 = 0x060042D8; From 7a8e00e49d40a92275f53c878904977891c95ec7 Mon Sep 17 00:00:00 2001 From: emilybrooks Date: Thu, 1 Oct 2020 04:49:47 -0700 Subject: [PATCH 3/6] ovl_en_hs2 OK (#423) * Decompiled ovl_en_hs2 * Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer * Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function * Changed 0xFFFE to ~1 --- .../actors/ovl_En_Hs2/EnHs2_Destroy.s | 12 -- .../overlays/actors/ovl_En_Hs2/EnHs2_Draw.s | 25 ---- .../overlays/actors/ovl_En_Hs2/EnHs2_Init.s | 71 ---------- .../overlays/actors/ovl_En_Hs2/EnHs2_Update.s | 102 ------------- .../actors/ovl_En_Hs2/func_80A6F0B4.s | 50 ------- .../actors/ovl_En_Hs2/func_80A6F164.s | 18 --- .../actors/ovl_En_Hs2/func_80A6F1A4.s | 21 --- .../actors/ovl_En_Hs2/func_80A6F358.s | 28 ---- .../actors/ovl_En_Hs2/func_80A6F390.s | 16 --- .../actors/ovl_En_Hs2/func_80A6F3C8.s | 8 -- .../actors/ovl_En_Hs2/func_80A6F3E0.s | 18 --- data/overlays/actors/z_en_hs2.data.s | 22 --- data/overlays/actors/z_en_hs2.reloc.s | 13 -- spec | 3 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 134 ++++++++++++++++-- src/overlays/actors/ovl_En_Hs2/z_en_hs2.h | 11 +- undefined_syms.txt | 4 + 17 files changed, 136 insertions(+), 420 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s delete mode 100644 data/overlays/actors/z_en_hs2.data.s delete mode 100644 data/overlays/actors/z_en_hs2.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s deleted file mode 100644 index e56cd62043..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnHs2_Destroy -/* 000EC 80A6F08C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F0 80A6F090 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000F4 80A6F094 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F8 80A6F098 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000FC 80A6F09C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00100 80A6F0A0 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 00104 80A6F0A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00108 80A6F0A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0010C 80A6F0AC 03E00008 */ jr $ra -/* 00110 80A6F0B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s deleted file mode 100644 index 4af2623adc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel EnHs2_Draw -/* 00480 80A6F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00484 80A6F424 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00488 80A6F428 AFA40028 */ sw $a0, 0x0028($sp) -/* 0048C 80A6F42C AFA5002C */ sw $a1, 0x002C($sp) -/* 00490 80A6F430 0C0250F2 */ jal func_800943C8 -/* 00494 80A6F434 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00498 80A6F438 8FA20028 */ lw $v0, 0x0028($sp) -/* 0049C 80A6F43C 3C0F80A7 */ lui $t7, %hi(func_80A6F358) ## $t7 = 80A70000 -/* 004A0 80A6F440 3C1880A7 */ lui $t8, %hi(func_80A6F3E0) ## $t8 = 80A70000 -/* 004A4 80A6F444 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C -/* 004A8 80A6F448 8C4601B8 */ lw $a2, 0x01B8($v0) ## 000001B8 -/* 004AC 80A6F44C 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A -/* 004B0 80A6F450 2718F3E0 */ addiu $t8, $t8, %lo(func_80A6F3E0) ## $t8 = 80A6F3E0 -/* 004B4 80A6F454 25EFF358 */ addiu $t7, $t7, %lo(func_80A6F358) ## $t7 = 80A6F358 -/* 004B8 80A6F458 AFAF0010 */ sw $t7, 0x0010($sp) -/* 004BC 80A6F45C AFB80014 */ sw $t8, 0x0014($sp) -/* 004C0 80A6F460 8FA4002C */ lw $a0, 0x002C($sp) -/* 004C4 80A6F464 0C0286B2 */ jal SkelAnime_DrawSV -/* 004C8 80A6F468 AFA20018 */ sw $v0, 0x0018($sp) -/* 004CC 80A6F46C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004D0 80A6F470 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004D4 80A6F474 03E00008 */ jr $ra -/* 004D8 80A6F478 00000000 */ nop -/* 004DC 80A6F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s deleted file mode 100644 index 828bfff3a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80A6F4E0 - .asciz "\x1b[36m ヒヨコの店(子人の時) \n\x1b[m" - .balign 4 - -.text -glabel EnHs2_Init -/* 00000 80A6EFA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A6EFA4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00008 80A6EFA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A6EFAC AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A6EFB0 AFA50044 */ sw $a1, 0x0044($sp) -/* 00014 80A6EFB4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00018 80A6EFB8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0001C 80A6EFBC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00020 80A6EFC0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00024 80A6EFC4 0C00AC78 */ jal ActorShape_Init - -/* 00028 80A6EFC8 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 0002C 80A6EFCC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 00030 80A6EFD0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00034 80A6EFD4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00038 80A6EFD8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC -/* 0003C 80A6EFDC 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C -/* 00040 80A6EFE0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A6EFE4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A6EFE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A6EFEC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 80A6EFF0 24E705C0 */ addiu $a3, $a3, 0x05C0 ## $a3 = 060005C0 -/* 00054 80A6EFF4 24C66260 */ addiu $a2, $a2, 0x6260 ## $a2 = 06006260 -/* 00058 80A6EFF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0005C 80A6EFFC 0C0291BE */ jal SkelAnime_InitSV -/* 00060 80A6F000 8FA40044 */ lw $a0, 0x0044($sp) -/* 00064 80A6F004 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00068 80A6F008 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 0006C 80A6F00C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) -/* 00074 80A6F014 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) -/* 0007C 80A6F01C 0C0170D9 */ jal Collider_InitCylinder - -/* 00080 80A6F020 8FA40044 */ lw $a0, 0x0044($sp) -/* 00084 80A6F024 3C0780A7 */ lui $a3, %hi(D_80A6F4A0) ## $a3 = 80A70000 -/* 00088 80A6F028 8FA50034 */ lw $a1, 0x0034($sp) -/* 0008C 80A6F02C 24E7F4A0 */ addiu $a3, $a3, %lo(D_80A6F4A0) ## $a3 = 80A6F4A0 -/* 00090 80A6F030 8FA40044 */ lw $a0, 0x0044($sp) -/* 00094 80A6F034 0C01712B */ jal Collider_SetCylinder - -/* 00098 80A6F038 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0009C 80A6F03C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 000A0 80A6F040 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 000A4 80A6F044 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 000A8 80A6F048 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 000AC 80A6F04C 0C00B58B */ jal Actor_SetScale - -/* 000B0 80A6F050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B4 80A6F054 3C0480A7 */ lui $a0, %hi(D_80A6F4E0) ## $a0 = 80A70000 -/* 000B8 80A6F058 0C00084C */ jal osSyncPrintf - -/* 000BC 80A6F05C 2484F4E0 */ addiu $a0, $a0, %lo(D_80A6F4E0) ## $a0 = 80A6F4E0 -/* 000C0 80A6F060 3C0880A7 */ lui $t0, %hi(func_80A6F1A4) ## $t0 = 80A70000 -/* 000C4 80A6F064 2508F1A4 */ addiu $t0, $t0, %lo(func_80A6F1A4) ## $t0 = 80A6F1A4 -/* 000C8 80A6F068 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 000CC 80A6F06C AE0802AC */ sw $t0, 0x02AC($s0) ## 000002AC -/* 000D0 80A6F070 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 -/* 000D4 80A6F074 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000D8 80A6F078 8FBF002C */ lw $ra, 0x002C($sp) -/* 000DC 80A6F07C 8FB00028 */ lw $s0, 0x0028($sp) -/* 000E0 80A6F080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000E4 80A6F084 03E00008 */ jr $ra -/* 000E8 80A6F088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s deleted file mode 100644 index 64a1073b5b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel EnHs2_Update -/* 00250 80A6F1F0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00254 80A6F1F4 AFB00024 */ sw $s0, 0x0024($sp) -/* 00258 80A6F1F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0025C 80A6F1FC AFB10028 */ sw $s1, 0x0028($sp) -/* 00260 80A6F200 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00264 80A6F204 AFBF002C */ sw $ra, 0x002C($sp) -/* 00268 80A6F208 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 0026C 80A6F20C 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00270 80A6F210 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00274 80A6F214 AFA60034 */ sw $a2, 0x0034($sp) -/* 00278 80A6F218 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0027C 80A6F21C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00280 80A6F220 8FA60034 */ lw $a2, 0x0034($sp) -/* 00284 80A6F224 02212821 */ addu $a1, $s1, $at -/* 00288 80A6F228 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 0028C 80A6F22C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00290 80A6F230 0C00B638 */ jal Actor_MoveForward - -/* 00294 80A6F234 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00298 80A6F238 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0029C 80A6F23C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 002A0 80A6F240 AFAE0014 */ sw $t6, 0x0014($sp) -/* 002A4 80A6F244 44060000 */ mfc1 $a2, $f0 -/* 002A8 80A6F248 44070000 */ mfc1 $a3, $f0 -/* 002AC 80A6F24C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002B0 80A6F250 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002B4 80A6F254 0C00B92D */ jal func_8002E4B4 -/* 002B8 80A6F258 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 002BC 80A6F25C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 002C0 80A6F260 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 002C4 80A6F264 50400005 */ beql $v0, $zero, .L80A6F27C -/* 002C8 80A6F268 8E1902AC */ lw $t9, 0x02AC($s0) ## 000002AC -/* 002CC 80A6F26C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 002D0 80A6F270 00000000 */ nop -/* 002D4 80A6F274 E60401B0 */ swc1 $f4, 0x01B0($s0) ## 000001B0 -/* 002D8 80A6F278 8E1902AC */ lw $t9, 0x02AC($s0) ## 000002AC -.L80A6F27C: -/* 002DC 80A6F27C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E0 80A6F280 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002E4 80A6F284 0320F809 */ jalr $ra, $t9 -/* 002E8 80A6F288 00000000 */ nop -/* 002EC 80A6F28C 960F02A8 */ lhu $t7, 0x02A8($s0) ## 000002A8 -/* 002F0 80A6F290 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 002F4 80A6F294 24053200 */ addiu $a1, $zero, 0x3200 ## $a1 = 00003200 -/* 002F8 80A6F298 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 002FC 80A6F29C 13000010 */ beq $t8, $zero, .L80A6F2E0 -/* 00300 80A6F2A0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00304 80A6F2A4 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 00308 80A6F2A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0030C 80A6F2AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00310 80A6F2B0 AFA90010 */ sw $t1, 0x0010($sp) -/* 00314 80A6F2B4 8E08003C */ lw $t0, 0x003C($s0) ## 0000003C -/* 00318 80A6F2B8 2606029C */ addiu $a2, $s0, 0x029C ## $a2 = 0000029C -/* 0031C 80A6F2BC 260702A2 */ addiu $a3, $s0, 0x02A2 ## $a3 = 000002A2 -/* 00320 80A6F2C0 AFA80014 */ sw $t0, 0x0014($sp) -/* 00324 80A6F2C4 8E090040 */ lw $t1, 0x0040($s0) ## 00000040 -/* 00328 80A6F2C8 0C00E0A4 */ jal func_80038290 -/* 0032C 80A6F2CC AFA90018 */ sw $t1, 0x0018($sp) -/* 00330 80A6F2D0 960A02A8 */ lhu $t2, 0x02A8($s0) ## 000002A8 -/* 00334 80A6F2D4 314BFFFE */ andi $t3, $t2, 0xFFFE ## $t3 = 00000000 -/* 00338 80A6F2D8 1000001A */ beq $zero, $zero, .L80A6F344 -/* 0033C 80A6F2DC A60B02A8 */ sh $t3, 0x02A8($s0) ## 000002A8 -.L80A6F2E0: -/* 00340 80A6F2E0 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 00344 80A6F2E4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00348 80A6F2E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0034C 80A6F2EC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00350 80A6F2F0 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 -/* 00354 80A6F2F4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00358 80A6F2F8 2604029E */ addiu $a0, $s0, 0x029E ## $a0 = 0000029E -/* 0035C 80A6F2FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00360 80A6F300 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00364 80A6F304 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00368 80A6F308 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 0036C 80A6F30C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00370 80A6F310 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00374 80A6F314 260402A2 */ addiu $a0, $s0, 0x02A2 ## $a0 = 000002A2 -/* 00378 80A6F318 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0037C 80A6F31C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00380 80A6F320 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00384 80A6F324 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00388 80A6F328 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 0038C 80A6F32C AFB90010 */ sw $t9, 0x0010($sp) -/* 00390 80A6F330 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 -/* 00394 80A6F334 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00398 80A6F338 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0039C 80A6F33C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 003A0 80A6F340 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -.L80A6F344: -/* 003A4 80A6F344 8FBF002C */ lw $ra, 0x002C($sp) -/* 003A8 80A6F348 8FB00024 */ lw $s0, 0x0024($sp) -/* 003AC 80A6F34C 8FB10028 */ lw $s1, 0x0028($sp) -/* 003B0 80A6F350 03E00008 */ jr $ra -/* 003B4 80A6F354 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s deleted file mode 100644 index 84f04d8b6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A6F0B4 -/* 00114 80A6F0B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00118 80A6F0B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0011C 80A6F0BC AFA5001C */ sw $a1, 0x001C($sp) -/* 00120 80A6F0C0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00124 80A6F0C4 AFA70024 */ sw $a3, 0x0024($sp) -/* 00128 80A6F0C8 0C00BC65 */ jal func_8002F194 -/* 0012C 80A6F0CC AFA40018 */ sw $a0, 0x0018($sp) -/* 00130 80A6F0D0 10400005 */ beq $v0, $zero, .L80A6F0E8 -/* 00134 80A6F0D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00138 80A6F0D8 8FAE0024 */ lw $t6, 0x0024($sp) -/* 0013C 80A6F0DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00140 80A6F0E0 1000001C */ beq $zero, $zero, .L80A6F154 -/* 00144 80A6F0E4 AC8E02AC */ sw $t6, 0x02AC($a0) ## 000002AC -.L80A6F0E8: -/* 00148 80A6F0E8 8498008A */ lh $t8, 0x008A($a0) ## 0000008A -/* 0014C 80A6F0EC 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -/* 00150 80A6F0F0 97AF0022 */ lhu $t7, 0x0022($sp) -/* 00154 80A6F0F4 03191023 */ subu $v0, $t8, $t9 -/* 00158 80A6F0F8 00021400 */ sll $v0, $v0, 16 -/* 0015C 80A6F0FC 00021403 */ sra $v0, $v0, 16 -/* 00160 80A6F100 04400003 */ bltz $v0, .L80A6F110 -/* 00164 80A6F104 A48F010E */ sh $t7, 0x010E($a0) ## 0000010E -/* 00168 80A6F108 10000002 */ beq $zero, $zero, .L80A6F114 -/* 0016C 80A6F10C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000001 -.L80A6F110: -/* 00170 80A6F110 00021823 */ subu $v1, $zero, $v0 -.L80A6F114: -/* 00174 80A6F114 28612151 */ slti $at, $v1, 0x2151 -/* 00178 80A6F118 1020000D */ beq $at, $zero, .L80A6F150 -/* 0017C 80A6F11C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00180 80A6F120 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 00184 80A6F124 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00188 80A6F128 4600203C */ c.lt.s $f4, $f0 -/* 0018C 80A6F12C 00000000 */ nop -/* 00190 80A6F130 45020008 */ bc1fl .L80A6F154 -/* 00194 80A6F134 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00198 80A6F138 948802A8 */ lhu $t0, 0x02A8($a0) ## 000002A8 -/* 0019C 80A6F13C 44060000 */ mfc1 $a2, $f0 -/* 001A0 80A6F140 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 001A4 80A6F144 A48902A8 */ sh $t1, 0x02A8($a0) ## 000002A8 -/* 001A8 80A6F148 0C00BCB3 */ jal func_8002F2CC -/* 001AC 80A6F14C 8FA5001C */ lw $a1, 0x001C($sp) -.L80A6F150: -/* 001B0 80A6F150 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A6F154: -/* 001B4 80A6F154 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B8 80A6F158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001BC 80A6F15C 03E00008 */ jr $ra -/* 001C0 80A6F160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s deleted file mode 100644 index 079f158130..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A6F164 -/* 001C4 80A6F164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C8 80A6F168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001CC 80A6F16C 0C00BCCD */ jal func_8002F334 -/* 001D0 80A6F170 AFA40018 */ sw $a0, 0x0018($sp) -/* 001D4 80A6F174 10400004 */ beq $v0, $zero, .L80A6F188 -/* 001D8 80A6F178 8FA40018 */ lw $a0, 0x0018($sp) -/* 001DC 80A6F17C 3C0E80A7 */ lui $t6, %hi(func_80A6F1A4) ## $t6 = 80A70000 -/* 001E0 80A6F180 25CEF1A4 */ addiu $t6, $t6, %lo(func_80A6F1A4) ## $t6 = 80A6F1A4 -/* 001E4 80A6F184 AC8E02AC */ sw $t6, 0x02AC($a0) ## 000002AC -.L80A6F188: -/* 001E8 80A6F188 948F02A8 */ lhu $t7, 0x02A8($a0) ## 000002A8 -/* 001EC 80A6F18C 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 001F0 80A6F190 A49802A8 */ sh $t8, 0x02A8($a0) ## 000002A8 -/* 001F4 80A6F194 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001F8 80A6F198 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001FC 80A6F19C 03E00008 */ jr $ra -/* 00200 80A6F1A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s deleted file mode 100644 index 892f02c6f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80A6F1A4 -/* 00204 80A6F1A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00208 80A6F1A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0020C 80A6F1AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00210 80A6F1B0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00214 80A6F1B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00218 80A6F1B8 0C01B0D8 */ jal Text_GetFaceReaction -/* 0021C 80A6F1BC 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 00220 80A6F1C0 14400002 */ bne $v0, $zero, .L80A6F1CC -/* 00224 80A6F1C4 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 -/* 00228 80A6F1C8 24065069 */ addiu $a2, $zero, 0x5069 ## $a2 = 00005069 -.L80A6F1CC: -/* 0022C 80A6F1CC 3C0780A7 */ lui $a3, %hi(func_80A6F164) ## $a3 = 80A70000 -/* 00230 80A6F1D0 24E7F164 */ addiu $a3, $a3, %lo(func_80A6F164) ## $a3 = 80A6F164 -/* 00234 80A6F1D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00238 80A6F1D8 0C29BC2D */ jal func_80A6F0B4 -/* 0023C 80A6F1DC 8FA5001C */ lw $a1, 0x001C($sp) -/* 00240 80A6F1E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00244 80A6F1E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00248 80A6F1E8 03E00008 */ jr $ra -/* 0024C 80A6F1EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s deleted file mode 100644 index 0c4adb062b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata -.late_rodata_alignment 8 - -glabel D_80A6F500 - .word func_80A6F390 -.word L80A6F3BC -.word func_80A6F3C8 -.word L80A6F384 -.word L80A6F384 -.word 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_80A6F358 -/* 003B8 80A6F358 24AEFFF7 */ addiu $t6, $a1, 0xFFF7 ## $t6 = FFFFFFF7 -/* 003BC 80A6F35C 2DC10005 */ sltiu $at, $t6, 0x0005 -/* 003C0 80A6F360 AFA40000 */ sw $a0, 0x0000($sp) -/* 003C4 80A6F364 1020001B */ beq $at, $zero, .L80A6F3D4 -/* 003C8 80A6F368 AFA7000C */ sw $a3, 0x000C($sp) -/* 003CC 80A6F36C 000E7080 */ sll $t6, $t6, 2 -/* 003D0 80A6F370 3C0180A7 */ lui $at, %hi(D_80A6F500) ## $at = 80A70000 -/* 003D4 80A6F374 002E0821 */ addu $at, $at, $t6 -/* 003D8 80A6F378 8C2EF500 */ lw $t6, %lo(D_80A6F500)($at) -/* 003DC 80A6F37C 01C00008 */ jr $t6 -/* 003E0 80A6F380 00000000 */ nop -glabel L80A6F384 -/* 003E4 80A6F384 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 003E8 80A6F388 03E00008 */ jr $ra -/* 003EC 80A6F38C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s deleted file mode 100644 index 7660473594..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A6F390 -/* 003F0 80A6F390 8FA20014 */ lw $v0, 0x0014($sp) -/* 003F4 80A6F394 8FA30010 */ lw $v1, 0x0010($sp) -/* 003F8 80A6F398 8458029E */ lh $t8, 0x029E($v0) ## 0000029E -/* 003FC 80A6F39C 846F0000 */ lh $t7, 0x0000($v1) ## 00000000 -/* 00400 80A6F3A0 84680004 */ lh $t0, 0x0004($v1) ## 00000004 -/* 00404 80A6F3A4 01F8C821 */ addu $t9, $t7, $t8 -/* 00408 80A6F3A8 A4790000 */ sh $t9, 0x0000($v1) ## 00000000 -/* 0040C 80A6F3AC 8449029C */ lh $t1, 0x029C($v0) ## 0000029C -/* 00410 80A6F3B0 01095021 */ addu $t2, $t0, $t1 -/* 00414 80A6F3B4 10000007 */ beq $zero, $zero, .L80A6F3D4 -/* 00418 80A6F3B8 A46A0004 */ sh $t2, 0x0004($v1) ## 00000004 -glabel L80A6F3BC -/* 0041C 80A6F3BC ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 00420 80A6F3C0 03E00008 */ jr $ra -/* 00424 80A6F3C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s deleted file mode 100644 index 44a44482a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80A6F3C8 -/* 00428 80A6F3C8 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 0042C 80A6F3CC 03E00008 */ jr $ra -/* 00430 80A6F3D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A6F3D4: -/* 00434 80A6F3D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00438 80A6F3D8 03E00008 */ jr $ra -/* 0043C 80A6F3DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s deleted file mode 100644 index 6b6e759dfb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A6F3E0 -/* 00440 80A6F3E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00444 80A6F3E4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00448 80A6F3E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0044C 80A6F3EC AFA40018 */ sw $a0, 0x0018($sp) -/* 00450 80A6F3F0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00454 80A6F3F4 14A10006 */ bne $a1, $at, .L80A6F410 -/* 00458 80A6F3F8 AFA70024 */ sw $a3, 0x0024($sp) -/* 0045C 80A6F3FC 8FA50028 */ lw $a1, 0x0028($sp) -/* 00460 80A6F400 3C0480A7 */ lui $a0, %hi(D_80A6F4CC) ## $a0 = 80A70000 -/* 00464 80A6F404 2484F4CC */ addiu $a0, $a0, %lo(D_80A6F4CC) ## $a0 = 80A6F4CC -/* 00468 80A6F408 0C0346BD */ jal Matrix_MultVec3f -/* 0046C 80A6F40C 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80A6F410: -/* 00470 80A6F410 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00474 80A6F414 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00478 80A6F418 03E00008 */ jr $ra -/* 0047C 80A6F41C 00000000 */ nop diff --git a/data/overlays/actors/z_en_hs2.data.s b/data/overlays/actors/z_en_hs2.data.s deleted file mode 100644 index 43daa8c3e7..0000000000 --- a/data/overlays/actors/z_en_hs2.data.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Hs2_InitVars - .word 0x01A60400, 0x00000009, 0x01280000, 0x000002B0 -.word EnHs2_Init -.word EnHs2_Destroy -.word EnHs2_Update -.word EnHs2_Draw -glabel D_80A6F4A0 - .word 0x0A001139, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00280028, 0x00000000, 0x00000000 -glabel D_80A6F4CC - .word 0x43960000, 0x447A0000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_hs2.reloc.s b/data/overlays/actors/z_en_hs2.reloc.s deleted file mode 100644 index 4d8dde3762..0000000000 --- a/data/overlays/actors/z_en_hs2.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80A6F520 - .incbin "baserom/ovl_En_Hs2", 0x580, 0x00000090 diff --git a/spec b/spec index abb6ded04b..ef4b566b01 100644 --- a/spec +++ b/spec @@ -2569,8 +2569,7 @@ endseg beginseg name "ovl_En_Hs2" include "build/src/overlays/actors/ovl_En_Hs2/z_en_hs2.o" - include "build/data/overlays/actors/z_en_hs2.data.o" - include "build/data/overlays/actors/z_en_hs2.reloc.o" + include "build/src/overlays/actors/ovl_En_Hs2/ovl_En_Hs2_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index bea28ce966..a58fb00e0d 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -6,6 +6,8 @@ #include "z_en_hs2.h" +#include + #define FLAGS 0x00000009 #define THIS ((EnHs2*)thisx) @@ -14,8 +16,8 @@ void EnHs2_Init(Actor* thisx, GlobalContext* globalCtx); void EnHs2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHs2_Update(Actor* thisx, GlobalContext* globalCtx); void EnHs2_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_80A6F1A4(EnHs2* this, GlobalContext* globalCtx); -/* const ActorInit En_Hs2_InitVars = { ACTOR_EN_HS2, ACTORTYPE_NPC, @@ -27,25 +29,131 @@ const ActorInit En_Hs2_InitVars = { (ActorFunc)EnHs2_Update, (ActorFunc)EnHs2_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x11, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 40, 40, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F0B4.s") +extern SkeletonHeader D_06006260; +extern AnimationHeader D_060005C0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F164.s") +void EnHs2_Init(Actor* thisx, GlobalContext* globalCtx) { + EnHs2* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06006260, &D_060005C0, this->limbDrawTable, + this->transitionDrawTable, 16); + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060005C0); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->actor.colChkInfo.mass = 0xFF; + Actor_SetScale(&this->actor, 0.01f); + osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); + this->actionFunc = func_80A6F1A4; + this->unk_2A8 = 0; + this->actor.unk_1F = 6; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Update.s") +void EnHs2_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnHs2* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F358.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F390.s") +s32 func_80A6F0B4(EnHs2* this, GlobalContext* globalCtx, u16 textId, EnHs2ActionFunc actionFunc) { + if (func_8002F194(&this->actor, globalCtx)) { + this->actionFunc = actionFunc; + return 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3C8.s") + this->actor.textId = textId; + if (ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y)) < 0x2151 && + this->actor.xzDistFromLink < 100.0f) { + this->unk_2A8 |= 0x1; + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F3E0.s") +void func_80A6F164(EnHs2* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + this->actionFunc = func_80A6F1A4; + } + this->unk_2A8 |= 0x1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s") +void func_80A6F1A4(EnHs2* this, GlobalContext* globalCtx) { + u16 textId; + + textId = Text_GetFaceReaction(globalCtx, 9); + if (textId == 0) { + textId = 0x5069; + } + + func_80A6F0B4(this, globalCtx, textId, func_80A6F164); +} + +void EnHs2_Update(Actor* thisx, GlobalContext* globalCtx) { + EnHs2* this = THIS; + s32 pad; + + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + this->skelAnime.animCurrentFrame = 0.0f; + } + this->actionFunc(this, globalCtx); + if (this->unk_2A8 & 0x1) { + func_80038290(globalCtx, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.posRot2.pos); + this->unk_2A8 &= ~1; + } else { + Math_SmoothScaleMaxMinS(&this->unk_29C.x, 12800, 6, 6200, 100); + Math_SmoothScaleMaxMinS(&this->unk_29C.y, 0, 6, 6200, 100); + Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100); + Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100); + } +} + +s32 EnHs2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* pos, Vec3s* rot, Actor* thisx) { + EnHs2* this = THIS; + + switch (limbIndex) { + case 12: + case 13: + *dList = NULL; + return 0; + case 9: + rot->x += this->unk_29C.y; + rot->z += this->unk_29C.x; + break; + case 10: + *dList = NULL; + return 0; + case 11: + *dList = NULL; + return 0; + } + return 0; +} + +void EnHs2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { + static Vec3f D_80A6F4CC = { 300.0f, 1000.0f, 0.0f }; + EnHs2* this = THIS; + + if (limbIndex == 9) { + Matrix_MultVec3f(&D_80A6F4CC, &this->actor.posRot2.pos); + } +} + +void EnHs2_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnHs2* this = THIS; + + func_800943C8(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnHs2_OverrideLimbDraw, EnHs2_PostLimbDraw, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h index 776088be33..fc44277e0f 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h @@ -6,9 +6,18 @@ struct EnHs2; +typedef void (*EnHs2ActionFunc)(struct EnHs2*, GlobalContext*); + typedef struct EnHs2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x164]; + /* 0x014C */ ColliderCylinder collider; + /* 0x0198 */ SkelAnime skelAnime; + /* 0x01DC */ Vec3s limbDrawTable[16]; + /* 0x023C */ Vec3s transitionDrawTable[16]; + /* 0x029C */ Vec3s unk_29C; + /* 0x02A2 */ Vec3s unk_2A2; + /* 0x02A8 */ u16 unk_2A8; + /* 0x02AC */ EnHs2ActionFunc actionFunc; } EnHs2; // size = 0x02B0 extern const ActorInit En_Hs2_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 01ac4a1946..6b88571da5 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -501,6 +501,10 @@ D_06000170 = 0x06000170; // z_eff_ss_kirakira D_04037880 = 0x04037880; +// z_en_hs2 +D_060005C0 = 0x60005C0; +D_06006260 = 0x6006260; + // z_en_bird D_0600006C = 0x0600006C; D_06002190 = 0x06002190; From 6136ee6debd570a63fc695a6f4664553303f2324 Mon Sep 17 00:00:00 2001 From: maekclena Date: Fri, 2 Oct 2020 00:51:05 +0200 Subject: [PATCH 4/6] ovl_En_Part (#383) * ovl_En_Part * PR review * PR review * Rebase * PR review * Oversight * Rebase * PR review --- .../actors/ovl_En_Part/EnPart_Destroy.s | 4 - .../overlays/actors/ovl_En_Part/EnPart_Draw.s | 412 ------------------ .../overlays/actors/ovl_En_Part/EnPart_Init.s | 4 - .../actors/ovl_En_Part/EnPart_Update.s | 62 --- .../actors/ovl_En_Part/func_80ACDDE8.s | 288 ------------ .../actors/ovl_En_Part/func_80ACE13C.s | 331 -------------- .../actors/ovl_En_Part/func_80ACE5B8.s | 5 - .../actors/ovl_En_Part/func_80ACE5C8.s | 153 ------- .../actors/ovl_En_Part/func_80ACE7E8.s | 141 ------ .../actors/ovl_En_Part/func_80ACEAC0.s | 49 --- data/overlays/actors/z_en_part.data.s | 37 -- data/overlays/actors/z_en_part.reloc.s | 13 - include/z64actor.h | 2 +- spec | 3 +- src/code/z_actor.c | 16 +- src/overlays/actors/ovl_En_Part/z_en_part.c | 305 ++++++++++++- src/overlays/actors/ovl_En_Part/z_en_part.h | 12 +- undefined_syms.txt | 9 + 18 files changed, 319 insertions(+), 1527 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s delete mode 100644 data/overlays/actors/z_en_part.data.s delete mode 100644 data/overlays/actors/z_en_part.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s deleted file mode 100644 index b73dac1ad3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnPart_Destroy -/* 0000C 80ACDDDC AFA40000 */ sw $a0, 0x0000($sp) -/* 00010 80ACDDE0 03E00008 */ jr $ra -/* 00014 80ACDDE4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s deleted file mode 100644 index 8a0c38638f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s +++ /dev/null @@ -1,412 +0,0 @@ -.rdata -glabel D_80ACF210 - .asciz "../z_en_part.c" - .balign 4 - -glabel D_80ACF220 - .asciz "../z_en_part.c" - .balign 4 - -glabel D_80ACF230 - .asciz "../z_en_part.c" - .balign 4 - -.text -glabel EnPart_Draw -/* 00DAC 80ACEB7C 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00DB0 80ACEB80 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DB4 80ACEB84 AFB00028 */ sw $s0, 0x0028($sp) -/* 00DB8 80ACEB88 AFA40098 */ sw $a0, 0x0098($sp) -/* 00DBC 80ACEB8C AFA5009C */ sw $a1, 0x009C($sp) -/* 00DC0 80ACEB90 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00DC4 80ACEB94 3C0680AD */ lui $a2, %hi(D_80ACF210) ## $a2 = 80AD0000 -/* 00DC8 80ACEB98 24C6F210 */ addiu $a2, $a2, %lo(D_80ACF210) ## $a2 = 80ACF210 -/* 00DCC 80ACEB9C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 -/* 00DD0 80ACEBA0 24070287 */ addiu $a3, $zero, 0x0287 ## $a3 = 00000287 -/* 00DD4 80ACEBA4 0C031AB1 */ jal Graph_OpenDisps -/* 00DD8 80ACEBA8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00DDC 80ACEBAC 8FAF0098 */ lw $t7, 0x0098($sp) -/* 00DE0 80ACEBB0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00DE4 80ACEBB4 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 00DE8 80ACEBB8 5B000004 */ blezl $t8, .L80ACEBCC -/* 00DEC 80ACEBBC 8FB9009C */ lw $t9, 0x009C($sp) -/* 00DF0 80ACEBC0 0C0343B5 */ jal Matrix_RotateZ -/* 00DF4 80ACEBC4 C5EC0154 */ lwc1 $f12, 0x0154($t7) ## 00000154 -/* 00DF8 80ACEBC8 8FB9009C */ lw $t9, 0x009C($sp) -.L80ACEBCC: -/* 00DFC 80ACEBCC 0C024F46 */ jal func_80093D18 -/* 00E00 80ACEBD0 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00E04 80ACEBD4 8FA40098 */ lw $a0, 0x0098($sp) -/* 00E08 80ACEBD8 8FA5009C */ lw $a1, 0x009C($sp) -/* 00E0C 80ACEBDC 0C00BAF3 */ jal func_8002EBCC -/* 00E10 80ACEBE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E14 80ACEBE4 8FA90098 */ lw $t1, 0x0098($sp) -/* 00E18 80ACEBE8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00E1C 80ACEBEC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00E20 80ACEBF0 8522001C */ lh $v0, 0x001C($t1) ## 0000001C -/* 00E24 80ACEBF4 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00E28 80ACEBF8 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 -/* 00E2C 80ACEBFC 5441003F */ bnel $v0, $at, .L80ACECFC -/* 00E30 80ACEC00 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00E34 80ACEC04 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00E38 80ACEC08 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E -/* 00E3C 80ACEC0C 240E0023 */ addiu $t6, $zero, 0x0023 ## $t6 = 00000023 -/* 00E40 80ACEC10 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00E44 80ACEC14 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 00E48 80ACEC18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00E4C 80ACEC1C 8FAC009C */ lw $t4, 0x009C($sp) -/* 00E50 80ACEC20 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00E54 80ACEC24 240700CD */ addiu $a3, $zero, 0x00CD ## $a3 = 000000CD -/* 00E58 80ACEC28 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00E5C 80ACEC2C AFA00018 */ sw $zero, 0x0018($sp) -/* 00E60 80ACEC30 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E64 80ACEC34 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00E68 80ACEC38 0C2B3AB0 */ jal func_80ACEAC0 -/* 00E6C 80ACEC3C AFA2007C */ sw $v0, 0x007C($sp) -/* 00E70 80ACEC40 8FA3007C */ lw $v1, 0x007C($sp) -/* 00E74 80ACEC44 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00E78 80ACEC48 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 00E7C 80ACEC4C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00E80 80ACEC50 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00E84 80ACEC54 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00E88 80ACEC58 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 00E8C 80ACEC5C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00E90 80ACEC60 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 00E94 80ACEC64 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00E98 80ACEC68 8FB9009C */ lw $t9, 0x009C($sp) -/* 00E9C 80ACEC6C 240500B9 */ addiu $a1, $zero, 0x00B9 ## $a1 = 000000B9 -/* 00EA0 80ACEC70 24060087 */ addiu $a2, $zero, 0x0087 ## $a2 = 00000087 -/* 00EA4 80ACEC74 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00EA8 80ACEC78 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EAC 80ACEC7C AFAB0014 */ sw $t3, 0x0014($sp) -/* 00EB0 80ACEC80 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00EB4 80ACEC84 24070019 */ addiu $a3, $zero, 0x0019 ## $a3 = 00000019 -/* 00EB8 80ACEC88 0C2B3AB0 */ jal func_80ACEAC0 -/* 00EBC 80ACEC8C AFA20078 */ sw $v0, 0x0078($sp) -/* 00EC0 80ACEC90 8FA30078 */ lw $v1, 0x0078($sp) -/* 00EC4 80ACEC94 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00EC8 80ACEC98 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 00ECC 80ACEC9C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00ED0 80ACECA0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00ED4 80ACECA4 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 00ED8 80ACECA8 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 00EDC 80ACECAC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00EE0 80ACECB0 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 00EE4 80ACECB4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00EE8 80ACECB8 8FAE009C */ lw $t6, 0x009C($sp) -/* 00EEC 80ACECBC 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 00EF0 80ACECC0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00EF4 80ACECC4 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 00EF8 80ACECC8 AFB90018 */ sw $t9, 0x0018($sp) -/* 00EFC 80ACECCC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00F00 80ACECD0 AFB80010 */ sw $t8, 0x0010($sp) -/* 00F04 80ACECD4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00F08 80ACECD8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00F0C 80ACECDC 0C2B3AB0 */ jal func_80ACEAC0 -/* 00F10 80ACECE0 AFA20074 */ sw $v0, 0x0074($sp) -/* 00F14 80ACECE4 8FA30074 */ lw $v1, 0x0074($sp) -/* 00F18 80ACECE8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00F1C 80ACECEC 8FAA0098 */ lw $t2, 0x0098($sp) -/* 00F20 80ACECF0 10000102 */ beq $zero, $zero, .L80ACF0FC -/* 00F24 80ACECF4 8D450150 */ lw $a1, 0x0150($t2) ## 00000150 -/* 00F28 80ACECF8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -.L80ACECFC: -/* 00F2C 80ACECFC 1441003D */ bne $v0, $at, .L80ACEDF4 -/* 00F30 80ACED00 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00F34 80ACED04 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00F38 80ACED08 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 00F3C 80ACED0C 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 00F40 80ACED10 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00F44 80ACED14 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00F48 80ACED18 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00F4C 80ACED1C 8FAD009C */ lw $t5, 0x009C($sp) -/* 00F50 80ACED20 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 -/* 00F54 80ACED24 24070037 */ addiu $a3, $zero, 0x0037 ## $a3 = 00000037 -/* 00F58 80ACED28 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 00F5C 80ACED2C AFA00018 */ sw $zero, 0x0018($sp) -/* 00F60 80ACED30 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F64 80ACED34 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F68 80ACED38 0C2B3AB0 */ jal func_80ACEAC0 -/* 00F6C 80ACED3C AFA20070 */ sw $v0, 0x0070($sp) -/* 00F70 80ACED40 8FA30070 */ lw $v1, 0x0070($sp) -/* 00F74 80ACED44 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00F78 80ACED48 37180024 */ ori $t8, $t8, 0x0024 ## $t8 = DB060024 -/* 00F7C 80ACED4C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00F80 80ACED50 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00F84 80ACED54 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 -/* 00F88 80ACED58 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00F8C 80ACED5C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00F90 80ACED60 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 00F94 80ACED64 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00F98 80ACED68 8FAF009C */ lw $t7, 0x009C($sp) -/* 00F9C 80ACED6C 240500CD */ addiu $a1, $zero, 0x00CD ## $a1 = 000000CD -/* 00FA0 80ACED70 240600A5 */ addiu $a2, $zero, 0x00A5 ## $a2 = 000000A5 -/* 00FA4 80ACED74 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00FA8 80ACED78 AFA00018 */ sw $zero, 0x0018($sp) -/* 00FAC 80ACED7C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00FB0 80ACED80 AFB90010 */ sw $t9, 0x0010($sp) -/* 00FB4 80ACED84 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 00FB8 80ACED88 0C2B3AB0 */ jal func_80ACEAC0 -/* 00FBC 80ACED8C AFA2006C */ sw $v0, 0x006C($sp) -/* 00FC0 80ACED90 8FA3006C */ lw $v1, 0x006C($sp) -/* 00FC4 80ACED94 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00FC8 80ACED98 358C0028 */ ori $t4, $t4, 0x0028 ## $t4 = DB060028 -/* 00FCC 80ACED9C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00FD0 80ACEDA0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00FD4 80ACEDA4 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 00FD8 80ACEDA8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00FDC 80ACEDAC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00FE0 80ACEDB0 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00FE4 80ACEDB4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00FE8 80ACEDB8 8FAD009C */ lw $t5, 0x009C($sp) -/* 00FEC 80ACEDBC 240500CD */ addiu $a1, $zero, 0x00CD ## $a1 = 000000CD -/* 00FF0 80ACEDC0 240600A5 */ addiu $a2, $zero, 0x00A5 ## $a2 = 000000A5 -/* 00FF4 80ACEDC4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 00FF8 80ACEDC8 AFA00018 */ sw $zero, 0x0018($sp) -/* 00FFC 80ACEDCC AFB80014 */ sw $t8, 0x0014($sp) -/* 01000 80ACEDD0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01004 80ACEDD4 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 01008 80ACEDD8 0C2B3AB0 */ jal func_80ACEAC0 -/* 0100C 80ACEDDC AFA20068 */ sw $v0, 0x0068($sp) -/* 01010 80ACEDE0 8FA30068 */ lw $v1, 0x0068($sp) -/* 01014 80ACEDE4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01018 80ACEDE8 8FAF0098 */ lw $t7, 0x0098($sp) -/* 0101C 80ACEDEC 100000C3 */ beq $zero, $zero, .L80ACF0FC -/* 01020 80ACEDF0 8DE50150 */ lw $a1, 0x0150($t7) ## 00000150 -.L80ACEDF4: -/* 01024 80ACEDF4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01028 80ACEDF8 14410040 */ bne $v0, $at, .L80ACEEFC -/* 0102C 80ACEDFC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 01030 80ACEE00 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01034 80ACEE04 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 01038 80ACEE08 240C00B4 */ addiu $t4, $zero, 0x00B4 ## $t4 = 000000B4 -/* 0103C 80ACEE0C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01040 80ACEE10 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 01044 80ACEE14 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01048 80ACEE18 8FAB009C */ lw $t3, 0x009C($sp) -/* 0104C 80ACEE1C 240D00B4 */ addiu $t5, $zero, 0x00B4 ## $t5 = 000000B4 -/* 01050 80ACEE20 240E00B4 */ addiu $t6, $zero, 0x00B4 ## $t6 = 000000B4 -/* 01054 80ACEE24 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01058 80ACEE28 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0105C 80ACEE2C AFAD0014 */ sw $t5, 0x0014($sp) -/* 01060 80ACEE30 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01064 80ACEE34 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 01068 80ACEE38 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0106C 80ACEE3C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 01070 80ACEE40 0C2B3AB0 */ jal func_80ACEAC0 -/* 01074 80ACEE44 AFA20064 */ sw $v0, 0x0064($sp) -/* 01078 80ACEE48 8FA30064 */ lw $v1, 0x0064($sp) -/* 0107C 80ACEE4C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01080 80ACEE50 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 01084 80ACEE54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01088 80ACEE58 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0108C 80ACEE5C 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 -/* 01090 80ACEE60 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 01094 80ACEE64 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01098 80ACEE68 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 0109C 80ACEE6C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 010A0 80ACEE70 8FB9009C */ lw $t9, 0x009C($sp) -/* 010A4 80ACEE74 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 -/* 010A8 80ACEE78 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD -/* 010AC 80ACEE7C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 010B0 80ACEE80 AFA00018 */ sw $zero, 0x0018($sp) -/* 010B4 80ACEE84 AFAB0014 */ sw $t3, 0x0014($sp) -/* 010B8 80ACEE88 AFAA0010 */ sw $t2, 0x0010($sp) -/* 010BC 80ACEE8C 24070073 */ addiu $a3, $zero, 0x0073 ## $a3 = 00000073 -/* 010C0 80ACEE90 0C2B3AB0 */ jal func_80ACEAC0 -/* 010C4 80ACEE94 AFA20060 */ sw $v0, 0x0060($sp) -/* 010C8 80ACEE98 8FA30060 */ lw $v1, 0x0060($sp) -/* 010CC 80ACEE9C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 010D0 80ACEEA0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 010D4 80ACEEA4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 010D8 80ACEEA8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 010DC 80ACEEAC 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 010E0 80ACEEB0 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 010E4 80ACEEB4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 010E8 80ACEEB8 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 010EC 80ACEEBC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 010F0 80ACEEC0 8FAE009C */ lw $t6, 0x009C($sp) -/* 010F4 80ACEEC4 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 -/* 010F8 80ACEEC8 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD -/* 010FC 80ACEECC 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 01100 80ACEED0 AFA00018 */ sw $zero, 0x0018($sp) -/* 01104 80ACEED4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01108 80ACEED8 AFB80010 */ sw $t8, 0x0010($sp) -/* 0110C 80ACEEDC 24070073 */ addiu $a3, $zero, 0x0073 ## $a3 = 00000073 -/* 01110 80ACEEE0 0C2B3AB0 */ jal func_80ACEAC0 -/* 01114 80ACEEE4 AFA2005C */ sw $v0, 0x005C($sp) -/* 01118 80ACEEE8 8FA3005C */ lw $v1, 0x005C($sp) -/* 0111C 80ACEEEC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01120 80ACEEF0 8FB90098 */ lw $t9, 0x0098($sp) -/* 01124 80ACEEF4 10000081 */ beq $zero, $zero, .L80ACF0FC -/* 01128 80ACEEF8 8F250150 */ lw $a1, 0x0150($t9) ## 00000150 -.L80ACEEFC: -/* 0112C 80ACEEFC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01130 80ACEF00 54410040 */ bnel $v0, $at, .L80ACF004 -/* 01134 80ACEF04 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01138 80ACEF08 8D2B0150 */ lw $t3, 0x0150($t1) ## 00000150 -/* 0113C 80ACEF0C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 01140 80ACEF10 254A2FF0 */ addiu $t2, $t2, 0x2FF0 ## $t2 = 06002FF0 -/* 01144 80ACEF14 154B003A */ bne $t2, $t3, .L80ACF000 -/* 01148 80ACEF18 3C068016 */ lui $a2, %hi(gSegments) -/* 0114C 80ACEF1C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01150 80ACEF20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01154 80ACEF24 24841300 */ addiu $a0, $a0, 0x1300 ## $a0 = 06001300 -/* 01158 80ACEF28 00047100 */ sll $t6, $a0, 4 -/* 0115C 80ACEF2C 000EC702 */ srl $t8, $t6, 28 -/* 01160 80ACEF30 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 01164 80ACEF34 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01168 80ACEF38 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0116C 80ACEF3C 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01170 80ACEF40 00187880 */ sll $t7, $t8, 2 -/* 01174 80ACEF44 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 01178 80ACEF48 00CFC821 */ addu $t9, $a2, $t7 -/* 0117C 80ACEF4C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01180 80ACEF50 8F2A0000 */ lw $t2, 0x0000($t9) ## 00000000 -/* 01184 80ACEF54 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 -/* 01188 80ACEF58 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 0118C 80ACEF5C 00875824 */ and $t3, $a0, $a3 -/* 01190 80ACEF60 3C088000 */ lui $t0, 0x8000 ## $t0 = 80000000 -/* 01194 80ACEF64 014B6021 */ addu $t4, $t2, $t3 -/* 01198 80ACEF68 01886821 */ addu $t5, $t4, $t0 -/* 0119C 80ACEF6C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 011A0 80ACEF70 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 011A4 80ACEF74 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 011A8 80ACEF78 24841700 */ addiu $a0, $a0, 0x1700 ## $a0 = 06001700 -/* 011AC 80ACEF7C 00047900 */ sll $t7, $a0, 4 -/* 011B0 80ACEF80 000FCF02 */ srl $t9, $t7, 28 -/* 011B4 80ACEF84 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 011B8 80ACEF88 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 011BC 80ACEF8C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 011C0 80ACEF90 37180024 */ ori $t8, $t8, 0x0024 ## $t8 = DB060024 -/* 011C4 80ACEF94 00195080 */ sll $t2, $t9, 2 -/* 011C8 80ACEF98 00CA5821 */ addu $t3, $a2, $t2 -/* 011CC 80ACEF9C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 011D0 80ACEFA0 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 011D4 80ACEFA4 00876824 */ and $t5, $a0, $a3 -/* 011D8 80ACEFA8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 011DC 80ACEFAC 018D7021 */ addu $t6, $t4, $t5 -/* 011E0 80ACEFB0 01C8C021 */ addu $t8, $t6, $t0 -/* 011E4 80ACEFB4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 011E8 80ACEFB8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 011EC 80ACEFBC 24841900 */ addiu $a0, $a0, 0x1900 ## $a0 = 06001900 -/* 011F0 80ACEFC0 00045100 */ sll $t2, $a0, 4 -/* 011F4 80ACEFC4 000A5F02 */ srl $t3, $t2, 28 -/* 011F8 80ACEFC8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 011FC 80ACEFCC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01200 80ACEFD0 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 01204 80ACEFD4 37390028 */ ori $t9, $t9, 0x0028 ## $t9 = DB060028 -/* 01208 80ACEFD8 000B6080 */ sll $t4, $t3, 2 -/* 0120C 80ACEFDC 00CC6821 */ addu $t5, $a2, $t4 -/* 01210 80ACEFE0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01214 80ACEFE4 8DAE0000 */ lw $t6, 0x0000($t5) ## DB060020 -/* 01218 80ACEFE8 0087C024 */ and $t8, $a0, $a3 -/* 0121C 80ACEFEC 01D87821 */ addu $t7, $t6, $t8 -/* 01220 80ACEFF0 01E8C821 */ addu $t9, $t7, $t0 -/* 01224 80ACEFF4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01228 80ACEFF8 10000040 */ beq $zero, $zero, .L80ACF0FC -/* 0122C 80ACEFFC 8D250150 */ lw $a1, 0x0150($t1) ## 00000150 -.L80ACF000: -/* 01230 80ACF000 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -.L80ACF004: -/* 01234 80ACF004 1441003D */ bne $v0, $at, .L80ACF0FC -/* 01238 80ACF008 8D250150 */ lw $a1, 0x0150($t1) ## 00000150 -/* 0123C 80ACF00C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 01240 80ACF010 254A2FF0 */ addiu $t2, $t2, 0x2FF0 ## $t2 = 06002FF0 -/* 01244 80ACF014 15450039 */ bne $t2, $a1, .L80ACF0FC -/* 01248 80ACF018 3C068016 */ lui $a2, %hi(gSegments) -/* 0124C 80ACF01C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01250 80ACF020 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01254 80ACF024 24841B00 */ addiu $a0, $a0, 0x1B00 ## $a0 = 06001B00 -/* 01258 80ACF028 00046900 */ sll $t5, $a0, 4 -/* 0125C 80ACF02C 000D7702 */ srl $t6, $t5, 28 -/* 01260 80ACF030 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 01264 80ACF034 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01268 80ACF038 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 0126C 80ACF03C 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 01270 80ACF040 000EC080 */ sll $t8, $t6, 2 -/* 01274 80ACF044 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 01278 80ACF048 00D87821 */ addu $t7, $a2, $t8 -/* 0127C 80ACF04C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01280 80ACF050 8DF90000 */ lw $t9, 0x0000($t7) ## 00000008 -/* 01284 80ACF054 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 -/* 01288 80ACF058 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 0128C 80ACF05C 00875024 */ and $t2, $a0, $a3 -/* 01290 80ACF060 3C088000 */ lui $t0, 0x8000 ## $t0 = 80000000 -/* 01294 80ACF064 032A5821 */ addu $t3, $t9, $t2 -/* 01298 80ACF068 01686021 */ addu $t4, $t3, $t0 -/* 0129C 80ACF06C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 012A0 80ACF070 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 012A4 80ACF074 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 012A8 80ACF078 24841F00 */ addiu $a0, $a0, 0x1F00 ## $a0 = 06001F00 -/* 012AC 80ACF07C 0004C100 */ sll $t8, $a0, 4 -/* 012B0 80ACF080 00187F02 */ srl $t7, $t8, 28 -/* 012B4 80ACF084 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 012B8 80ACF088 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 012BC 80ACF08C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 012C0 80ACF090 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 012C4 80ACF094 000FC880 */ sll $t9, $t7, 2 -/* 012C8 80ACF098 00D95021 */ addu $t2, $a2, $t9 -/* 012CC 80ACF09C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 012D0 80ACF0A0 8D4B0000 */ lw $t3, 0x0000($t2) ## 06002FF0 -/* 012D4 80ACF0A4 00876024 */ and $t4, $a0, $a3 -/* 012D8 80ACF0A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 012DC 80ACF0AC 016C6821 */ addu $t5, $t3, $t4 -/* 012E0 80ACF0B0 01A87021 */ addu $t6, $t5, $t0 -/* 012E4 80ACF0B4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 012E8 80ACF0B8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 012EC 80ACF0BC 24842100 */ addiu $a0, $a0, 0x2100 ## $a0 = 06002100 -/* 012F0 80ACF0C0 0004C900 */ sll $t9, $a0, 4 -/* 012F4 80ACF0C4 00195702 */ srl $t2, $t9, 28 -/* 012F8 80ACF0C8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 012FC 80ACF0CC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01300 80ACF0D0 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 01304 80ACF0D4 35EF0028 */ ori $t7, $t7, 0x0028 ## $t7 = DB060028 -/* 01308 80ACF0D8 000A5880 */ sll $t3, $t2, 2 -/* 0130C 80ACF0DC 00CB6021 */ addu $t4, $a2, $t3 -/* 01310 80ACF0E0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01314 80ACF0E4 8D8D0000 */ lw $t5, 0x0000($t4) ## DB060020 -/* 01318 80ACF0E8 00877024 */ and $t6, $a0, $a3 -/* 0131C 80ACF0EC 01AEC021 */ addu $t8, $t5, $t6 -/* 01320 80ACF0F0 03087821 */ addu $t7, $t8, $t0 -/* 01324 80ACF0F4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01328 80ACF0F8 8D250150 */ lw $a1, 0x0150($t1) ## 00000150 -.L80ACF0FC: -/* 0132C 80ACF0FC 10A00017 */ beq $a1, $zero, .L80ACF15C -/* 01330 80ACF100 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 01334 80ACF104 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01338 80ACF108 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 0133C 80ACF10C 3C0580AD */ lui $a1, %hi(D_80ACF220) ## $a1 = 80AD0000 -/* 01340 80ACF110 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01344 80ACF114 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 01348 80ACF118 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0134C 80ACF11C 8FAB009C */ lw $t3, 0x009C($sp) -/* 01350 80ACF120 24A5F220 */ addiu $a1, $a1, %lo(D_80ACF220) ## $a1 = 80ACF220 -/* 01354 80ACF124 240602B8 */ addiu $a2, $zero, 0x02B8 ## $a2 = 000002B8 -/* 01358 80ACF128 8D640000 */ lw $a0, 0x0000($t3) ## 00000008 -/* 0135C 80ACF12C 0C0346A2 */ jal Matrix_NewMtx -/* 01360 80ACF130 AFA20040 */ sw $v0, 0x0040($sp) -/* 01364 80ACF134 8FA30040 */ lw $v1, 0x0040($sp) -/* 01368 80ACF138 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 0136C 80ACF13C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01370 80ACF140 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01374 80ACF144 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01378 80ACF148 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0137C 80ACF14C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01380 80ACF150 8FAE0098 */ lw $t6, 0x0098($sp) -/* 01384 80ACF154 8DD80150 */ lw $t8, 0x0150($t6) ## 00000150 -/* 01388 80ACF158 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -.L80ACF15C: -/* 0138C 80ACF15C 8FAF009C */ lw $t7, 0x009C($sp) -/* 01390 80ACF160 3C0680AD */ lui $a2, %hi(D_80ACF230) ## $a2 = 80AD0000 -/* 01394 80ACF164 24C6F230 */ addiu $a2, $a2, %lo(D_80ACF230) ## $a2 = 80ACF230 -/* 01398 80ACF168 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 -/* 0139C 80ACF16C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC -/* 013A0 80ACF170 0C031AD5 */ jal Graph_CloseDisps -/* 013A4 80ACF174 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 013A8 80ACF178 8FBF002C */ lw $ra, 0x002C($sp) -/* 013AC 80ACF17C 8FB00028 */ lw $s0, 0x0028($sp) -/* 013B0 80ACF180 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 013B4 80ACF184 03E00008 */ jr $ra -/* 013B8 80ACF188 00000000 */ nop -/* 013BC 80ACF18C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s deleted file mode 100644 index 9907c9bfef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnPart_Init -/* 00000 80ACDDD0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 80ACDDD4 03E00008 */ jr $ra -/* 00008 80ACDDD8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s deleted file mode 100644 index c1ac1db3e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel EnPart_Update -/* 00C14 80ACE9E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C18 80ACE9E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C1C 80ACE9EC AFB00020 */ sw $s0, 0x0020($sp) -/* 00C20 80ACE9F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C24 80ACE9F4 0C00B638 */ jal Actor_MoveForward - -/* 00C28 80ACE9F8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00C2C 80ACE9FC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00C30 80ACEA00 28410005 */ slti $at, $v0, 0x0005 -/* 00C34 80ACEA04 14200003 */ bne $at, $zero, .L80ACEA14 -/* 00C38 80ACEA08 28410009 */ slti $at, $v0, 0x0009 -/* 00C3C 80ACEA0C 54200004 */ bnel $at, $zero, .L80ACEA20 -/* 00C40 80ACEA10 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80ACEA14: -/* 00C44 80ACEA14 0443001D */ bgezl $v0, .L80ACEA8C -/* 00C48 80ACEA18 9208014C */ lbu $t0, 0x014C($s0) ## 0000014C -/* 00C4C 80ACEA1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80ACEA20: -/* 00C50 80ACEA20 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00C54 80ACEA24 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00C58 80ACEA28 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C5C 80ACEA2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00C60 80ACEA30 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 00C64 80ACEA34 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 00C68 80ACEA38 0C00B92D */ jal func_8002E4B4 -/* 00C6C 80ACEA3C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00C70 80ACEA40 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00C74 80ACEA44 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00C78 80ACEA48 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00C7C 80ACEA4C 05E0000E */ bltz $t7, .L80ACEA88 -/* 00C80 80ACEA50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C84 80ACEA54 44050000 */ mfc1 $a1, $f0 -/* 00C88 80ACEA58 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00C8C 80ACEA5C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00C90 80ACEA60 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00C94 80ACEA64 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00C98 80ACEA68 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00C9C 80ACEA6C 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 00CA0 80ACEA70 53000006 */ beql $t8, $zero, .L80ACEA8C -/* 00CA4 80ACEA74 9208014C */ lbu $t0, 0x014C($s0) ## 0000014C -/* 00CA8 80ACEA78 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 00CAC 80ACEA7C 3059FFFE */ andi $t9, $v0, 0xFFFE ## $t9 = 00000000 -/* 00CB0 80ACEA80 A6190088 */ sh $t9, 0x0088($s0) ## 00000088 -/* 00CB4 80ACEA84 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -.L80ACEA88: -/* 00CB8 80ACEA88 9208014C */ lbu $t0, 0x014C($s0) ## 0000014C -.L80ACEA8C: -/* 00CBC 80ACEA8C 3C1980AD */ lui $t9, %hi(D_80ACF1F8) ## $t9 = 80AD0000 -/* 00CC0 80ACEA90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CC4 80ACEA94 00084880 */ sll $t1, $t0, 2 -/* 00CC8 80ACEA98 0329C821 */ addu $t9, $t9, $t1 -/* 00CCC 80ACEA9C 8F39F1F8 */ lw $t9, %lo(D_80ACF1F8)($t9) -/* 00CD0 80ACEAA0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00CD4 80ACEAA4 0320F809 */ jalr $ra, $t9 -/* 00CD8 80ACEAA8 00000000 */ nop -/* 00CDC 80ACEAAC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00CE0 80ACEAB0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00CE4 80ACEAB4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CE8 80ACEAB8 03E00008 */ jr $ra -/* 00CEC 80ACEABC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s deleted file mode 100644 index d678ae0e8c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s +++ /dev/null @@ -1,288 +0,0 @@ -.late_rodata -glabel D_80ACF240 - .word 0x469C4000 -glabel jtbl_80ACF244 -.word L80ACDE58 -.word L80ACDF68 -.word L80ACDF98 -.word L80ACE010 -.word L80ACDF68 -.word L80ACE0AC -.word L80ACE0AC -.word L80ACE0AC -.word L80ACE0AC -.word L80ACDF68 -.word L80ACDF68 -.word L80ACDFEC -.word L80ACDEBC -.word L80ACDEB4 -.word L80ACDF44 -glabel D_80ACF280 - .word 0xBE99999A -glabel D_80ACF284 - .float 0.3 - -glabel D_80ACF288 - .word 0xBF19999A -glabel D_80ACF28C - .float 0.15 - -glabel D_80ACF290 - .word 0xBF19999A -glabel D_80ACF294 - .float 0.15 - -glabel D_80ACF298 - .word 0xBF19999A -glabel D_80ACF29C - .float 0.3 - -glabel D_80ACF2A0 - .float 0.15 - -glabel D_80ACF2A4 - .float -1.2 - -glabel D_80ACF2A8 - .float 0.15 - -.text -glabel func_80ACDDE8 -/* 00018 80ACDDE8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0001C 80ACDDEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00020 80ACDDF0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00024 80ACDDF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00028 80ACDDF8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0002C 80ACDDFC AFA5003C */ sw $a1, 0x003C($sp) -/* 00030 80ACDE00 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00034 80ACDE04 A08E014C */ sb $t6, 0x014C($a0) ## 0000014C -/* 00038 80ACDE08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0003C 80ACDE0C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00040 80ACDE10 E7A20034 */ swc1 $f2, 0x0034($sp) -/* 00044 80ACDE14 3C0180AD */ lui $at, %hi(D_80ACF240) ## $at = 80AD0000 -/* 00048 80ACDE18 C424F240 */ lwc1 $f4, %lo(D_80ACF240)($at) -/* 0004C 80ACDE1C 9619001C */ lhu $t9, 0x001C($s0) ## 0000001C -/* 00050 80ACDE20 8FA4003C */ lw $a0, 0x003C($sp) -/* 00054 80ACDE24 46040182 */ mul.s $f6, $f0, $f4 -/* 00058 80ACDE28 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 0005C 80ACDE2C 2F21000F */ sltiu $at, $t9, 0x000F -/* 00060 80ACDE30 0019C880 */ sll $t9, $t9, 2 -/* 00064 80ACDE34 4600320D */ trunc.w.s $f8, $f6 -/* 00068 80ACDE38 44184000 */ mfc1 $t8, $f8 -/* 0006C 80ACDE3C 102000BA */ beq $at, $zero, .L80ACE128 -/* 00070 80ACDE40 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 00074 80ACDE44 3C0180AD */ lui $at, %hi(jtbl_80ACF244) ## $at = 80AD0000 -/* 00078 80ACDE48 00390821 */ addu $at, $at, $t9 -/* 0007C 80ACDE4C 8C39F244 */ lw $t9, %lo(jtbl_80ACF244)($at) -/* 00080 80ACDE50 03200008 */ jr $t9 -/* 00084 80ACDE54 00000000 */ nop -glabel L80ACDE58 -/* 00088 80ACDE58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0008C 80ACDE5C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00090 80ACDE60 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00094 80ACDE64 3C0180AD */ lui $at, %hi(D_80ACF280) ## $at = 80AD0000 -/* 00098 80ACDE68 C42AF280 */ lwc1 $f10, %lo(D_80ACF280)($at) -/* 0009C 80ACDE6C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 000A0 80ACDE70 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 000A4 80ACDE74 3C0180AD */ lui $at, %hi(D_80ACF284) ## $at = 80AD0000 -/* 000A8 80ACDE78 24080019 */ addiu $t0, $zero, 0x0019 ## $t0 = 00000019 -/* 000AC 80ACDE7C 46100482 */ mul.s $f18, $f0, $f16 -/* 000B0 80ACDE80 46125101 */ sub.s $f4, $f10, $f18 -/* 000B4 80ACDE84 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000B8 80ACDE88 C426F284 */ lwc1 $f6, %lo(D_80ACF284)($at) -/* 000BC 80ACDE8C A608014E */ sh $t0, 0x014E($s0) ## 0000014E -/* 000C0 80ACDE90 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000C4 80ACDE94 E6060158 */ swc1 $f6, 0x0158($s0) ## 00000158 -/* 000C8 80ACDE98 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 000CC 80ACDE9C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 000D0 80ACDEA0 00000000 */ nop -/* 000D4 80ACDEA4 46080081 */ sub.s $f2, $f0, $f8 -/* 000D8 80ACDEA8 46021400 */ add.s $f16, $f2, $f2 -/* 000DC 80ACDEAC 1000009E */ beq $zero, $zero, .L80ACE128 -/* 000E0 80ACDEB0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -glabel L80ACDEB4 -/* 000E4 80ACDEB4 24090190 */ addiu $t1, $zero, 0x0190 ## $t1 = 00000190 -/* 000E8 80ACDEB8 A609014E */ sh $t1, 0x014E($s0) ## 0000014E -glabel L80ACDEBC -/* 000EC 80ACDEBC 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 000F0 80ACDEC0 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 000F4 80ACDEC4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 000F8 80ACDEC8 00000000 */ nop -/* 000FC 80ACDECC 8E0B0024 */ lw $t3, 0x0024($s0) ## 00000024 -/* 00100 80ACDED0 860C014E */ lh $t4, 0x014E($s0) ## 0000014E -/* 00104 80ACDED4 8E0A0028 */ lw $t2, 0x0028($s0) ## 00000028 -/* 00108 80ACDED8 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 -/* 0010C 80ACDEDC 8E0B002C */ lw $t3, 0x002C($s0) ## 0000002C -/* 00110 80ACDEE0 258D003C */ addiu $t5, $t4, 0x003C ## $t5 = 0000003C -/* 00114 80ACDEE4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00118 80ACDEE8 A60D014E */ sh $t5, 0x014E($s0) ## 0000014E -/* 0011C 80ACDEEC AE0A000C */ sw $t2, 0x000C($s0) ## 0000000C -/* 00120 80ACDEF0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00124 80ACDEF4 AE0B0010 */ sw $t3, 0x0010($s0) ## 00000010 -/* 00128 80ACDEF8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0012C 80ACDEFC 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 00130 80ACDF00 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00134 80ACDF04 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 00138 80ACDF08 460A0482 */ mul.s $f18, $f0, $f10 -/* 0013C 80ACDF0C 46049180 */ add.s $f6, $f18, $f4 -/* 00140 80ACDF10 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00144 80ACDF14 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 00148 80ACDF18 3C0180AD */ lui $at, %hi(D_80ACF288) ## $at = 80AD0000 -/* 0014C 80ACDF1C C428F288 */ lwc1 $f8, %lo(D_80ACF288)($at) -/* 00150 80ACDF20 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00154 80ACDF24 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00158 80ACDF28 3C0180AD */ lui $at, %hi(D_80ACF28C) ## $at = 80AD0000 -/* 0015C 80ACDF2C 46100282 */ mul.s $f10, $f0, $f16 -/* 00160 80ACDF30 460A4481 */ sub.s $f18, $f8, $f10 -/* 00164 80ACDF34 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 00168 80ACDF38 C424F28C */ lwc1 $f4, %lo(D_80ACF28C)($at) -/* 0016C 80ACDF3C 1000007A */ beq $zero, $zero, .L80ACE128 -/* 00170 80ACDF40 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -glabel L80ACDF44 -/* 00174 80ACDF44 240E8001 */ addiu $t6, $zero, 0x8001 ## $t6 = FFFF8001 -/* 00178 80ACDF48 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 0017C 80ACDF4C AFAF0018 */ sw $t7, 0x0018($sp) -/* 00180 80ACDF50 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00184 80ACDF54 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00188 80ACDF58 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 0018C 80ACDF5C 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 00190 80ACDF60 0C00A935 */ jal EffectSsEnFire_SpawnVec3f -/* 00194 80ACDF64 AFA00014 */ sw $zero, 0x0014($sp) -glabel L80ACDF68 -/* 00198 80ACDF68 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0019C 80ACDF6C 00000000 */ nop -/* 001A0 80ACDF70 3C014188 */ lui $at, 0x4188 ## $at = 41880000 -/* 001A4 80ACDF74 44813000 */ mtc1 $at, $f6 ## $f6 = 17.00 -/* 001A8 80ACDF78 8618014E */ lh $t8, 0x014E($s0) ## 0000014E -/* 001AC 80ACDF7C 46060402 */ mul.s $f16, $f0, $f6 -/* 001B0 80ACDF80 4600820D */ trunc.w.s $f8, $f16 -/* 001B4 80ACDF84 440A4000 */ mfc1 $t2, $f8 -/* 001B8 80ACDF88 00000000 */ nop -/* 001BC 80ACDF8C 030A5821 */ addu $t3, $t8, $t2 -/* 001C0 80ACDF90 256C0005 */ addiu $t4, $t3, 0x0005 ## $t4 = 00000005 -/* 001C4 80ACDF94 A60C014E */ sh $t4, 0x014E($s0) ## 0000014E -glabel L80ACDF98 -/* 001C8 80ACDF98 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001CC 80ACDF9C 00000000 */ nop -/* 001D0 80ACDFA0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 001D4 80ACDFA4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 001D8 80ACDFA8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 001DC 80ACDFAC 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 001E0 80ACDFB0 460A0482 */ mul.s $f18, $f0, $f10 -/* 001E4 80ACDFB4 46049180 */ add.s $f6, $f18, $f4 -/* 001E8 80ACDFB8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001EC 80ACDFBC E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 001F0 80ACDFC0 3C0180AD */ lui $at, %hi(D_80ACF290) ## $at = 80AD0000 -/* 001F4 80ACDFC4 C430F290 */ lwc1 $f16, %lo(D_80ACF290)($at) -/* 001F8 80ACDFC8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 001FC 80ACDFCC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 00200 80ACDFD0 3C0180AD */ lui $at, %hi(D_80ACF294) ## $at = 80AD0000 -/* 00204 80ACDFD4 46080282 */ mul.s $f10, $f0, $f8 -/* 00208 80ACDFD8 460A8481 */ sub.s $f18, $f16, $f10 -/* 0020C 80ACDFDC E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 00210 80ACDFE0 C424F294 */ lwc1 $f4, %lo(D_80ACF294)($at) -/* 00214 80ACDFE4 10000050 */ beq $zero, $zero, .L80ACE128 -/* 00218 80ACDFE8 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -glabel L80ACDFEC -/* 0021C 80ACDFEC 240D8001 */ addiu $t5, $zero, 0x8001 ## $t5 = FFFF8001 -/* 00220 80ACDFF0 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00224 80ACDFF4 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00228 80ACDFF8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 0022C 80ACDFFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00230 80ACE000 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00234 80ACE004 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 00238 80ACE008 0C00A935 */ jal EffectSsEnFire_SpawnVec3f -/* 0023C 80ACE00C AFA00014 */ sw $zero, 0x0014($sp) -glabel L80ACE010 -/* 00240 80ACE010 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00244 80ACE014 00000000 */ nop -/* 00248 80ACE018 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0024C 80ACE01C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00250 80ACE020 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00254 80ACE024 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 00258 80ACE028 46060201 */ sub.s $f8, $f0, $f6 -/* 0025C 80ACE02C 46104282 */ mul.s $f10, $f8, $f16 -/* 00260 80ACE030 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00264 80ACE034 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00268 80ACE038 3C014188 */ lui $at, 0x4188 ## $at = 41880000 -/* 0026C 80ACE03C 44819000 */ mtc1 $at, $f18 ## $f18 = 17.00 -/* 00270 80ACE040 00000000 */ nop -/* 00274 80ACE044 46120102 */ mul.s $f4, $f0, $f18 -/* 00278 80ACE048 4600218D */ trunc.w.s $f6, $f4 -/* 0027C 80ACE04C 44093000 */ mfc1 $t1, $f6 -/* 00280 80ACE050 00000000 */ nop -/* 00284 80ACE054 2538000A */ addiu $t8, $t1, 0x000A ## $t8 = 0000000A -/* 00288 80ACE058 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0028C 80ACE05C A618014E */ sh $t8, 0x014E($s0) ## 0000014E -/* 00290 80ACE060 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00294 80ACE064 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 00298 80ACE068 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0029C 80ACE06C 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 002A0 80ACE070 46080402 */ mul.s $f16, $f0, $f8 -/* 002A4 80ACE074 460A8480 */ add.s $f18, $f16, $f10 -/* 002A8 80ACE078 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002AC 80ACE07C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 002B0 80ACE080 3C0180AD */ lui $at, %hi(D_80ACF298) ## $at = 80AD0000 -/* 002B4 80ACE084 C424F298 */ lwc1 $f4, %lo(D_80ACF298)($at) -/* 002B8 80ACE088 3C0180AD */ lui $at, %hi(D_80ACF29C) ## $at = 80AD0000 -/* 002BC 80ACE08C C426F29C */ lwc1 $f6, %lo(D_80ACF29C)($at) -/* 002C0 80ACE090 3C0180AD */ lui $at, %hi(D_80ACF2A0) ## $at = 80AD0000 -/* 002C4 80ACE094 46060202 */ mul.s $f8, $f0, $f6 -/* 002C8 80ACE098 46082401 */ sub.s $f16, $f4, $f8 -/* 002CC 80ACE09C E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C -/* 002D0 80ACE0A0 C42AF2A0 */ lwc1 $f10, %lo(D_80ACF2A0)($at) -/* 002D4 80ACE0A4 10000020 */ beq $zero, $zero, .L80ACE128 -/* 002D8 80ACE0A8 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 -glabel L80ACE0AC -/* 002DC 80ACE0AC 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 002E0 80ACE0B0 8E0D0150 */ lw $t5, 0x0150($s0) ## 00000150 -/* 002E4 80ACE0B4 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 002E8 80ACE0B8 854B00B6 */ lh $t3, 0x00B6($t2) ## 000000B6 -/* 002EC 80ACE0BC 258C5380 */ addiu $t4, $t4, 0x5380 ## $t4 = 06015380 -/* 002F0 80ACE0C0 158D0004 */ bne $t4, $t5, .L80ACE0D4 -/* 002F4 80ACE0C4 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 002F8 80ACE0C8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 002FC 80ACE0CC 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -/* 00300 80ACE0D0 00000000 */ nop -.L80ACE0D4: -/* 00304 80ACE0D4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00308 80ACE0D8 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 0030C 80ACE0DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00310 80ACE0E0 3C0180AD */ lui $at, %hi(D_80ACF2A4) ## $at = 80AD0000 -/* 00314 80ACE0E4 46029182 */ mul.s $f6, $f18, $f2 -/* 00318 80ACE0E8 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 0031C 80ACE0EC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00320 80ACE0F0 44050000 */ mfc1 $a1, $f0 -/* 00324 80ACE0F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00328 80ACE0F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0032C 80ACE0FC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00330 80ACE100 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00334 80ACE104 C424F2A4 */ lwc1 $f4, %lo(D_80ACF2A4)($at) -/* 00338 80ACE108 3C0180AD */ lui $at, %hi(D_80ACF2A8) ## $at = 80AD0000 -/* 0033C 80ACE10C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00340 80ACE110 C428F2A8 */ lwc1 $f8, %lo(D_80ACF2A8)($at) -/* 00344 80ACE114 46024402 */ mul.s $f16, $f8, $f2 -/* 00348 80ACE118 0C00AC78 */ jal ActorShape_Init - -/* 0034C 80ACE11C E6100158 */ swc1 $f16, 0x0158($s0) ## 00000158 -/* 00350 80ACE120 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 00354 80ACE124 A60E014E */ sh $t6, 0x014E($s0) ## 0000014E -.L80ACE128: -/* 00358 80ACE128 8FBF002C */ lw $ra, 0x002C($sp) -/* 0035C 80ACE12C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00360 80ACE130 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00364 80ACE134 03E00008 */ jr $ra -/* 00368 80ACE138 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s deleted file mode 100644 index b385c4efa7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s +++ /dev/null @@ -1,331 +0,0 @@ -.late_rodata -glabel jtbl_80ACF2AC -.word L80ACE2AC -.word L80ACE56C -.word L80ACE348 -.word L80ACE3E4 -.word L80ACE4A4 -.word L80ACE4A4 -.word L80ACE4A4 -.word L80ACE4A4 -.word L80ACE2AC -.word L80ACE2AC -.word L80ACE348 -.word L80ACE56C -.word L80ACE56C -.word L80ACE2AC - -.text -glabel func_80ACE13C -/* 0036C 80ACE13C 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 00370 80ACE140 3C0F80AD */ lui $t7, %hi(D_80ACF1B0) ## $t7 = 80AD0000 -/* 00374 80ACE144 AFBF0064 */ sw $ra, 0x0064($sp) -/* 00378 80ACE148 AFB40060 */ sw $s4, 0x0060($sp) -/* 0037C 80ACE14C AFB3005C */ sw $s3, 0x005C($sp) -/* 00380 80ACE150 AFB20058 */ sw $s2, 0x0058($sp) -/* 00384 80ACE154 AFB10054 */ sw $s1, 0x0054($sp) -/* 00388 80ACE158 AFB00050 */ sw $s0, 0x0050($sp) -/* 0038C 80ACE15C F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00390 80ACE160 25EFF1B0 */ addiu $t7, $t7, %lo(D_80ACF1B0) ## $t7 = 80ACF1B0 -/* 00394 80ACE164 8DF90000 */ lw $t9, 0x0000($t7) ## 80ACF1B0 -/* 00398 80ACE168 27AE008C */ addiu $t6, $sp, 0x008C ## $t6 = FFFFFFE4 -/* 0039C 80ACE16C 8DF80004 */ lw $t8, 0x0004($t7) ## 80ACF1B4 -/* 003A0 80ACE170 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE4 -/* 003A4 80ACE174 8DF90008 */ lw $t9, 0x0008($t7) ## 80ACF1B8 -/* 003A8 80ACE178 3C0980AD */ lui $t1, %hi(D_80ACF1BC) ## $t1 = 80AD0000 -/* 003AC 80ACE17C 2529F1BC */ addiu $t1, $t1, %lo(D_80ACF1BC) ## $t1 = 80ACF1BC -/* 003B0 80ACE180 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFE8 -/* 003B4 80ACE184 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFEC -/* 003B8 80ACE188 8D2B0000 */ lw $t3, 0x0000($t1) ## 80ACF1BC -/* 003BC 80ACE18C 27A80080 */ addiu $t0, $sp, 0x0080 ## $t0 = FFFFFFD8 -/* 003C0 80ACE190 8D2A0004 */ lw $t2, 0x0004($t1) ## 80ACF1C0 -/* 003C4 80ACE194 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFD8 -/* 003C8 80ACE198 8D2B0008 */ lw $t3, 0x0008($t1) ## 80ACF1C4 -/* 003CC 80ACE19C 3C0C80AD */ lui $t4, %hi(D_80ACF1C8) ## $t4 = 80AD0000 -/* 003D0 80ACE1A0 258CF1C8 */ addiu $t4, $t4, %lo(D_80ACF1C8) ## $t4 = 80ACF1C8 -/* 003D4 80ACE1A4 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFDC -/* 003D8 80ACE1A8 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE0 -/* 003DC 80ACE1AC 8D8E0000 */ lw $t6, 0x0000($t4) ## 80ACF1C8 -/* 003E0 80ACE1B0 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFCC -/* 003E4 80ACE1B4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 003E8 80ACE1B8 AE6E0000 */ sw $t6, 0x0000($s3) ## FFFFFFCC -/* 003EC 80ACE1BC 8D8D0004 */ lw $t5, 0x0004($t4) ## 80ACF1CC -/* 003F0 80ACE1C0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 003F4 80ACE1C4 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 003F8 80ACE1C8 AE6D0004 */ sw $t5, 0x0004($s3) ## FFFFFFD0 -/* 003FC 80ACE1CC 8D8E0008 */ lw $t6, 0x0008($t4) ## 80ACF1D0 -/* 00400 80ACE1D0 AE6E0008 */ sw $t6, 0x0008($s3) ## FFFFFFD4 -/* 00404 80ACE1D4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00408 80ACE1D8 10410004 */ beq $v0, $at, .L80ACE1EC -/* 0040C 80ACE1DC 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 00410 80ACE1E0 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00414 80ACE1E4 54410027 */ bnel $v0, $at, .L80ACE284 -/* 00418 80ACE1E8 8623014E */ lh $v1, 0x014E($s1) ## 0000014E -.L80ACE1EC: -/* 0041C 80ACE1EC 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00420 80ACE1F0 240F001D */ addiu $t7, $zero, 0x001D ## $t7 = 0000001D -/* 00424 80ACE1F4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00428 80ACE1F8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 0042C 80ACE1FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00430 80ACE200 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 00434 80ACE204 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 00438 80ACE208 0C00B92D */ jal func_8002E4B4 -/* 0043C 80ACE20C E7B40010 */ swc1 $f20, 0x0010($sp) -/* 00440 80ACE210 96380088 */ lhu $t8, 0x0088($s1) ## 00000088 -/* 00444 80ACE214 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 00448 80ACE218 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 0044C 80ACE21C 57200008 */ bnel $t9, $zero, .L80ACE240 -/* 00450 80ACE220 A228014C */ sb $t0, 0x014C($s1) ## 0000014C -/* 00454 80ACE224 C6240080 */ lwc1 $f4, 0x0080($s1) ## 00000080 -/* 00458 80ACE228 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 0045C 80ACE22C 4604303E */ c.le.s $f6, $f4 -/* 00460 80ACE230 00000000 */ nop -/* 00464 80ACE234 45020006 */ bc1fl .L80ACE250 -/* 00468 80ACE238 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -/* 0046C 80ACE23C A228014C */ sb $t0, 0x014C($s1) ## 0000014C -.L80ACE240: -/* 00470 80ACE240 E6340068 */ swc1 $f20, 0x0068($s1) ## 00000068 -/* 00474 80ACE244 E634006C */ swc1 $f20, 0x006C($s1) ## 0000006C -/* 00478 80ACE248 E6340060 */ swc1 $f20, 0x0060($s1) ## 00000060 -/* 0047C 80ACE24C 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -.L80ACE250: -/* 00480 80ACE250 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00484 80ACE254 15210008 */ bne $t1, $at, .L80ACE278 -/* 00488 80ACE258 00000000 */ nop -/* 0048C 80ACE25C 8E220118 */ lw $v0, 0x0118($s1) ## 00000118 -/* 00490 80ACE260 10400005 */ beq $v0, $zero, .L80ACE278 -/* 00494 80ACE264 00000000 */ nop -/* 00498 80ACE268 8C4A0130 */ lw $t2, 0x0130($v0) ## 00000130 -/* 0049C 80ACE26C 15400002 */ bne $t2, $zero, .L80ACE278 -/* 004A0 80ACE270 00000000 */ nop -/* 004A4 80ACE274 AE200118 */ sw $zero, 0x0118($s1) ## 00000118 -.L80ACE278: -/* 004A8 80ACE278 100000C0 */ beq $zero, $zero, .L80ACE57C -/* 004AC 80ACE27C 8623014E */ lh $v1, 0x014E($s1) ## 0000014E -/* 004B0 80ACE280 8623014E */ lh $v1, 0x014E($s1) ## 0000014E -.L80ACE284: -/* 004B4 80ACE284 2D61000E */ sltiu $at, $t3, 0x000E -/* 004B8 80ACE288 000B5880 */ sll $t3, $t3, 2 -/* 004BC 80ACE28C 5C6000BC */ bgtzl $v1, .L80ACE580 -/* 004C0 80ACE290 C6300154 */ lwc1 $f16, 0x0154($s1) ## 00000154 -/* 004C4 80ACE294 102000B5 */ beq $at, $zero, .L80ACE56C -/* 004C8 80ACE298 3C0180AD */ lui $at, %hi(jtbl_80ACF2AC) ## $at = 80AD0000 -/* 004CC 80ACE29C 002B0821 */ addu $at, $at, $t3 -/* 004D0 80ACE2A0 8C2BF2AC */ lw $t3, %lo(jtbl_80ACF2AC)($at) -/* 004D4 80ACE2A4 01600008 */ jr $t3 -/* 004D8 80ACE2A8 00000000 */ nop -glabel L80ACE2AC -/* 004DC 80ACE2AC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 004E0 80ACE2B0 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 004E4 80ACE2B4 C6280054 */ lwc1 $f8, 0x0054($s1) ## 00000054 -/* 004E8 80ACE2B8 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 -/* 004EC 80ACE2BC 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 004F0 80ACE2C0 460A4402 */ mul.s $f16, $f8, $f10 -/* 004F4 80ACE2C4 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 004F8 80ACE2C8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 004FC 80ACE2CC 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00500 80ACE2D0 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00504 80ACE2D4 AFAC002C */ sw $t4, 0x002C($sp) -/* 00508 80ACE2D8 AFAB0024 */ sw $t3, 0x0024($sp) -/* 0050C 80ACE2DC 4600848D */ trunc.w.s $f18, $f16 -/* 00510 80ACE2E0 AFAA0020 */ sw $t2, 0x0020($sp) -/* 00514 80ACE2E4 AFA9001C */ sw $t1, 0x001C($sp) -/* 00518 80ACE2E8 AFA80018 */ sw $t0, 0x0018($sp) -/* 0051C 80ACE2EC 440D9000 */ mfc1 $t5, $f18 -/* 00520 80ACE2F0 AFB90014 */ sw $t9, 0x0014($sp) -/* 00524 80ACE2F4 AFA00030 */ sw $zero, 0x0030($sp) -/* 00528 80ACE2F8 000D7400 */ sll $t6, $t5, 16 -/* 0052C 80ACE2FC 000E7C03 */ sra $t7, $t6, 16 -/* 00530 80ACE300 000FC080 */ sll $t8, $t7, 2 -/* 00534 80ACE304 030FC021 */ addu $t8, $t8, $t7 -/* 00538 80ACE308 0018C0C0 */ sll $t8, $t8, 3 -/* 0053C 80ACE30C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00540 80ACE310 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 00544 80ACE314 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00548 80ACE318 AFAD0034 */ sw $t5, 0x0034($sp) -/* 0054C 80ACE31C AFAE0038 */ sw $t6, 0x0038($sp) -/* 00550 80ACE320 AFAF003C */ sw $t7, 0x003C($sp) -/* 00554 80ACE324 AFB80010 */ sw $t8, 0x0010($sp) -/* 00558 80ACE328 AFA00028 */ sw $zero, 0x0028($sp) -/* 0055C 80ACE32C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00560 80ACE330 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 -/* 00564 80ACE334 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFCC -/* 00568 80ACE338 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 0056C 80ACE33C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFCC -/* 00570 80ACE340 1000008A */ beq $zero, $zero, .L80ACE56C -/* 00574 80ACE344 00000000 */ nop -glabel L80ACE348 -/* 00578 80ACE348 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0057C 80ACE34C 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00580 80ACE350 C6240054 */ lwc1 $f4, 0x0054($s1) ## 00000054 -/* 00584 80ACE354 240B0007 */ addiu $t3, $zero, 0x0007 ## $t3 = 00000007 -/* 00588 80ACE358 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 0058C 80ACE35C 46062202 */ mul.s $f8, $f4, $f6 -/* 00590 80ACE360 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00594 80ACE364 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00598 80ACE368 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 0059C 80ACE36C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 005A0 80ACE370 AFB80030 */ sw $t8, 0x0030($sp) -/* 005A4 80ACE374 AFAF0024 */ sw $t7, 0x0024($sp) -/* 005A8 80ACE378 4600428D */ trunc.w.s $f10, $f8 -/* 005AC 80ACE37C AFAE0020 */ sw $t6, 0x0020($sp) -/* 005B0 80ACE380 AFAD001C */ sw $t5, 0x001C($sp) -/* 005B4 80ACE384 AFAC0018 */ sw $t4, 0x0018($sp) -/* 005B8 80ACE388 44195000 */ mfc1 $t9, $f10 -/* 005BC 80ACE38C AFAB0014 */ sw $t3, 0x0014($sp) -/* 005C0 80ACE390 AFA0002C */ sw $zero, 0x002C($sp) -/* 005C4 80ACE394 00194400 */ sll $t0, $t9, 16 -/* 005C8 80ACE398 00084C03 */ sra $t1, $t0, 16 -/* 005CC 80ACE39C 00095080 */ sll $t2, $t1, 2 -/* 005D0 80ACE3A0 01495021 */ addu $t2, $t2, $t1 -/* 005D4 80ACE3A4 000A50C0 */ sll $t2, $t2, 3 -/* 005D8 80ACE3A8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 005DC 80ACE3AC 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 005E0 80ACE3B0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 005E4 80ACE3B4 AFB90034 */ sw $t9, 0x0034($sp) -/* 005E8 80ACE3B8 AFA80038 */ sw $t0, 0x0038($sp) -/* 005EC 80ACE3BC AFA9003C */ sw $t1, 0x003C($sp) -/* 005F0 80ACE3C0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 005F4 80ACE3C4 AFA00028 */ sw $zero, 0x0028($sp) -/* 005F8 80ACE3C8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 005FC 80ACE3CC 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 -/* 00600 80ACE3D0 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFCC -/* 00604 80ACE3D4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00608 80ACE3D8 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFCC -/* 0060C 80ACE3DC 10000063 */ beq $zero, $zero, .L80ACE56C -/* 00610 80ACE3E0 00000000 */ nop -glabel L80ACE3E4 -/* 00614 80ACE3E4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00618 80ACE3E8 4481A000 */ mtc1 $at, $f20 ## $f20 = 60.00 -/* 0061C 80ACE3EC 24100007 */ addiu $s0, $zero, 0x0007 ## $s0 = 00000007 -/* 00620 80ACE3F0 27B20098 */ addiu $s2, $sp, 0x0098 ## $s2 = FFFFFFF0 -.L80ACE3F4: -/* 00624 80ACE3F4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00628 80ACE3F8 4600A306 */ mov.s $f12, $f20 -/* 0062C 80ACE3FC C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 00630 80ACE400 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00634 80ACE404 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 00638 80ACE408 46100480 */ add.s $f18, $f0, $f16 -/* 0063C 80ACE40C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00640 80ACE410 E7B20098 */ swc1 $f18, 0x0098($sp) -/* 00644 80ACE414 C62400BC */ lwc1 $f4, 0x00BC($s1) ## 000000BC -/* 00648 80ACE418 C6260054 */ lwc1 $f6, 0x0054($s1) ## 00000054 -/* 0064C 80ACE41C C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 00650 80ACE420 4600A306 */ mov.s $f12, $f20 -/* 00654 80ACE424 46062202 */ mul.s $f8, $f4, $f6 -/* 00658 80ACE428 46085400 */ add.s $f16, $f10, $f8 -/* 0065C 80ACE42C 46100480 */ add.s $f18, $f0, $f16 -/* 00660 80ACE430 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00664 80ACE434 E7B2009C */ swc1 $f18, 0x009C($sp) -/* 00668 80ACE438 C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 0066C 80ACE43C 46040180 */ add.s $f6, $f0, $f4 -/* 00670 80ACE440 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00674 80ACE444 E7A600A0 */ swc1 $f6, 0x00A0($sp) -/* 00678 80ACE448 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0067C 80ACE44C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00680 80ACE450 24040050 */ addiu $a0, $zero, 0x0050 ## $a0 = 00000050 -/* 00684 80ACE454 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 00688 80ACE458 460A0200 */ add.s $f8, $f0, $f10 -/* 0068C 80ACE45C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00690 80ACE460 E7A80090 */ swc1 $f8, 0x0090($sp) -/* 00694 80ACE464 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 -/* 00698 80ACE468 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0069C 80ACE46C AFAB001C */ sw $t3, 0x001C($sp) -/* 006A0 80ACE470 AFAA0014 */ sw $t2, 0x0014($sp) -/* 006A4 80ACE474 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 006A8 80ACE478 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFF0 -/* 006AC 80ACE47C 27A6008C */ addiu $a2, $sp, 0x008C ## $a2 = FFFFFFE4 -/* 006B0 80ACE480 27A70080 */ addiu $a3, $sp, 0x0080 ## $a3 = FFFFFFD8 -/* 006B4 80ACE484 AFA20010 */ sw $v0, 0x0010($sp) -/* 006B8 80ACE488 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile -/* 006BC 80ACE48C AFA00018 */ sw $zero, 0x0018($sp) -/* 006C0 80ACE490 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000006 -/* 006C4 80ACE494 0601FFD7 */ bgez $s0, .L80ACE3F4 -/* 006C8 80ACE498 00000000 */ nop -/* 006CC 80ACE49C 10000033 */ beq $zero, $zero, .L80ACE56C -/* 006D0 80ACE4A0 00000000 */ nop -glabel L80ACE4A4 -/* 006D4 80ACE4A4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 006D8 80ACE4A8 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 -/* 006DC 80ACE4AC 24100004 */ addiu $s0, $zero, 0x0004 ## $s0 = 00000004 -/* 006E0 80ACE4B0 27B20098 */ addiu $s2, $sp, 0x0098 ## $s2 = FFFFFFF0 -.L80ACE4B4: -/* 006E4 80ACE4B4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 006E8 80ACE4B8 4600A306 */ mov.s $f12, $f20 -/* 006EC 80ACE4BC C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 006F0 80ACE4C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 006F4 80ACE4C4 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 006F8 80ACE4C8 46100480 */ add.s $f18, $f0, $f16 -/* 006FC 80ACE4CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00700 80ACE4D0 E7B20098 */ swc1 $f18, 0x0098($sp) -/* 00704 80ACE4D4 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 00708 80ACE4D8 4600A306 */ mov.s $f12, $f20 -/* 0070C 80ACE4DC 46040180 */ add.s $f6, $f0, $f4 -/* 00710 80ACE4E0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00714 80ACE4E4 E7A6009C */ swc1 $f6, 0x009C($sp) -/* 00718 80ACE4E8 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 0071C 80ACE4EC 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 -/* 00720 80ACE4F0 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 00724 80ACE4F4 460A0200 */ add.s $f8, $f0, $f10 -/* 00728 80ACE4F8 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 0072C 80ACE4FC 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00730 80ACE500 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00734 80ACE504 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00738 80ACE508 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 0073C 80ACE50C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00740 80ACE510 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 00744 80ACE514 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00748 80ACE518 E7A800A0 */ swc1 $f8, 0x00A0($sp) -/* 0074C 80ACE51C AFAB003C */ sw $t3, 0x003C($sp) -/* 00750 80ACE520 AFAA0038 */ sw $t2, 0x0038($sp) -/* 00754 80ACE524 AFA90034 */ sw $t1, 0x0034($sp) -/* 00758 80ACE528 AFA80030 */ sw $t0, 0x0030($sp) -/* 0075C 80ACE52C AFB90024 */ sw $t9, 0x0024($sp) -/* 00760 80ACE530 AFB80020 */ sw $t8, 0x0020($sp) -/* 00764 80ACE534 AFAF001C */ sw $t7, 0x001C($sp) -/* 00768 80ACE538 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0076C 80ACE53C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00770 80ACE540 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00774 80ACE544 AFA0002C */ sw $zero, 0x002C($sp) -/* 00778 80ACE548 AFA00028 */ sw $zero, 0x0028($sp) -/* 0077C 80ACE54C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00780 80ACE550 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFF0 -/* 00784 80ACE554 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFCC -/* 00788 80ACE558 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 0078C 80ACE55C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFCC -/* 00790 80ACE560 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 -/* 00794 80ACE564 0601FFD3 */ bgez $s0, .L80ACE4B4 -/* 00798 80ACE568 00000000 */ nop -glabel L80ACE56C -.L80ACE56C: -/* 0079C 80ACE56C 0C00B55C */ jal Actor_Kill - -/* 007A0 80ACE570 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007A4 80ACE574 10000008 */ beq $zero, $zero, .L80ACE598 -/* 007A8 80ACE578 8FBF0064 */ lw $ra, 0x0064($sp) -.L80ACE57C: -/* 007AC 80ACE57C C6300154 */ lwc1 $f16, 0x0154($s1) ## 00000154 -.L80ACE580: -/* 007B0 80ACE580 C6320158 */ lwc1 $f18, 0x0158($s1) ## 00000158 -/* 007B4 80ACE584 246CFFFF */ addiu $t4, $v1, 0xFFFF ## $t4 = FFFFFFFF -/* 007B8 80ACE588 A62C014E */ sh $t4, 0x014E($s1) ## 0000014E -/* 007BC 80ACE58C 46128100 */ add.s $f4, $f16, $f18 -/* 007C0 80ACE590 E6240154 */ swc1 $f4, 0x0154($s1) ## 00000154 -/* 007C4 80ACE594 8FBF0064 */ lw $ra, 0x0064($sp) -.L80ACE598: -/* 007C8 80ACE598 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 007CC 80ACE59C 8FB00050 */ lw $s0, 0x0050($sp) -/* 007D0 80ACE5A0 8FB10054 */ lw $s1, 0x0054($sp) -/* 007D4 80ACE5A4 8FB20058 */ lw $s2, 0x0058($sp) -/* 007D8 80ACE5A8 8FB3005C */ lw $s3, 0x005C($sp) -/* 007DC 80ACE5AC 8FB40060 */ lw $s4, 0x0060($sp) -/* 007E0 80ACE5B0 03E00008 */ jr $ra -/* 007E4 80ACE5B4 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s deleted file mode 100644 index 87a23e0202..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80ACE5B8 -/* 007E8 80ACE5B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 007EC 80ACE5BC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 007F0 80ACE5C0 03E00008 */ jr $ra -/* 007F4 80ACE5C4 A08E014C */ sb $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s deleted file mode 100644 index fe338a1270..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s +++ /dev/null @@ -1,153 +0,0 @@ -.late_rodata -glabel D_80ACF2E4 - .word 0x44228000 -glabel D_80ACF2E8 - .float 0.04 - -.text -glabel func_80ACE5C8 -/* 007F8 80ACE5C8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 007FC 80ACE5CC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00800 80ACE5D0 AFB10030 */ sw $s1, 0x0030($sp) -/* 00804 80ACE5D4 AFB0002C */ sw $s0, 0x002C($sp) -/* 00808 80ACE5D8 848E014E */ lh $t6, 0x014E($a0) ## 0000014E -/* 0080C 80ACE5DC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00810 80ACE5E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00814 80ACE5E4 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00818 80ACE5E8 A48F014E */ sh $t7, 0x014E($a0) ## 0000014E -/* 0081C 80ACE5EC 8498014E */ lh $t8, 0x014E($a0) ## 0000014E -/* 00820 80ACE5F0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00824 80ACE5F4 27B90050 */ addiu $t9, $sp, 0x0050 ## $t9 = FFFFFFF0 -/* 00828 80ACE5F8 17000005 */ bne $t8, $zero, .L80ACE610 -/* 0082C 80ACE5FC 3C0880AD */ lui $t0, %hi(D_80ACF1D4) ## $t0 = 80AD0000 -/* 00830 80ACE600 0C00B55C */ jal Actor_Kill - -/* 00834 80ACE604 00000000 */ nop -/* 00838 80ACE608 10000073 */ beq $zero, $zero, .L80ACE7D8 -/* 0083C 80ACE60C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80ACE610: -/* 00840 80ACE610 2508F1D4 */ addiu $t0, $t0, %lo(D_80ACF1D4) ## $t0 = FFFFF1D4 -/* 00844 80ACE614 8D0A0000 */ lw $t2, 0x0000($t0) ## FFFFF1D4 -/* 00848 80ACE618 8D090004 */ lw $t1, 0x0004($t0) ## FFFFF1D8 -/* 0084C 80ACE61C 3C0C80AD */ lui $t4, %hi(D_80ACF1E0) ## $t4 = 80AD0000 -/* 00850 80ACE620 AF2A0000 */ sw $t2, 0x0000($t9) ## 00000000 -/* 00854 80ACE624 8D0A0008 */ lw $t2, 0x0008($t0) ## FFFFF1DC -/* 00858 80ACE628 258CF1E0 */ addiu $t4, $t4, %lo(D_80ACF1E0) ## $t4 = 80ACF1E0 -/* 0085C 80ACE62C AF290004 */ sw $t1, 0x0004($t9) ## 00000004 -/* 00860 80ACE630 AF2A0008 */ sw $t2, 0x0008($t9) ## 00000008 -/* 00864 80ACE634 8D8E0000 */ lw $t6, 0x0000($t4) ## 80ACF1E0 -/* 00868 80ACE638 27AB0044 */ addiu $t3, $sp, 0x0044 ## $t3 = FFFFFFE4 -/* 0086C 80ACE63C 8D8D0004 */ lw $t5, 0x0004($t4) ## 80ACF1E4 -/* 00870 80ACE640 AD6E0000 */ sw $t6, 0x0000($t3) ## FFFFFFE4 -/* 00874 80ACE644 8D8E0008 */ lw $t6, 0x0008($t4) ## 80ACF1E8 -/* 00878 80ACE648 AD6D0004 */ sw $t5, 0x0004($t3) ## FFFFFFE8 -/* 0087C 80ACE64C 3C014044 */ lui $at, 0x4044 ## $at = 40440000 -/* 00880 80ACE650 AD6E0008 */ sw $t6, 0x0008($t3) ## FFFFFFEC -/* 00884 80ACE654 C604008C */ lwc1 $f4, 0x008C($s0) ## 0000008C -/* 00888 80ACE658 44813800 */ mtc1 $at, $f7 ## $f7 = 3.06 -/* 0088C 80ACE65C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00890 80ACE660 46002021 */ cvt.d.s $f0, $f4 -/* 00894 80ACE664 46200004 */ sqrt.d $f0, $f0 -/* 00898 80ACE668 4626003E */ c.le.d $f0, $f6 -/* 0089C 80ACE66C 00000000 */ nop -/* 008A0 80ACE670 4502002C */ bc1fl .L80ACE724 -/* 008A4 80ACE674 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 008A8 80ACE678 80620A78 */ lb $v0, 0x0A78($v1) ## 00000A78 -/* 008AC 80ACE67C 1C40000F */ bgtz $v0, .L80ACE6BC -/* 008B0 80ACE680 A3A20043 */ sb $v0, 0x0043($sp) -/* 008B4 80ACE684 2841FFD9 */ slti $at, $v0, 0xFFD9 -/* 008B8 80ACE688 10200003 */ beq $at, $zero, .L80ACE698 -/* 008BC 80ACE68C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 008C0 80ACE690 1000000A */ beq $zero, $zero, .L80ACE6BC -/* 008C4 80ACE694 A0600A78 */ sb $zero, 0x0A78($v1) ## 00000A78 -.L80ACE698: -/* 008C8 80ACE698 A0600A78 */ sb $zero, 0x0A78($v1) ## 00000A78 -/* 008CC 80ACE69C AFA3005C */ sw $v1, 0x005C($sp) -/* 008D0 80ACE6A0 0331C821 */ addu $t9, $t9, $s1 -/* 008D4 80ACE6A4 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 008D8 80ACE6A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008DC 80ACE6AC 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 008E0 80ACE6B0 0320F809 */ jalr $ra, $t9 -/* 008E4 80ACE6B4 00000000 */ nop -/* 008E8 80ACE6B8 8FA3005C */ lw $v1, 0x005C($sp) -.L80ACE6BC: -/* 008EC 80ACE6BC 8E050118 */ lw $a1, 0x0118($s0) ## 00000118 -/* 008F0 80ACE6C0 3C0180AD */ lui $at, %hi(D_80ACF2E4) ## $at = 80AD0000 -/* 008F4 80ACE6C4 C428F2E4 */ lwc1 $f8, %lo(D_80ACF2E4)($at) -/* 008F8 80ACE6C8 C4AA0090 */ lwc1 $f10, 0x0090($a1) ## 00000090 -/* 008FC 80ACE6CC 3C0180AD */ lui $at, %hi(D_80ACF2E8) ## $at = 80AD0000 -/* 00900 80ACE6D0 C432F2E8 */ lwc1 $f18, %lo(D_80ACF2E8)($at) -/* 00904 80ACE6D4 460A4401 */ sub.s $f16, $f8, $f10 -/* 00908 80ACE6D8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0090C 80ACE6DC 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 00910 80ACE6E0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00914 80ACE6E4 46128102 */ mul.s $f4, $f16, $f18 -/* 00918 80ACE6E8 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 0091C 80ACE6EC 84A70032 */ lh $a3, 0x0032($a1) ## 00000032 -/* 00920 80ACE6F0 AFA3005C */ sw $v1, 0x005C($sp) -/* 00924 80ACE6F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00928 80ACE6F8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0092C 80ACE6FC 46062200 */ add.s $f8, $f4, $f6 -/* 00930 80ACE700 44064000 */ mfc1 $a2, $f8 -/* 00934 80ACE704 0C00BDC7 */ jal func_8002F71C -/* 00938 80ACE708 00000000 */ nop -/* 0093C 80ACE70C 8FA3005C */ lw $v1, 0x005C($sp) -/* 00940 80ACE710 93AF0043 */ lbu $t7, 0x0043($sp) -/* 00944 80ACE714 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00948 80ACE718 A06F0A78 */ sb $t7, 0x0A78($v1) ## 00000A78 -/* 0094C 80ACE71C A618014E */ sh $t8, 0x014E($s0) ## 0000014E -/* 00950 80ACE720 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -.L80ACE724: -/* 00954 80ACE724 2408012C */ addiu $t0, $zero, 0x012C ## $t0 = 0000012C -/* 00958 80ACE728 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 -/* 0095C 80ACE72C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00960 80ACE730 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00964 80ACE734 AFA90014 */ sw $t1, 0x0014($sp) -/* 00968 80ACE738 AFA80010 */ sw $t0, 0x0010($sp) -/* 0096C 80ACE73C AFA50038 */ sw $a1, 0x0038($sp) -/* 00970 80ACE740 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00974 80ACE744 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00978 80ACE748 0C00CD20 */ jal func_80033480 -/* 0097C 80ACE74C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00980 80ACE750 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 00984 80ACE754 44816000 */ mtc1 $at, $f12 ## $f12 = 16.00 -/* 00988 80ACE758 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0098C 80ACE75C 00000000 */ nop -/* 00990 80ACE760 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00994 80ACE764 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 00998 80ACE768 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0099C 80ACE76C 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 009A0 80ACE770 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 009A4 80ACE774 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 009A8 80ACE778 46100482 */ mul.s $f18, $f0, $f16 -/* 009AC 80ACE77C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 009B0 80ACE780 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 009B4 80ACE784 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 009B8 80ACE788 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 009BC 80ACE78C 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 009C0 80ACE790 AFB9001C */ sw $t9, 0x001C($sp) -/* 009C4 80ACE794 46049180 */ add.s $f6, $f18, $f4 -/* 009C8 80ACE798 AFAE0018 */ sw $t6, 0x0018($sp) -/* 009CC 80ACE79C AFAB0010 */ sw $t3, 0x0010($sp) -/* 009D0 80ACE7A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009D4 80ACE7A4 46083282 */ mul.s $f10, $f6, $f8 -/* 009D8 80ACE7A8 8FA50038 */ lw $a1, 0x0038($sp) -/* 009DC 80ACE7AC 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFF0 -/* 009E0 80ACE7B0 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFFE4 -/* 009E4 80ACE7B4 AFA00020 */ sw $zero, 0x0020($sp) -/* 009E8 80ACE7B8 4600540D */ trunc.w.s $f16, $f10 -/* 009EC 80ACE7BC 440D8000 */ mfc1 $t5, $f16 -/* 009F0 80ACE7C0 0C00A5C9 */ jal EffectSsHahen_Spawn -/* 009F4 80ACE7C4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 009F8 80ACE7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009FC 80ACE7CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A00 80ACE7D0 240530E0 */ addiu $a1, $zero, 0x30E0 ## $a1 = 000030E0 -/* 00A04 80ACE7D4 8FBF0034 */ lw $ra, 0x0034($sp) -.L80ACE7D8: -/* 00A08 80ACE7D8 8FB0002C */ lw $s0, 0x002C($sp) -/* 00A0C 80ACE7DC 8FB10030 */ lw $s1, 0x0030($sp) -/* 00A10 80ACE7E0 03E00008 */ jr $ra -/* 00A14 80ACE7E4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s deleted file mode 100644 index 37d891f2e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_80ACE7E8 -/* 00A18 80ACE7E8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00A1C 80ACE7EC 3C0E80AD */ lui $t6, %hi(D_80ACF1EC) ## $t6 = 80AD0000 -/* 00A20 80ACE7F0 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00A24 80ACE7F4 AFB00050 */ sw $s0, 0x0050($sp) -/* 00A28 80ACE7F8 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00A2C 80ACE7FC AFA5007C */ sw $a1, 0x007C($sp) -/* 00A30 80ACE800 25CEF1EC */ addiu $t6, $t6, %lo(D_80ACF1EC) ## $t6 = 80ACF1EC -/* 00A34 80ACE804 8DD80000 */ lw $t8, 0x0000($t6) ## 80ACF1EC -/* 00A38 80ACE808 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFF4 -/* 00A3C 80ACE80C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A40 80ACE810 ACD80000 */ sw $t8, 0x0000($a2) ## FFFFFFF4 -/* 00A44 80ACE814 8DCF0004 */ lw $t7, 0x0004($t6) ## 80ACF1F0 -/* 00A48 80ACE818 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00A4C 80ACE81C 00C03825 */ or $a3, $a2, $zero ## $a3 = FFFFFFF4 -/* 00A50 80ACE820 ACCF0004 */ sw $t7, 0x0004($a2) ## FFFFFFF8 -/* 00A54 80ACE824 8DD80008 */ lw $t8, 0x0008($t6) ## 80ACF1F4 -/* 00A58 80ACE828 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00A5C 80ACE82C 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 00A60 80ACE830 ACD80008 */ sw $t8, 0x0008($a2) ## FFFFFFFC -/* 00A64 80ACE834 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 00A68 80ACE838 8FA4007C */ lw $a0, 0x007C($sp) -/* 00A6C 80ACE83C 50400005 */ beql $v0, $zero, .L80ACE854 -/* 00A70 80ACE840 C6040054 */ lwc1 $f4, 0x0054($s0) ## 00000054 -/* 00A74 80ACE844 8C590130 */ lw $t9, 0x0130($v0) ## 00000130 -/* 00A78 80ACE848 57200025 */ bnel $t9, $zero, .L80ACE8E0 -/* 00A7C 80ACE84C 8603014E */ lh $v1, 0x014E($s0) ## 0000014E -/* 00A80 80ACE850 C6040054 */ lwc1 $f4, 0x0054($s0) ## 00000054 -.L80ACE854: -/* 00A84 80ACE854 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00A88 80ACE858 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00A8C 80ACE85C 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00A90 80ACE860 46062202 */ mul.s $f8, $f4, $f6 -/* 00A94 80ACE864 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00A98 80ACE868 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00A9C 80ACE86C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00AA0 80ACE870 AFA8002C */ sw $t0, 0x002C($sp) -/* 00AA4 80ACE874 AFB90024 */ sw $t9, 0x0024($sp) -/* 00AA8 80ACE878 AFB80020 */ sw $t8, 0x0020($sp) -/* 00AAC 80ACE87C 4600428D */ trunc.w.s $f10, $f8 -/* 00AB0 80ACE880 AFAF001C */ sw $t7, 0x001C($sp) -/* 00AB4 80ACE884 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00AB8 80ACE888 AFA00030 */ sw $zero, 0x0030($sp) -/* 00ABC 80ACE88C 44095000 */ mfc1 $t1, $f10 -/* 00AC0 80ACE890 AFA00028 */ sw $zero, 0x0028($sp) -/* 00AC4 80ACE894 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00AC8 80ACE898 00095400 */ sll $t2, $t1, 16 -/* 00ACC 80ACE89C 000A5C03 */ sra $t3, $t2, 16 -/* 00AD0 80ACE8A0 000B6080 */ sll $t4, $t3, 2 -/* 00AD4 80ACE8A4 018B6021 */ addu $t4, $t4, $t3 -/* 00AD8 80ACE8A8 000C60C0 */ sll $t4, $t4, 3 -/* 00ADC 80ACE8AC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00AE0 80ACE8B0 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 00AE4 80ACE8B4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00AE8 80ACE8B8 AFA90034 */ sw $t1, 0x0034($sp) -/* 00AEC 80ACE8BC AFAA0038 */ sw $t2, 0x0038($sp) -/* 00AF0 80ACE8C0 AFAB003C */ sw $t3, 0x003C($sp) -/* 00AF4 80ACE8C4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00AF8 80ACE8C8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00AFC 80ACE8CC 0C00B55C */ jal Actor_Kill - -/* 00B00 80ACE8D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B04 80ACE8D4 1000003F */ beq $zero, $zero, .L80ACE9D4 -/* 00B08 80ACE8D8 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00B0C 80ACE8DC 8603014E */ lh $v1, 0x014E($s0) ## 0000014E -.L80ACE8E0: -/* 00B10 80ACE8E0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00B14 80ACE8E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B18 80ACE8E8 14600030 */ bne $v1, $zero, .L80ACE9AC -/* 00B1C 80ACE8EC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00B20 80ACE8F0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00B24 80ACE8F4 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 00B28 80ACE8F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00B2C 80ACE8FC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00B30 80ACE900 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00B34 80ACE904 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C -/* 00B38 80ACE908 46000506 */ mov.s $f20, $f0 -/* 00B3C 80ACE90C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00B40 80ACE910 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B44 80ACE914 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00B48 80ACE918 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00B4C 80ACE91C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00B50 80ACE920 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00B54 80ACE924 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 00B58 80ACE928 4600A500 */ add.s $f20, $f20, $f0 -/* 00B5C 80ACE92C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00B60 80ACE930 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B64 80ACE934 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00B68 80ACE938 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00B6C 80ACE93C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00B70 80ACE940 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00B74 80ACE944 4600A500 */ add.s $f20, $f20, $f0 -/* 00B78 80ACE948 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 -/* 00B7C 80ACE94C 44051000 */ mfc1 $a1, $f2 -/* 00B80 80ACE950 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B84 80ACE954 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 -/* 00B88 80ACE958 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00B8C 80ACE95C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00B90 80ACE960 4600A500 */ add.s $f20, $f20, $f0 -/* 00B94 80ACE964 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00B98 80ACE968 00000000 */ nop -/* 00B9C 80ACE96C 4606A032 */ c.eq.s $f20, $f6 -/* 00BA0 80ACE970 00000000 */ nop -/* 00BA4 80ACE974 4500000B */ bc1f .L80ACE9A4 -/* 00BA8 80ACE978 00000000 */ nop -/* 00BAC 80ACE97C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 00BB0 80ACE980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB4 80ACE984 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A -/* 00BB8 80ACE988 844C0014 */ lh $t4, 0x0014($v0) ## 00000014 -/* 00BBC 80ACE98C 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 00BC0 80ACE990 A44D0014 */ sh $t5, 0x0014($v0) ## 00000014 -/* 00BC4 80ACE994 860E014E */ lh $t6, 0x014E($s0) ## 0000014E -/* 00BC8 80ACE998 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00BCC 80ACE99C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00BD0 80ACE9A0 A60F014E */ sh $t7, 0x014E($s0) ## 0000014E -.L80ACE9A4: -/* 00BD4 80ACE9A4 10000005 */ beq $zero, $zero, .L80ACE9BC -/* 00BD8 80ACE9A8 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -.L80ACE9AC: -/* 00BDC 80ACE9AC 18600003 */ blez $v1, .L80ACE9BC -/* 00BE0 80ACE9B0 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF -/* 00BE4 80ACE9B4 A618014E */ sh $t8, 0x014E($s0) ## 0000014E -/* 00BE8 80ACE9B8 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -.L80ACE9BC: -/* 00BEC 80ACE9BC 905900AF */ lbu $t9, 0x00AF($v0) ## 000000AF -/* 00BF0 80ACE9C0 53200004 */ beql $t9, $zero, .L80ACE9D4 -/* 00BF4 80ACE9C4 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00BF8 80ACE9C8 0C00B55C */ jal Actor_Kill - -/* 00BFC 80ACE9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C00 80ACE9D0 8FBF0054 */ lw $ra, 0x0054($sp) -.L80ACE9D4: -/* 00C04 80ACE9D4 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00C08 80ACE9D8 8FB00050 */ lw $s0, 0x0050($sp) -/* 00C0C 80ACE9DC 03E00008 */ jr $ra -/* 00C10 80ACE9E0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s deleted file mode 100644 index 20ab288831..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80ACEAC0 -/* 00CF0 80ACEAC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CF4 80ACEAC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CF8 80ACEAC8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00CFC 80ACEACC AFA60020 */ sw $a2, 0x0020($sp) -/* 00D00 80ACEAD0 AFA70024 */ sw $a3, 0x0024($sp) -/* 00D04 80ACEAD4 0C031A73 */ jal Graph_Alloc - -/* 00D08 80ACEAD8 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 00D0C 80ACEADC 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 00D10 80ACEAE0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00D14 80ACEAE4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00D18 80ACEAE8 24440008 */ addiu $a0, $v0, 0x0008 ## $a0 = 00000008 -/* 00D1C 80ACEAEC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00D20 80ACEAF0 00801025 */ or $v0, $a0, $zero ## $v0 = 00000008 -/* 00D24 80ACEAF4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 00D28 80ACEAF8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000008 -/* 00D2C 80ACEAFC 93AA0023 */ lbu $t2, 0x0023($sp) -/* 00D30 80ACEB00 93B9001F */ lbu $t9, 0x001F($sp) -/* 00D34 80ACEB04 93AE0027 */ lbu $t6, 0x0027($sp) -/* 00D38 80ACEB08 000A5C00 */ sll $t3, $t2, 16 -/* 00D3C 80ACEB0C 00194600 */ sll $t0, $t9, 24 -/* 00D40 80ACEB10 010B6025 */ or $t4, $t0, $t3 ## $t4 = 00000000 -/* 00D44 80ACEB14 000E7A00 */ sll $t7, $t6, 8 -/* 00D48 80ACEB18 018FC025 */ or $t8, $t4, $t7 ## $t8 = FA000000 -/* 00D4C 80ACEB1C 371900FF */ ori $t9, $t8, 0x00FF ## $t9 = FA0000FF -/* 00D50 80ACEB20 AC590004 */ sw $t9, 0x0004($v0) ## 0000000C -/* 00D54 80ACEB24 24840008 */ addiu $a0, $a0, 0x0008 ## $a0 = 00000010 -/* 00D58 80ACEB28 00801025 */ or $v0, $a0, $zero ## $v0 = 00000010 -/* 00D5C 80ACEB2C 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 00D60 80ACEB30 AC490000 */ sw $t1, 0x0000($v0) ## 00000010 -/* 00D64 80ACEB34 93AE002F */ lbu $t6, 0x002F($sp) -/* 00D68 80ACEB38 93A8002B */ lbu $t0, 0x002B($sp) -/* 00D6C 80ACEB3C 93B90033 */ lbu $t9, 0x0033($sp) -/* 00D70 80ACEB40 000E6400 */ sll $t4, $t6, 16 -/* 00D74 80ACEB44 00085E00 */ sll $t3, $t0, 24 -/* 00D78 80ACEB48 016C7825 */ or $t7, $t3, $t4 ## $t7 = 00000000 -/* 00D7C 80ACEB4C 00194A00 */ sll $t1, $t9, 8 -/* 00D80 80ACEB50 01E95025 */ or $t2, $t7, $t1 ## $t2 = FB000000 -/* 00D84 80ACEB54 354800FF */ ori $t0, $t2, 0x00FF ## $t0 = FB0000FF -/* 00D88 80ACEB58 AC480004 */ sw $t0, 0x0004($v0) ## 00000014 -/* 00D8C 80ACEB5C 3C0DDF00 */ lui $t5, 0xDF00 ## $t5 = DF000000 -/* 00D90 80ACEB60 AC8D0008 */ sw $t5, 0x0008($a0) ## 00000018 -/* 00D94 80ACEB64 AC80000C */ sw $zero, 0x000C($a0) ## 0000001C -/* 00D98 80ACEB68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D9C 80ACEB6C 24840008 */ addiu $a0, $a0, 0x0008 ## $a0 = 00000018 -/* 00DA0 80ACEB70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DA4 80ACEB74 03E00008 */ jr $ra -/* 00DA8 80ACEB78 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 diff --git a/data/overlays/actors/z_en_part.data.s b/data/overlays/actors/z_en_part.data.s deleted file mode 100644 index 6c62159fed..0000000000 --- a/data/overlays/actors/z_en_part.data.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Part_InitVars - .word 0x00070700, 0x00000010, 0x00010000, 0x0000015C -.word EnPart_Init -.word EnPart_Destroy -.word EnPart_Update -.word EnPart_Draw -glabel D_80ACF1B0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ACF1BC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ACF1C8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ACF1D4 - .word 0x00000000, 0x41000000, 0x00000000 -glabel D_80ACF1E0 - .word 0x00000000, 0xBFC00000, 0x00000000 -glabel D_80ACF1EC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ACF1F8 - .word func_80ACDDE8 -.word func_80ACE13C -.word func_80ACE5B8 -.word func_80ACE5C8 -.word func_80ACE7E8 -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_part.reloc.s b/data/overlays/actors/z_en_part.reloc.s deleted file mode 100644 index d9871aa86e..0000000000 --- a/data/overlays/actors/z_en_part.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80ACF2F0 - .incbin "baserom/ovl_En_Part", 0x1520, 0x000001B0 diff --git a/include/z64actor.h b/include/z64actor.h index a9b43a1aab..4630539cad 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -196,7 +196,7 @@ typedef struct { /* 0x04 */ s16* unk_04; /* 0x08 */ s16 unk_08; /* 0x0A */ char unk_0A[0x02]; - /* 0x0C */ s32* unk_0C; + /* 0x0C */ Gfx** unk_0C; /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; } struct_80032E24; diff --git a/spec b/spec index ef4b566b01..53f17574df 100644 --- a/spec +++ b/spec @@ -2886,8 +2886,7 @@ endseg beginseg name "ovl_En_Part" include "build/src/overlays/actors/ovl_En_Part/z_en_part.o" - include "build/data/overlays/actors/z_en_part.data.o" - include "build/data/overlays/actors/z_en_part.reloc.o" + include "build/src/overlays/actors/ovl_En_Part/ovl_En_Part_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 118f226d87..e17084fd1a 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3128,7 +3128,7 @@ s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, mtx->wy, mtx->wz, 0, 0, objBankIndex, params); if (spawnedEnPart != NULL) { func_800D20CC(&arg1->unk_00[arg1->unk_08], &spawnedEnPart->actor.shape.rot, 0); - spawnedEnPart->unk_150 = arg1->unk_0C[arg1->unk_08]; + spawnedEnPart->displayList = arg1->unk_0C[arg1->unk_08]; spawnedEnPart->actor.scale = actor->scale; } @@ -4082,7 +4082,7 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) { /** * Spawns En_Part (Dissipating Flames) actor as a child of the given actor. */ -EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f* arg3, s32 arg4, s32 unused, +EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 arg4, s32 unused, GlobalContext* globalCtx, s16 params, s32 arg8) { EnPart* spawnedEnPart; @@ -4091,12 +4091,12 @@ EnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f* arg spawnPos->z, spawnRot->x, spawnRot->y, actor->objBankIndex, params); if (spawnedEnPart != NULL) { spawnedEnPart->actor.scale = actor->scale; - spawnedEnPart->actor.speedXZ = arg3->x; - spawnedEnPart->unk_150 = arg8; - spawnedEnPart->unk_14C = 2; - spawnedEnPart->unk_14E = arg4; - spawnedEnPart->unk_154 = arg3->y; - spawnedEnPart->unk_158 = arg3->z; + spawnedEnPart->actor.speedXZ = arg3[0]; + spawnedEnPart->displayList = arg8; + spawnedEnPart->action = 2; + spawnedEnPart->timer = arg4; + spawnedEnPart->rotZ = arg3[1]; + spawnedEnPart->rotZSpeed = arg3[2]; return spawnedEnPart; } diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index f239b197ff..5284ab76ac 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -1,3 +1,9 @@ +/* + * File: z_en_part.c + * Overlay: ovl_En_Part + * Description: Effect spawner for enemies' death + */ + #include "z_en_part.h" #define FLAGS 0x00000010 @@ -9,7 +15,6 @@ void EnPart_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPart_Update(Actor* thisx, GlobalContext* globalCtx); void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx); -/* const ActorInit En_Part_InitVars = { ACTOR_EN_PART, ACTORTYPE_ITEMACTION, @@ -21,23 +26,299 @@ const ActorInit En_Part_InitVars = { (ActorFunc)EnPart_Update, (ActorFunc)EnPart_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Destroy.s") +extern UNK_TYPE D_06001300[]; +extern UNK_TYPE D_06001700[]; +extern UNK_TYPE D_06001900[]; +extern UNK_TYPE D_06001B00[]; +extern UNK_TYPE D_06001F00[]; +extern UNK_TYPE D_06002100[]; +extern Gfx D_06002FF0[]; +extern Gfx D_06015380[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s") +void EnPart_Init(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s") +void EnPart_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5B8.s") +void func_80ACDDE8(EnPart* this, GlobalContext* globalCtx) { + f32 sign = 1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s") + this->action = 1; + this->actor.posRot.rot.y = Math_Rand_ZeroOne() * 20000.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s") + switch (this->actor.params) { + case 0: + this->actor.velocity.y = 0.0f; + this->actor.gravity = -0.3f - Math_Rand_ZeroOne() * 0.5f; + this->rotZSpeed = 0.3f; + this->timer = 25; + this->actor.speedXZ = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + break; + case 13: + this->timer = 400; + case 12: + this->actor.speedXZ = Math_Rand_CenteredFloat(6.0f); + this->actor.initPosRot.pos = this->actor.posRot.pos; + this->timer += 60; + this->actor.velocity.y = Math_Rand_ZeroOne() * 5.0f + 4.0f; + this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.5f; + this->rotZSpeed = 0.15f; + break; + case 14: + EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &this->actor.posRot.pos, 40, 0x8001, 0, -1); + case 1: + case 4: + case 9: + case 10: + this->timer += (s16)(Math_Rand_ZeroOne() * 17.0f) + 5; + case 2: + this->actor.velocity.y = Math_Rand_ZeroOne() * 5.0f + 4.0f; + this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.5f; + this->rotZSpeed = 0.15f; + break; + case 11: + EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &this->actor.posRot.pos, 40, 0x8001, 0, -1); + case 3: + this->actor.speedXZ = (Math_Rand_ZeroOne() - 0.5f) * 3.0f; + this->timer = (s16)(Math_Rand_ZeroOne() * 17.0f) + 10; + this->actor.velocity.y = Math_Rand_ZeroOne() * 3.0f + 8.0f; + this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.3f; + this->rotZSpeed = 0.15f; + break; + case 5: + case 6: + case 7: + case 8: + this->actor.posRot.rot.y = this->actor.parent->shape.rot.y; + if (this->displayList == D_06015380) { + sign = -1.0f; + } + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 6.0f * sign; + this->actor.gravity = -1.2f; + this->rotZSpeed = 0.15f * sign; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + this->timer = 18; + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Update.s") +void func_80ACE13C(EnPart* this, GlobalContext* globalCtx) { + s32 i; + Vec3f pos; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.0f, 0.0f }; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACEAC0.s") + if ((this->actor.params == 12) || (this->actor.params == 13)) { + func_8002E4B4(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f, 0x1D); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s") + if ((this->actor.bgCheckFlags & 1) || (this->actor.posRot.pos.y <= this->actor.groundY)) { + this->action = 4; + this->actor.speedXZ = 0.0f; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + } + + if ((this->actor.params == 13) && (this->actor.parent != NULL) && (this->actor.parent->update == NULL)) { + this->actor.parent = NULL; + } + } else if (this->timer <= 0) { + switch (this->actor.params) { + case 1: + case 9: + case 10: + case 14: + EffectSsDeadDb_Spawn(globalCtx, &this->actor.posRot.pos, &zeroVec, &zeroVec, + (s16)(this->actor.scale.y * 100.0f) * 40, 7, 255, 255, 255, 255, 0, 255, 0, 1, 9, + true); + break; + case 3: + case 11: + EffectSsDeadDb_Spawn(globalCtx, &this->actor.posRot.pos, &zeroVec, &zeroVec, + (s16)(this->actor.scale.y * 100.0f) * 40, 7, 255, 255, 255, 255, 0, 0, 255, 1, 9, + true); + break; + case 4: + for (i = 7; i >= 0; i--) { + pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(60.0f); + pos.y = this->actor.posRot.pos.y + this->actor.shape.unk_08 * this->actor.scale.y + + Math_Rand_CenteredFloat(50.0f); + pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(60.0f); + velocity.y = Math_Rand_ZeroOne() + 1.0f; + EffectSsDtBubble_SpawnColorProfile(globalCtx, &pos, &velocity, &accel, Math_Rand_S16Offset(80, 100), + 25, 0, true); + } + break; + case 5: + case 6: + case 7: + case 8: + for (i = 4; i >= 0; i--) { + pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(25.0f); + pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(40.0f); + pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(25.0f); + EffectSsDeadDb_Spawn(globalCtx, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 0, 0, 255, 1, + 9, true); + } + break; + } + + Actor_Kill(&this->actor); + return; + } + + this->timer--; + this->rotZ += this->rotZSpeed; +} + +void func_80ACE5B8(EnPart* this, GlobalContext* globalCtx) { + this->action = 3; +} + +void func_80ACE5C8(EnPart* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->timer--; + if (this->timer == 0) { + Actor_Kill(&this->actor); + } else { + Vec3f velocity = { 0.0f, 8.0f, 0.0f }; + Vec3f accel = { 0.0f, -1.5f, 0.0f }; + + if (sqrt(this->actor.xyzDistFromLinkSq) <= 40.0f) { + u8 prevInvincibilityTimer = player->invincibilityTimer; + if (player->invincibilityTimer <= 0) { + if (player->invincibilityTimer <= -40) { + player->invincibilityTimer = 0; + } else { + player->invincibilityTimer = 0; + globalCtx->damagePlayer(globalCtx, -8); + } + } + func_8002F71C(globalCtx, this->actor.parent, (650.0f - this->actor.parent->xzDistFromLink) * 0.04f + 4.0f, + this->actor.parent->posRot.rot.y, 8.0f); + player->invincibilityTimer = prevInvincibilityTimer; + this->timer = 1; + } + + func_80033480(globalCtx, &this->actor.posRot.pos, 0.0f, 1, 300, 150, 1); + velocity.x = Math_Rand_CenteredFloat(16.0f); + EffectSsHahen_Spawn(globalCtx, &this->actor.posRot.pos, &velocity, &accel, 20, + (s32)((Math_Rand_ZeroOne() * 5.0f + 12.0f) * 2), -1, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_MONBLIN_GNDWAVE - SFX_FLAG); + } +} + +void func_80ACE7E8(EnPart* this, GlobalContext* globalCtx) { + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + + if ((this->actor.parent == NULL) || (this->actor.parent->update == NULL)) { + EffectSsDeadDb_Spawn(globalCtx, &this->actor.posRot.pos, &zeroVec, &zeroVec, + (s16)(this->actor.scale.y * 100.0f) * 40, 7, 255, 255, 255, 255, 0, 255, 0, 1, 9, true); + Actor_Kill(&this->actor); + return; + } + + if (this->timer == 0) { + f32 diffsSum = + Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f, 5.0f, 0.0f); + diffsSum += Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 1.0f, 5.0f, 0.0f); + diffsSum += Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f, 5.0f, 0.0f); + diffsSum += Math_SmoothScaleMaxMinF(&this->rotZ, 0.0f, 1.0f, 0.25f, 0.0f); + if (diffsSum == 0.0f) { + this->actor.parent->initPosRot.rot.x--; + this->timer--; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_DAMAGE); + } + } else if (this->timer > 0) { + this->timer--; + } + + if (this->actor.parent->colChkInfo.health != 0) { + Actor_Kill(&this->actor); + } +} + +void EnPart_Update(Actor* thisx, GlobalContext* globalCtx) { + static EnPartActionFunc sActionFuncs[] = { + func_80ACDDE8, func_80ACE13C, func_80ACE5B8, func_80ACE5C8, func_80ACE7E8, + }; + + EnPart* this = THIS; + + Actor_MoveForward(&this->actor); + + if ((this->actor.params > 4 && this->actor.params < 9) || this->actor.params < 0) { + func_8002E4B4(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f, 5); + if (this->actor.params >= 0) { + Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + if (thisx->bgCheckFlags & 1) { + thisx->bgCheckFlags &= ~1; + thisx->velocity.y = 6.0f; + } + } + } + + sActionFuncs[this->action](this, globalCtx); +} + +Gfx* func_80ACEAC0(GraphicsContext* gfxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB) { + Gfx* dList; + Gfx* dListHead; + + dList = Graph_Alloc(gfxCtx, 4 * sizeof(Gfx)); + dListHead = dList; + + gDPPipeSync(dListHead++); + gDPSetPrimColor(dListHead++, 0, 0, primR, primG, primB, 255); + gDPSetEnvColor(dListHead++, envR, envG, envB, 255); + gSPEndDisplayList(dListHead++); + + return dList; +} + +void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnPart* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_part.c", 647); + + if (thisx->params > 0) { + Matrix_RotateZ(this->rotZ, MTXMODE_APPLY); + } + + func_80093D18(globalCtx->state.gfxCtx); + func_8002EBCC(thisx, globalCtx, 0); + + if (thisx->params == 5) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 245, 255, 205, 30, 35, 0)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 185, 135, 25, 20, 20, 0)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 30, 40, 20)); + } else if (thisx->params == 6) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 55, 65, 55, 0, 0, 0)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 205, 165, 75, 25, 20, 0)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 205, 165, 75, 25, 20, 0)); + } else if (thisx->params == 7) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 180, 180, 180)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); + } else if ((thisx->params == 9) && (this->displayList == D_06002FF0)) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001300)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001700)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06001900)); + } else if ((thisx->params == 10) && (this->displayList == D_06002FF0)) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001B00)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001F00)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06002100)); + } + + if (this->displayList != NULL) { + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_part.c", 696), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyOpa.p++, this->displayList); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_part.c", 700); +} diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h index f6664d78a8..4324d34cba 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -6,13 +6,15 @@ struct EnPart; +typedef void (*EnPartActionFunc)(struct EnPart*, GlobalContext*); + typedef struct EnPart { /* 0x000 */ Actor actor; - /* 0x14C */ u8 unk_14C; - /* 0x14E */ s16 unk_14E; - /* 0x150 */ s32 unk_150; - /* 0x154 */ f32 unk_154; - /* 0x158 */ f32 unk_158; + /* 0x14C */ u8 action; + /* 0x14E */ s16 timer; + /* 0x150 */ Gfx* displayList; + /* 0x154 */ f32 rotZ; + /* 0x158 */ f32 rotZSpeed; } EnPart; // size = 0x015C extern const ActorInit En_Part_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 6b88571da5..0389ff73b1 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -768,6 +768,15 @@ D_06000420 = 0x06000420; D_06000C20 = 0x06000C20; D_06001420 = 0x06001420; +// z_en_part +D_06001300 = 0x06001300; +D_06001700 = 0x06001700; +D_06001900 = 0x06001900; +D_06001F00 = 0x06001F00; +D_06002100 = 0x06002100; +D_06002FF0 = 0x06002FF0; +D_06015380 = 0x06015380; + // z_en_pu_box D_06000380 = 0x06000380; D_060006D0 = 0x060006D0; From 174af7384d1cfcbf15da02d9069bf02bdc433c20 Mon Sep 17 00:00:00 2001 From: Random <28494085+Random06457@users.noreply.github.com> Date: Sat, 3 Oct 2020 17:22:44 +0200 Subject: [PATCH 5/6] libultra cleanup (#215) * cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes --- Makefile | 21 +- include/PR/abi.h | 622 ------------------ include/PR/gs2dex.h | 392 ----------- include/PR/gu.h | 29 - include/PR/libaudio.h | 21 - include/PR/libultra.h | 18 - include/PR/mbi.h | 102 --- include/PR/os_ai.h | 92 --- include/PR/os_cache.h | 96 --- include/PR/os_eeprom.h | 107 --- include/PR/os_exception.h | 119 ---- include/PR/os_internal.h | 18 - include/PR/os_libc.h | 10 - include/PR/os_message.h | 155 ----- include/PR/os_misc.h | 11 - include/PR/os_pi.h | 85 --- include/PR/os_rdp.h | 92 --- include/PR/os_thread.h | 75 --- include/PR/os_time.h | 27 - include/PR/os_tlb.h | 107 --- include/PR/os_vi.h | 117 ---- include/PR/sptask.h | 113 ---- include/PR/ucode.h | 23 - include/PR/ultratypes.h | 42 -- include/alloca.h | 2 +- include/fp.h | 2 +- include/functions.h | 74 ++- include/macros.h | 5 +- include/math.h | 20 +- include/segment_symbols.h | 2 +- include/stdarg.h | 22 +- include/stdlib.h | 13 +- include/string.h | 10 - include/ultra64.h | 41 +- include/ultra64/abi.h | 6 +- include/ultra64/controller.h | 215 +++--- include/ultra64/convert.h | 7 - include/ultra64/gbi.h | 2 +- include/ultra64/gu.h | 6 - include/ultra64/hardware.h | 2 +- include/ultra64/internal.h | 28 + include/ultra64/interrupt.h | 8 - include/ultra64/mbi.h | 85 +-- include/ultra64/message.h | 46 +- include/ultra64/os_internal.h | 39 -- include/ultra64/os_message.h | 163 ----- include/ultra64/os_misc.h | 8 - include/ultra64/os_pi.h | 87 --- include/ultra64/os_thread.h | 75 --- include/ultra64/os_vi.h | 116 ---- include/ultra64/pfs.h | 180 ++--- include/ultra64/pi.h | 63 ++ include/ultra64/printf.h | 12 +- include/ultra64/rcp.h | 16 +- include/ultra64/rdp.h | 72 +- include/ultra64/rsp.h | 56 +- include/ultra64/sptask.h | 14 +- include/ultra64/thread.h | 82 +-- include/ultra64/time.h | 29 +- include/ultra64/vi.h | 95 +++ include/variables.h | 17 +- include/z64.h | 99 ++- include/z64actor.h | 8 +- include/z64animation.h | 11 +- include/z64audio.h | 2 +- include/z64collision_check.h | 2 +- include/z64cutscene.h | 2 +- include/z64cutscene_commands.h | 4 +- include/z64dma.h | 2 +- include/z64effect.h | 2 +- include/z64light.h | 8 +- include/z64math.h | 16 +- include/z64player.h | 2 +- include/z64transition.h | 5 +- spec | 118 ++-- src/boot/assert.c | 2 +- src/boot/boot_main.c | 5 +- src/boot/idle.c | 17 +- src/boot/is_debug.c | 3 +- src/boot/logutils.c | 10 +- src/boot/stackcheck.c | 5 +- src/boot/viconfig.c | 5 +- src/boot/yaz0.c | 3 +- src/boot/z_locale.c | 5 +- src/boot/z_std_dma.c | 14 +- src/buffers/gfxbuffers.c | 2 +- src/buffers/heaps.c | 2 +- src/buffers/zbuffer.c | 2 +- src/code/PreRender.c | 2 +- src/code/TwoHeadArena.c | 2 +- src/code/__osMalloc.c | 4 +- src/code/audioMgr.c | 5 +- src/code/audio_effects.c | 4 +- src/code/audio_heap.c | 4 +- src/code/audio_playback.c | 3 +- src/code/audio_seqplayer.c | 4 +- src/code/code_800430A0.c | 3 +- src/code/code_80043480.c | 3 +- src/code/code_80069420.c | 3 +- src/code/code_8006BA00.c | 3 +- src/code/code_8006C3A0.c | 3 +- src/code/code_8006C510.c | 3 +- src/code/code_8008E6A0.c | 10 +- src/code/code_80097A00.c | 3 +- src/code/code_800A9D40.c | 3 +- src/code/code_800A9F30.c | 3 +- src/code/code_800ACE70.c | 2 +- src/code/code_800AD920.c | 2 +- src/code/code_800BB0A0.c | 2 +- src/code/code_800C3C20.c | 2 +- src/code/code_800D2E30.c | 3 +- src/code/code_800D31A0.c | 4 +- src/code/code_800DACC0.c | 4 +- src/code/code_800E11F0.c | 4 +- src/code/code_800EC960.c | 4 +- src/code/code_800F7260.c | 4 +- src/code/code_800F9280.c | 4 +- src/code/code_800FBCE0.c | 2 +- src/code/code_800FC620.c | 2 +- src/code/code_800FCE80.c | 5 +- src/code/code_800FD970.c | 3 +- src/code/code_801067F0.c | 3 +- src/code/code_80106860.c | 3 +- src/code/code_801068B0.c | 3 +- src/code/code_80110450.c | 3 +- src/code/db_camera.c | 3 +- src/code/debug_malloc.c | 2 +- src/code/fault.c | 87 ++- src/code/fault_drawer.c | 5 +- src/code/flg_set.c | 23 +- src/code/game.c | 26 +- src/code/gamealloc.c | 2 +- src/code/gfxprint.c | 3 +- src/code/graph.c | 10 +- src/code/irqmgr.c | 8 +- src/code/jpegdecoder.c | 2 +- src/code/jpegutils.c | 2 +- src/code/listalloc.c | 2 +- src/code/loadfragment2.c | 2 +- src/code/logseverity.c | 2 +- src/code/main.c | 18 +- src/code/mempak.c | 2 +- src/code/mtxuty-cvt.c | 2 +- src/code/padmgr.c | 42 +- src/code/padsetup.c | 2 +- src/code/padutils.c | 30 +- src/code/printutils.c | 2 +- src/code/relocation.c | 2 +- src/code/sched.c | 5 +- src/code/shrink_window.c | 2 +- src/code/sleep.c | 2 +- src/code/speed_meter.c | 5 +- src/code/sys_cfb.c | 2 +- src/code/sys_math.c | 4 +- src/code/sys_math3d.c | 5 +- src/code/sys_math_atan.c | 3 +- src/code/sys_matrix.c | 3 +- src/code/sys_ucode.c | 2 +- src/code/system_malloc.c | 2 +- src/code/title_setup.c | 2 +- src/code/ucode_disas.c | 2 +- src/code/z_DLF.c | 5 +- src/code/z_actor.c | 7 +- src/code/z_actor_dlftbls.c | 5 +- src/code/z_bgcheck.c | 19 +- src/code/z_camera.c | 13 +- src/code/z_cheap_proc.c | 3 +- src/code/z_collision_btltbls.c | 3 +- src/code/z_collision_check.c | 16 +- src/code/z_common_data.c | 3 +- src/code/z_construct.c | 3 +- src/code/z_debug.c | 55 +- src/code/z_debug_display.c | 3 +- src/code/z_demo.c | 20 +- src/code/z_draw.c | 3 +- src/code/z_eff_blure.c | 3 +- src/code/z_eff_shield_particle.c | 5 +- src/code/z_eff_spark.c | 3 +- src/code/z_eff_ss_dead.c | 3 +- src/code/z_effect.c | 3 +- src/code/z_effect_soft_sprite.c | 5 +- src/code/z_effect_soft_sprite_dlftbls.c | 5 +- src/code/z_effect_soft_sprite_old_init.c | 3 +- src/code/z_elf_message.c | 3 +- src/code/z_en_a_keep.c | 4 +- src/code/z_en_item00.c | 3 +- src/code/z_face_reaction.c | 3 +- src/code/z_fbdemo.c | 3 +- src/code/z_fbdemo_circle.c | 2 +- src/code/z_fbdemo_fade.c | 4 +- src/code/z_fbdemo_triforce.c | 2 +- src/code/z_fbdemo_wipe1.c | 2 +- src/code/z_fcurve_data_skelanime.c | 3 +- src/code/z_game_dlftbls.c | 2 +- src/code/z_horse.c | 5 +- src/code/z_jpeg.c | 5 +- src/code/z_kaleido_manager.c | 4 +- src/code/z_kaleido_scope_call.c | 6 +- src/code/z_kaleido_setup.c | 6 +- src/code/z_kanfont.c | 3 +- src/code/z_kankyo.c | 3 +- src/code/z_lib.c | 7 +- src/code/z_lifemeter.c | 3 +- src/code/z_lights.c | 3 +- src/code/z_malloc.c | 2 +- src/code/z_map_data.c | 2 +- src/code/z_map_exp.c | 9 +- src/code/z_map_mark.c | 5 +- src/code/z_message_PAL.c | 3 +- src/code/z_moji.c | 3 +- src/code/z_msgevent.c | 3 +- src/code/z_olib.c | 3 +- src/code/z_onepointdemo.c | 3 +- src/code/z_parameter.c | 12 +- src/code/z_path.c | 3 +- src/code/z_play.c | 7 +- src/code/z_player_call.c | 2 +- src/code/z_player_lib.c | 3 +- src/code/z_prenmi.c | 5 +- src/code/z_prenmi_buff.c | 3 +- src/code/z_quake.c | 4 +- src/code/z_rcp.c | 3 +- src/code/z_room.c | 5 +- src/code/z_sample.c | 6 +- src/code/z_scene.c | 5 +- src/code/z_scene_table.c | 3 +- src/code/z_skelanime.c | 5 +- src/code/z_skin.c | 3 +- src/code/z_skin_awb.c | 3 +- src/code/z_skin_matrix.c | 5 +- src/code/z_sram.c | 3 +- src/code/z_view.c | 7 +- src/code/z_vimode.c | 3 +- src/code/z_vismono.c | 3 +- src/code/z_vr_box.c | 3 +- src/code/z_vr_box_draw.c | 2 +- src/libultra_boot_O1/__osDequeueThread.c | 2 +- src/libultra_boot_O1/__osGetHWIntrRoutine.c | 3 +- src/libultra_boot_O1/__osResetGlobalIntMask.c | 2 +- src/libultra_boot_O1/__osSetGlobalIntMask.c | 2 +- src/libultra_boot_O1/__osSetHWIntrRoutine.c | 5 +- src/libultra_boot_O1/initialize.c | 3 +- src/libultra_boot_O1/osCreateMesgQueue.c | 2 +- src/libultra_boot_O1/osCreateThread.c | 2 +- src/libultra_boot_O1/osDestroyThread.c | 2 +- src/libultra_boot_O1/osGetMemSize.c | 2 +- src/libultra_boot_O1/osGetThreadId.c | 2 +- src/libultra_boot_O1/osGetThreadPri.c | 2 +- src/libultra_boot_O1/osGetTime.c | 2 +- src/libultra_boot_O1/osJamMesg.c | 2 +- src/libultra_boot_O1/osRecvMesg.c | 2 +- src/libultra_boot_O1/osSendMesg.c | 2 +- src/libultra_boot_O1/osSetEventMesg.c | 5 +- src/libultra_boot_O1/osSetThreadPri.c | 2 +- src/libultra_boot_O1/osStartThread.c | 2 +- src/libultra_boot_O1/osStopThread.c | 2 +- src/libultra_boot_O1/osViExtendVStart.c | 2 +- src/libultra_boot_O1/osViModePalLan1.c | 2 +- src/libultra_boot_O1/osVirtualToPhysical.c | 2 +- src/libultra_boot_O1/osYieldThread.c | 2 +- src/libultra_boot_O1/piacs.c | 2 +- src/libultra_boot_O1/timerintr.c | 2 +- src/libultra_boot_O2/_Ldtob.c | 13 +- src/libultra_boot_O2/_Litob.c | 5 +- src/libultra_boot_O2/_Printf.c | 11 +- src/libultra_boot_O2/__osDevMgrMain.c | 4 +- src/libultra_boot_O2/__osEPiRawReadIo.c | 3 +- src/libultra_boot_O2/__osEPiRawStartDma.c | 3 +- src/libultra_boot_O2/__osEPiRawWriteIo.c | 3 +- src/libultra_boot_O2/__osPiRawStartDma.c | 11 +- src/libultra_boot_O2/__osSiDeviceBusy.c | 3 +- src/libultra_boot_O2/__osSiRawReadIo.c | 3 +- src/libultra_boot_O2/__osSiRawWriteIo.c | 3 +- .../__osViGetCurrentContext.c | 2 +- src/libultra_boot_O2/__osViInit.c | 3 +- src/libultra_boot_O2/__osViSwapContext.c | 3 +- src/libultra_boot_O2/ldiv.c | 7 +- src/libultra_boot_O2/osCartRomInit.c | 3 +- src/libultra_boot_O2/osDriveRomInit.c | 3 +- src/libultra_boot_O2/osEPiReadIo.c | 2 +- src/libultra_boot_O2/osEPiStartDma.c | 3 +- src/libultra_boot_O2/osEPiWriteIo.c | 2 +- src/libultra_boot_O2/osPiGetCmdQueue.c | 3 +- src/libultra_boot_O2/osViBlack.c | 2 +- src/libultra_boot_O2/osViGetNextFramebuffer.c | 2 +- src/libultra_boot_O2/osViModeFpalLan1.c | 2 +- src/libultra_boot_O2/osViModeMpalLan1.c | 2 +- src/libultra_boot_O2/osViModeNtscLan1.c | 2 +- src/libultra_boot_O2/osViSetMode.c | 2 +- src/libultra_boot_O2/osViSetSpecialFeatures.c | 2 +- src/libultra_boot_O2/osViSetXScale.c | 2 +- src/libultra_boot_O2/osViSetYScale.c | 4 +- src/libultra_boot_O2/osViSwapBuffer.c | 2 +- src/libultra_boot_O2/pimgr.c | 3 +- src/libultra_boot_O2/sprintf.c | 2 +- src/libultra_boot_O2/string.c | 2 +- src/libultra_boot_O2/vimgr.c | 3 +- src/libultra_code/__osSpGetStatus.c | 7 - src/libultra_code/libultra_internal.h | 43 -- src/libultra_code/osAi.h | 7 - src/libultra_code/osAiGetLength.c | 7 - .../llcvt.c | 2 +- .../osSetTimer.c | 2 +- .../osStopTimer.c | 2 +- .../__osContAddressCrc.c | 14 +- .../__osContRamRead.c | 4 +- .../__osContRamWrite.c | 7 +- .../__osGetActiveQueue.c | 2 +- .../__osGetCurrFaultedThread.c | 3 +- .../__osPfsGetStatus.c | 4 +- .../__osPfsSelectBank.c | 4 +- .../__osSiCreateAccessQueue.c | 5 +- .../__osSiRawStartDma.c | 3 +- src/libultra_code_O2/__osSpGetStatus.c | 5 + .../__osSpRawStartDma.c | 8 +- .../__osSpSetPc.c | 4 +- .../__osSpSetStatus.c | 4 +- .../code_800E6840.c | 2 +- .../code_80102FA0.c | 4 +- .../code_80104D60.c | 4 +- .../contpfs.c | 4 +- .../contquery.c | 3 +- .../cosf.c | 6 +- .../coss.c | 3 +- .../guLookAt.c | 3 +- .../guLookAtHilite.c | 3 +- .../guPerspectiveF.c | 16 +- .../guPosition.c | 2 +- .../guS2DInitBg.c | 2 +- .../ortho.c | 3 +- .../osAfterPreNMI.c | 4 +- src/libultra_code_O2/osAiGetLength.c | 5 + .../osAiSetFrequency.c | 3 +- .../osAiSetNextBuffer.c | 3 +- .../osContInit.c | 4 +- src/libultra_code_O2/osContQuery.c | 32 + .../osContSetCh.c | 4 +- .../osContStartReadData.c | 4 +- .../osDpGetStatus.c | 2 +- .../osDpSetStatus.c | 2 +- src/libultra_code_O2/osMempakAddrCRC.c | 65 ++ .../osPfsDeleteFile.c | 10 +- .../osPfsFindFile.c | 4 +- .../osPfsFreeBlocks.c | 6 +- .../osPfsIsPlug.c | 4 +- src/libultra_code_O2/osReadMempak.c | 60 ++ .../osRumblePak.c | 4 +- .../osSpTaskYield.c | 2 +- .../osSpTaskYielded.c | 2 +- .../osViGetCurrentFramebuffer.c | 3 +- .../osViSetEvent.c | 2 +- .../pfsallocatefile.c | 6 +- .../pfschecker.c | 6 +- .../pfsinitpak.c | 4 +- .../pfsreadwritefile.c | 4 +- .../rotate.c | 2 +- .../sinf.c | 4 +- .../sins.c | 3 +- .../sintable.c | 2 +- src/{libultra_code => libultra_code_O2}/sp.c | 4 +- .../sptask.c | 3 +- .../sqrtf.c | 2 +- .../absf.c | 2 +- .../sqrt.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 5 +- .../actors/ovl_Arms_Hook/z_arms_hook.h | 4 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.h | 4 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.h | 4 +- .../actors/ovl_Arrow_Light/z_arrow_light.h | 4 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h | 4 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h | 4 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h | 4 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.h | 4 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h | 4 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.h | 4 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h | 4 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h | 4 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.h | 4 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h | 4 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h | 4 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 2 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h | 4 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h | 4 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h | 4 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h | 4 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h | 4 +- .../ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h | 4 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h | 4 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h | 4 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h | 4 +- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h | 4 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.h | 4 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h | 4 +- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h | 4 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h | 4 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h | 4 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h | 4 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.h | 4 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h | 4 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 2 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.h | 4 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h | 4 +- .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h | 4 +- .../z_bg_hidan_firewall.h | 4 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h | 4 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h | 4 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h | 4 +- .../ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h | 4 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h | 4 +- .../z_bg_hidan_kowarerukabe.h | 4 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h | 4 +- .../z_bg_hidan_rsekizou.h | 4 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h | 4 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h | 4 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h | 4 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.h | 4 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h | 4 +- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h | 4 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.h | 4 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.h | 4 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.h | 4 +- .../z_bg_jya_amishutter.h | 4 +- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h | 4 +- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.h | 4 +- .../z_bg_jya_bombchuiwa.h | 4 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 2 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h | 4 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h | 4 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h | 4 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h | 4 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h | 4 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h | 4 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h | 4 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.h | 4 +- .../z_bg_jya_zurerukabe.c | 3 +- .../z_bg_jya_zurerukabe.h | 4 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h | 4 +- .../z_bg_menkuri_kaiten.h | 4 +- .../z_bg_menkuri_nisekabe.h | 4 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h | 4 +- .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h | 4 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h | 4 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h | 4 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.h | 4 +- src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h | 4 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h | 4 +- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h | 4 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h | 4 +- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h | 4 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h | 4 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h | 4 +- .../z_bg_mori_kaitenkabe.h | 4 +- .../z_bg_mori_rakkatenjo.h | 4 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.h | 4 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h | 4 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.h | 4 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.h | 4 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.h | 4 +- .../z_bg_spot00_hanebasi.h | 4 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h | 4 +- .../z_bg_spot01_idohashira.h | 4 +- .../z_bg_spot01_idomizu.h | 4 +- .../z_bg_spot01_idosoko.h | 4 +- .../z_bg_spot01_objects2.h | 4 +- .../z_bg_spot02_objects.h | 4 +- .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h | 4 +- .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h | 4 +- .../z_bg_spot06_objects.h | 4 +- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h | 4 +- .../z_bg_spot08_bakudankabe.h | 4 +- .../z_bg_spot08_iceblock.h | 4 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h | 4 +- .../z_bg_spot11_bakudankabe.h | 4 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h | 4 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h | 4 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h | 4 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h | 4 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h | 4 +- .../z_bg_spot16_bombstone.h | 4 +- .../z_bg_spot16_doughnut.c | 2 +- .../z_bg_spot16_doughnut.h | 4 +- .../z_bg_spot17_bakudankabe.h | 4 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h | 4 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h | 4 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h | 4 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h | 4 +- .../z_bg_spot18_shutter.h | 4 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h | 4 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h | 4 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h | 4 +- .../z_bg_toki_swd_cutscene_data_1.c | 2 +- .../z_bg_toki_swd_cutscene_data_2.c | 2 +- .../z_bg_toki_swd_cutscene_data_3.c | 2 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.h | 4 +- .../z_bg_treemouth_cutscene_data.c | 2 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.h | 4 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h | 4 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h | 4 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h | 4 +- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h | 4 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h | 4 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.h | 4 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h | 4 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h | 4 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.h | 4 +- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.h | 4 +- .../ovl_Boss_Ganondrof/z_boss_ganondrof.h | 4 +- .../actors/ovl_Boss_Goma/z_boss_goma.h | 4 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h | 4 +- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h | 4 +- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h | 4 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.h | 4 +- src/overlays/actors/ovl_Demo_6K/z_demo_6k.h | 4 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.h | 4 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h | 4 +- .../actors/ovl_Demo_Effect/z_demo_effect.h | 4 +- src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h | 4 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 3 +- .../actors/ovl_Demo_Geff/z_demo_geff.h | 4 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h | 4 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 3 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.h | 4 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h | 4 +- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h | 4 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 2 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.h | 4 +- .../ovl_Demo_Im/z_demo_im_cutscene_data.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.h | 4 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.h | 4 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 2 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h | 4 +- .../ovl_Demo_Sa/z_demo_sa_cutscene_data.c | 2 +- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h | 4 +- .../actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c | 4 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h | 4 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.h | 4 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.h | 4 +- .../actors/ovl_Door_Killer/z_door_killer.h | 4 +- .../actors/ovl_Door_Shutter/z_door_shutter.h | 4 +- .../actors/ovl_Door_Toki/z_door_toki.h | 4 +- .../actors/ovl_Door_Warp1/z_door_warp1.h | 4 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.h | 4 +- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h | 4 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 2 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h | 4 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 2 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h | 4 +- src/overlays/actors/ovl_En_Am/z_en_am.h | 4 +- src/overlays/actors/ovl_En_Ani/z_en_ani.h | 4 +- .../actors/ovl_En_Anubice/z_en_anubice.h | 4 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.h | 4 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.c | 2 +- .../ovl_En_Anubice_Tag/z_en_anubice_tag.h | 4 +- .../actors/ovl_En_Arow_Trap/z_en_arow_trap.h | 6 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.h | 4 +- .../ovl_En_Attack_Niw/z_en_attack_niw.h | 4 +- src/overlays/actors/ovl_En_Ba/z_en_ba.h | 4 +- src/overlays/actors/ovl_En_Bb/z_en_bb.h | 4 +- .../actors/ovl_En_Bdfire/z_en_bdfire.h | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.h | 4 +- src/overlays/actors/ovl_En_Bili/z_en_bili.h | 4 +- src/overlays/actors/ovl_En_Bird/z_en_bird.h | 4 +- .../actors/ovl_En_Blkobj/z_en_blkobj.h | 4 +- src/overlays/actors/ovl_En_Bom/z_en_bom.h | 4 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h | 4 +- .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h | 4 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.h | 4 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.h | 4 +- src/overlays/actors/ovl_En_Boom/z_en_boom.h | 4 +- src/overlays/actors/ovl_En_Box/z_en_box.h | 4 +- src/overlays/actors/ovl_En_Brob/z_en_brob.h | 4 +- .../actors/ovl_En_Bubble/z_en_bubble.h | 4 +- src/overlays/actors/ovl_En_Butte/z_en_butte.h | 4 +- src/overlays/actors/ovl_En_Bw/z_en_bw.h | 4 +- src/overlays/actors/ovl_En_Bx/z_en_bx.h | 4 +- .../actors/ovl_En_Changer/z_en_changer.h | 4 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.h | 4 +- src/overlays/actors/ovl_En_Cow/z_en_cow.h | 4 +- src/overlays/actors/ovl_En_Crow/z_en_crow.h | 4 +- src/overlays/actors/ovl_En_Cs/z_en_cs.h | 4 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.h | 4 +- .../z_en_daiku_kakariko.h | 4 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.h | 4 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.h | 4 +- src/overlays/actors/ovl_En_Dh/z_en_dh.h | 4 +- src/overlays/actors/ovl_En_Dha/z_en_dha.h | 4 +- .../ovl_En_Diving_Game/z_en_diving_game.h | 4 +- src/overlays/actors/ovl_En_Dns/z_en_dns.h | 4 +- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h | 4 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h | 4 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h | 4 +- .../actors/ovl_En_Dodojr/z_en_dodojr.h | 4 +- .../actors/ovl_En_Dodongo/z_en_dodongo.h | 4 +- src/overlays/actors/ovl_En_Dog/z_en_dog.h | 4 +- src/overlays/actors/ovl_En_Door/z_en_door.h | 4 +- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 2 +- src/overlays/actors/ovl_En_Ds/z_en_ds.h | 6 +- src/overlays/actors/ovl_En_Du/z_en_du.h | 4 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.h | 4 +- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 2 +- src/overlays/actors/ovl_En_Eg/z_en_eg.h | 4 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h | 4 +- src/overlays/actors/ovl_En_Elf/z_en_elf.h | 4 +- .../actors/ovl_En_Encount1/z_en_encount1.h | 4 +- .../actors/ovl_En_Encount2/z_en_encount2.h | 4 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.h | 4 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h | 4 +- src/overlays/actors/ovl_En_Fd/z_en_fd.h | 4 +- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.h | 4 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h | 4 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.h | 4 +- .../actors/ovl_En_Firefly/z_en_firefly.h | 4 +- src/overlays/actors/ovl_En_Fish/z_en_fish.h | 4 +- .../actors/ovl_En_Floormas/z_en_floormas.h | 4 +- src/overlays/actors/ovl_En_Fr/z_en_fr.h | 4 +- src/overlays/actors/ovl_En_Fu/z_en_fu.h | 4 +- src/overlays/actors/ovl_En_Fw/z_en_fw.h | 4 +- src/overlays/actors/ovl_En_Fz/z_en_fz.h | 4 +- .../actors/ovl_En_G_Switch/z_en_g_switch.h | 4 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.h | 4 +- .../ovl_En_Ganon_Organ/z_en_ganon_organ.h | 4 +- src/overlays/actors/ovl_En_Gb/z_en_gb.h | 4 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.h | 4 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.h | 4 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.h | 4 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.h | 4 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.h | 4 +- src/overlays/actors/ovl_En_Gm/z_en_gm.h | 4 +- src/overlays/actors/ovl_En_Go/z_en_go.h | 4 +- src/overlays/actors/ovl_En_Go2/z_en_go2.h | 4 +- src/overlays/actors/ovl_En_Goma/z_en_goma.h | 4 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.h | 4 +- src/overlays/actors/ovl_En_Gs/z_en_gs.h | 4 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 2 +- src/overlays/actors/ovl_En_Guest/z_en_guest.h | 4 +- src/overlays/actors/ovl_En_Hata/z_en_hata.h | 4 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.h | 4 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 2 +- .../actors/ovl_En_Heishi2/z_en_heishi2.h | 4 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 2 +- .../actors/ovl_En_Heishi3/z_en_heishi3.h | 4 +- .../actors/ovl_En_Heishi4/z_en_heishi4.h | 4 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.h | 4 +- src/overlays/actors/ovl_En_Holl/z_en_holl.h | 4 +- .../actors/ovl_En_Honotrap/z_en_honotrap.h | 4 +- src/overlays/actors/ovl_En_Horse/z_en_horse.h | 4 +- .../z_en_horse_game_check.h | 4 +- .../ovl_En_Horse_Ganon/z_en_horse_ganon.h | 4 +- .../z_en_horse_link_child.h | 4 +- .../ovl_En_Horse_Normal/z_en_horse_normal.h | 4 +- .../ovl_En_Horse_Zelda/z_en_horse_zelda.h | 4 +- src/overlays/actors/ovl_En_Hs/z_en_hs.h | 4 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 3 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.h | 4 +- src/overlays/actors/ovl_En_Hy/z_en_hy.h | 4 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.h | 4 +- src/overlays/actors/ovl_En_Ik/z_en_ik.h | 4 +- src/overlays/actors/ovl_En_In/z_en_in.h | 4 +- .../actors/ovl_En_Insect/z_en_insect.c | 2 +- .../actors/ovl_En_Insect/z_en_insect.h | 4 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.h | 4 +- src/overlays/actors/ovl_En_It/z_en_it.h | 4 +- src/overlays/actors/ovl_En_Jj/z_en_jj.h | 4 +- src/overlays/actors/ovl_En_Js/z_en_js.h | 4 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.h | 4 +- .../actors/ovl_En_Kakasi/z_en_kakasi.h | 4 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.h | 4 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.h | 4 +- .../actors/ovl_En_Kanban/z_en_kanban.h | 4 +- .../actors/ovl_En_Karebaba/z_en_karebaba.h | 4 +- src/overlays/actors/ovl_En_Ko/z_en_ko.h | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.h | 4 +- src/overlays/actors/ovl_En_Kz/z_en_kz.h | 4 +- src/overlays/actors/ovl_En_Light/z_en_light.h | 4 +- .../actors/ovl_En_Lightbox/z_en_lightbox.h | 4 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.h | 4 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.h | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.h | 4 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.h | 4 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.h | 4 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 12 +- src/overlays/actors/ovl_En_Mag/z_en_mag.h | 4 +- src/overlays/actors/ovl_En_Mb/z_en_mb.h | 4 +- src/overlays/actors/ovl_En_Md/z_en_md.h | 4 +- src/overlays/actors/ovl_En_Mk/z_en_mk.h | 4 +- src/overlays/actors/ovl_En_Mm/z_en_mm.h | 4 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.h | 4 +- src/overlays/actors/ovl_En_Ms/dlists.h | 4 +- src/overlays/actors/ovl_En_Ms/z_en_ms.h | 4 +- src/overlays/actors/ovl_En_Mu/z_en_mu.h | 4 +- src/overlays/actors/ovl_En_Nb/z_en_nb.h | 4 +- src/overlays/actors/ovl_En_Niw/z_en_niw.h | 4 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 2 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.h | 4 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.h | 4 +- .../actors/ovl_En_Nutsball/z_en_nutsball.h | 4 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.h | 4 +- src/overlays/actors/ovl_En_Ny/z_en_ny.h | 4 +- src/overlays/actors/ovl_En_OE2/z_en_oe2.h | 4 +- .../z_en_okarina_effect.c | 2 +- .../z_en_okarina_effect.h | 4 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.h | 4 +- .../z_en_okarina_tag_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.h | 4 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.h | 4 +- src/overlays/actors/ovl_En_Owl/z_en_owl.h | 4 +- src/overlays/actors/ovl_En_Part/z_en_part.h | 4 +- .../actors/ovl_En_Peehat/z_en_peehat.h | 4 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.h | 4 +- .../actors/ovl_En_Po_Field/z_en_po_field.h | 4 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.h | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.h | 4 +- src/overlays/actors/ovl_En_Poh/z_en_poh.h | 4 +- .../actors/ovl_En_Pu_box/z_en_pu_box.h | 4 +- src/overlays/actors/ovl_En_Rd/z_en_rd.h | 4 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.h | 4 +- .../ovl_En_River_Sound/z_en_river_sound.h | 4 +- src/overlays/actors/ovl_En_Rl/z_en_rl.h | 4 +- src/overlays/actors/ovl_En_Rr/z_en_rr.h | 4 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 3 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.h | 8 +- .../ovl_En_Ru1/z_en_ru1_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 2 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2.h | 4 +- .../ovl_En_Ru2/z_en_ru2_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Sa/z_en_sa.h | 4 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Sb/z_en_sb.h | 4 +- .../ovl_En_Scene_Change/z_en_scene_change.h | 4 +- src/overlays/actors/ovl_En_Sda/z_en_sda.h | 4 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.h | 4 +- src/overlays/actors/ovl_En_Si/z_en_si.h | 4 +- .../actors/ovl_En_Siofuki/z_en_siofuki.h | 4 +- src/overlays/actors/ovl_En_Skb/z_en_skb.h | 4 +- src/overlays/actors/ovl_En_Skj/z_en_skj.h | 4 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.h | 4 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.h | 4 +- src/overlays/actors/ovl_En_St/z_en_st.h | 4 +- src/overlays/actors/ovl_En_Sth/z_en_sth.h | 4 +- .../actors/ovl_En_Stream/z_en_stream.h | 4 +- src/overlays/actors/ovl_En_Sw/z_en_sw.h | 4 +- .../ovl_En_Syateki_Itm/z_en_syateki_itm.h | 4 +- .../ovl_En_Syateki_Man/z_en_syateki_man.h | 4 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 2 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.h | 4 +- src/overlays/actors/ovl_En_Ta/z_en_ta.h | 4 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 2 +- .../ovl_En_Takara_Man/z_en_takara_man.h | 4 +- src/overlays/actors/ovl_En_Tana/z_en_tana.h | 4 +- src/overlays/actors/ovl_En_Test/z_en_test.h | 4 +- src/overlays/actors/ovl_En_Tg/z_en_tg.h | 4 +- src/overlays/actors/ovl_En_Tite/z_en_tite.h | 4 +- src/overlays/actors/ovl_En_Tk/z_en_tk.h | 4 +- src/overlays/actors/ovl_En_Torch/z_en_torch.h | 4 +- .../actors/ovl_En_Torch2/z_en_torch2.h | 4 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.h | 4 +- src/overlays/actors/ovl_En_Tp/z_en_tp.h | 4 +- src/overlays/actors/ovl_En_Tr/z_en_tr.h | 4 +- src/overlays/actors/ovl_En_Trap/z_en_trap.h | 4 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 3 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h | 4 +- src/overlays/actors/ovl_En_Vali/z_en_vali.h | 4 +- src/overlays/actors/ovl_En_Vase/z_en_vase.h | 4 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.h | 4 +- .../actors/ovl_En_Viewer/z_en_viewer.h | 4 +- src/overlays/actors/ovl_En_Vm/z_en_vm.h | 4 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h | 4 +- .../actors/ovl_En_Wallmas/z_en_wallmas.h | 4 +- .../ovl_En_Weather_Tag/z_en_weather_tag.h | 4 +- .../actors/ovl_En_Weiyer/z_en_weiyer.h | 4 +- src/overlays/actors/ovl_En_Wf/z_en_wf.h | 4 +- .../ovl_En_Wonder_Item/z_en_wonder_item.h | 4 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 2 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.h | 4 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 2 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.h | 4 +- .../actors/ovl_En_Wood02/z_en_wood02.h | 4 +- src/overlays/actors/ovl_En_Xc/z_en_xc.h | 4 +- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.h | 4 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.h | 4 +- src/overlays/actors/ovl_En_Zf/z_en_zf.h | 4 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.h | 4 +- .../ovl_En_Zl1/z_en_zl1_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 2 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.h | 4 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.h | 4 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4.h | 4 +- src/overlays/actors/ovl_En_Zo/z_en_zo.h | 4 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.h | 4 +- .../actors/ovl_End_Title/z_end_title.h | 4 +- src/overlays/actors/ovl_Fishing/z_fishing.h | 4 +- .../actors/ovl_Item_B_Heart/z_item_b_heart.h | 4 +- .../ovl_Item_Etcetera/z_item_etcetera.h | 4 +- .../actors/ovl_Item_Inbox/z_item_inbox.h | 4 +- .../actors/ovl_Item_Ocarina/z_item_ocarina.h | 4 +- .../actors/ovl_Item_Shield/z_item_shield.h | 4 +- .../actors/ovl_Magic_Dark/z_magic_dark.h | 4 +- .../actors/ovl_Magic_Fire/z_magic_fire.h | 4 +- .../actors/ovl_Magic_Wind/z_magic_wind.h | 4 +- .../actors/ovl_Magic_Wind/z_magic_wind_gfx.c | 2 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h | 4 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h | 4 +- .../ovl_Obj_Blockstop/z_obj_blockstop.h | 4 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h | 4 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h | 4 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.h | 4 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.h | 4 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.h | 4 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h | 4 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.h | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h | 4 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.h | 4 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.h | 4 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h | 4 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 2 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.h | 4 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 2 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.h | 4 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h | 4 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h | 4 +- .../actors/ovl_Obj_Mure2/z_obj_mure2.h | 4 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.h | 4 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h | 4 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.h | 6 +- .../actors/ovl_Obj_Switch/z_obj_switch.h | 4 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.h | 4 +- .../ovl_Obj_Timeblock/z_obj_timeblock.h | 4 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.h | 4 +- .../ovl_Obj_Warp2block/z_obj_warp2block.h | 4 +- .../ovl_Object_Kankyo/z_object_kankyo.h | 4 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 2 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.h | 4 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.h | 4 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.h | 4 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h | 4 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h | 4 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h | 4 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h | 4 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 6 +- .../actors/ovl_player_actor/z_player.c | 152 +++-- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.h | 4 +- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h | 4 +- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h | 4 +- .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h | 4 +- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h | 4 +- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h | 4 +- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h | 4 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h | 4 +- .../z_eff_ss_dead_sound.h | 4 +- .../z_eff_ss_dt_bubble.h | 4 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.h | 4 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h | 4 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h | 4 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.h | 4 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h | 4 +- .../z_eff_ss_fhg_flash.h | 4 +- .../z_eff_ss_fire_tail.h | 4 +- .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h | 4 +- .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h | 4 +- .../z_eff_ss_g_magma2.h | 4 +- .../z_eff_ss_g_ripple.h | 4 +- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h | 4 +- .../z_eff_ss_g_splash.h | 4 +- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h | 4 +- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h | 4 +- .../z_eff_ss_ice_piece.h | 4 +- .../z_eff_ss_ice_smoke.h | 4 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h | 4 +- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h | 4 +- .../z_eff_ss_kirakira.h | 4 +- .../z_eff_ss_lightning.h | 4 +- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h | 4 +- .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h | 4 +- .../z_eff_ss_solder_srch_ball.h | 4 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.h | 4 +- .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h | 4 +- .../gamestates/ovl_opening/z_opening.c | 3 +- src/overlays/gamestates/ovl_select/z_select.c | 35 +- src/overlays/gamestates/ovl_title/z_title.c | 5 +- 890 files changed, 2628 insertions(+), 5625 deletions(-) delete mode 100644 include/PR/abi.h delete mode 100644 include/PR/gs2dex.h delete mode 100644 include/PR/gu.h delete mode 100644 include/PR/libaudio.h delete mode 100644 include/PR/libultra.h delete mode 100644 include/PR/mbi.h delete mode 100644 include/PR/os_ai.h delete mode 100644 include/PR/os_cache.h delete mode 100644 include/PR/os_eeprom.h delete mode 100644 include/PR/os_exception.h delete mode 100644 include/PR/os_internal.h delete mode 100644 include/PR/os_libc.h delete mode 100644 include/PR/os_message.h delete mode 100644 include/PR/os_misc.h delete mode 100644 include/PR/os_pi.h delete mode 100644 include/PR/os_rdp.h delete mode 100644 include/PR/os_thread.h delete mode 100644 include/PR/os_time.h delete mode 100644 include/PR/os_tlb.h delete mode 100644 include/PR/os_vi.h delete mode 100644 include/PR/sptask.h delete mode 100644 include/PR/ucode.h delete mode 100644 include/PR/ultratypes.h delete mode 100644 include/string.h create mode 100644 include/ultra64/internal.h delete mode 100644 include/ultra64/os_internal.h delete mode 100644 include/ultra64/os_message.h delete mode 100644 include/ultra64/os_misc.h delete mode 100644 include/ultra64/os_pi.h delete mode 100644 include/ultra64/os_thread.h delete mode 100644 include/ultra64/os_vi.h create mode 100644 include/ultra64/pi.h create mode 100644 include/ultra64/vi.h delete mode 100644 src/libultra_code/__osSpGetStatus.c delete mode 100644 src/libultra_code/libultra_internal.h delete mode 100644 src/libultra_code/osAi.h delete mode 100644 src/libultra_code/osAiGetLength.c rename src/{libultra_code => libultra_code_O1}/llcvt.c (94%) rename src/{libultra_code => libultra_code_O1}/osSetTimer.c (97%) rename src/{libultra_code => libultra_code_O1}/osStopTimer.c (96%) rename src/{libultra_code => libultra_code_O2}/__osContAddressCrc.c (85%) rename src/{libultra_code => libultra_code_O2}/__osContRamRead.c (96%) rename src/{libultra_code => libultra_code_O2}/__osContRamWrite.c (93%) rename src/{libultra_code => libultra_code_O2}/__osGetActiveQueue.c (76%) rename src/{libultra_code => libultra_code_O2}/__osGetCurrFaultedThread.c (63%) rename src/{libultra_code => libultra_code_O2}/__osPfsGetStatus.c (97%) rename src/{libultra_code => libultra_code_O2}/__osPfsSelectBank.c (87%) rename src/{libultra_code => libultra_code_O2}/__osSiCreateAccessQueue.c (88%) rename src/{libultra_code => libultra_code_O2}/__osSiRawStartDma.c (90%) create mode 100644 src/libultra_code_O2/__osSpGetStatus.c rename src/{libultra_code => libultra_code_O2}/__osSpRawStartDma.c (59%) rename src/{libultra_code => libultra_code_O2}/__osSpSetPc.c (75%) rename src/{libultra_code => libultra_code_O2}/__osSpSetStatus.c (50%) rename src/{libultra_code => libultra_code_O2}/code_800E6840.c (93%) rename src/{libultra_code => libultra_code_O2}/code_80102FA0.c (64%) rename src/{libultra_code => libultra_code_O2}/code_80104D60.c (65%) rename src/{libultra_code => libultra_code_O2}/contpfs.c (99%) rename src/{libultra_code => libultra_code_O2}/contquery.c (94%) rename src/{libultra_code => libultra_code_O2}/cosf.c (93%) rename src/{libultra_code => libultra_code_O2}/coss.c (53%) rename src/{libultra_code => libultra_code_O2}/guLookAt.c (97%) rename src/{libultra_code => libultra_code_O2}/guLookAtHilite.c (98%) rename src/{libultra_code => libultra_code_O2}/guPerspectiveF.c (65%) rename src/{libultra_code => libultra_code_O2}/guPosition.c (97%) rename src/{libultra_code => libultra_code_O2}/guS2DInitBg.c (97%) rename src/{libultra_code => libultra_code_O2}/ortho.c (94%) rename src/{libultra_code => libultra_code_O2}/osAfterPreNMI.c (57%) create mode 100644 src/libultra_code_O2/osAiGetLength.c rename src/{libultra_code => libultra_code_O2}/osAiSetFrequency.c (89%) rename src/{libultra_code => libultra_code_O2}/osAiSetNextBuffer.c (91%) rename src/{libultra_code => libultra_code_O2}/osContInit.c (97%) create mode 100644 src/libultra_code_O2/osContQuery.c rename src/{libultra_code => libultra_code_O2}/osContSetCh.c (91%) rename src/{libultra_code => libultra_code_O2}/osContStartReadData.c (95%) rename src/{libultra_code => libultra_code_O2}/osDpGetStatus.c (73%) rename src/{libultra_code => libultra_code_O2}/osDpSetStatus.c (76%) create mode 100644 src/libultra_code_O2/osMempakAddrCRC.c rename src/{libultra_code => libultra_code_O2}/osPfsDeleteFile.c (85%) rename src/{libultra_code => libultra_code_O2}/osPfsFindFile.c (97%) rename src/{libultra_code => libultra_code_O2}/osPfsFreeBlocks.c (92%) rename src/{libultra_code => libultra_code_O2}/osPfsIsPlug.c (98%) create mode 100644 src/libultra_code_O2/osReadMempak.c rename src/{libultra_code => libultra_code_O2}/osRumblePak.c (97%) rename src/{libultra_code => libultra_code_O2}/osSpTaskYield.c (75%) rename src/{libultra_code => libultra_code_O2}/osSpTaskYielded.c (94%) rename src/{libultra_code => libultra_code_O2}/osViGetCurrentFramebuffer.c (80%) rename src/{libultra_code => libultra_code_O2}/osViSetEvent.c (90%) rename src/{libultra_code => libultra_code_O2}/pfsallocatefile.c (98%) rename src/{libultra_code => libultra_code_O2}/pfschecker.c (98%) rename src/{libultra_code => libultra_code_O2}/pfsinitpak.c (98%) rename src/{libultra_code => libultra_code_O2}/pfsreadwritefile.c (98%) rename src/{libultra_code => libultra_code_O2}/rotate.c (97%) rename src/{libultra_code => libultra_code_O2}/sinf.c (97%) rename src/{libultra_code => libultra_code_O2}/sins.c (92%) rename src/{libultra_code => libultra_code_O2}/sintable.c (99%) rename src/{libultra_code => libultra_code_O2}/sp.c (74%) rename src/{libultra_code => libultra_code_O2}/sptask.c (96%) rename src/{libultra_code => libultra_code_O2}/sqrtf.c (86%) rename src/{libultra_code => libultra_code_O2_g3}/absf.c (67%) rename src/{libultra_code => libultra_code_O2_g3}/sqrt.c (86%) diff --git a/Makefile b/Makefile index 9775e9bef5..1370db57bb 100644 --- a/Makefile +++ b/Makefile @@ -129,8 +129,15 @@ O_FILES := $(foreach f,$(S_FILES:.s=.o),build/$f) \ # create build directories $(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(TEXTURE_DIRS) $(TEXTURE_BIN_DIRS) $(SCENE_DIRS),build/$(dir))) + build/src/libultra_boot_O1/%.o: OPTFLAGS := -O1 build/src/libultra_boot_O2/%.o: OPTFLAGS := -O2 +build/src/libultra_code_O1/%.o: OPTFLAGS := -O1 +build/src/libultra_code_O2/%.o: OPTFLAGS := -O2 +build/src/libultra_code_O2_g3/%.o: OPTFLAGS := -O2 -g3 + +build/src/libultra_code_O1/llcvt.o: MIPS_VERSION := -mips3 -32 + build/src/code/fault.o: CFLAGS += -trapuv build/src/code/fault.o: OPTFLAGS := -O2 -g3 build/src/code/fault_drawer.o: CFLAGS += -trapuv @@ -140,18 +147,12 @@ build/src/code/code_801068B0.o: OPTFLAGS := -g build/src/code/code_80106860.o: OPTFLAGS := -g build/src/code/code_801067F0.o: OPTFLAGS := -g -# Todo: split libultra_code into libultra_code_O1, etc.. -build/src/libultra_code/sqrt.o: OPTFLAGS := -O2 -g3 -build/src/libultra_code/absf.o: OPTFLAGS := -O2 -g3 -build/src/libultra_code/osSetTimer.o: OPTFLAGS := -O1 -build/src/libultra_code/osStopTimer.o: OPTFLAGS := -O1 -build/src/libultra_code/llcvt.o: OPTFLAGS := -O1 -build/src/libultra_code/llcvt.o: MIPS_VERSION := -mips3 -32 - build/src/libultra_boot_O1/%.o: CC := $(CC_OLD) build/src/libultra_boot_O2/%.o: CC := $(CC_OLD) +build/src/libultra_code_O1/%.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- +build/src/libultra_code_O2/%.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- +build/src/libultra_code_O2_g3/%.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- -build/src/libultra_code/%.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- build/src/code/jpegutils.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- build/src/code/jpegdecoder.o: CC := python3 tools/asm_processor/build.py $(CC_OLD) -- $(AS) $(ASFLAGS) -- @@ -229,7 +230,7 @@ build/src/%.o: src/%.c $(CC_CHECK) $^ @$(OBJDUMP) -d $@ > $(@:.o=.s) -build/src/libultra_code/llcvt.o: src/libultra_code/llcvt.c +build/src/libultra_code_O1/llcvt.o: src/libultra_code_O1/llcvt.c $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^ $(CC_CHECK) $^ python3 tools/set_o32abi_bit.py $@ diff --git a/include/PR/abi.h b/include/PR/abi.h deleted file mode 100644 index 8545be3bb3..0000000000 --- a/include/PR/abi.h +++ /dev/null @@ -1,622 +0,0 @@ -#ifndef _ABI_H_ -#define _ABI_H_ - -/************************************************************************** - * * - * Copyright (C) 1994, Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs contain * - * unpublished proprietary information of Silicon Graphics, Inc., and * - * are protected by Federal copyright law. They may not be disclosed * - * to third parties or copied or duplicated in any form, in whole or * - * in part, without the prior written consent of Silicon Graphics, Inc. * - * * - **************************************************************************/ - -/************************************************************************** - * - * $Revision: 1.32 $ - * $Date: 1997/02/11 08:16:37 $ - * $Source: /exdisk2/cvs/N64OS/Master/cvsmdev2/PR/include/abi.h,v $ - * - **************************************************************************/ - -/* - * Header file for the Audio Binary Interface. - * This is included in the Media Binary Interface file - * mbi.h. - * - * This file follows the framework used for graphics. - * - */ - -/* Audio commands: */ -#define A_SPNOOP 0 -#define A_ADPCM 1 -#define A_CLEARBUFF 2 -#define A_ENVMIXER 3 -#define A_LOADBUFF 4 -#define A_RESAMPLE 5 -#define A_SAVEBUFF 6 -#define A_SEGMENT 7 -#define A_SETBUFF 8 -#define A_SETVOL 9 -#define A_DMEMMOVE 10 -#define A_LOADADPCM 11 -#define A_MIXER 12 -#define A_INTERLEAVE 13 -#define A_POLEF 14 -#define A_SETLOOP 15 - -#define ACMD_SIZE 32 -/* - * Audio flags - */ - -#define A_INIT 0x01 -#define A_CONTINUE 0x00 -#define A_LOOP 0x02 -#define A_OUT 0x02 -#define A_LEFT 0x02 -#define A_RIGHT 0x00 -#define A_VOL 0x04 -#define A_RATE 0x00 -#define A_AUX 0x08 -#define A_NOAUX 0x00 -#define A_MAIN 0x00 -#define A_MIX 0x10 - -/* - * BEGIN C-specific section: (typedef's) - */ -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/* - * Data Structures. - */ - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int gain:16; - unsigned int addr; -} Aadpcm; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int gain:16; - unsigned int addr; -} Apolef; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int pad1:16; - unsigned int addr; -} Aenvelope; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:8; - unsigned int dmem:16; - unsigned int pad2:16; - unsigned int count:16; -} Aclearbuff; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:8; - unsigned int pad2:16; - unsigned int inL:16; - unsigned int inR:16; -} Ainterleave; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:24; - unsigned int addr; -} Aloadbuff; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int pad1:16; - unsigned int addr; -} Aenvmixer; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int gain:16; - unsigned int dmemi:16; - unsigned int dmemo:16; -} Amixer; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int dmem2:16; - unsigned int addr; -} Apan; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int pitch:16; - unsigned int addr; -} Aresample; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int pad1:16; - unsigned int addr; -} Areverb; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:24; - unsigned int addr; -} Asavebuff; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:24; - unsigned int pad2:2; - unsigned int number:4; - unsigned int base:24; -} Asegment; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int dmemin:16; - unsigned int dmemout:16; - unsigned int count:16; -} Asetbuff; - -typedef struct { - unsigned int cmd:8; - unsigned int flags:8; - unsigned int vol:16; - unsigned int voltgt:16; - unsigned int volrate:16; -} Asetvol; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:8; - unsigned int dmemin:16; - unsigned int dmemout:16; - unsigned int count:16; -} Admemmove; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:8; - unsigned int count:16; - unsigned int addr; -} Aloadadpcm; - -typedef struct { - unsigned int cmd:8; - unsigned int pad1:8; - unsigned int pad2:16; - unsigned int addr; -} Asetloop; - -/* - * Generic Acmd Packet - */ - -typedef struct { - uintptr_t w0; - uintptr_t w1; -} Awords; - -typedef union { - Awords words; -#if IS_BIG_ENDIAN && !IS_64_BIT - Aadpcm adpcm; - Apolef polef; - Aclearbuff clearbuff; - Aenvelope envelope; - Ainterleave interleave; - Aloadbuff loadbuff; - Aenvmixer envmixer; - Aresample resample; - Areverb reverb; - Asavebuff savebuff; - Asegment segment; - Asetbuff setbuff; - Asetvol setvol; - Admemmove dmemmove; - Aloadadpcm loadadpcm; - Amixer mixer; - Asetloop setloop; -#endif - long long int force_union_align; /* dummy, force alignment */ -} Acmd; - -/* - * ADPCM State - */ -typedef short ADPCM_STATE[16]; - -/* - * Pole filter state - */ -typedef short POLEF_STATE[4]; - -/* - * Resampler state - */ -typedef short RESAMPLE_STATE[16]; - -/* - * Resampler constants - */ -#define UNITY_PITCH 0x8000 -#define MAX_RATIO 1.99996 /* within .03 cents of +1 octave */ - -/* - * Enveloper/Mixer state - */ -typedef short ENVMIX_STATE[40]; - -/* - * Macros to assemble the audio command list - */ - -/* - * Info about parameters: - * - * A "count" in the following macros is always measured in bytes. - * - * All volumes/gains are in Q1.15 signed fixed point numbers: - * 0x8000 is the minimum volume (-100%), negating the audio curve. - * 0x0000 is silent. - * 0x7fff is maximum volume (99.997%). - * - * All DRAM addresses refer to segmented addresses. A segment table shall - * first be set up by calling aSegment for each segment. When a DRAM - * address is later used as parameter, the 8 high bits will be an index - * to the segment table and the lower 24 bits are added to the base address - * stored in the segment table for this entry. The result is the physical address. - * - * Transfers to/from DRAM are executed using DMA and hence follow these restrictions: - * All DRAM addresses should be aligned by 8 bytes, or they will be - * rounded down to the nearest multiple of 8 bytes. - * All DRAM lengths should be aligned by 8 bytes, or they will be - * rounded up to the nearest multiple of 8 bytes. - */ - -/* - * Decompresses ADPCM data. - * Possible flags: A_INIT and A_LOOP. - * - * First set up internal data in DMEM: - * aLoadADPCM(cmd++, nEntries * 16, physicalAddressOfBook) - * aSetLoop(cmd++, physicalAddressOfLoopState) (if A_LOOP is set) - * - * Then before this command, call: - * aSetBuffer(cmd++, 0, in, out, count) - * - * Note: count will be rounded up to the nearest multiple of 32 bytes. - * - * ADPCM decompression works on a block of 16 (uncompressed) samples. - * The previous 2 samples and 9 bytes of input are decompressed to - * 16 new samples using the code book previously loaded. - * - * Before the algorithm starts, the previous 16 samples are loaded according to flag: - * A_INIT: all zeros - * A_LOOP: the address set by aSetLoop - * no flags: the DRAM address in the s parameter - * These 16 samples are immediately copied to the destination address. - * - * The result of "count" bytes will be written after these 16 initial samples. - * The last 16 samples written to the destination will also be written to - * the state address in DRAM. - */ -#define aADPCMdec(pkt, f, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_ADPCM, 24, 8) | _SHIFTL(f, 16, 8); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Not used in SM64. - */ -#define aPoleFilter(pkt, f, g, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_POLEF, 24, 8) | _SHIFTL(f, 16, 8) | \ - _SHIFTL(g, 0, 16)); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Clears DMEM data, where d is address and c is count, by writing zeros. - * - * Note: c is rounded up to the nearest multiple of 16 bytes. - */ -#define aClearBuffer(pkt, d, c) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_CLEARBUFF, 24, 8) | _SHIFTL(d, 0, 24); \ - _a->words.w1 = (uintptr_t)(c); \ -} - -/* - * Mixes an envelope with mono sound into 2 or 4 channels. - * Possible flags: A_INIT, A_AUX (indicates that 4 channels should be used). - * - * Before this command, call: - * aSetBuffer(cmd++, 0, inBuf, dryLeft, count) - * aSetBuffer(cmd++, A_AUX, dryRight, wetLeft, wetRight) - * - * The first time (A_INIT is set), volume also needs to be set: - * aSetVolume(cmd++, A_VOL | A_LEFT, initialVolumeLeft, 0, 0) - * aSetVolume(cmd++, A_VOL | A_RIGHT, initialVolumeRight, 0, 0) - * aSetVolume32(cmd++, A_RATE | A_LEFT, targetVolumeLeft, rampLeft) - * aSetVolume32(cmd++, A_RATE | A_RIGHT, targetVolumeRight, rampRight) - * aSetVolume(cmd++, A_AUX, dryVolume, 0, wetVolume) - * - * This command will now mix samples in inBuf into the destination buffers (dry and wet), - * but with the volume increased (or decreased) from initial volumes to target volumes, - * with the specified ramp rate. Once the target volume is reached, the volume stays - * at that level. Before the samples are finally mixed (added) into the destination - * buffers (dry and wet), the volume is changed according to dryVolume and wetVolume. - * - * Note: count will be rounded up to the nearest multiple of 16 bytes. - * Note: the wet channels are used for reverb. - * - */ -#define aEnvMixer(pkt, f, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_ENVMIXER, 24, 8) | _SHIFTL(f, 16, 8); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Interleaves two mono channels into stereo. - * - * First call: - * aSetBuffer(cmd++, 0, 0, output, count) - * - * The count refers to the size of the output. - * A left sample will be placed before the right sample. - * - * Note: count will be rounded up to the nearest multiple of 16 bytes. - */ -#define aInterleave(pkt, l, r) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_INTERLEAVE, 24, 8); \ - _a->words.w1 = _SHIFTL(l, 16, 16) | _SHIFTL(r, 0, 16); \ -} - -/* - * Loads a buffer from DRAM to DMEM. - * - * First call: - * aSetBuffer(cmd++, 0, in, 0, count) - * - * The in parameter to aSetBuffer is the destination in DMEM and the - * s parameter to this command is the source in DRAM. - */ -#define aLoadBuffer(pkt, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_LOADBUFF, 24, 8); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Mixes audio. - * Possible flags: no flags used, although parameter present. - * - * First call: - * aSetBuffer(cmd++, 0, 0, 0, count) - * - * Input and output addresses are taken from the i and o parameters. - * The volume with which the input is changed is taken from the g parameter. - * After the volume of the input samples have been changed, the result - * is added to the output. - * - * Note: count will be rounded up to the nearest multiple of 32 bytes. - */ -#define aMix(pkt, f, g, i, o) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_MIXER, 24, 8) | _SHIFTL(f, 16, 8) | \ - _SHIFTL(g, 0, 16)); \ - _a->words.w1 = _SHIFTL(i,16, 16) | _SHIFTL(o, 0, 16); \ -} - -// Not present in the audio microcode. -#define aPan(pkt, f, d, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_PAN, 24, 8) | _SHIFTL(f, 16, 8) | \ - _SHIFTL(d, 0, 16)); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Resamples audio. - * Possible flags: A_INIT, A_OUT? (not used in SM64). - * - * First call: - * aSetBuffer(cmd++, 0, in, out, count) - * - * This command resamples the audio using the given frequency ratio (pitch) - * using a filter that uses a window of 4 source samples. This can be used - * either for just resampling audio to be able to be played back at a different - * sample rate, or to change the pitch if the result is played back at - * the same sample rate as the input. - * - * The frequency ratio is given in UQ1.15 fixed point format. - * For no change in frequency, use pitch 0x8000. - * For 1 octave up or downsampling to (roughly) half number of samples, use pitch 0xffff. - * For 1 octave down or upsampling to double as many samples, use pitch 0x4000. - * - * Note: count represents the number of output samples and is rounded up to - * the nearest multiple of 16 bytes. - * - * The state consists of the four following source samples when the algorithm stopped as - * well as a fractional position, and is initialized to all zeros if A_INIT is given. - * Otherwise it is loaded from DRAM at address s. - * - * The algorithm starts by writing the four source samples from the state (or zero) - * to just before the input address given. It then creates one output sample by examining - * the four next source samples and then moving the source position zero or more - * samples forward. The first output sample (when A_INIT is given) is always 0. - * - * When "count" samples have been written, the following four source samples - * are written to the state in DRAM as well as a fractional position. - */ -#define aResample(pkt, f, p, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_RESAMPLE, 24, 8) | _SHIFTL(f, 16, 8) |\ - _SHIFTL(p, 0, 16)); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Stores a buffer in DMEM to DRAM. - * - * First call: - * aSetBuffer(cmd++, 0, 0, out, count) - * - * The out parameter to aSetBuffer is the source in DMEM and the - * s parameter to this command is the destination in DRAM. - */ -#define aSaveBuffer(pkt, s) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_SAVEBUFF, 24, 8); \ - _a->words.w1 = (uintptr_t)(s); \ -} - -/* - * Sets up an entry in the segment table. - * - * The s parameter is a segment index, 0 to 15. - * The b parameter is the base offset. - */ -#define aSegment(pkt, s, b) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_SEGMENT, 24, 8); \ - _a->words.w1 = _SHIFTL(s, 24, 8) | _SHIFTL(b, 0, 24); \ -} - -/* - * Sets internal DMEM buffer addresses used for later commands. - * See each command for how to use aSetBuffer. - */ -#define aSetBuffer(pkt, f, i, o, c) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_SETBUFF, 24, 8) | _SHIFTL(f, 16, 8) | \ - _SHIFTL(i, 0, 16)); \ - _a->words.w1 = _SHIFTL(o, 16, 16) | _SHIFTL(c, 0, 16); \ -} - -/* - * Sets internal volume parameters. - * See aEnvMixer for more info. - */ -#define aSetVolume(pkt, f, v, t, r) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_SETVOL, 24, 8) | _SHIFTL(f, 16, 16) | \ - _SHIFTL(v, 0, 16)); \ - _a->words.w1 = _SHIFTL(t, 16, 16) | _SHIFTL(r, 0, 16); \ -} - -/* - * Sets the address to ADPCM loop state. - * - * The a parameter is a DRAM address. - * See aADPCMdec for more info. - */ -#define aSetLoop(pkt, a) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - _a->words.w0 = _SHIFTL(A_SETLOOP, 24, 8); \ - _a->words.w1 = (uintptr_t)(a); \ -} - -/* - * Copies memory in DMEM. - * - * Copies c bytes from address i to address o. - * - * Note: count is rounded up to the nearest multiple of 16 bytes. - * - * Note: This acts as memcpy where 16 bytes are moved at a time, therefore - * if input and output overlap, output address should be less than input address. - */ -#define aDMEMMove(pkt, i, o, c) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_DMEMMOVE, 24, 8) | _SHIFTL(i, 0, 24); \ - _a->words.w1 = _SHIFTL(o, 16, 16) | _SHIFTL(c, 0, 16); \ -} - -/* - * Loads ADPCM book from DRAM into DMEM. - * - * This command loads ADPCM table entries from DRAM to DMEM. - * - * The count parameter c should be a multiple of 16 bytes. - * The d parameter is a DRAM address. - */ -#define aLoadADPCM(pkt, c, d) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = _SHIFTL(A_LOADADPCM, 24, 8) | _SHIFTL(c, 0, 24); \ - _a->words.w1 = (uintptr_t) d; \ -} - -// This is a version of aSetVolume which takes a single 32-bit parameter -// instead of two 16-bit ones. According to AziAudio, it is used to set -// ramping values when neither bit 4 nor bit 8 is set in the flags parameter. -// It does not appear in the official abi.h header. -/* - * Sets internal volume parameters. - * See aEnvMixer for more info. - */ -#define aSetVolume32(pkt, f, v, tr) \ -{ \ - Acmd *_a = (Acmd *)pkt; \ - \ - _a->words.w0 = (_SHIFTL(A_SETVOL, 24, 8) | _SHIFTL(f, 16, 16) | \ - _SHIFTL(v, 0, 16)); \ - _a->words.w1 = (uintptr_t)(tr); \ -} - -#endif /* _LANGUAGE_C */ - -#endif /* !_ABI_H_ */ diff --git a/include/PR/gs2dex.h b/include/PR/gs2dex.h deleted file mode 100644 index ced468555a..0000000000 --- a/include/PR/gs2dex.h +++ /dev/null @@ -1,392 +0,0 @@ -/*--------------------------------------------------------------------- - Copyright (C) 1997, Nintendo. - - File gs2dex.h - Coded by Yoshitaka Yasumoto. Jul 31, 1997. - Modified by - Comments Header file for S2DEX ucode. - - $Id: gs2dex.h,v 1.21 1998/05/28 00:14:49 has Exp $ - ---------------------------------------------------------------------*/ - -#ifndef _GS2DEX_H_ -#define _GS2DEX_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -/*===========================================================================* - * Macro - *===========================================================================*/ -#define GS_CALC_DXT(line) (((1<< G_TX_DXT_FRAC)-1)/(line)+1) -#define GS_PIX2TMEM(pix, siz) ((pix)>>(4-(siz))) -#define GS_PIX2DXT(pix, siz) GS_CALC_DXT(GS_PIX2TMEM((pix), (siz))) - -/*===========================================================================* - * Data structures for S2DEX microcode - *===========================================================================*/ - -/*---------------------------------------------------------------------------* - * Background - *---------------------------------------------------------------------------*/ -#define G_BGLT_LOADBLOCK 0x0033 -#define G_BGLT_LOADTILE 0xfff4 - -#define G_BG_FLAG_FLIPS 0x01 -#define G_BG_FLAG_FLIPT 0x10 - -/* Non scalable background plane */ -typedef struct { - u16 imageX; /* x-coordinate of upper-left position of texture (u10.5) */ - u16 imageW; /* width of the texture (u10.2) */ - s16 frameX; /* upper-left position of transferred frame (s10.2) */ - u16 frameW; /* width of transferred frame (u10.2) */ - - u16 imageY; /* y-coordinate of upper-left position of texture (u10.5) */ - u16 imageH; /* height of the texture (u10.2) */ - s16 frameY; /* upper-left position of transferred frame (s10.2) */ - u16 frameH; /* height of transferred frame (u10.2) */ - - u64 *imagePtr; /* texture source address on DRAM */ - u16 imageLoad; /* which to use, LoadBlock or LoadTile */ - u8 imageFmt; /* format of texel - G_IM_FMT_* */ - u8 imageSiz; /* size of texel - G_IM_SIZ_* */ - u16 imagePal; /* pallet number */ - u16 imageFlip; /* right & left image inversion (Inverted by G_BG_FLAG_FLIPS) */ - - /* The following is set in the initialization routine guS2DInitBg(). There is no need for the user to set it. */ - u16 tmemW; /* TMEM width and Word size of frame 1 line. - At LoadBlock, GS_PIX2TMEM(imageW/4,imageSiz) - At LoadTile GS_PIX2TMEM(frameW/4,imageSiz)+1 */ - u16 tmemH; /* height of TMEM loadable at a time (s13.2) 4 times value - When the normal texture, 512/tmemW*4 - When the CI texture, 256/tmemW*4 */ - u16 tmemLoadSH; /* SH value - At LoadBlock, tmemSize/2-1 - At LoadTile, tmemW*16-1 */ - u16 tmemLoadTH; /* TH value or Stride value - At LoadBlock, GS_CALC_DXT(tmemW) - At LoadTile, tmemH-1 */ - u16 tmemSizeW; /* skip value of imagePtr for image 1-line - At LoadBlock, tmemW*2 - At LoadTile, GS_PIX2TMEM(imageW/4,imageSiz)*2 */ - u16 tmemSize; /* skip value of imagePtr for 1-loading - = tmemSizeW*tmemH */ -} uObjBg_t; /* 40 bytes */ - -/* Scalable background plane */ -typedef struct { - u16 imageX; /* x-coordinate of upper-left position of texture (u10.5) */ - u16 imageW; /* width of texture (u10.2) */ - s16 frameX; /* upper-left position of transferred frame (s10.2) */ - u16 frameW; /* width of transferred frame (u10.2) */ - - u16 imageY; /* y-coordinate of upper-left position of texture (u10.5) */ - u16 imageH; /* height of texture (u10.2) */ - s16 frameY; /* upper-left position of transferred frame (s10.2) */ - u16 frameH; /* height of transferred frame (u10.2) */ - - u64 *imagePtr; /* texture source address on DRAM */ - u16 imageLoad; /* Which to use, LoadBlock or LoadTile? */ - u8 imageFmt; /* format of texel - G_IM_FMT_* */ - u8 imageSiz; /* size of texel - G_IM_SIZ_* */ - u16 imagePal; /* pallet number */ - u16 imageFlip; /* right & left image inversion (Inverted by G_BG_FLAG_FLIPS) */ - - u16 scaleW; /* scale value of X-direction (u5.10) */ - u16 scaleH; /* scale value of Y-direction (u5.10) */ - s32 imageYorig; /* start point of drawing on image (s20.5) */ - - u8 padding[4]; - -} uObjScaleBg_t; /* 40 bytes */ - -typedef union { - uObjBg_t b; - uObjScaleBg_t s; - long long int force_structure_alignment; -} uObjBg; - -/*---------------------------------------------------------------------------* - * 2D Objects - *---------------------------------------------------------------------------*/ -#define G_OBJ_FLAG_FLIPS 1<<0 /* inversion to S-direction */ -#define G_OBJ_FLAG_FLIPT 1<<4 /* nversion to T-direction */ - -typedef struct { - s16 objX; /* s10.2 OBJ x-coordinate of upper-left end */ - u16 scaleW; /* u5.10 Scaling of u5.10 width direction */ - u16 imageW; /* u10.5 width of u10.5 texture (length of S-direction) */ - u16 paddingX; /* Unused - Always 0 */ - s16 objY; /* s10.2 OBJ y-coordinate of s10.2 OBJ upper-left end */ - u16 scaleH; /* u5.10 Scaling of u5.10 height direction */ - u16 imageH; /* u10.5 height of u10.5 texture (length of T-direction) */ - u16 paddingY; /* Unused - Always 0 */ - u16 imageStride; /* folding width of texel (In units of 64bit word) */ - u16 imageAdrs; /* texture header position in TMEM (In units of 64bit word) */ - u8 imageFmt; /* format of texel - G_IM_FMT_* */ - u8 imageSiz; /* size of texel - G_IM_SIZ_* */ - u8 imagePal; /* pallet number (0-7) */ - u8 imageFlags; /* The display flag - G_OBJ_FLAG_FLIP* */ -} uObjSprite_t; /* 24 bytes */ - -typedef union { - uObjSprite_t s; - long long int force_structure_alignment; -} uObjSprite; - -/*---------------------------------------------------------------------------* - * 2D Matrix - *---------------------------------------------------------------------------*/ -typedef struct { - s32 A, B, C, D; /* s15.16 */ - s16 X, Y; /* s10.2 */ - u16 BaseScaleX; /* u5.10 */ - u16 BaseScaleY; /* u5.10 */ -} uObjMtx_t; /* 24 bytes */ - -typedef union { - uObjMtx_t m; - long long int force_structure_alignment; -} uObjMtx; - -typedef struct { - s16 X, Y; /* s10.2 */ - u16 BaseScaleX; /* u5.10 */ - u16 BaseScaleY; /* u5.10 */ -} uObjSubMtx_t; /* 8 bytes */ - -typedef union { - uObjSubMtx_t m; - long long int force_structure_alignment; -} uObjSubMtx; - -/*---------------------------------------------------------------------------* - * Loading into TMEM - *---------------------------------------------------------------------------*/ -#define G_OBJLT_TXTRBLOCK 0x00001033 -#define G_OBJLT_TXTRTILE 0x00fc1034 -#define G_OBJLT_TLUT 0x00000030 - -#define GS_TB_TSIZE(pix,siz) (GS_PIX2TMEM((pix),(siz))-1) -#define GS_TB_TLINE(pix,siz) (GS_CALC_DXT(GS_PIX2TMEM((pix),(siz)))) - -typedef struct { - u32 type; /* G_OBJLT_TXTRBLOCK divided into types */ - u64 *image; /* texture source address on DRAM */ - u16 tmem; /* loaded TMEM word address (8byteWORD) */ - u16 tsize; /* Texture size, Specified by macro GS_TB_TSIZE() */ - u16 tline; /* width of Texture 1-line, Specified by macro GS_TB_TLINE() */ - u16 sid; /* STATE ID Multipled by 4 (Either one of 0, 4, 8 and 12) */ - u32 flag; /* STATE flag */ - u32 mask; /* STATE mask */ -} uObjTxtrBlock_t; /* 24 bytes */ - -#define GS_TT_TWIDTH(pix,siz) ((GS_PIX2TMEM((pix), (siz))<<2)-1) -#define GS_TT_THEIGHT(pix,siz) (((pix)<<2)-1) - -typedef struct { - u32 type; /* G_OBJLT_TXTRTILE divided into types */ - u64 *image; /* texture source address on DRAM */ - u16 tmem; /* loaded TMEM word address (8byteWORD)*/ - u16 twidth; /* width of Texture (Specified by macro GS_TT_TWIDTH()) */ - u16 theight; /* height of Texture (Specified by macro GS_TT_THEIGHT()) */ - u16 sid; /* STATE ID Multipled by 4 (Either one of 0, 4, 8 and 12) */ - u32 flag; /* STATE flag */ - u32 mask; /* STATE mask */ -} uObjTxtrTile_t; /* 24 bytes */ - -#define GS_PAL_HEAD(head) ((head)+256) -#define GS_PAL_NUM(num) ((num)-1) - -typedef struct { - u32 type; /* G_OBJLT_TLUT divided into types */ - u64 *image; /* texture source address on DRAM */ - u16 phead; /* pallet number of load header (Between 256 and 511) */ - u16 pnum; /* loading pallet number -1 */ - u16 zero; /* Assign 0 all the time */ - u16 sid; /* STATE ID Multipled by 4 (Either one of 0, 4, 8 and 12)*/ - u32 flag; /* STATE flag */ - u32 mask; /* STATE mask */ -} uObjTxtrTLUT_t; /* 24 bytes */ - -typedef union { - uObjTxtrBlock_t block; - uObjTxtrTile_t tile; - uObjTxtrTLUT_t tlut; - long long int force_structure_alignment; -} uObjTxtr; - -/*---------------------------------------------------------------------------* - * Loading into TMEM & 2D Objects - *---------------------------------------------------------------------------*/ -typedef struct { - uObjTxtr txtr; - uObjSprite sprite; -} uObjTxSprite; /* 48 bytes */ - -/*===========================================================================* - * GBI Commands for S2DEX microcode - *===========================================================================*/ -/* GBI Header */ -#ifdef F3DEX_GBI_2 -#define G_OBJ_RECTANGLE_R 0xda -#define G_OBJ_MOVEMEM 0xdc -#define G_RDPHALF_0 0xe4 -#define G_OBJ_RECTANGLE 0x01 -#define G_OBJ_SPRITE 0x02 -#define G_SELECT_DL 0x04 -#define G_OBJ_LOADTXTR 0x05 -#define G_OBJ_LDTX_SPRITE 0x06 -#define G_OBJ_LDTX_RECT 0x07 -#define G_OBJ_LDTX_RECT_R 0x08 -#define G_BG_1CYC 0x09 -#define G_BG_COPY 0x0a -#define G_OBJ_RENDERMODE 0x0b -#else -#define G_BG_1CYC 0x01 -#define G_BG_COPY 0x02 -#define G_OBJ_RECTANGLE 0x03 -#define G_OBJ_SPRITE 0x04 -#define G_OBJ_MOVEMEM 0x05 -#define G_SELECT_DL 0xb0 -#define G_OBJ_RENDERMODE 0xb1 -#define G_OBJ_RECTANGLE_R 0xb2 -#define G_OBJ_LOADTXTR 0xc1 -#define G_OBJ_LDTX_SPRITE 0xc2 -#define G_OBJ_LDTX_RECT 0xc3 -#define G_OBJ_LDTX_RECT_R 0xc4 -#define G_RDPHALF_0 0xe4 -#endif - -/*---------------------------------------------------------------------------* - * Background wrapped screen - *---------------------------------------------------------------------------*/ -#define gSPBgRectangle(pkt, m, mptr) gDma0p((pkt),(m),(mptr),0) -#define gsSPBgRectangle(m, mptr) gsDma0p( (m),(mptr),0) -#define gSPBgRectCopy(pkt, mptr) gSPBgRectangle((pkt), G_BG_COPY, (mptr)) -#define gsSPBgRectCopy(mptr) gsSPBgRectangle( G_BG_COPY, (mptr)) -#define gSPBgRect1Cyc(pkt, mptr) gSPBgRectangle((pkt), G_BG_1CYC, (mptr)) -#define gsSPBgRect1Cyc(mptr) gsSPBgRectangle( G_BG_1CYC, (mptr)) - -/*---------------------------------------------------------------------------* - * 2D Objects - *---------------------------------------------------------------------------*/ -#define gSPObjSprite(pkt, mptr) gDma0p((pkt),G_OBJ_SPRITE, (mptr),0) -#define gsSPObjSprite(mptr) gsDma0p( G_OBJ_SPRITE, (mptr),0) -#define gSPObjRectangle(pkt, mptr) gDma0p((pkt),G_OBJ_RECTANGLE, (mptr),0) -#define gsSPObjRectangle(mptr) gsDma0p( G_OBJ_RECTANGLE, (mptr),0) -#define gSPObjRectangleR(pkt, mptr) gDma0p((pkt),G_OBJ_RECTANGLE_R,(mptr),0) -#define gsSPObjRectangleR(mptr) gsDma0p( G_OBJ_RECTANGLE_R,(mptr),0) - -/*---------------------------------------------------------------------------* - * 2D Matrix - *---------------------------------------------------------------------------*/ -#define gSPObjMatrix(pkt, mptr) gDma1p((pkt),G_OBJ_MOVEMEM,(mptr),0,23) -#define gsSPObjMatrix(mptr) gsDma1p( G_OBJ_MOVEMEM,(mptr),0,23) -#define gSPObjSubMatrix(pkt, mptr) gDma1p((pkt),G_OBJ_MOVEMEM,(mptr),2, 7) -#define gsSPObjSubMatrix(mptr) gsDma1p( G_OBJ_MOVEMEM,(mptr),2, 7) - -/*---------------------------------------------------------------------------* - * Loading into TMEM - *---------------------------------------------------------------------------*/ -#define gSPObjLoadTxtr(pkt, tptr) gDma0p((pkt),G_OBJ_LOADTXTR, (tptr),23) -#define gsSPObjLoadTxtr(tptr) gsDma0p( G_OBJ_LOADTXTR, (tptr),23) -#define gSPObjLoadTxSprite(pkt, tptr) gDma0p((pkt),G_OBJ_LDTX_SPRITE,(tptr),47) -#define gsSPObjLoadTxSprite(tptr) gsDma0p( G_OBJ_LDTX_SPRITE,(tptr),47) -#define gSPObjLoadTxRect(pkt, tptr) gDma0p((pkt),G_OBJ_LDTX_RECT, (tptr),47) -#define gsSPObjLoadTxRect(tptr) gsDma0p( G_OBJ_LDTX_RECT, (tptr),47) -#define gSPObjLoadTxRectR(pkt, tptr) gDma0p((pkt),G_OBJ_LDTX_RECT_R,(tptr),47) -#define gsSPObjLoadTxRectR(tptr) gsDma0p( G_OBJ_LDTX_RECT_R,(tptr),47) - -/*---------------------------------------------------------------------------* - * Select Display List - *---------------------------------------------------------------------------*/ -#define gSPSelectDL(pkt, mptr, sid, flag, mask) \ -{ gDma1p((pkt), G_RDPHALF_0, (flag), (u32)(mptr) & 0xffff, (sid)); \ - gDma1p((pkt), G_SELECT_DL, (mask), (u32)(mptr) >> 16, G_DL_PUSH); } -#define gsSPSelectDL(mptr, sid, flag, mask) \ -{ gsDma1p(G_RDPHALF_0, (flag), (u32)(mptr) & 0xffff, (sid)); \ - gsDma1p(G_SELECT_DL, (mask), (u32)(mptr) >> 16, G_DL_PUSH); } -#define gSPSelectBranchDL(pkt, mptr, sid, flag, mask) \ -{ gDma1p((pkt), G_RDPHALF_0, (flag), (u32)(mptr) & 0xffff, (sid)); \ - gDma1p((pkt), G_SELECT_DL, (mask), (u32)(mptr) >> 16, G_DL_NOPUSH); } -#define gsSPSelectBranchDL(mptr, sid, flag, mask) \ -{ gsDma1p(G_RDPHALF_0, (flag), (u32)(mptr) & 0xffff, (sid)); \ - gsDma1p(G_SELECT_DL, (mask), (u32)(mptr) >> 16, G_DL_NOPUSH); } - -/*---------------------------------------------------------------------------* - * Set general status - *---------------------------------------------------------------------------*/ -#define G_MW_GENSTAT 0x08 /* Note that it is the same value of G_MW_FOG */ - -#define gSPSetStatus(pkt, sid, val) \ - gMoveWd((pkt), G_MW_GENSTAT, (sid), (val)) -#define gsSPSetStatus(sid, val) \ - gsMoveWd( G_MW_GENSTAT, (sid), (val)) - -/*---------------------------------------------------------------------------* - * Set Object Render Mode - *---------------------------------------------------------------------------*/ -#define G_OBJRM_NOTXCLAMP 0x01 -#define G_OBJRM_XLU 0x02 /* Ignored */ -#define G_OBJRM_ANTIALIAS 0x04 /* Ignored */ -#define G_OBJRM_BILERP 0x08 -#define G_OBJRM_SHRINKSIZE_1 0x10 -#define G_OBJRM_SHRINKSIZE_2 0x20 -#define G_OBJRM_WIDEN 0x40 - -#define gSPObjRenderMode(pkt, mode) gImmp1((pkt),G_OBJ_RENDERMODE,(mode)) -#define gsSPObjRenderMode(mode) gsImmp1( G_OBJ_RENDERMODE,(mode)) - -/*===========================================================================* - * Render Mode Macro - *===========================================================================*/ -#define RM_RA_SPRITE(clk) \ - AA_EN | CVG_DST_CLAMP | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | ZMODE_OPA | TEX_EDGE | \ - GBL_c##clk(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) - -#define G_RM_SPRITE G_RM_OPA_SURF -#define G_RM_SPRITE2 G_RM_OPA_SURF2 -#define G_RM_RA_SPRITE RM_RA_SPRITE(1) -#define G_RM_RA_SPRITE2 RM_RA_SPRITE(2) -#define G_RM_AA_SPRITE G_RM_AA_TEX_TERR -#define G_RM_AA_SPRITE2 G_RM_AA_TEX_TERR2 -#define G_RM_XLU_SPRITE G_RM_XLU_SURF -#define G_RM_XLU_SPRITE2 G_RM_XLU_SURF2 -#define G_RM_AA_XLU_SPRITE G_RM_AA_XLU_SURF -#define G_RM_AA_XLU_SPRITE2 G_RM_AA_XLU_SURF2 - -/*===========================================================================* - * External functions - *===========================================================================*/ -extern u64 gspS2DEX_fifoTextStart[], gspS2DEX_fifoTextEnd[]; -extern u64 gspS2DEX_fifoDataStart[], gspS2DEX_fifoDataEnd[]; -extern u64 gspS2DEX_fifo_dTextStart[], gspS2DEX_fifo_dTextEnd[]; -extern u64 gspS2DEX_fifo_dDataStart[], gspS2DEX_fifo_dDataEnd[]; -extern u64 gspS2DEX2_fifoTextStart[], gspS2DEX2_fifoTextEnd[]; -extern u64 gspS2DEX2_fifoDataStart[], gspS2DEX2_fifoDataEnd[]; -extern u64 gspS2DEX2_xbusTextStart[], gspS2DEX2_xbusTextEnd[]; -extern u64 gspS2DEX2_xbusDataStart[], gspS2DEX2_xbusDataEnd[]; -extern void guS2DInitBg(uObjBg *); - -#ifdef F3DEX_GBI_2 -# define guS2DEmuBgRect1Cyc guS2D2EmuBgRect1Cyc /*Wrapper*/ -# define guS2DEmuSetScissor guS2D2EmuSetScissor /*Wrapper*/ - extern void guS2D2EmuSetScissor(u32, u32, u32, u32, u8); - extern void guS2D2EmuBgRect1Cyc(Gfx **, uObjBg *); -#else - extern void guS2DEmuSetScissor(u32, u32, u32, u32, u8); - extern void guS2DEmuBgRect1Cyc(Gfx **, uObjBg *); -#endif - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif -#endif /* _GS2DEX_H_ */ - -/*======== End of gs2dex.h ========*/ diff --git a/include/PR/gu.h b/include/PR/gu.h deleted file mode 100644 index 6527777d9c..0000000000 --- a/include/PR/gu.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _ULTRA64_GU_H_ -#define _ULTRA64_GU_H_ - -#include -#include - -#define GU_PI 3.1415926 -/* Functions */ - -void guPerspectiveF(float mf[4][4], u16 *perspNorm, float fovy, float aspect, - float near, float far, float scale); -void guPerspective(Mtx *m, u16 *perspNorm, float fovy, float aspect, float near, - float far, float scale); -void guOrtho(Mtx *m, float left, float right, float bottom, float top, - float near, float far, float scale); -void guTranslate(Mtx *m, float x, float y, float z); -void guRotate(Mtx *m, float a, float x, float y, float z); -void guScale(Mtx *m, float x, float y, float z); -void guMtxF2L(float mf[4][4], Mtx *m); -void guMtxIdent(Mtx *m); -void guMtxIdentF(float mf[4][4]); -void guMtxL2F(float mf[4][4], Mtx *m); -void guNormalize(float *, float *, float *); - -/* Used only in Fast3DEX2 */ -void guLookAtReflect (Mtx *m, LookAt *l, float xEye, float yEye, float zEye, - float xAt, float yAt, float zAt, - float xUp, float yUp, float zUp); -#endif diff --git a/include/PR/libaudio.h b/include/PR/libaudio.h deleted file mode 100644 index c374a9ff30..0000000000 --- a/include/PR/libaudio.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _ULTRA64_LIBAUDIO_H_ -#define _ULTRA64_LIBAUDIO_H_ - -#include "abi.h" - -typedef struct -{ - u8 *offset; - s32 len; -} ALSeqData; - -typedef struct -{ - s16 revision; - s16 seqCount; - ALSeqData seqArray[1]; -} ALSeqFile; - -void alSeqFileNew(ALSeqFile *f, u8 *base); - -#endif diff --git a/include/PR/libultra.h b/include/PR/libultra.h deleted file mode 100644 index f0dab415f5..0000000000 --- a/include/PR/libultra.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _LIBULTRA_H -#define _LIBULTRA_H - -#define TV_TYPE_NTSC 1 -#define TV_TYPE_PAL 0 -#define TV_TYPE_MPAL 2 - -#define RESET_TYPE_COLD_RESET 0 -#define RESET_TYPE_NMI 1 -#define RESET_TYPE_BOOT_DISK 2 - -extern u32 osTvType; -extern u32 osRomBase; -extern u32 osResetType; -extern u32 osMemSize; -extern u8 osAppNmiBuffer[64]; - -#endif /* _LIBULTRA_H */ diff --git a/include/PR/mbi.h b/include/PR/mbi.h deleted file mode 100644 index 6b3cebfe4b..0000000000 --- a/include/PR/mbi.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef _MBI_H_ -#define _MBI_H_ - -#include "platform_info.h" - -/************************************************************************** - * * - * Copyright (C) 1994, Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs contain * - * unpublished proprietary information of Silicon Graphics, Inc., and * - * are protected by Federal copyright law. They may not be disclosed * - * to third parties or copied or duplicated in any form, in whole or * - * in part, without the prior written consent of Silicon Graphics, Inc. * - * * - **************************************************************************/ - -/************************************************************************** - * - * $Revision: 1.136 $ - * $Date: 1999/01/05 13:04:00 $ - * $Source: /hosts/gate3/exdisk2/cvs/N64OS/Master/cvsmdev2/PR/include/mbi.h,v $ - * - **************************************************************************/ - -/* - * Header file for the Media Binary Interface - * - * NOTE: This file is included by the RSP microcode, so any C-specific - * constructs must be bracketed by #ifdef _LANGUAGE_C - * - */ - - -/* - * the SHIFT macros are used to build display list commands, inserting - * bit-fields into a 32-bit word. They take a value, a shift amount, - * and a width. - * - * For the left shift, the lower bits of the value are masked, - * then shifted left. - * - * For the right shift, the value is shifted right, then the lower bits - * are masked. - * - * (NOTE: _SHIFTL(v, 0, 32) won't work, just use an assignment) - * - */ -#define _SHIFTL(v, s, w) \ - ((unsigned int) (((unsigned int)(v) & ((0x01 << (w)) - 1)) << (s))) -#define _SHIFTR(v, s, w) \ - ((unsigned int)(((unsigned int)(v) >> (s)) & ((0x01 << (w)) - 1))) - -#define _SHIFT _SHIFTL /* old, for compatibility only */ - -#define G_ON (1) -#define G_OFF (0) - -/************************************************************************** - * - * Graphics Binary Interface - * - **************************************************************************/ - -#include - -/************************************************************************** - * - * Audio Binary Interface - * - **************************************************************************/ - -#include - -/************************************************************************** - * - * Task list - * - **************************************************************************/ - -#define M_GFXTASK 1 -#define M_AUDTASK 2 -#define M_VIDTASK 3 -#define M_HVQTASK 6 -#define M_HVQMTASK 7 - -/************************************************************************** - * - * Segment macros and definitions - * - **************************************************************************/ - -#define NUM_SEGMENTS (16) -#define SEGMENT_OFFSET(a) ((unsigned int)(a) & 0x00ffffff) -#define SEGMENT_NUMBER(a) (((unsigned int)(a) << 4) >> 28) -#define SEGMENT_ADDR(num, off) (((num) << 24) + (off)) - -#ifndef NULL -#define NULL 0 -#endif - -#endif /* !_MBI_H_ */ diff --git a/include/PR/os_ai.h b/include/PR/os_ai.h deleted file mode 100644 index f89d87cfe5..0000000000 --- a/include/PR/os_ai.h +++ /dev/null @@ -1,92 +0,0 @@ - -/*==================================================================== - * os_ai.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_ai.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:04 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_AI_H_ -#define _OS_AI_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* Audio interface (Ai) */ -extern u32 osAiGetStatus(void); -extern u32 osAiGetLength(void); -extern s32 osAiSetFrequency(u32); -extern s32 osAiSetNextBuffer(void *, u32); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_AI_H_ */ diff --git a/include/PR/os_cache.h b/include/PR/os_cache.h deleted file mode 100644 index 93d53c5f18..0000000000 --- a/include/PR/os_cache.h +++ /dev/null @@ -1,96 +0,0 @@ - -/*==================================================================== - * os_cache.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_cache.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:04 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_CACHE_H_ -#define _OS_CACHE_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - -#define OS_DCACHE_ROUNDUP_ADDR(x) (void *)(((((u32)(x)+0xf)/0x10)*0x10)) -#define OS_DCACHE_ROUNDUP_SIZE(x) (u32)(((((u32)(x)+0xf)/0x10)*0x10)) - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* Cache operations and macros */ - -extern void osInvalDCache(void *, size_t); -extern void osInvalICache(void *, size_t); -extern void osWritebackDCache(void *, size_t); -extern void osWritebackDCacheAll(void); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_CACHE_H_ */ diff --git a/include/PR/os_eeprom.h b/include/PR/os_eeprom.h deleted file mode 100644 index b3bca81444..0000000000 --- a/include/PR/os_eeprom.h +++ /dev/null @@ -1,107 +0,0 @@ - -/*==================================================================== - * os_eeprom.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_eeprom.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:06 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_EEPROM_H_ -#define _OS_EEPROM_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include -#include "os_message.h" - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - -/* EEPROM TYPE */ - -#define EEPROM_TYPE_4K 0x01 -#define EEPROM_TYPE_16K 0x02 - -/* definition for EEPROM */ - -#define EEPROM_MAXBLOCKS 64 -#define EEP16K_MAXBLOCKS 256 -#define EEPROM_BLOCK_SIZE 8 - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* EEPROM interface */ - -extern s32 osEepromProbe(OSMesgQueue *); -extern s32 osEepromRead(OSMesgQueue *, u8, u8 *); -extern s32 osEepromWrite(OSMesgQueue *, u8, u8 *); -extern s32 osEepromLongRead(OSMesgQueue *, u8, u8 *, int); -extern s32 osEepromLongWrite(OSMesgQueue *, u8, u8 *, int); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_EEPROM_H_ */ diff --git a/include/PR/os_exception.h b/include/PR/os_exception.h deleted file mode 100644 index 245e5e6971..0000000000 --- a/include/PR/os_exception.h +++ /dev/null @@ -1,119 +0,0 @@ - -/*==================================================================== - * os_exception.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_exception.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:07 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_EXCEPTION_H_ -#define _OS_EXCEPTION_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - -typedef u32 OSIntMask; -typedef u32 OSHWIntr; - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - -/* Flags for debugging purpose */ - -#define OS_FLAG_CPU_BREAK 1 /* Break exception has occurred */ -#define OS_FLAG_FAULT 2 /* CPU fault has occurred */ - -/* Interrupt masks */ - -#define OS_IM_NONE 0x00000001 -#define OS_IM_SW1 0x00000501 -#define OS_IM_SW2 0x00000601 -#define OS_IM_CART 0x00000c01 -#define OS_IM_PRENMI 0x00001401 -#define OS_IM_RDBWRITE 0x00002401 -#define OS_IM_RDBREAD 0x00004401 -#define OS_IM_COUNTER 0x00008401 -#define OS_IM_CPU 0x0000ff01 -#define OS_IM_SP 0x00010401 -#define OS_IM_SI 0x00020401 -#define OS_IM_AI 0x00040401 -#define OS_IM_VI 0x00080401 -#define OS_IM_PI 0x00100401 -#define OS_IM_DP 0x00200401 -#define OS_IM_ALL 0x003fff01 -#define RCP_IMASK 0x003f0000 -#define RCP_IMASKSHIFT 16 - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* Interrupt operations */ - -extern OSIntMask osGetIntMask(void); -extern OSIntMask osSetIntMask(OSIntMask); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_EXCEPTION_H_ */ diff --git a/include/PR/os_internal.h b/include/PR/os_internal.h deleted file mode 100644 index a18e03674f..0000000000 --- a/include/PR/os_internal.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _ULTRA64_OS_INTERNAL_H_ -#define _ULTRA64_OS_INTERNAL_H_ - -/* Internal functions used by the operating system */ -/* Do not include this header in application code */ - -/* Variables */ - -//extern u64 osClockRate; - -/* Functions */ - -/*u32 __osProbeTLB(void *); -u32 __osDisableInt(void); -void __osRestoreInt(u32);*/ -OSThread *__osGetCurrFaultedThread(void); - -#endif diff --git a/include/PR/os_libc.h b/include/PR/os_libc.h deleted file mode 100644 index 94111c0b6c..0000000000 --- a/include/PR/os_libc.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _OS_LIBC_H_ -#define _OS_LIBC_H_ - -#include "ultratypes.h" - -// Old deprecated functions from strings.h, replaced by memcpy/memset. -extern void bcopy(const void *, void *, size_t); -extern void bzero(void *, size_t); - -#endif /* !_OS_LIBC_H_ */ diff --git a/include/PR/os_message.h b/include/PR/os_message.h deleted file mode 100644 index cd3df6569f..0000000000 --- a/include/PR/os_message.h +++ /dev/null @@ -1,155 +0,0 @@ - -/*==================================================================== - * os_message.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -#ifndef _OS_MESSAGE_H_ -#define _OS_MESSAGE_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - -typedef u32 OSEvent; - -/* - * Structure for message - */ -typedef void * OSMesg; - -/* - * Structure for message queue - */ -typedef struct OSMesgQueue_s { - OSThread *mtqueue; /* Queue to store threads blocked - on empty mailboxes (receive) */ - OSThread *fullqueue; /* Queue to store threads blocked - on full mailboxes (send) */ - s32 validCount; /* Contains number of valid message */ - s32 first; /* Points to first valid message */ - s32 msgCount; /* Contains total # of messages */ - OSMesg *msg; /* Points to message buffer array */ -} OSMesgQueue; - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - -/* Events */ -#ifdef _FINALROM -#define OS_NUM_EVENTS 15 -#else -#define OS_NUM_EVENTS 23 -#endif - -#define OS_EVENT_SW1 0 /* CPU SW1 interrupt */ -#define OS_EVENT_SW2 1 /* CPU SW2 interrupt */ -#define OS_EVENT_CART 2 /* Cartridge interrupt: used by rmon */ -#define OS_EVENT_COUNTER 3 /* Counter int: used by VI/Timer Mgr */ -#define OS_EVENT_SP 4 /* SP task done interrupt */ -#define OS_EVENT_SI 5 /* SI (controller) interrupt */ -#define OS_EVENT_AI 6 /* AI interrupt */ -#define OS_EVENT_VI 7 /* VI interrupt: used by VI/Timer Mgr */ -#define OS_EVENT_PI 8 /* PI interrupt: used by PI Manager */ -#define OS_EVENT_DP 9 /* DP full sync interrupt */ -#define OS_EVENT_CPU_BREAK 10 /* CPU breakpoint: used by rmon */ -#define OS_EVENT_SP_BREAK 11 /* SP breakpoint: used by rmon */ -#define OS_EVENT_FAULT 12 /* CPU fault event: used by rmon */ -#define OS_EVENT_THREADSTATUS 13 /* CPU thread status: used by rmon */ -#define OS_EVENT_PRENMI 14 /* Pre NMI interrupt */ -#ifndef _FINALROM -#define OS_EVENT_RDB_READ_DONE 15 /* RDB read ok event: used by rmon */ -#define OS_EVENT_RDB_LOG_DONE 16 /* read of log data complete */ -#define OS_EVENT_RDB_DATA_DONE 17 /* read of hostio data complete */ -#define OS_EVENT_RDB_REQ_RAMROM 18 /* host needs ramrom access */ -#define OS_EVENT_RDB_FREE_RAMROM 19 /* host is done with ramrom access */ -#define OS_EVENT_RDB_DBG_DONE 20 -#define OS_EVENT_RDB_FLUSH_PROF 21 -#define OS_EVENT_RDB_ACK_PROF 22 -#endif - -/* Flags to turn blocking on/off when sending/receiving message */ - -#define OS_MESG_NOBLOCK 0 -#define OS_MESG_BLOCK 1 - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - -/* Get count of valid messages in queue */ -#define MQ_GET_COUNT(mq) ((mq)->validCount) - -/* Figure out if message queue is empty or full */ -#define MQ_IS_EMPTY(mq) (MQ_GET_COUNT(mq) == 0) -#define MQ_IS_FULL(mq) (MQ_GET_COUNT(mq) >= (mq)->msgCount) - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* Message operations */ - -extern void osCreateMesgQueue(OSMesgQueue *, OSMesg *, s32); -extern s32 osSendMesg(OSMesgQueue *, OSMesg, s32); -extern s32 osJamMesg(OSMesgQueue *, OSMesg, s32); -extern s32 osRecvMesg(OSMesgQueue *, OSMesg *, s32); - -/* Event operations */ - -extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_MESSAGE_H_ */ diff --git a/include/PR/os_misc.h b/include/PR/os_misc.h deleted file mode 100644 index 6b7f6e6136..0000000000 --- a/include/PR/os_misc.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _ULTRA64_OS_MISC_H_ -#define _ULTRA64_OS_MISC_H_ - -/* Miscellaneous OS functions */ - -void osInitialize(void); -u32 osGetCount(void); - -uintptr_t osVirtualToPhysical(void *); - -#endif diff --git a/include/PR/os_pi.h b/include/PR/os_pi.h deleted file mode 100644 index 1d4176fabf..0000000000 --- a/include/PR/os_pi.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef _ULTRA64_PI_H_ -#define _ULTRA64_PI_H_ - -/* Ultra64 Parallel Interface */ - -/* Types */ - -typedef struct -{ - u32 errStatus; - void *dramAddr; - void *C2Addr; - u32 sectorSize; - u32 C1ErrNum; - u32 C1ErrSector[4]; -} __OSBlockInfo; - -typedef struct -{ - u32 cmdType; - u16 transferMode; - u16 blockNum; - s32 sectorNum; - uintptr_t devAddr; - u32 bmCtlShadow; - u32 seqCtlShadow; - __OSBlockInfo block[2]; -} __OSTranxInfo; - -typedef struct OSPiHandle_s -{ - struct OSPiHandle_s *next; - u8 type; - u8 latency; - u8 pageSize; - u8 relDuration; - u8 pulse; - u8 domain; - u32 baseAddress; - u32 speed; - __OSTranxInfo transferInfo; -} OSPiHandle; - -typedef struct -{ - u8 type; - uintptr_t address; -} OSPiInfo; - -typedef struct -{ - u16 type; - u8 pri; - u8 status; - OSMesgQueue *retQueue; -} OSIoMesgHdr; - -typedef struct -{ - /*0x00*/ OSIoMesgHdr hdr; - /*0x08*/ void *dramAddr; - /*0x0C*/ uintptr_t devAddr; - /*0x10*/ size_t size; - //OSPiHandle *piHandle; //from the official definition -} OSIoMesg; - -/* Definitions */ - -#define OS_READ 0 // device -> RDRAM -#define OS_WRITE 1 // device <- RDRAM - -#define OS_MESG_PRI_NORMAL 0 -#define OS_MESG_PRI_HIGH 1 - -/* Functions */ - -s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, - uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq); -void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, - s32 cmdMsgCnt); -OSMesgQueue *osPiGetCmdQueue(void); -s32 osPiWriteIo(uintptr_t devAddr, u32 data); -s32 osPiReadIo(uintptr_t devAddr, u32 *data); - -#endif diff --git a/include/PR/os_rdp.h b/include/PR/os_rdp.h deleted file mode 100644 index 6b3d288cef..0000000000 --- a/include/PR/os_rdp.h +++ /dev/null @@ -1,92 +0,0 @@ - -/*==================================================================== - * os_rdp.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_rdp.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:16 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_RDP_H_ -#define _OS_RDP_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* Display processor interface (Dp) */ -extern u32 osDpGetStatus(void); -extern void osDpSetStatus(u32); -extern void osDpGetCounters(u32 *); -extern s32 osDpSetNextBuffer(void *, u64); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_RDP_H_ */ diff --git a/include/PR/os_thread.h b/include/PR/os_thread.h deleted file mode 100644 index 791701c249..0000000000 --- a/include/PR/os_thread.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef _ULTRA64_THREAD_H_ -#define _ULTRA64_THREAD_H_ - -/* Recommended priorities for system threads */ -#define OS_PRIORITY_MAX 255 -#define OS_PRIORITY_VIMGR 254 -#define OS_PRIORITY_RMON 250 -#define OS_PRIORITY_RMONSPIN 200 -#define OS_PRIORITY_PIMGR 150 -#define OS_PRIORITY_SIMGR 140 -#define OS_PRIORITY_APPMAX 127 -#define OS_PRIORITY_IDLE 0 - -#define OS_STATE_STOPPED 1 -#define OS_STATE_RUNNABLE 2 -#define OS_STATE_RUNNING 4 -#define OS_STATE_WAITING 8 - -/* Types */ - -typedef s32 OSPri; -typedef s32 OSId; - -typedef union -{ - struct {f32 f_odd; f32 f_even;} f; -} __OSfp; - -typedef struct -{ - /* registers */ - /*0x20*/ u64 at, v0, v1, a0, a1, a2, a3; - /*0x58*/ u64 t0, t1, t2, t3, t4, t5, t6, t7; - /*0x98*/ u64 s0, s1, s2, s3, s4, s5, s6, s7; - /*0xD8*/ u64 t8, t9, gp, sp, s8, ra; - /*0x108*/ u64 lo, hi; - /*0x118*/ u32 sr, pc, cause, badvaddr, rcp; - /*0x12C*/ u32 fpcsr; - __OSfp fp0, fp2, fp4, fp6, fp8, fp10, fp12, fp14; - __OSfp fp16, fp18, fp20, fp22, fp24, fp26, fp28, fp30; -} __OSThreadContext; - -typedef struct -{ - u32 flag; - u32 count; - u64 time; -} __OSThreadprofile_s; - -typedef struct OSThread_s -{ - /*0x00*/ struct OSThread_s *next; - /*0x04*/ OSPri priority; - /*0x08*/ struct OSThread_s **queue; - /*0x0C*/ struct OSThread_s *tlnext; - /*0x10*/ u16 state; - /*0x12*/ u16 flags; - /*0x14*/ OSId id; - /*0x18*/ int fp; - /*0x1C*/ __OSThreadprofile_s *thprof; - /*0x20*/ __OSThreadContext context; -} OSThread; - - -/* Functions */ - -void osCreateThread(OSThread *thread, OSId id, void (*entry)(void *), - void *arg, void *sp, OSPri pri); -OSId osGetThreadId(OSThread *thread); -OSPri osGetThreadPri(OSThread *thread); -void osSetThreadPri(OSThread *thread, OSPri pri); -void osStartThread(OSThread *thread); -void osStopThread(OSThread *thread); - -#endif diff --git a/include/PR/os_time.h b/include/PR/os_time.h deleted file mode 100644 index 328e601500..0000000000 --- a/include/PR/os_time.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ULTRA64_TIME_H_ -#define _ULTRA64_TIME_H_ - -#include -#include - -/* Types */ - -typedef struct OSTimer_str -{ - struct OSTimer_str *next; - struct OSTimer_str *prev; - u64 interval; - u64 remaining; - OSMesgQueue *mq; - OSMesg *msg; -} OSTimer; - -typedef u64 OSTime; - -/* Functions */ - -OSTime osGetTime(void); -void osSetTime(OSTime time); -u32 osSetTimer(OSTimer *, OSTime, u64, OSMesgQueue *, OSMesg); - -#endif diff --git a/include/PR/os_tlb.h b/include/PR/os_tlb.h deleted file mode 100644 index 2cdd5c9c6c..0000000000 --- a/include/PR/os_tlb.h +++ /dev/null @@ -1,107 +0,0 @@ - -/*==================================================================== - * os_tlb.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_tlb.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:20 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_TLB_H_ -#define _OS_TLB_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - -typedef u32 OSPageMask; - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - -/* - * Page size argument for TLB routines - */ -#define OS_PM_4K 0x0000000 -#define OS_PM_16K 0x0006000 -#define OS_PM_64K 0x001e000 -#define OS_PM_256K 0x007e000 -#define OS_PM_1M 0x01fe000 -#define OS_PM_4M 0x07fe000 -#define OS_PM_16M 0x1ffe000 - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* TLB management routines */ - -extern void osMapTLB(s32, OSPageMask, void *, u32, u32, s32); -extern void osMapTLBRdb(void); -extern void osUnmapTLB(s32); -extern void osUnmapTLBAll(void); -extern void osSetTLBASID(s32); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_TLB_H_ */ diff --git a/include/PR/os_vi.h b/include/PR/os_vi.h deleted file mode 100644 index 3578c9a31f..0000000000 --- a/include/PR/os_vi.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef _ULTRA64_VI_H_ -#define _ULTRA64_VI_H_ - -#include -#include - -/* Ultra64 Video Interface */ - - -/* Special Features */ -#define OS_VI_GAMMA_ON 0x0001 -#define OS_VI_GAMMA_OFF 0x0002 -#define OS_VI_GAMMA_DITHER_ON 0x0004 -#define OS_VI_GAMMA_DITHER_OFF 0x0008 -#define OS_VI_DIVOT_ON 0x0010 -#define OS_VI_DIVOT_OFF 0x0020 -#define OS_VI_DITHER_FILTER_ON 0x0040 -#define OS_VI_DITHER_FILTER_OFF 0x0080 - -#define OS_VI_GAMMA 0x08 -#define OS_VI_GAMMA_DITHER 0x04 -#define OS_VI_DIVOT 0x10 -#define OS_VI_DITHER_FILTER 0x10000 -#define OS_VI_UNK200 0x200 -#define OS_VI_UNK100 0x100 - - -/* Types */ - -typedef struct -{ - u32 ctrl; - u32 width; - u32 burst; - u32 vSync; - u32 hSync; - u32 leap; - u32 hStart; - u32 xScale; - u32 vCurrent; -} OSViCommonRegs; - -typedef struct -{ - u32 origin; - u32 yScale; - u32 vStart; - u32 vBurst; - u32 vIntr; -} OSViFieldRegs; - -typedef struct -{ - u8 type; - OSViCommonRegs comRegs; - OSViFieldRegs fldRegs[2]; -} OSViMode; - -typedef struct -{ - /* 0x00 */ u16 unk00; //some kind of flags. swap buffer sets to 0x10 - /* 0x02 */ u16 retraceCount; - /* 0x04 */ void* buffer; - /* 0x08 */ OSViMode *unk08; - /* 0x0c */ u32 features; - /* 0x10 */ OSMesgQueue *mq; - /* 0x14 */ OSMesg *msg; - /* 0x18 */ u32 unk18; - /* 0x1c */ u32 unk1c; - /* 0x20 */ u32 unk20; - /* 0x24 */ f32 unk24; - /* 0x28 */ u16 unk28; - /* 0x2c */ u32 unk2c; -} OSViContext; - -void osCreateViManager(OSPri pri); -void osViSetMode(OSViMode *mode); -void osViSetEvent(OSMesgQueue *mq, OSMesg msg, u32 retraceCount); -void osViBlack(u8 active); -void osViSetSpecialFeatures(u32 func); -void osViSwapBuffer(void *vaddr); - - -#define OS_VI_NTSC_LPN1 0 /* NTSC */ -#define OS_VI_NTSC_LPF1 1 -#define OS_VI_NTSC_LAN1 2 -#define OS_VI_NTSC_LAF1 3 -#define OS_VI_NTSC_LPN2 4 -#define OS_VI_NTSC_LPF2 5 -#define OS_VI_NTSC_LAN2 6 -#define OS_VI_NTSC_LAF2 7 -#define OS_VI_NTSC_HPN1 8 -#define OS_VI_NTSC_HPF1 9 -#define OS_VI_NTSC_HAN1 10 -#define OS_VI_NTSC_HAF1 11 -#define OS_VI_NTSC_HPN2 12 -#define OS_VI_NTSC_HPF2 13 - -#define OS_VI_PAL_LPN1 14 /* PAL */ -#define OS_VI_PAL_LPF1 15 -#define OS_VI_PAL_LAN1 16 -#define OS_VI_PAL_LAF1 17 -#define OS_VI_PAL_LPN2 18 -#define OS_VI_PAL_LPF2 19 -#define OS_VI_PAL_LAN2 20 -#define OS_VI_PAL_LAF2 21 -#define OS_VI_PAL_HPN1 22 -#define OS_VI_PAL_HPF1 23 -#define OS_VI_PAL_HAN1 24 -#define OS_VI_PAL_HAF1 25 -#define OS_VI_PAL_HPN2 26 -#define OS_VI_PAL_HPF2 27 - -extern OSViMode osViModeTable[]; /* Global VI mode table */ - - -#endif diff --git a/include/PR/sptask.h b/include/PR/sptask.h deleted file mode 100644 index 8f23c1b2d8..0000000000 --- a/include/PR/sptask.h +++ /dev/null @@ -1,113 +0,0 @@ -#ifndef _ULTRA64_SPTASK_H_ -#define _ULTRA64_SPTASK_H_ - -/* Task Types */ -#define M_GFXTASK 1 -#define M_AUDTASK 2 -#define M_VIDTASK 3 -#define M_HVQTASK 6 -#define M_HVQMTASK 7 - -#if (defined(F3DEX_GBI) || defined(F3DLP_GBI) || defined(F3DEX_GBI_2)) -#define OS_YIELD_DATA_SIZE 0xc00 -#else -#define OS_YIELD_DATA_SIZE 0x900 -#endif -#define OS_YIELD_AUDIO_SIZE 0x400 - -/* Flags */ -#define M_TASK_FLAG0 1 -#define M_TASK_FLAG1 2 - -/* SpStatus */ -#define SPSTATUS_CLEAR_HALT 0x00000001 -#define SPSTATUS_SET_HALT 0x00000002 -#define SPSTATUS_CLEAR_BROKE 0x00000004 -#define SPSTATUS_CLEAR_INTR 0x00000008 -#define SPSTATUS_SET_INTR 0x00000010 -#define SPSTATUS_CLEAR_SSTEP 0x00000020 -#define SPSTATUS_SET_SSTEP 0x00000040 -#define SPSTATUS_CLEAR_INTR_ON_BREAK 0x00000080 -#define SPSTATUS_SET_INTR_ON_BREAK 0x00000100 -#define SPSTATUS_CLEAR_SIGNAL0 0x00000200 -#define SPSTATUS_SET_SIGNAL0 0x00000400 -#define SPSTATUS_CLEAR_SIGNAL1 0x00000800 -#define SPSTATUS_SET_SIGNAL1 0x00001000 -#define SPSTATUS_CLEAR_SIGNAL2 0x00002000 -#define SPSTATUS_SET_SIGNAL2 0x00004000 -#define SPSTATUS_CLEAR_SIGNAL3 0x00008000 -#define SPSTATUS_SET_SIGNAL3 0x00010000 -#define SPSTATUS_CLEAR_SIGNAL4 0x00020000 -#define SPSTATUS_SET_SIGNAL4 0x00040000 -#define SPSTATUS_CLEAR_SIGNAL5 0x00080000 -#define SPSTATUS_SET_SIGNAL5 0x00100000 -#define SPSTATUS_CLEAR_SIGNAL6 0x00200000 -#define SPSTATUS_SET_SIGNAL6 0x00800000 -#define SPSTATUS_CLEAR_SIGNAL7 0x01000000 -#define SPSTATUS_SET_SIGNAL7 0x02000000 - -#define SPSTATUS_HALT 0x0001 -#define SPSTATUS_BROKE 0x0002 -#define SPSTATUS_DMA_BUSY 0x0004 -#define SPSTATUS_DMA_FULL 0x0008 -#define SPSTATUS_IO_FULL 0x0010 -#define SPSTATUS_SINGLE_STEP 0x0020 -#define SPSTATUS_INTERRUPT_ON_BREAK 0x0040 -#define SPSTATUS_SIGNAL0_SET 0x0080 -#define SPSTATUS_SIGNAL1_SET 0x0100 -#define SPSTATUS_SIGNAL2_SET 0x0200 -#define SPSTATUS_SIGNAL3_SET 0x0400 -#define SPSTATUS_SIGNAL4_SET 0x0800 -#define SPSTATUS_SIGNAL5_SET 0x1000 -#define SPSTATUS_SIGNAL6_SET 0x2000 -#define SPSTATUS_SIGNAL7_SET 0x4000 - -/* Types */ -/* Types */ - -typedef struct -{ - /*0x00*/ u32 type; - /*0x04*/ u32 flags; - - /*0x08*/ u64 *ucode_boot; - /*0x0C*/ u32 ucode_boot_size; - - /*0x10*/ u64 *ucode; - /*0x14*/ u32 ucode_size; - - /*0x18*/ u64 *ucode_data; - /*0x1C*/ u32 ucode_data_size; - - /*0x20*/ u64 *dram_stack; - /*0x24*/ u32 dram_stack_size; - - /*0x28*/ u64 *output_buff; - /*0x2C*/ u64 *output_buff_size; - - /*0x30*/ u64 *data_ptr; - /*0x34*/ u32 data_size; - - /*0x38*/ u64 *yield_data_ptr; - /*0x3C*/ u32 yield_data_size; -} OSTask_t; // size = 0x40 - -typedef union { - OSTask_t t; - long long int force_structure_alignment; -} OSTask; - -typedef u32 OSYieldResult; - -/* Functions */ - -#define osSpTaskStart(p) \ - osSpTaskLoad(p); \ - osSpTaskStartGo(p); - -void osSpTaskLoad(OSTask *task); -void osSpTaskStartGo(OSTask *task); -void osSpTaskYield(void); -OSYieldResult osSpTaskYielded(OSTask *task); - -#endif diff --git a/include/PR/ucode.h b/include/PR/ucode.h deleted file mode 100644 index 37fd197754..0000000000 --- a/include/PR/ucode.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _ULTRA64_UCODE_H_ -#define _ULTRA64_UCODE_H_ - -#define SP_DRAM_STACK_SIZE8 0x400 -#define SP_UCODE_SIZE 0x1000 -#define SP_UCODE_DATA_SIZE 0x800 - -// standard boot ucode -extern u64 rspF3DBootStart[], rspF3DBootEnd[]; - -// F3D ucode -extern u64 rspF3DStart[], rspF3DEnd[]; - -// F3D ucode data -extern u64 rspF3DDataStart[], rspF3DDataEnd[]; - -// aspMain (audio) ucode -extern u64 rspAspMainStart[], rspAspMainEnd[]; - -// aspMain ucode data -extern u64 rspAspMainDataStart[], rspAspMainDataEnd[]; - -#endif diff --git a/include/PR/ultratypes.h b/include/PR/ultratypes.h deleted file mode 100644 index 1f0d3e012a..0000000000 --- a/include/PR/ultratypes.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef _ULTRA64_TYPES_H_ -#define _ULTRA64_TYPES_H_ - -#ifndef NULL -#define NULL (void *)0 -#endif - -#define TRUE 1 -#define FALSE 0 - -typedef signed char s8; -typedef unsigned char u8; -typedef signed short int s16; -typedef unsigned short int u16; -typedef signed int s32; -typedef unsigned int u32; -typedef signed long long int s64; -typedef unsigned long long int u64; - -typedef volatile u8 vu8; -typedef volatile u16 vu16; -typedef volatile u32 vu32; -typedef volatile u64 vu64; -typedef volatile s8 vs8; -typedef volatile s16 vs16; -typedef volatile s32 vs32; -typedef volatile s64 vs64; - -typedef float f32; -typedef double f64; - -#ifdef TARGET_N64 -typedef u32 size_t; -typedef s32 ssize_t; -typedef u32 uintptr_t; -typedef s32 intptr_t; -typedef s32 ptrdiff_t; -#else -#include -#endif - -#endif diff --git a/include/alloca.h b/include/alloca.h index bb44ef0d2b..d7f0f268aa 100644 --- a/include/alloca.h +++ b/include/alloca.h @@ -1,7 +1,7 @@ #ifndef _ALLOCA_H_ #define _ALLOCA_H_ -void* alloca(unsigned int); +void* alloca(u32); #define alloca __builtin_alloca #endif diff --git a/include/fp.h b/include/fp.h index 7346d5e082..7fac5bfc10 100644 --- a/include/fp.h +++ b/include/fp.h @@ -1,6 +1,6 @@ #ifndef _FP_H_ #define _FP_H_ -#include +#include "ultra64.h" extern f32 qNaN0x3FFFFF; extern f32 qNaN0x10000; diff --git a/include/functions.h b/include/functions.h index c809471da3..87344620e5 100644 --- a/include/functions.h +++ b/include/functions.h @@ -3,11 +3,11 @@ #include "z64.h" -float fabsf(float f); +f32 fabsf(f32 f); #pragma intrinsic(fabsf) -float sqrtf(float f); +f32 sqrtf(f32 f); #pragma intrinsic(sqrtf) -double sqrt(double d); +f64 sqrt(f64 d); #pragma intrinsic(sqrt) void cleararena(void); @@ -27,7 +27,7 @@ void DmaMgr_ProcessMsg(DmaRequest* req); void DmaMgr_ThreadEntry(void* arg0); s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg); s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size); -void DmaMgr_Start(); +void DmaMgr_Init(); s32 DmaMgr_SendRequest2(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, const char* file, s32 line); s32 DmaMgr_SendRequest1(void* ram0, u32 vrom, u32 size, const char* file, s32 line); @@ -55,8 +55,8 @@ void StackCheck_Cleanup(StackEntry* entry); StackStatus StackCheck_GetState(StackEntry* entry); u32 StackCheck_CheckAll(); u32 StackCheck_Check(StackEntry* entry); -float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name, - float var2, const char* var3Name, float var3); +f32 LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, f32 var1, const char* var2Name, + f32 var2, const char* var3Name, f32 var3); s32 LogUtils_CheckIntRange(const char* exp, s32 arg1, const char* var1Name, s32 var1, const char* var2Name, s32 var2, const char* var3Name, s32 var3); void LogUtils_LogHexDump(void* ptr, s32 size0); @@ -98,7 +98,7 @@ void osWritebackDCache(void* vaddr, s32 nbytes); void* osViGetNextFramebuffer(); void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt); void __osDevMgrMain(void* arg); -s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void* dram_addr, size_t size); +s32 __osPiRawStartDma(s32 dir, u32 cartAddr, void* dramAddr, size_t size); u32 osVirtualToPhysical(void* vaddr); void osViBlack(u8 active); s32 __osSiRawReadIo(void* a0, u32* a1); @@ -118,6 +118,7 @@ void osInvalICache(void* vaddr, s32 nbytes); void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 count); void osInvalDCache(void* vaddr, s32 nbytes); s32 __osSiDeviceBusy(); +s32 osJamMesg(OSMesgQueue* mq, OSMesg mesg, s32 flag); void osSetThreadPri(OSThread* thread, OSPri pri); OSPri osGetThreadPri(OSThread* thread); s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data); @@ -146,13 +147,19 @@ void __osSetFpcCsr(u32); u32 __osGetFpcCsr(); s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data); void osMapTLBRdb(void); +void osYieldThread(); u32 __osGetCause(); s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data); +void _Litob(_Pft* args, u8 type); +ldiv_t ldiv(s32 num, s32 denom); +lldiv_t lldiv(s64 num, s64 denom); +void _Ldtob(_Pft* args, u8 type); +s32 __osSiRawWriteIo(void* a0, u32 a1); void osCreateViManager(OSPri pri); void viMgrMain(void* vargs); OSViContext* __osViGetCurrentContext(); void osStartThread(OSThread* thread); -void osViSetYScale(float scale); +void osViSetYScale(f32 scale); void osViSetXScale(f32 value); void __osSetHWIntrRoutine(s32 idx, OSMesgQueue* queue, OSMesg msg); void __osGetHWIntrRoutine(s32 idx, OSMesgQueue** outQueue, OSMesg* outMsg); @@ -1651,7 +1658,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr); void AudioMgr_HandlePRENMI(AudioMgr* audioMgr); void AudioMgr_ThreadEntry(void* arg0); void AudioMgr_Unlock(AudioMgr* audioMgr); -void AudioMgr_Start(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr); +void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr); void TitleSetup_InitImpl(GameState* gameState); void TitleSetup_Destroy(GameState* gameState); void TitleSetup_Init(GameState* gameState); @@ -1707,7 +1714,7 @@ void PadMgr_UnlockPadData(PadMgr* padmgr); void PadMgr_RumbleControl(PadMgr* padmgr); void PadMgr_RumbleStop(PadMgr* padmgr); void PadMgr_RumbleReset(PadMgr* padmgr); -void PadMgr_RumbleSet(PadMgr* padmgr, u8* ctrlr_rumbles); +void PadMgr_RumbleSet(PadMgr* padmgr, u8* ctrlrRumbles); void PadMgr_ProcessInputs(PadMgr* padmgr); void PadMgr_HandleRetraceMsg(PadMgr* padmgr); void PadMgr_HandlePreNMI(PadMgr* padmgr); @@ -1864,7 +1871,7 @@ void IrqMgr_HandlePRENMI480(IrqMgr* this); void IrqMgr_HandlePRENMI500(IrqMgr* this); void IrqMgr_HandleRetrace(IrqMgr* this); void IrqMgr_ThreadEntry(void* arg0); -void IrqMgr_Create(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount); +void IrqMgr_Init(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount); void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action); void* DebugArena_Malloc(u32 size); void* DebugArena_MallocDebug(u32 size, const char* file, s32 line); @@ -1919,7 +1926,7 @@ void Fault_ProcessClients(); void Fault_UpdatePad(); void Fault_ThreadEntry(void*); void Fault_SetFB(void*, u16, u16); -void Fault_Start(void); +void Fault_Init(void); void Fault_HangupFaultClient(const char*, const char*); void Fault_AddHungupAndCrashImpl(const char*, const char*); void Fault_AddHungupAndCrash(const char*, u32); @@ -2468,8 +2475,8 @@ void guScale(Mtx* m, f32 x, f32 y, f32 z); f32 sinf(f32); s16 sins(u16); // ? func_801004C0(?); -// ? osSpTaskLoad(?); -// ? osSpTaskStartGo(?); +void osSpTaskLoad(OSTask* task); +void osSpTaskStartGo(OSTask* task); s32 osSetRumble(OSPfs* pfs, u32 vibrate); void osSetUpMempakWrite(s32 channel, OSPifRam* buf); s32 osProbeRumblePak(OSMesgQueue* ctrlrqueue, OSPfs* pfs, u32 channel); @@ -2482,24 +2489,22 @@ void __osPackRequestData(u8 poll); s32 osContStartReadData(OSMesgQueue* mq); void osContGetReadData(OSContPad* pad); void __osPackReadData(); -// ? guPerspectiveF(?); -// ? guPerspective(?); -// ? __osSpRawStartDma(?); +void guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale); +void guPerspective(Mtx* m, u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale); +s32 __osSpRawStartDma(s32 direction, void* devAddr, void* dramAddr, u32 size); s32 __osSiRawStartDma(s32 dir, void* addr); -// ? osSpTaskYield(?); +void osSpTaskYield(void); s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page); s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, s32 size, u8* data); s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel); void __osPfsRequestOneChannel(s32 channel, u8 poll); void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData); // ? guMtxIdentF(?); -void guLookAtF(float mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); +void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); void guLookAt(Mtx*, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp); -s32 osPfsAllocateFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name, s32 length, - s32* file_no); -s32 __osPfsDeclearPage(OSPfs* pfs, __OSInode* inode, s32 fileSizeInPages, s32* startPage, u8 bank, s32* decleared, - s32* finalPage); -// ? osStopTimer(?); +s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 length, s32* fileNo); +s32 __osPfsDeclearPage(OSPfs* pfs, __OSInode* inode, s32 fileSizeInPages, s32* startPage, u8 bank, s32* decleared, s32* finalPage); +s32 osStopTimer(OSTimer* timer); u16 __osSumcalc(u8* ptr, s32 length); s32 __osIdCheckSum(u16* ptr, u16* csum, u16* icsum); s32 __osRepairPackId(OSPfs* pfs, __OSPackId* badid, __OSPackId* newid); @@ -2509,26 +2514,26 @@ s32 __osCheckId(OSPfs* pfs); s32 __osPfsRWInode(OSPfs* pfs, __OSInode* inode, u8 flag, u8 bank); // ? func_80102FA0(?); s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo); -// ? osAfterPreNMI(?); -// ? osContStartQuery(?); +s32 osAfterPreNMI(void); +s32 osContStartQuery(OSMesgQueue* mq); void osContGetQuery(OSContStatus* data); // ? guLookAtHiliteF(?); void guLookAtHilite(Mtx* m, LookAt* l, Hilite* h, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp, f32 xl1, f32 yl1, f32 zl1, f32 xl2, f32 yl2, f32 zl2, s32 hiliteWidth, s32 hiliteHeight); -// ? __osSpDeviceBusy(?); +u32 __osSpDeviceBusy(); // ? guMtxIdent(?); -// ? guPositionF(?); +void guPositionF(f32 mf[4][4], f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f32 y, f32 z); void guPosition(Mtx*, f32, f32, f32, f32, f32, f32, f32); -// ? osSpTaskYielded(?); +OSYieldResult osSpTaskYielded(OSTask* task); // ? guRotateF(?); void guRotate(Mtx*, f32 angle, f32 x, f32 y, f32 z); s32 osAiSetFrequency(u32 frequency); -// ? __osGetActiveQueue(?); +OSThread* __osGetActiveQueue(); // ? guNormalize(?); u32 osDpGetStatus(void); void osDpSetStatus(u32 status); -s32 osPfsDeleteFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name); +s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName); s32 __osPfsReleasePages(OSPfs* pfs, __OSInode* inode, u8 initialPage, u8 bank, __OSInodeUnit* finalPage); void guOrthoF(f32[4][4], f32, f32, f32, f32, f32, f32, f32); void guOrtho(Mtx*, f32, f32, f32, f32, f32, f32, f32); @@ -2541,18 +2546,19 @@ void __osPfsGetInitData(u8* pattern, OSContStatus* contData); void guS2DInitBg(uObjBg* bg); s32 __osPfsSelectBank(OSPfs* pfs, u8 bank); s32 osContSetCh(u8 ch); -s32 osPfsFileState(OSPfs* pfs, s32 file_no, OSPfsState* state); +s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state); s32 osPfsInitPak(OSMesgQueue* mq, OSPfs* pfs, s32 channel); s32 __osPfsCheckRamArea(OSPfs* pfs); s32 osPfsChecker(OSPfs* pfs); s32 func_80105788(OSPfs* pfs, __OSInodeCache* cache); s32 func_80105A60(OSPfs* pfs, __OSInodeUnit fpage, __OSInodeCache* cache); -// ? osAiGetLength(?); +u32 osAiGetLength(void); void guTranslate(Mtx* m, f32 x, f32 y, f32 z); s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 force); s32 __osContRamRead(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data); u8 __osContAddressCrc(u16 addr); u8 __osContDataCrc(u8* data); +s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg); u32 __osSpGetStatus(); void __osSpSetStatus(u32 status); void osWritebackDCacheAll(void); @@ -2567,7 +2573,7 @@ OSThread* __osGetCurrFaultedThread(); // ? __ull_to_d(?); // ? __ull_to_f(?); u32* osViGetCurrentFramebuffer(void); -// ? __osSpSetPc(?); +s32 __osSpSetPc(void* pc); f32 absf(f32); void* func_80106860(void* ptr, s32 val, size_t size); void* func_801068B0(void* dst, void* src, size_t size); diff --git a/include/macros.h b/include/macros.h index 7d370507c0..8ebfb26fbc 100644 --- a/include/macros.h +++ b/include/macros.h @@ -12,7 +12,6 @@ #define SQ(x) ((x)*(x)) #define ABS(x) ((x) >= 0 ? (x) : -(x)) -#define ULTRA_ABS(x) ((x) > 0) ? (x) : -(x) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) #define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) #define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x)) @@ -55,7 +54,9 @@ ? gSaveContext.equips.buttonItems[button + 1] \ : ITEM_NONE) -#define CHECK_PAD(state, combo) (~(state.in.button | ~(combo)) == 0) +#define CHECK_BTN_ALL(state, combo) (~((state) | ~(combo)) == 0) +#define CHECK_BTN_ANY(state, combo) (((state) & (combo)) != 0) + #define LOG(exp, value, format, file, line) \ do { \ diff --git a/include/math.h b/include/math.h index 4524283aa1..b0df65e56d 100644 --- a/include/math.h +++ b/include/math.h @@ -1,6 +1,8 @@ #ifndef _MATH_H_ #define _MATH_H_ +#include "ultra64/types.h" + #define M_PI 3.14159265358979323846f #define M_SQRT2 1.41421356237309504880f #define FLT_MAX 340282346638528859811704183484516925440.0f @@ -8,26 +10,20 @@ #define SHT_MINV (1.0f / SHT_MAX) #define DEGTORAD(x) (x * M_PI / 180.0f) -float sinf(float); -double sin(double); -float cosf(float); -double cos(double); -float sqrtf(float f); - typedef union { struct { - unsigned int hi; - unsigned int lo; + u32 hi; + u32 lo; } word; - double d; + f64 d; } du; typedef union { - unsigned int i; - float f; + u32 i; + f32 f; } fu; -extern float __libm_qnan_f; +extern f32 __libm_qnan_f; #endif diff --git a/include/segment_symbols.h b/include/segment_symbols.h index 82aec4a79a..96089eed7a 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -1,7 +1,7 @@ #ifndef _SEGMENT_SYMBOLS_H_ #define _SEGMENT_SYMBOLS_H_ -#include +#include "z64.h" #define DECLARE_SEGMENT(name) \ extern u8 _##name##SegmentStart[]; \ diff --git a/include/stdarg.h b/include/stdarg.h index 3303fdcb83..0cd0fa1f44 100644 --- a/include/stdarg.h +++ b/include/stdarg.h @@ -1,8 +1,6 @@ #ifndef _STDARG_H_ #define _STDARG_H_ -#include - // When building with GCC, use the official vaarg macros to avoid warnings // and possibly bad codegen. #ifdef __GNUC__ @@ -12,31 +10,31 @@ #define va_end __builtin_va_end #else -typedef char *va_list; +typedef char* va_list; #define _FP 1 #define _INT 0 #define _STRUCT 2 #define _VA_FP_SAVE_AREA 0x10 -#define _VA_ALIGN(p, a) (((unsigned int)(((char *)p) + ((a) > 4 ? (a) : 4) - 1)) & -((a) > 4 ? (a) : 4)) +#define _VA_ALIGN(p, a) (((u32)(((char*)p) + ((a) > 4 ? (a) : 4) - 1)) & -((a) > 4 ? (a) : 4)) #define va_start(vp, parmN) (vp = ((va_list)&parmN + sizeof(parmN))) #define __va_stack_arg(list, mode) \ ( \ - ((list) = (char *)_VA_ALIGN(list, __builtin_alignof(mode)) + \ + ((list) = (char*)_VA_ALIGN(list, __builtin_alignof(mode)) + \ _VA_ALIGN(sizeof(mode), 4)), \ - (((char *)list) - (_VA_ALIGN(sizeof(mode), 4) - sizeof(mode)))) + (((char*)list) - (_VA_ALIGN(sizeof(mode), 4) - sizeof(mode)))) #define __va_double_arg(list, mode) \ ( \ - (((long)list & 0x1) /* 1 byte aligned? */ \ - ? (list = (char *)((long)list + 7), (char *)((long)list - 6 - _VA_FP_SAVE_AREA)) \ - : (((long)list & 0x2) /* 2 byte aligned? */ \ - ? (list = (char *)((long)list + 10), (char *)((long)list - 24 - _VA_FP_SAVE_AREA)) \ + (((s32)list & 0x1) /* 1 byte aligned? */ \ + ? (list = (char*)((s32)list + 7), (char*)((s32)list - 6 - _VA_FP_SAVE_AREA)) \ + : (((s32)list & 0x2) /* 2 byte aligned? */ \ + ? (list = (char*)((s32)list + 10), (char*)((s32)list - 24 - _VA_FP_SAVE_AREA)) \ : __va_stack_arg(list, mode)))) -#define va_arg(list, mode) ((mode *)(((__builtin_classof(mode) == _FP && \ - __builtin_alignof(mode) == sizeof(double)) \ +#define va_arg(list, mode) ((mode*)(((__builtin_classof(mode) == _FP && \ + __builtin_alignof(mode) == sizeof(f64)) \ ? __va_double_arg(list, mode) \ : __va_stack_arg(list, mode))))[-1] #define va_end(__list) diff --git a/include/stdlib.h b/include/stdlib.h index 81dc327572..5f014cb37c 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -1,17 +1,16 @@ #ifndef _STDLIB_H_ #define _STDLIB_H_ +#include "ultra64.h" + typedef struct lldiv_t { - long long quot; - long long rem; + s64 quot; + s64 rem; } lldiv_t; typedef struct ldiv_t { - long quot; - long rem; + s32 quot; + s32 rem; } ldiv_t; -lldiv_t lldiv(long long, long long); -ldiv_t ldiv(long, long); - #endif diff --git a/include/string.h b/include/string.h deleted file mode 100644 index 29ce60a57c..0000000000 --- a/include/string.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _STRING_H_ -#define _STRING_H_ - -#include - -void* memcpy(void*, const void*, size_t); -size_t strlen(const u8* str); -const u8* strchr(const u8* str, s32 ch); - -#endif diff --git a/include/ultra64.h b/include/ultra64.h index daf79835b5..2625e37ae8 100644 --- a/include/ultra64.h +++ b/include/ultra64.h @@ -1,25 +1,28 @@ #ifndef _ULTRA64_H_ #define _ULTRA64_H_ -#include -#include -#include -#include +#include "stddef.h" +#include "stdbool.h" +#include "math.h" +#include "unk.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ultra64/types.h" +#include "ultra64/interrupt.h" +#include "ultra64/rcp.h" +#include "ultra64/rdp.h" +#include "ultra64/rsp.h" +#include "ultra64/thread.h" +#include "ultra64/convert.h" +#include "ultra64/time.h" +#include "ultra64/message.h" +#include "ultra64/sptask.h" +#include "ultra64/gu.h" +#include "ultra64/vi.h" +#include "ultra64/pi.h" +#include "ultra64/hardware.h" +#include "ultra64/controller.h" +#include "ultra64/printf.h" +#include "ultra64/mbi.h" +#include "ultra64/pfs.h" #endif diff --git a/include/ultra64/abi.h b/include/ultra64/abi.h index 63d6b0f99a..f2949f53e1 100644 --- a/include/ultra64/abi.h +++ b/include/ultra64/abi.h @@ -1,5 +1,5 @@ -#ifndef _ABI_H_ -#define _ABI_H_ +#ifndef _ULTRA64_ABI_H_ +#define _ULTRA64_ABI_H_ /* Audio commands: */ #define A_SPNOOP 0 @@ -388,4 +388,4 @@ typedef short ENVMIX_STATE[40]; _a->words.w1 = (unsigned int)d; \ } -#endif /* !_ABI_H_ */ +#endif /* _ULTRA64_ABI_H_ */ diff --git a/include/ultra64/controller.h b/include/ultra64/controller.h index 18629225ac..b587996f9e 100644 --- a/include/ultra64/controller.h +++ b/include/ultra64/controller.h @@ -1,9 +1,8 @@ #ifndef _ULTRA64_CONTROLLER_H_ #define _ULTRA64_CONTROLLER_H_ -#include -#include -#include +#include "ultra64.h" +#include "ultra64/message.h" #define SIAccessQueueSize 2 #define BLOCKSIZE 32 @@ -40,14 +39,14 @@ #define CONT_CMD_END 0xFE // Indicates end of a command #define CONT_CMD_EXE 1 // Set pif ram status byte to this to do a command -#define CONT_ERR_NO_CONTROLLER PFS_ERR_NOPACK /* 1 */ -#define CONT_ERR_CONTRFAIL CONT_OVERRUN_ERROR /* 4 */ -#define CONT_ERR_INVALID PFS_ERR_INVALID /* 5 */ -#define CONT_ERR_DEVICE PFS_ERR_DEVICE /* 11 */ -#define CONT_ERR_NOT_READY 12 -#define CONT_ERR_VOICE_MEMORY 13 -#define CONT_ERR_VOICE_WORD 14 -#define CONT_ERR_VOICE_NO_RESPONSE 15 +#define CONT_ERR_NO_CONTROLLER PFS_ERR_NOPACK /* 1 */ +#define CONT_ERR_CONTRFAIL CONT_OVERRUN_ERROR /* 4 */ +#define CONT_ERR_INVALID PFS_ERR_INVALID /* 5 */ +#define CONT_ERR_DEVICE PFS_ERR_DEVICE /* 11 */ +#define CONT_ERR_NOT_READY 12 +#define CONT_ERR_VOICE_MEMORY 13 +#define CONT_ERR_VOICE_WORD 14 +#define CONT_ERR_VOICE_NO_RESPONSE 15 #define DIR_STATUS_EMPTY 0 @@ -66,155 +65,107 @@ #define CONT_OVERRUN_ERROR 0x4 /* Controller type */ - #define CONT_ABSOLUTE 0x0001 #define CONT_RELATIVE 0x0002 #define CONT_JOYPORT 0x0004 -#define CONT_EEPROM 0x8000 -#define CONT_EEP16K 0x4000 -#define CONT_TYPE_MASK 0x1F07 -#define CONT_TYPE_NORMAL 0x0005 -#define CONT_TYPE_MOUSE 0x0002 -#define CONT_TYPE_VOICE 0x0100 +#define CONT_EEPROM 0x8000 +#define CONT_EEP16K 0x4000 +#define CONT_TYPE_MASK 0x1F07 +#define CONT_TYPE_NORMAL 0x0005 +#define CONT_TYPE_MOUSE 0x0002 +#define CONT_TYPE_VOICE 0x0100 /* Controller status */ - #define CONT_CARD_ON 0x01 #define CONT_CARD_PULL 0x02 #define CONT_ADDR_CRC_ER 0x04 -#define CONT_EEPROM_BUSY 0x80 +#define CONT_EEPROM_BUSY 0x80 /* Buttons */ - -#define CONT_A 0x8000 -#define CONT_B 0x4000 -#define CONT_G 0x2000 -#define CONT_START 0x1000 -#define CONT_UP 0x0800 -#define CONT_DOWN 0x0400 -#define CONT_LEFT 0x0200 -#define CONT_RIGHT 0x0100 -#define CONT_L 0x0020 -#define CONT_R 0x0010 -#define CONT_E 0x0008 -#define CONT_D 0x0004 -#define CONT_C 0x0002 -#define CONT_F 0x0001 - -/* Nintendo's official button names */ - -#define A_BUTTON CONT_A -#define B_BUTTON CONT_B -#define L_TRIG CONT_L -#define R_TRIG CONT_R -#define Z_TRIG CONT_G -#define START_BUTTON CONT_START -#define U_JPAD CONT_UP -#define L_JPAD CONT_LEFT -#define R_JPAD CONT_RIGHT -#define D_JPAD CONT_DOWN -#define U_CBUTTONS CONT_E -#define L_CBUTTONS CONT_C -#define R_CBUTTONS CONT_F -#define D_CBUTTONS CONT_D - -typedef struct -{ - /* 0x00 */ union{ - u16 button; - struct{ - u16 a : 1; - u16 b : 1; - u16 z : 1; - u16 s : 1; - u16 du : 1; - u16 dd : 1; - u16 dl : 1; - u16 dr : 1; - u16 illegal_h : 1; - u16 illegal_l : 1; - u16 l : 1; - u16 r : 1; - u16 cu : 1; - u16 cd : 1; - u16 cl : 1; - u16 cr : 1; - }; - }; - /* 0x02 */ s8 x; - /* 0x03 */ s8 y; -} PadInput; // size = 0x4 +#define BTN_CRIGHT 0x0001 +#define BTN_CLEFT 0x0002 +#define BTN_CDOWN 0x0004 +#define BTN_CUP 0x0008 +#define BTN_R 0x0010 +#define BTN_L 0x0020 +#define BTN_DRIGHT 0x0100 +#define BTN_DLEFT 0x0200 +#define BTN_DDOWN 0x0400 +#define BTN_DUP 0x0800 +#define BTN_START 0x1000 +#define BTN_Z 0x2000 +#define BTN_B 0x4000 +#define BTN_A 0x8000 typedef struct { - u32 ram[15]; /* RAM */ - u32 status; -} OSPifRam; + /* 0x00 */ u32 ram[15]; + /* 0x3C */ u32 status; +} OSPifRam; // size = 0x40 typedef struct { - u16 type; /* Controller Type */ - u8 status; /* Controller status */ - u8 errno; -} OSContStatus; + /* 0x00 */ u16 type; + /* 0x02 */ u8 status; + /* 0x03 */ u8 errno; +} OSContStatus; // size = 0x04 typedef struct { - u16 button; - s8 stick_x; /* -80 <= stick_x <= 80 */ - s8 stick_y; /* -80 <= stick_y <= 80 */ - u8 errno; -} OSContPad; + /* 0x00 */ u16 button; + /* 0x02 */ s8 stick_x; + /* 0x03 */ s8 stick_y; + /* 0x04 */ u8 errno; +} OSContPad; // size = 0x06 typedef struct { - void *address; /* Ram pad Address: 11 bits */ - u8 databuffer[32]; /* address of the data buffer */ - u8 addressCrc; /* CRC code for address */ - u8 dataCrc; /* CRC code for data */ - u8 errno; -} OSContRamIo; + /* 0x00 */ void* address; + /* 0x04 */ u8 databuffer[32]; + /* 0x24 */ u8 addressCrc; + /* 0x25 */ u8 dataCrc; + /* 0x26 */ u8 errno; +} OSContRamIo; // size = 0x28 // Original name: __OSContRequesFormat typedef struct { - u8 align; - u8 txsize; - u8 rxsize; - u8 poll; - u8 typeh; - u8 typel; - u8 status; - u8 align1; -} __OSContRequestHeader; + /* 0x00 */ u8 align; + /* 0x01 */ u8 txsize; + /* 0x02 */ u8 rxsize; + /* 0x03 */ u8 poll; + /* 0x04 */ u8 typeh; + /* 0x05 */ u8 typel; + /* 0x06 */ u8 status; + /* 0x07 */ u8 align1; +} __OSContRequestHeader; // size = 0x8 // Original name: __OSContRequesHeaderFormatShort typedef struct { - u8 txsize; - u8 rxsize; - u8 poll; - u8 typeh; - u8 typel; - u8 status; -} __OSContRequestHeaderAligned; + /* 0x00 */ u8 txsize; + /* 0x01 */ u8 rxsize; + /* 0x02 */ u8 poll; + /* 0x03 */ u8 typeh; + /* 0x04 */ u8 typel; + /* 0x05 */ u8 status; +} __OSContRequestHeaderAligned; // size = 0x6 // Original Name: __OSContRamReadFormat typedef struct { - u8 unk_00; - u8 txsize; - u8 rxsize; - u8 poll; - u8 hi; - u8 lo; - u8 data[BLOCKSIZE]; - u8 datacrc; -} __OSContRamHeader; + /* 0x00 */ u8 unk_00; + /* 0x01 */ u8 txsize; + /* 0x02 */ u8 rxsize; + /* 0x03 */ u8 poll; + /* 0x04 */ u8 hi; + /* 0x05 */ u8 lo; + /* 0x06 */ u8 data[BLOCKSIZE]; + /* 0x26 */ u8 datacrc; +} __OSContRamHeader; // size = 0x27 // Original name: __OSContReadFormat typedef struct { - u8 align; - u8 txsize; - u8 rxsize; - u8 poll; - u16 button; - s8 joyX; - s8 joyY; -} __OSContReadHeader; + /* 0x00 */ u8 align; + /* 0x01 */ u8 txsize; + /* 0x02 */ u8 rxsize; + /* 0x03 */ u8 poll; + /* 0x04 */ u16 button; + /* 0x06 */ s8 joyX; + /* 0x07 */ s8 joyY; +} __OSContReadHeader; // size = 0x8 - -#endif //_ULTRA64_CONTROLLER_H_ +#endif diff --git a/include/ultra64/convert.h b/include/ultra64/convert.h index 260b58911f..e68a56576e 100644 --- a/include/ultra64/convert.h +++ b/include/ultra64/convert.h @@ -4,8 +4,6 @@ #define OS_CLOCK_RATE 62500000LL #define OS_CPU_COUNTER (OS_CLOCK_RATE*3/4) -/* Macros */ - #define OS_NSEC_TO_CYCLES(n) (((u64)(n)*(OS_CPU_COUNTER/15625000LL))/(1000000000LL/15625000LL)) #define OS_USEC_TO_CYCLES(n) (((u64)(n)*(OS_CPU_COUNTER/15625LL))/(1000000LL/15625LL)) #define OS_CYCLES_TO_NSEC(c) (((u64)(c)*(1000000000LL/15625000LL))/(OS_CPU_COUNTER/15625000LL)) @@ -17,9 +15,4 @@ #define OS_PHYSICAL_TO_K0(x) (void*)(((u32)(x)+0x80000000)) #define OS_PHYSICAL_TO_K1(x) (void*)(((u32)(x)+0xA0000000)) -/* Functions */ - -extern u32 osVirtualToPhysical(void*); -extern void* osPhysicalToVirtual(u32); - #endif diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index 5f58904002..e87179f5e5 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -1,4 +1,4 @@ -#include "mbi.h" +#include "ultra64/mbi.h" #ifndef _ULTRA64_GBI_H_ #define _ULTRA64_GBI_H_ diff --git a/include/ultra64/gu.h b/include/ultra64/gu.h index 2fa10e5dd9..43b3339793 100644 --- a/include/ultra64/gu.h +++ b/include/ultra64/gu.h @@ -2,13 +2,7 @@ #define _ULTRA64_GU_H_ #define GU_PI 3.1415926 -/* Functions */ #define ROUND(x) (s32)(((x) >= 0.0) ? ((x) + 0.5) : ((x) - 0.5)) -void guPerspectiveF(float mf[4][4], u16 *perspNorm, float fovy, float aspect, - float near, float far, float scale); -void guPerspective(Mtx *m, u16 *perspNorm, float fovy, float aspect, float near, - float far, float scale); - #endif diff --git a/include/ultra64/hardware.h b/include/ultra64/hardware.h index 1d94340015..ae9e30ce7e 100644 --- a/include/ultra64/hardware.h +++ b/include/ultra64/hardware.h @@ -1,7 +1,7 @@ #ifndef _ULTRA64_HARDWARE_H_ #define _ULTRA64_HARDWARE_H_ -#define HW_REG(reg, type) *(volatile type *)(reg | 0xa0000000) +#define HW_REG(reg, type) *(volatile type*)(reg | 0xa0000000) #define AI_DRAM_ADDR_REG 0x04500000 #define AI_LEN_REG 0x04500004 diff --git a/include/ultra64/internal.h b/include/ultra64/internal.h new file mode 100644 index 0000000000..15a2739624 --- /dev/null +++ b/include/ultra64/internal.h @@ -0,0 +1,28 @@ +#ifndef _ULTRA64_INTERNAL_H_ +#define _ULTRA64_INTERNAL_H_ + +typedef struct { + /* 0x00 */ u32 initialized; + /* 0x04 */ OSThread* mgrThread; + /* 0x08 */ OSMesgQueue* cmdQueue; + /* 0x0C */ OSMesgQueue* eventQueue; + /* 0x10 */ OSMesgQueue* acccessQueue; + /* 0x14 */ s32 (*piDmaCallback)(s32, u32, void*, size_t); + /* 0x18 */ s32 (*epiDmaCallback)(OSPiHandle*, s32, u32, void*, size_t); +} OSMgrArgs; // size = 0x1C + +typedef struct { + /* 0x00 */ OSMesgQueue* queue; + /* 0x04 */ OSMesg msg; +} __osHwInt; // size = 0x08 + +typedef struct { + /* 0x00 */ OSMesgQueue* queue; + /* 0x04 */ OSMesg msg; +} __OSEventState; // size = 0x08 + +extern OSMgrArgs __osPiDevMgr; +extern __osHwInt __osHwIntTable[]; +extern __OSEventState __osEventStateTab[]; + +#endif diff --git a/include/ultra64/interrupt.h b/include/ultra64/interrupt.h index 7eb8a4d79d..0516bcc9a3 100644 --- a/include/ultra64/interrupt.h +++ b/include/ultra64/interrupt.h @@ -1,14 +1,6 @@ #ifndef _ULTRA64_INTERRUPT_H_ #define _ULTRA64_INTERRUPT_H_ -/* Types */ - typedef u32 OSIntMask; - -/* Functions */ - -OSIntMask osGetIntMask(void); -OSIntMask osSetIntMask(OSIntMask); - #endif diff --git a/include/ultra64/mbi.h b/include/ultra64/mbi.h index f0e0029504..ea4edb7cb7 100644 --- a/include/ultra64/mbi.h +++ b/include/ultra64/mbi.h @@ -1,25 +1,5 @@ -#ifndef _MBI_H_ -#define _MBI_H_ - -/************************************************************************** - * * - * Copyright (C) 1994, Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs contain * - * unpublished proprietary information of Silicon Graphics, Inc., and * - * are protected by Federal copyright law. They may not be disclosed * - * to third parties or copied or duplicated in any form, in whole or * - * in part, without the prior written consent of Silicon Graphics, Inc. * - * * - **************************************************************************/ - -/************************************************************************** - * - * $Revision: 1.136 $ - * $Date: 1999/01/05 13:04:00 $ - * $Source: /hosts/gate3/exdisk2/cvs/N64OS/Master/cvsmdev2/PR/include/mbi.h,v $ - * - **************************************************************************/ +#ifndef _ULTRA64_MBI_H_ +#define _ULTRA64_MBI_H_ /* * Header file for the Media Binary Interface @@ -44,57 +24,22 @@ * (NOTE: _SHIFTL(v, 0, 32) won't work, just use an assignment) * */ -#define _SHIFTL(v, s, w) \ - ((unsigned int) (((unsigned int)(v) & ((0x01 << (w)) - 1)) << (s))) -#define _SHIFTR(v, s, w) \ - ((unsigned int)(((unsigned int)(v) >> (s)) & ((0x01 << (w)) - 1))) +#define _SHIFTL(v, s, w) \ + ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s))) +#define _SHIFTR(v, s, w) \ + ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1))) -#define G_ON (1) -#define G_OFF (0) +#define _SHIFT _SHIFTL /* old, for compatibility only */ -/************************************************************************** - * - * Graphics Binary Interface - * - **************************************************************************/ +#define G_ON (1) +#define G_OFF (0) -#include +#include "ultra64/gbi.h" +#include "ultra64/abi.h" -/************************************************************************** - * - * Audio Binary Interface - * - **************************************************************************/ +#define NUM_SEGMENTS (16) +#define SEGMENT_OFFSET(a) ((u32)(a) & 0x00ffffff) +#define SEGMENT_NUMBER(a) (((u32)(a) << 4) >> 28) +#define SEGMENT_ADDR(num, off) (((num) << 24) + (off)) -#include - -/************************************************************************** - * - * Task list - * - **************************************************************************/ - -#define M_NULTASK 0 -#define M_GFXTASK 1 -#define M_AUDTASK 2 -#define M_VIDTASK 3 -#define M_NJPEGTASK 4 -#define M_HVQTASK 6 -#define M_HVQMTASK 7 - -/************************************************************************** - * - * Segment macros and definitions - * - **************************************************************************/ - -#define NUM_SEGMENTS (16) -#define SEGMENT_OFFSET(a) ((unsigned int)(a) & 0x00ffffff) -#define SEGMENT_NUMBER(a) (((unsigned int)(a) << 4) >> 28) -#define SEGMENT_ADDR(num, off) (((num) << 24) + (off)) - -#ifndef NULL -#define NULL 0 #endif - -#endif /* !_MBI_H_ */ diff --git a/include/ultra64/message.h b/include/ultra64/message.h index e4811f1331..3f52482d83 100644 --- a/include/ultra64/message.h +++ b/include/ultra64/message.h @@ -1,31 +1,39 @@ #ifndef _ULTRA64_MESSAGE_H_ #define _ULTRA64_MESSAGE_H_ -/* Message Blocking Flags */ +#include "ultra64/types.h" #define OS_MESG_NOBLOCK 0 #define OS_MESG_BLOCK 1 -/* Types */ +typedef void* OSMesg; +typedef u32 OSEvent; -typedef void *OSMesg; +#define OS_NUM_EVENTS 15 -typedef struct OSMesgQueue_s -{ - OSThread *mtqueue; - OSThread *fullqueue; - s32 validCount; - s32 first; - s32 msgCount; - OSMesg *msg; -} OSMesgQueue; +#define OS_EVENT_SW1 0 /* CPU SW1 interrupt */ +#define OS_EVENT_SW2 1 /* CPU SW2 interrupt */ +#define OS_EVENT_CART 2 /* Cartridge interrupt: used by rmon */ +#define OS_EVENT_COUNTER 3 /* Counter int: used by VI/Timer Mgr */ +#define OS_EVENT_SP 4 /* SP task done interrupt */ +#define OS_EVENT_SI 5 /* SI (controller) interrupt */ +#define OS_EVENT_AI 6 /* AI interrupt */ +#define OS_EVENT_VI 7 /* VI interrupt: used by VI/Timer Mgr */ +#define OS_EVENT_PI 8 /* PI interrupt: used by PI Manager */ +#define OS_EVENT_DP 9 /* DP full sync interrupt */ +#define OS_EVENT_CPU_BREAK 10 /* CPU breakpoint: used by rmon */ +#define OS_EVENT_SP_BREAK 11 /* SP breakpoint: used by rmon */ +#define OS_EVENT_FAULT 12 /* CPU fault event: used by rmon */ +#define OS_EVENT_THREADSTATUS 13 /* CPU thread status: used by rmon */ +#define OS_EVENT_PRENMI 14 /* Pre NMI interrupt */ - -/* Functions */ - -void osCreateMesgQueue(OSMesgQueue *, OSMesg *, s32); -s32 osSendMesg(OSMesgQueue *, OSMesg, s32); -s32 osJamMesg(OSMesgQueue *, OSMesg, s32); -s32 osRecvMesg(OSMesgQueue *, OSMesg *, s32); +typedef struct OSMesgQueue { + /* 0x00 */ OSThread* mtqueue; + /* 0x04 */ OSThread* fullqueue; + /* 0x08 */ s32 validCount; + /* 0x0C */ s32 first; + /* 0x10 */ s32 msgCount; + /* 0x14 */ OSMesg* msg; +} OSMesgQueue; // size = 0x18 #endif diff --git a/include/ultra64/os_internal.h b/include/ultra64/os_internal.h deleted file mode 100644 index a46f336f9e..0000000000 --- a/include/ultra64/os_internal.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef _ULTRA64_OS_INTERNAL_H_ -#define _ULTRA64_OS_INTERNAL_H_ - -/* Internal functions used by the operating system */ -/* Do not include this header in application code */ - -/* Variables */ - -typedef struct -{ - u32 initialized; - OSThread *mgrThread; - OSMesgQueue *cmdQueue; - OSMesgQueue *eventQueue; - OSMesgQueue *acccessQueue; - s32 (*piDmaCallback)(s32, u32, void*, size_t); - s32 (*epiDmaCallback)(OSPiHandle *, s32, u32, void *, size_t); -} OSMgrArgs; - -typedef struct -{ - OSMesgQueue* queue; - OSMesg msg; -} __osHwInt; - -typedef struct -{ - OSMesgQueue* queue; - OSMesg msg; -} __OSEventState; - -/* Functions */ - -u32 __osProbeTLB(void *); -s32 __osDisableInt(void); -OSThread *__osPopThread(OSThread**); -void __osCleanupThread(void); - -#endif diff --git a/include/ultra64/os_message.h b/include/ultra64/os_message.h deleted file mode 100644 index 51ce59e923..0000000000 --- a/include/ultra64/os_message.h +++ /dev/null @@ -1,163 +0,0 @@ - -/*==================================================================== - * os_message.h - * - * Copyright 1995, Silicon Graphics, Inc. - * All Rights Reserved. - * - * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Silicon Graphics, - * Inc.; the contents of this file may not be disclosed to third - * parties, copied or duplicated in any form, in whole or in part, - * without the prior written permission of Silicon Graphics, Inc. - * - * RESTRICTED RIGHTS LEGEND: - * Use, duplication or disclosure by the Government is subject to - * restrictions as set forth in subdivision (c)(1)(ii) of the Rights - * in Technical Data and Computer Software clause at DFARS - * 252.227-7013, and/or in similar or successor clauses in the FAR, - * DOD or NASA FAR Supplement. Unpublished - rights reserved under the - * Copyright Laws of the United States. - *====================================================================*/ - -/*---------------------------------------------------------------------* - Copyright (C) 1998 Nintendo. (Originated by SGI) - - $RCSfile: os_message.h,v $ - $Revision: 1.1 $ - $Date: 1998/10/09 08:01:15 $ - *---------------------------------------------------------------------*/ - -#ifndef _OS_MESSAGE_H_ -#define _OS_MESSAGE_H_ - -#ifdef _LANGUAGE_C_PLUS_PLUS -extern "C" { -#endif - -#include - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Type definitions - * - */ - -typedef u32 OSEvent; - -/* - * Structure for message - */ -typedef void * OSMesg; - -/* - * Structure for message queue - */ -typedef struct OSMesgQueue_s { - OSThread *mtqueue; /* Queue to store threads blocked - on empty mailboxes (receive) */ - OSThread *fullqueue; /* Queue to store threads blocked - on full mailboxes (send) */ - s32 validCount; /* Contains number of valid message */ - s32 first; /* Points to first valid message */ - s32 msgCount; /* Contains total # of messages */ - OSMesg *msg; /* Points to message buffer array */ -} OSMesgQueue; - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -/************************************************************************** - * - * Global definitions - * - */ - -/* Events */ -#ifdef _FINALROM -#define OS_NUM_EVENTS 15 -#else -#define OS_NUM_EVENTS 23 -#endif - -#define OS_EVENT_SW1 0 /* CPU SW1 interrupt */ -#define OS_EVENT_SW2 1 /* CPU SW2 interrupt */ -#define OS_EVENT_CART 2 /* Cartridge interrupt: used by rmon */ -#define OS_EVENT_COUNTER 3 /* Counter int: used by VI/Timer Mgr */ -#define OS_EVENT_SP 4 /* SP task done interrupt */ -#define OS_EVENT_SI 5 /* SI (controller) interrupt */ -#define OS_EVENT_AI 6 /* AI interrupt */ -#define OS_EVENT_VI 7 /* VI interrupt: used by VI/Timer Mgr */ -#define OS_EVENT_PI 8 /* PI interrupt: used by PI Manager */ -#define OS_EVENT_DP 9 /* DP full sync interrupt */ -#define OS_EVENT_CPU_BREAK 10 /* CPU breakpoint: used by rmon */ -#define OS_EVENT_SP_BREAK 11 /* SP breakpoint: used by rmon */ -#define OS_EVENT_FAULT 12 /* CPU fault event: used by rmon */ -#define OS_EVENT_THREADSTATUS 13 /* CPU thread status: used by rmon */ -#define OS_EVENT_PRENMI 14 /* Pre NMI interrupt */ -#ifndef _FINALROM -#define OS_EVENT_RDB_READ_DONE 15 /* RDB read ok event: used by rmon */ -#define OS_EVENT_RDB_LOG_DONE 16 /* read of log data complete */ -#define OS_EVENT_RDB_DATA_DONE 17 /* read of hostio data complete */ -#define OS_EVENT_RDB_REQ_RAMROM 18 /* host needs ramrom access */ -#define OS_EVENT_RDB_FREE_RAMROM 19 /* host is done with ramrom access */ -#define OS_EVENT_RDB_DBG_DONE 20 -#define OS_EVENT_RDB_FLUSH_PROF 21 -#define OS_EVENT_RDB_ACK_PROF 22 -#endif - -/* Flags to turn blocking on/off when sending/receiving message */ - -#define OS_MESG_NOBLOCK 0 -#define OS_MESG_BLOCK 1 - - -#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) - -/************************************************************************** - * - * Macro definitions - * - */ - -/* Get count of valid messages in queue */ -#define MQ_GET_COUNT(mq) ((mq)->validCount) - -/* Figure out if message queue is empty or full */ -#define MQ_IS_EMPTY(mq) (MQ_GET_COUNT(mq) == 0) -#define MQ_IS_FULL(mq) (MQ_GET_COUNT(mq) >= (mq)->msgCount) - - -/************************************************************************** - * - * Extern variables - * - */ - - -/************************************************************************** - * - * Function prototypes - * - */ - -/* Message operations */ - -extern void osCreateMesgQueue(OSMesgQueue *, OSMesg *, s32); -extern s32 osSendMesg(OSMesgQueue *, OSMesg, s32); -extern s32 osJamMesg(OSMesgQueue *, OSMesg, s32); -extern s32 osRecvMesg(OSMesgQueue *, OSMesg *, s32); - -/* Event operations */ - -extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); - - -#endif /* defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) */ - -#ifdef _LANGUAGE_C_PLUS_PLUS -} -#endif - -#endif /* !_OS_MESSAGE_H_ */ diff --git a/include/ultra64/os_misc.h b/include/ultra64/os_misc.h deleted file mode 100644 index 4e7353ba71..0000000000 --- a/include/ultra64/os_misc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _ULTRA64_OS_MISC_H_ -#define _ULTRA64_OS_MISC_H_ - -/* Miscellaneous OS functions */ - -u32 osGetCount(void); - -#endif diff --git a/include/ultra64/os_pi.h b/include/ultra64/os_pi.h deleted file mode 100644 index e2bff353b9..0000000000 --- a/include/ultra64/os_pi.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef _ULTRA64_OS_PI_H_ -#define _ULTRA64_OS_PI_H_ - -/* Ultra64 Parallel Interface */ - -/* Types */ - -typedef struct -{ - /* 0x00 */ u32 errStatus; - /* 0x04 */ void *dramAddr; - /* 0x08 */ void *C2Addr; - /* 0x0C */ u32 sectorSize; - /* 0x10 */ u32 C1ErrNum; - /* 0x14 */ u32 C1ErrSector[4]; -} __OSBlockInfo; /* length: 0x24 */ - -typedef struct -{ - /* 0x00 */ u32 cmdType; - /* 0x04 */ u16 transferMode; - /* 0x06 */ u16 blockNum; - /* 0x08 */ s32 sectorNum; - /* 0x0C */ u32 devAddr; - /* 0x10 */ u32 bmCtlShadow; - /* 0x14 */ u32 seqCtlShadow; - /* 0x18 */ __OSBlockInfo block[2]; -} __OSTranxInfo; /* length: 0x60 */ - -typedef struct OSPiHandle_s -{ - /* 0x00 */ struct OSPiHandle_s *next; - /* 0x04 */ u8 type; - /* 0x05 */ u8 latency; - /* 0x06 */ u8 pageSize; - /* 0x07 */ u8 relDuration; - /* 0x08 */ u8 pulse; - /* 0x09 */ u8 domain; - /* 0x0A padding */ - /* 0x0B padding */ - /* 0x0C */ u32 baseAddress; - /* 0x10 */ u32 speed; - /* 0x14 */ __OSTranxInfo transferInfo; -} OSPiHandle; /* length: 0x74 */ - -typedef struct -{ - u8 type; - u32 address; -} OSPiInfo; - -typedef struct -{ - /* 0x00 */ u16 type; - /* 0x02 */ u8 pri; - /* 0x03 */ u8 status; - /* 0x04 */ OSMesgQueue *retQueue; -} OSIoMesgHdr; /* length: 0x8 */ - -typedef struct -{ - /*0x00*/ OSIoMesgHdr hdr; - /*0x08*/ void *dramAddr; - /*0x0C*/ u32 devAddr; - /*0x10*/ size_t size; - /*0x14*/ OSPiHandle* piHandle; //from the official definition -} OSIoMesg; /* length: 0x18 */ - -/* Definitions */ - -#define OS_READ 0 // device -> RDRAM -#define OS_WRITE 1 // device <- RDRAM - -#define OS_MESG_PRI_NORMAL 0 -#define OS_MESG_PRI_HIGH 1 - -/* Functions */ - -s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, - u32 devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq); -void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, - s32 cmdMsgCnt); -OSMesgQueue *osPiGetCmdQueue(void); -s32 osPiWriteIo(u32 devAddr, u32 data); -s32 osPiReadIo(u32 devAddr, u32 *data); - -#endif diff --git a/include/ultra64/os_thread.h b/include/ultra64/os_thread.h deleted file mode 100644 index 791701c249..0000000000 --- a/include/ultra64/os_thread.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef _ULTRA64_THREAD_H_ -#define _ULTRA64_THREAD_H_ - -/* Recommended priorities for system threads */ -#define OS_PRIORITY_MAX 255 -#define OS_PRIORITY_VIMGR 254 -#define OS_PRIORITY_RMON 250 -#define OS_PRIORITY_RMONSPIN 200 -#define OS_PRIORITY_PIMGR 150 -#define OS_PRIORITY_SIMGR 140 -#define OS_PRIORITY_APPMAX 127 -#define OS_PRIORITY_IDLE 0 - -#define OS_STATE_STOPPED 1 -#define OS_STATE_RUNNABLE 2 -#define OS_STATE_RUNNING 4 -#define OS_STATE_WAITING 8 - -/* Types */ - -typedef s32 OSPri; -typedef s32 OSId; - -typedef union -{ - struct {f32 f_odd; f32 f_even;} f; -} __OSfp; - -typedef struct -{ - /* registers */ - /*0x20*/ u64 at, v0, v1, a0, a1, a2, a3; - /*0x58*/ u64 t0, t1, t2, t3, t4, t5, t6, t7; - /*0x98*/ u64 s0, s1, s2, s3, s4, s5, s6, s7; - /*0xD8*/ u64 t8, t9, gp, sp, s8, ra; - /*0x108*/ u64 lo, hi; - /*0x118*/ u32 sr, pc, cause, badvaddr, rcp; - /*0x12C*/ u32 fpcsr; - __OSfp fp0, fp2, fp4, fp6, fp8, fp10, fp12, fp14; - __OSfp fp16, fp18, fp20, fp22, fp24, fp26, fp28, fp30; -} __OSThreadContext; - -typedef struct -{ - u32 flag; - u32 count; - u64 time; -} __OSThreadprofile_s; - -typedef struct OSThread_s -{ - /*0x00*/ struct OSThread_s *next; - /*0x04*/ OSPri priority; - /*0x08*/ struct OSThread_s **queue; - /*0x0C*/ struct OSThread_s *tlnext; - /*0x10*/ u16 state; - /*0x12*/ u16 flags; - /*0x14*/ OSId id; - /*0x18*/ int fp; - /*0x1C*/ __OSThreadprofile_s *thprof; - /*0x20*/ __OSThreadContext context; -} OSThread; - - -/* Functions */ - -void osCreateThread(OSThread *thread, OSId id, void (*entry)(void *), - void *arg, void *sp, OSPri pri); -OSId osGetThreadId(OSThread *thread); -OSPri osGetThreadPri(OSThread *thread); -void osSetThreadPri(OSThread *thread, OSPri pri); -void osStartThread(OSThread *thread); -void osStopThread(OSThread *thread); - -#endif diff --git a/include/ultra64/os_vi.h b/include/ultra64/os_vi.h deleted file mode 100644 index b8d66a9a05..0000000000 --- a/include/ultra64/os_vi.h +++ /dev/null @@ -1,116 +0,0 @@ -#ifndef _ULTRA64_VI_H_ -#define _ULTRA64_VI_H_ - -/* Ultra64 Video Interface */ - - -/* Special Features */ -#define OS_VI_GAMMA_ON 0x0001 -#define OS_VI_GAMMA_OFF 0x0002 -#define OS_VI_GAMMA_DITHER_ON 0x0004 -#define OS_VI_GAMMA_DITHER_OFF 0x0008 -#define OS_VI_DIVOT_ON 0x0010 -#define OS_VI_DIVOT_OFF 0x0020 -#define OS_VI_DITHER_FILTER_ON 0x0040 -#define OS_VI_DITHER_FILTER_OFF 0x0080 - -#define OS_VI_GAMMA 0x08 -#define OS_VI_GAMMA_DITHER 0x04 -#define OS_VI_DIVOT 0x10 -#define OS_VI_DITHER_FILTER 0x10000 -#define OS_VI_UNK200 0x200 -#define OS_VI_UNK100 0x100 - - -/* Types */ - -typedef struct -{ - u32 ctrl; - u32 width; - u32 burst; - u32 vSync; - u32 hSync; - u32 leap; - u32 hStart; - u32 xScale; - u32 vCurrent; -} OSViCommonRegs; - -typedef struct -{ - u32 origin; - u32 yScale; - u32 vStart; - u32 vBurst; - u32 vIntr; -} OSViFieldRegs; - -typedef struct -{ - u8 type; - OSViCommonRegs comRegs; - OSViFieldRegs fldRegs[2]; -} OSViMode; - -typedef struct { - /* 0x0 */ f32 factor; - /* 0x4 */ u16 offset; - /* 0x8 */ u32 scale; -} __OSViScale; - -typedef struct -{ - /* 0x00 */ u16 state; - /* 0x02 */ u16 retraceCount; - /* 0x04 */ void* buffer; - /* 0x08 */ OSViMode *modep; - /* 0x0c */ u32 features; - /* 0x10 */ OSMesgQueue *mq; - /* 0x14 */ OSMesg *msg; - /* 0x18 */ __OSViScale x; - /* 0x24 */ __OSViScale y; -} OSViContext; - -void osCreateViManager(OSPri pri); -void osViSetMode(OSViMode *mode); -void osViSetEvent(OSMesgQueue *mq, OSMesg msg, u32 retraceCount); -void osViBlack(u8 active); -void osViSetSpecialFeatures(u32 func); -void osViSwapBuffer(void *vaddr); - - -#define OS_VI_NTSC_LPN1 0 /* NTSC */ -#define OS_VI_NTSC_LPF1 1 -#define OS_VI_NTSC_LAN1 2 -#define OS_VI_NTSC_LAF1 3 -#define OS_VI_NTSC_LPN2 4 -#define OS_VI_NTSC_LPF2 5 -#define OS_VI_NTSC_LAN2 6 -#define OS_VI_NTSC_LAF2 7 -#define OS_VI_NTSC_HPN1 8 -#define OS_VI_NTSC_HPF1 9 -#define OS_VI_NTSC_HAN1 10 -#define OS_VI_NTSC_HAF1 11 -#define OS_VI_NTSC_HPN2 12 -#define OS_VI_NTSC_HPF2 13 - -#define OS_VI_PAL_LPN1 14 /* PAL */ -#define OS_VI_PAL_LPF1 15 -#define OS_VI_PAL_LAN1 16 -#define OS_VI_PAL_LAF1 17 -#define OS_VI_PAL_LPN2 18 -#define OS_VI_PAL_LPF2 19 -#define OS_VI_PAL_LAN2 20 -#define OS_VI_PAL_LAF2 21 -#define OS_VI_PAL_HPN1 22 -#define OS_VI_PAL_HPF1 23 -#define OS_VI_PAL_HAN1 24 -#define OS_VI_PAL_HAF1 25 -#define OS_VI_PAL_HPN2 26 -#define OS_VI_PAL_HPF2 27 - -extern OSViMode osViModeTable[]; /* Global VI mode table */ - - -#endif diff --git a/include/ultra64/pfs.h b/include/ultra64/pfs.h index d3d2928a1e..e86a2b738c 100644 --- a/include/ultra64/pfs.h +++ b/include/ultra64/pfs.h @@ -1,19 +1,19 @@ #ifndef _ULTRA64_PFS_H_ #define _ULTRA64_PFS_H_ -#include +#include "ultra64.h" /* File System size */ -#define OS_PFS_VERSION 0x0200 -#define OS_PFS_VERSION_HI (OS_PFS_VERSION >> 8) -#define OS_PFS_VERSION_LO (OS_PFS_VERSION & 255) +#define OS_PFS_VERSION 0x0200 +#define OS_PFS_VERSION_HI (OS_PFS_VERSION >> 8) +#define OS_PFS_VERSION_LO (OS_PFS_VERSION & 255) -#define PFS_INODE_SIZE_PER_PAGE 128 +#define PFS_INODE_SIZE_PER_PAGE 128 #define PFS_FILE_NAME_LEN 16 #define PFS_FILE_EXT_LEN 4 -#define BLOCKSIZE 32 -#define PFS_ONE_PAGE 8 -#define PFS_MAX_BANKS 62 +#define BLOCKSIZE 32 +#define PFS_ONE_PAGE 8 +#define PFS_MAX_BANKS 62 /* File System flag */ @@ -22,40 +22,40 @@ #define PFS_CREATE 2 /* File System status */ -#define PFS_INITIALIZED 0x1 -#define PFS_CORRUPTED 0x2 -#define PFS_ID_BROKEN 0x4 -#define PFS_MOTOR_INITIALIZED 0x8 -#define PFS_GBPAK_INITIALIZED 0x10 +#define PFS_INITIALIZED 0x1 +#define PFS_CORRUPTED 0x2 +#define PFS_ID_BROKEN 0x4 +#define PFS_MOTOR_INITIALIZED 0x8 +#define PFS_GBPAK_INITIALIZED 0x10 /* Definition for page usage */ -#define PFS_EOF 1 -#define PFS_PAGE_NOT_EXIST 2 -#define PFS_PAGE_NOT_USED 3 +#define PFS_EOF 1 +#define PFS_PAGE_NOT_EXIST 2 +#define PFS_PAGE_NOT_USED 3 /* File System error number */ -#define PFS_ERR_NOPACK 1 /* no memory card is plugged or */ -#define PFS_ERR_NEW_PACK 2 /* ram pack has been changed to a different one */ -#define PFS_ERR_INCONSISTENT 3 /* need to run Pfschecker*/ -#define PFS_ERR_CONTRFAIL CONT_OVERRUN_ERROR -#define PFS_ERR_INVALID 5 /* invalid parameter or file not exist*/ -#define PFS_ERR_BAD_DATA 6 /* the data read from pack are bad*/ -#define PFS_DATA_FULL 7 /* no free pages on ram pack*/ -#define PFS_DIR_FULL 8 /* no free directories on ram pack*/ -#define PFS_ERR_EXIST 9 /* file exists*/ -#define PFS_ERR_ID_FATAL 10 /* dead ram pack */ -#define PFS_ERR_DEVICE 11 /* wrong device type*/ -#define PFS_ERR_NO_GBCART 12 /* no gb cartridge (64GB-PAK) */ -#define PFS_ERR_NEW_GBCART 13 /* gb cartridge may be changed */ +#define PFS_ERR_NOPACK 1 /* no memory card is plugged or */ +#define PFS_ERR_NEW_PACK 2 /* ram pack has been changed to a different one */ +#define PFS_ERR_INCONSISTENT 3 /* need to run Pfschecker*/ +#define PFS_ERR_CONTRFAIL CONT_OVERRUN_ERROR +#define PFS_ERR_INVALID 5 /* invalid parameter or file not exist*/ +#define PFS_ERR_BAD_DATA 6 /* the data read from pack are bad*/ +#define PFS_DATA_FULL 7 /* no free pages on ram pack*/ +#define PFS_DIR_FULL 8 /* no free directories on ram pack*/ +#define PFS_ERR_EXIST 9 /* file exists*/ +#define PFS_ERR_ID_FATAL 10 /* dead ram pack */ +#define PFS_ERR_DEVICE 11 /* wrong device type*/ +#define PFS_ERR_NO_GBCART 12 /* no gb cartridge (64GB-PAK) */ +#define PFS_ERR_NEW_GBCART 13 /* gb cartridge may be changed */ /* Definition for bank */ -#define PFS_ID_BANK_256K 0 -#define PFS_ID_BANK_1M 4 -#define PFS_BANKS_256K 1 +#define PFS_ID_BANK_256K 0 +#define PFS_ID_BANK_1M 4 +#define PFS_BANKS_256K 1 -#define PFS_WRITTEN 2 -#define DEF_DIR_PAGES 2 +#define PFS_WRITTEN 2 +#define DEF_DIR_PAGES 2 #define PFS_ID_0AREA 1 #define PFS_ID_1AREA 3 @@ -64,74 +64,74 @@ #define PFS_LABEL_AREA 7 #define PFS_ID_PAGE PFS_ONE_PAGE * 0 -#define PFS_BANK_LAPPED_BY 8 /* => u8 */ -#define PFS_SECTOR_PER_BANK 32 -#define PFS_INODE_DIST_MAP (PFS_BANK_LAPPED_BY * PFS_SECTOR_PER_BANK) -#define PFS_SECTOR_SIZE (PFS_INODE_SIZE_PER_PAGE/PFS_SECTOR_PER_BANK) +#define PFS_BANK_LAPPED_BY 8 /* => u8 */ +#define PFS_SECTOR_PER_BANK 32 +#define PFS_INODE_DIST_MAP (PFS_BANK_LAPPED_BY * PFS_SECTOR_PER_BANK) +#define PFS_SECTOR_SIZE (PFS_INODE_SIZE_PER_PAGE/PFS_SECTOR_PER_BANK) typedef struct { - int status; - OSMesgQueue* queue; - int channel; - u8 id[32]; - u8 label[32]; - int version; - int dir_size; - int inode_table; /* block location */ - int minode_table; /* mirrioring inode_table */ - int dir_table; /* block location */ - int inodeStartPage; /* page # */ - u8 banks; - u8 activebank; -} OSPfs; + /* 0x00 */ s32 status; + /* 0x04 */ OSMesgQueue* queue; + /* 0x08 */ s32 channel; + /* 0x0C */ u8 id[32]; + /* 0x2C */ u8 label[32]; + /* 0x4C */ s32 version; + /* 0x50 */ s32 dir_size; + /* 0x54 */ s32 inode_table; /* block location */ + /* 0x58 */ s32 minode_table; /* mirrioring inode_table */ + /* 0x5C */ s32 dir_table; /* block location */ + /* 0x60 */ s32 inodeStartPage; /* page # */ + /* 0x64 */ u8 banks; + /* 0x65 */ u8 activebank; +} OSPfs; // size = 0x68 typedef struct { - u32 file_size; /* bytes */ - u32 game_code; - u16 company_code; - char ext_name[4]; - char game_name[16]; -} OSPfsState; + /* 0x00 */ u32 file_size; /* bytes */ + /* 0x04 */ u32 game_code; + /* 0x08 */ u16 company_code; + /* 0x0C */ char ext_name[4]; + /* 0x10 */ char game_name[16]; +} OSPfsState; // size = 0x20 typedef union { - struct { - u8 bank; - u8 page; - } inode_t; - u16 ipage; -} __OSInodeUnit; + struct { + /* 0x00 */ u8 bank; + /* 0x01 */ u8 page; + } inode_t; + /* 0x00 */ u16 ipage; +} __OSInodeUnit; // size = 0x02 typedef struct { - __OSInodeUnit inodePage[128]; -} __OSInode; + /* 0x00 */ __OSInodeUnit inodePage[128]; +} __OSInode; // size = 0x100 typedef struct { - u32 game_code; - u16 company_code; - __OSInodeUnit start_page; - u8 status; - s8 reserved; - u16 data_sum; - u8 ext_name[PFS_FILE_EXT_LEN]; - u8 game_name[PFS_FILE_NAME_LEN]; -} __OSDir; + /* 0x00 */ u32 game_code; + /* 0x04 */ u16 company_code; + /* 0x06 */ __OSInodeUnit start_page; + /* 0x08 */ u8 status; + /* 0x09 */ s8 reserved; + /* 0x0A */ u16 data_sum; + /* 0x0C */ u8 ext_name[PFS_FILE_EXT_LEN]; + /* 0x10 */ u8 game_name[PFS_FILE_NAME_LEN]; +} __OSDir; // size = 0x20 typedef struct { - u32 repaired; - u32 random; - u64 serialMid; - u64 serialLow; - u16 deviceid; - u8 banks; - u8 version; - u16 checksum; - u16 invertedChecksum; -} __OSPackId; + /* 0x00 */ u32 repaired; + /* 0x04 */ u32 random; + /* 0x08 */ u64 serialMid; + /* 0x10 */ u64 serialLow; + /* 0x18 */ u16 deviceid; + /* 0x1A */ u8 banks; + /* 0x1B */ u8 version; + /* 0x1C */ u16 checksum; + /* 0x1E */ u16 invertedChecksum; +} __OSPackId; // size = 0x20 -typedef struct { - __OSInode inode; - u8 bank; - u8 map[PFS_INODE_DIST_MAP]; -} __OSInodeCache; +typedef struct { + /* 0x000 */ __OSInode inode; + /* 0x100 */ u8 bank; + /* 0x101 */ u8 map[PFS_INODE_DIST_MAP]; +} __OSInodeCache; // size = 0x202 #endif diff --git a/include/ultra64/pi.h b/include/ultra64/pi.h new file mode 100644 index 0000000000..d28dbc12d3 --- /dev/null +++ b/include/ultra64/pi.h @@ -0,0 +1,63 @@ +#ifndef _ULTRA64_PI_H_ +#define _ULTRA64_PI_H_ + +typedef struct { + /* 0x00 */ u32 errStatus; + /* 0x04 */ void* dramAddr; + /* 0x08 */ void* C2Addr; + /* 0x0C */ u32 sectorSize; + /* 0x10 */ u32 C1ErrNum; + /* 0x14 */ u32 C1ErrSector[4]; +} __OSBlockInfo; // size = 0x24 + +typedef struct { + /* 0x00 */ u32 cmdType; + /* 0x04 */ u16 transferMode; + /* 0x06 */ u16 blockNum; + /* 0x08 */ s32 sectorNum; + /* 0x0C */ u32 devAddr; + /* 0x10 */ u32 bmCtlShadow; + /* 0x14 */ u32 seqCtlShadow; + /* 0x18 */ __OSBlockInfo block[2]; +} __OSTranxInfo; // size = 0x60 + +typedef struct OSPiHandle { + /* 0x00 */ struct OSPiHandle* next; + /* 0x04 */ u8 type; + /* 0x05 */ u8 latency; + /* 0x06 */ u8 pageSize; + /* 0x07 */ u8 relDuration; + /* 0x08 */ u8 pulse; + /* 0x09 */ u8 domain; + /* 0x0C */ u32 baseAddress; + /* 0x10 */ u32 speed; + /* 0x14 */ __OSTranxInfo transferInfo; +} OSPiHandle; // size = 0x74 + +typedef struct { + /* 0x00 */ u8 type; + /* 0x04 */ u32 address; +} OSPiInfo; // size = 0x08 + +typedef struct { + /* 0x00 */ u16 type; + /* 0x02 */ u8 pri; + /* 0x03 */ u8 status; + /* 0x04 */ OSMesgQueue* retQueue; +} OSIoMesgHdr; // size = 0x08 + +typedef struct { + /* 0x00 */ OSIoMesgHdr hdr; + /* 0x08 */ void* dramAddr; + /* 0x0C */ u32 devAddr; + /* 0x10 */ size_t size; + /* 0x14 */ OSPiHandle* piHandle; +} OSIoMesg; // size = 0x18 + +#define OS_READ 0 // device -> RDRAM +#define OS_WRITE 1 // device <- RDRAM + +#define OS_MESG_PRI_NORMAL 0 +#define OS_MESG_PRI_HIGH 1 + +#endif diff --git a/include/ultra64/printf.h b/include/ultra64/printf.h index 6f4738addc..23718012a5 100644 --- a/include/ultra64/printf.h +++ b/include/ultra64/printf.h @@ -1,6 +1,6 @@ -#ifndef _PRINTF_H_ -#define _PRINTF_H_ -#include +#ifndef _ULTRA64_PRINTF_H_ +#define _ULTRA64_PRINTF_H_ +#include "stdarg.h" typedef struct { /* 0x0 */ union { @@ -19,7 +19,7 @@ typedef struct { /* 0x2C */ u32 nchar; /* 0x30 */ u32 flags; /* 0x34 */ u8 qual; -} _Pft; +} _Pft; // size = 0x38 #define FLAGS_SPACE 1 #define FLAGS_PLUS 2 @@ -27,8 +27,4 @@ typedef struct { #define FLAGS_HASH 8 #define FLAGS_ZERO 16 -s32 _Printf(char *(*prout)(char *, const char *, size_t), char *dst, const char *fmt, va_list args); -void _Litob(_Pft *args, u8 type); -void _Ldtob(_Pft *args, u8 type); - #endif diff --git a/include/ultra64/rcp.h b/include/ultra64/rcp.h index 29b652387a..6bd778ccfa 100644 --- a/include/ultra64/rcp.h +++ b/include/ultra64/rcp.h @@ -1,14 +1,14 @@ #ifndef _ULTRA64_RCP_H_ #define _ULTRA64_RCP_H_ -#define VI_NTSC_CLOCK 48681812 /* Hz = 48.681812 MHz */ -#define VI_PAL_CLOCK 49656530 /* Hz = 49.656530 MHz */ -#define VI_MPAL_CLOCK 48628316 /* Hz = 48.628316 MHz */ +#define VI_NTSC_CLOCK 48681812 /* Hz = 48.681812 MHz */ +#define VI_PAL_CLOCK 49656530 /* Hz = 49.656530 MHz */ +#define VI_MPAL_CLOCK 48628316 /* Hz = 48.628316 MHz */ -#define DEVICE_TYPE_CART 0 /* ROM cartridge */ -#define DEVICE_TYPE_BULK 1 /* ROM bulk */ -#define DEVICE_TYPE_64DD 2 /* 64 Disk Drive */ -#define DEVICE_TYPE_SRAM 3 /* SRAM */ -#define DEVICE_TYPE_INIT 7 /* initial value */ +#define DEVICE_TYPE_CART 0 /* ROM cartridge */ +#define DEVICE_TYPE_BULK 1 /* ROM bulk */ +#define DEVICE_TYPE_64DD 2 /* 64 Disk Drive */ +#define DEVICE_TYPE_SRAM 3 /* SRAM */ +#define DEVICE_TYPE_INIT 7 /* initial value */ #endif diff --git a/include/ultra64/rdp.h b/include/ultra64/rdp.h index 95bfc4884c..25aad6f9b3 100644 --- a/include/ultra64/rdp.h +++ b/include/ultra64/rdp.h @@ -5,54 +5,48 @@ #define DPC_REG_BASE 0xA4100000 -#define DPC_START_REG (*(vu32 *)(DPC_REG_BASE + 0x00)) -#define DPC_END_REG (*(vu32 *)(DPC_REG_BASE + 0x04)) -#define DPC_CURRENT_REG (*(vu32 *)(DPC_REG_BASE + 0x08)) -#define DPC_STATUS_REG (*(vu32 *)(DPC_REG_BASE + 0x0C)) -#define DPC_CLOCK_REG (*(vu32 *)(DPC_REG_BASE + 0x10)) -#define DPC_BUFBUSY_REG (*(vu32 *)(DPC_REG_BASE + 0x14)) -#define DPC_PIPEBUSY_REG (*(vu32 *)(DPC_REG_BASE + 0x18)) -#define DPC_TMEM_REG (*(vu32 *)(DPC_REG_BASE + 0x1C)) +#define DPC_START_REG (*(vu32*)(DPC_REG_BASE + 0x00)) +#define DPC_END_REG (*(vu32*)(DPC_REG_BASE + 0x04)) +#define DPC_CURRENT_REG (*(vu32*)(DPC_REG_BASE + 0x08)) +#define DPC_STATUS_REG (*(vu32*)(DPC_REG_BASE + 0x0C)) +#define DPC_CLOCK_REG (*(vu32*)(DPC_REG_BASE + 0x10)) +#define DPC_BUFBUSY_REG (*(vu32*)(DPC_REG_BASE + 0x14)) +#define DPC_PIPEBUSY_REG (*(vu32*)(DPC_REG_BASE + 0x18)) +#define DPC_TMEM_REG (*(vu32*)(DPC_REG_BASE + 0x1C)) /* DP Span Registers */ #define DPS_REG_BASE 0xA4200000 -#define DPS_TBIST_REG (*(vu32 *)(DPS_REG_BASE + 0x00)) -#define DPS_TEST_MODE_REG (*(vu32 *)(DPS_REG_BASE + 0x04)) -#define DPS_BUFTEST_ADDR_REG (*(vu32 *)(DPS_REG_BASE + 0x08)) -#define DPS_BUFTEST_DATA_REG (*(vu32 *)(DPS_REG_BASE + 0x0C)) +#define DPS_TBIST_REG (*(vu32*)(DPS_REG_BASE + 0x00)) +#define DPS_TEST_MODE_REG (*(vu32*)(DPS_REG_BASE + 0x04)) +#define DPS_BUFTEST_ADDR_REG (*(vu32*)(DPS_REG_BASE + 0x08)) +#define DPS_BUFTEST_DATA_REG (*(vu32*)(DPS_REG_BASE + 0x0C)) /* DP Status Read Flags */ -#define DPC_STATUS_XBUS_DMEM_DMA 0x001 -#define DPC_STATUS_FREEZE 0x002 -#define DPC_STATUS_FLUSH 0x004 -#define DPC_STATUS_START_GCLK 0x008 -#define DPC_STATUS_TMEM_BUSY 0x010 -#define DPC_STATUS_PIPE_BUSY 0x020 -#define DPC_STATUS_CMD_BUSY 0x040 -#define DPC_STATUS_CBUF_READY 0x080 -#define DPC_STATUS_DMA_BUSY 0x100 -#define DPC_STATUS_END_VALID 0x200 -#define DPC_STATUS_START_VALID 0x400 +#define DPC_STATUS_XBUS_DMEM_DMA 0x001 +#define DPC_STATUS_FREEZE 0x002 +#define DPC_STATUS_FLUSH 0x004 +#define DPC_STATUS_START_GCLK 0x008 +#define DPC_STATUS_TMEM_BUSY 0x010 +#define DPC_STATUS_PIPE_BUSY 0x020 +#define DPC_STATUS_CMD_BUSY 0x040 +#define DPC_STATUS_CBUF_READY 0x080 +#define DPC_STATUS_DMA_BUSY 0x100 +#define DPC_STATUS_END_VALID 0x200 +#define DPC_STATUS_START_VALID 0x400 /* DP Status Write Flags */ -#define DPC_CLR_XBUS_DMEM_DMA 0x0001 -#define DPC_SET_XBUS_DMEM_DMA 0x0002 -#define DPC_CLR_FREEZE 0x0004 -#define DPC_SET_FREEZE 0x0008 -#define DPC_CLR_FLUSH 0x0010 -#define DPC_SET_FLUSH 0x0020 -#define DPC_CLR_TMEM_CTR 0x0040 -#define DPC_CLR_PIPE_CTR 0x0080 -#define DPC_CLR_CMD_CTR 0x0100 -#define DPC_CLR_CLOCK_CTR 0x0200 - - -/* Functions */ - -u32 osDpGetStatus(void); -void osDpSetStatus(u32 status); +#define DPC_CLR_XBUS_DMEM_DMA 0x0001 +#define DPC_SET_XBUS_DMEM_DMA 0x0002 +#define DPC_CLR_FREEZE 0x0004 +#define DPC_SET_FREEZE 0x0008 +#define DPC_CLR_FLUSH 0x0010 +#define DPC_SET_FLUSH 0x0020 +#define DPC_CLR_TMEM_CTR 0x0040 +#define DPC_CLR_PIPE_CTR 0x0080 +#define DPC_CLR_CMD_CTR 0x0100 +#define DPC_CLR_CLOCK_CTR 0x0200 #endif diff --git a/include/ultra64/rsp.h b/include/ultra64/rsp.h index 002a0c4cc7..bc70ed938b 100644 --- a/include/ultra64/rsp.h +++ b/include/ultra64/rsp.h @@ -12,39 +12,39 @@ #define SP_STATUS_YIELD 0x080 #define SP_STATUS_YIELDED 0x100 #define SP_STATUS_TASKDONE 0x200 -//#define SP_STATUS_SIG0 0x080 -//#define SP_STATUS_SIG1 0x100 -//#define SP_STATUS_SIG2 0x200 +//#define SP_STATUS_SIG0 0x080 +//#define SP_STATUS_SIG1 0x100 +//#define SP_STATUS_SIG2 0x200 #define SP_STATUS_SIG3 0x400 #define SP_STATUS_SIG4 0x800 #define SP_STATUS_SIG5 0x1000 #define SP_STATUS_SIG6 0x2000 #define SP_STATUS_SIG7 0x4000 -#define SP_CLR_HALT 0x00001 -#define SP_SET_HALT 0x00002 -#define SP_CLR_BROKE 0x00004 -#define SP_CLR_INTR 0x00008 -#define SP_SET_INTR 0x00010 -#define SP_CLR_SSTEP 0x00020 -#define SP_SET_SSTEP 0x00040 -#define SP_CLR_INTR_BREAK 0x00080 -#define SP_SET_INTR_BREAK 0x00100 -#define SP_CLR_SIG0 0x00200 -#define SP_SET_SIG0 0x00400 -#define SP_CLR_SIG1 0x00800 -#define SP_SET_SIG1 0x01000 -#define SP_CLR_SIG2 0x02000 -#define SP_SET_SIG2 0x04000 -#define SP_CLR_SIG3 0x08000 -#define SP_SET_SIG3 0x10000 -#define SP_CLR_SIG4 0x20000 -#define SP_SET_SIG4 0x40000 -#define SP_CLR_SIG5 0x80000 -#define SP_SET_SIG5 0x100000 -#define SP_CLR_SIG6 0x200000 -#define SP_SET_SIG6 0x400000 -#define SP_CLR_SIG7 0x800000 -#define SP_SET_SIG7 0x1000000 +#define SP_CLR_HALT 0x00001 +#define SP_SET_HALT 0x00002 +#define SP_CLR_BROKE 0x00004 +#define SP_CLR_INTR 0x00008 +#define SP_SET_INTR 0x00010 +#define SP_CLR_SSTEP 0x00020 +#define SP_SET_SSTEP 0x00040 +#define SP_CLR_INTR_BREAK 0x00080 +#define SP_SET_INTR_BREAK 0x00100 +#define SP_CLR_SIG0 0x00200 +#define SP_SET_SIG0 0x00400 +#define SP_CLR_SIG1 0x00800 +#define SP_SET_SIG1 0x01000 +#define SP_CLR_SIG2 0x02000 +#define SP_SET_SIG2 0x04000 +#define SP_CLR_SIG3 0x08000 +#define SP_SET_SIG3 0x10000 +#define SP_CLR_SIG4 0x20000 +#define SP_SET_SIG4 0x40000 +#define SP_CLR_SIG5 0x80000 +#define SP_SET_SIG5 0x100000 +#define SP_CLR_SIG6 0x200000 +#define SP_SET_SIG6 0x400000 +#define SP_CLR_SIG7 0x800000 +#define SP_SET_SIG7 0x1000000 #endif diff --git a/include/ultra64/sptask.h b/include/ultra64/sptask.h index 9d74566a89..90a9626bb9 100644 --- a/include/ultra64/sptask.h +++ b/include/ultra64/sptask.h @@ -2,9 +2,11 @@ #define _ULTRA64_SPTASK_H_ /* Task Types */ +#define M_NULTASK 0 #define M_GFXTASK 1 #define M_AUDTASK 2 #define M_VIDTASK 3 +#define M_NJPEGTASK 4 #define M_HVQTASK 6 #define M_HVQMTASK 7 @@ -24,10 +26,7 @@ #define OS_YIELD_DATA_SIZE 0xC00 -/* Types */ - -typedef struct -{ +typedef struct { /* 0x00 */ u32 type; /* 0x04 */ u32 flags; @@ -61,15 +60,8 @@ typedef union typedef u32 OSYieldResult; -/* Functions */ - #define osSpTaskStart(p) \ osSpTaskLoad(p); \ osSpTaskStartGo(p); -void osSpTaskLoad(OSTask *task); -void osSpTaskStartGo(OSTask *task); -void osSpTaskYield(void); -OSYieldResult osSpTaskYielded(OSTask *task); - #endif diff --git a/include/ultra64/thread.h b/include/ultra64/thread.h index 962f0269a2..bea9dc8c96 100644 --- a/include/ultra64/thread.h +++ b/include/ultra64/thread.h @@ -1,57 +1,59 @@ #ifndef _ULTRA64_THREAD_H_ #define _ULTRA64_THREAD_H_ -/* Types */ +#define OS_PRIORITY_MAX 255 +#define OS_PRIORITY_VIMGR 254 +#define OS_PRIORITY_RMON 250 +#define OS_PRIORITY_RMONSPIN 200 +#define OS_PRIORITY_PIMGR 150 +#define OS_PRIORITY_SIMGR 140 +#define OS_PRIORITY_APPMAX 127 +#define OS_PRIORITY_IDLE 0 + +#define OS_STATE_STOPPED 1 +#define OS_STATE_RUNNABLE 2 +#define OS_STATE_RUNNING 4 +#define OS_STATE_WAITING 8 typedef s32 OSPri; typedef s32 OSId; -typedef union -{ - struct {f32 f_odd; f32 f_even;} f; -} __OSfp; +typedef union { + struct { + /* 0x00 */ f32 f_odd; + /* 0x04 */ f32 f_even; + } f; +} __OSfp; // size = 0x08 -typedef struct -{ - /* registers */ - /*0x20*/ u64 at, v0, v1, a0, a1, a2, a3; - /*0x58*/ u64 t0, t1, t2, t3, t4, t5, t6, t7; - /*0x98*/ u64 s0, s1, s2, s3, s4, s5, s6, s7; - /*0xD8*/ u64 t8, t9, gp, sp, s8, ra; - /*0x108*/ u64 lo, hi; - /*0x118*/ u32 sr, pc, cause, badvaddr, rcp; - /*0x12C*/ u32 fpcsr; - __OSfp fp0, fp2, fp4, fp6, fp8, fp10, fp12, fp14; - __OSfp fp16, fp18, fp20, fp22, fp24, fp26, fp28, fp30; -} __OSThreadContext; +typedef struct { + /* 0x000 */ u64 at, v0, v1, a0, a1, a2, a3; + /* 0x038 */ u64 t0, t1, t2, t3, t4, t5, t6, t7; + /* 0x078 */ u64 s0, s1, s2, s3, s4, s5, s6, s7; + /* 0x0B8 */ u64 t8, t9, gp, sp, s8, ra; + /* 0x0E8 */ u64 lo, hi; + /* 0x0F8 */ u32 sr, pc, cause, badvaddr, rcp; + /* 0x10C */ u32 fpcsr; + /* 0x110 */ __OSfp fp0, fp2, fp4, fp6, fp8, fp10, fp12, fp14; + /* 0x150 */ __OSfp fp16, fp18, fp20, fp22, fp24, fp26, fp28, fp30; +} __OSThreadContext; // size = 0x190 -typedef struct -{ - u32 flag; - u32 count; - u64 time; -} __OSThreadprofile_s; +typedef struct { + /* 0x00 */ u32 flag; + /* 0x04 */ u32 count; + /* 0x08 */ u64 time; +} __OSThreadprofile; // size = 0x10 -typedef struct OSThread_s -{ - /*0x00*/ struct OSThread_s *next; +typedef struct OSThread { + /*0x00*/ struct OSThread* next; /*0x04*/ OSPri priority; - /*0x08*/ struct OSThread_s **queue; - /*0x0C*/ struct OSThread_s *tlnext; + /*0x08*/ struct OSThread** queue; + /*0x0C*/ struct OSThread* tlnext; /*0x10*/ u16 state; /*0x12*/ u16 flags; /*0x14*/ OSId id; - /*0x18*/ int fp; - /*0x1C*/ __OSThreadprofile_s *thprof; + /*0x18*/ s32 fp; + /*0x1C*/ __OSThreadprofile* thprof; /*0x20*/ __OSThreadContext context; -} OSThread; - - -/* Functions */ - -OSId osGetThreadId(OSThread *thread); -OSPri osGetThreadPri(OSThread *thread); -void osStartThread(OSThread *thread); -void osStopThread(OSThread *thread); +} OSThread; // size = 0x1B0 #endif diff --git a/include/ultra64/time.h b/include/ultra64/time.h index ddce900b7e..8f2b7ce720 100644 --- a/include/ultra64/time.h +++ b/include/ultra64/time.h @@ -1,28 +1,17 @@ #ifndef _ULTRA64_TIME_H_ #define _ULTRA64_TIME_H_ -#include - -/* Types */ +#include "ultra64/message.h" typedef u64 OSTime; -typedef struct OSTimer_s -{ - struct OSTimer_s *next; - struct OSTimer_s *prev; - OSTime interval; - OSTime value; - OSMesgQueue *mq; - OSMesg msg; -} OSTimer; - - -/* Functions */ - -OSTime osGetTime(void); - -int osSetTimer(OSTimer *timer, OSTime countdown, OSTime interval, OSMesgQueue *mq, OSMesg msg); -s32 osStopTimer(OSTimer *timer); +typedef struct OSTimer { + /* 0x00 */ struct OSTimer* next; + /* 0x04 */ struct OSTimer* prev; + /* 0x08 */ OSTime interval; + /* 0x10 */ OSTime value; + /* 0x18 */ OSMesgQueue* mq; + /* 0x1C */ OSMesg msg; +} OSTimer; // size = 0x20 #endif diff --git a/include/ultra64/vi.h b/include/ultra64/vi.h new file mode 100644 index 0000000000..b2a84840ea --- /dev/null +++ b/include/ultra64/vi.h @@ -0,0 +1,95 @@ +#ifndef _ULTRA64_VI_H_ +#define _ULTRA64_VI_H_ + +/* Special Features */ +#define OS_VI_GAMMA_ON 0x0001 +#define OS_VI_GAMMA_OFF 0x0002 +#define OS_VI_GAMMA_DITHER_ON 0x0004 +#define OS_VI_GAMMA_DITHER_OFF 0x0008 +#define OS_VI_DIVOT_ON 0x0010 +#define OS_VI_DIVOT_OFF 0x0020 +#define OS_VI_DITHER_FILTER_ON 0x0040 +#define OS_VI_DITHER_FILTER_OFF 0x0080 + +#define OS_VI_GAMMA 0x08 +#define OS_VI_GAMMA_DITHER 0x04 +#define OS_VI_DIVOT 0x10 +#define OS_VI_DITHER_FILTER 0x10000 +#define OS_VI_UNK200 0x200 +#define OS_VI_UNK100 0x100 + +typedef struct { + /* 0x00 */ u32 ctrl; + /* 0x04 */ u32 width; + /* 0x08 */ u32 burst; + /* 0x0C */ u32 vSync; + /* 0x10 */ u32 hSync; + /* 0x14 */ u32 leap; + /* 0x18 */ u32 hStart; + /* 0x1C */ u32 xScale; + /* 0x20 */ u32 vCurrent; +} OSViCommonRegs; // size = 0x20 + +typedef struct { + /* 0x00 */ u32 origin; + /* 0x04 */ u32 yScale; + /* 0x08 */ u32 vStart; + /* 0x0C */ u32 vBurst; + /* 0x10 */ u32 vIntr; +} OSViFieldRegs; // size = 0x14 + +typedef struct { + /* 0x00 */ u8 type; + /* 0x04 */ OSViCommonRegs comRegs; + /* 0x24 */ OSViFieldRegs fldRegs[2]; +} OSViMode; // size = 0x4C + +typedef struct { + /* 0x0 */ f32 factor; + /* 0x4 */ u16 offset; + /* 0x8 */ u32 scale; +} __OSViScale; // size = 0x0C + +typedef struct { + /* 0x00 */ u16 state; + /* 0x02 */ u16 retraceCount; + /* 0x04 */ void* buffer; + /* 0x08 */ OSViMode* modep; + /* 0x0c */ u32 features; + /* 0x10 */ OSMesgQueue* mq; + /* 0x14 */ OSMesg* msg; + /* 0x18 */ __OSViScale x; + /* 0x24 */ __OSViScale y; +} OSViContext; // size = 0x30 + +#define OS_VI_NTSC_LPN1 0 /* NTSC */ +#define OS_VI_NTSC_LPF1 1 +#define OS_VI_NTSC_LAN1 2 +#define OS_VI_NTSC_LAF1 3 +#define OS_VI_NTSC_LPN2 4 +#define OS_VI_NTSC_LPF2 5 +#define OS_VI_NTSC_LAN2 6 +#define OS_VI_NTSC_LAF2 7 +#define OS_VI_NTSC_HPN1 8 +#define OS_VI_NTSC_HPF1 9 +#define OS_VI_NTSC_HAN1 10 +#define OS_VI_NTSC_HAF1 11 +#define OS_VI_NTSC_HPN2 12 +#define OS_VI_NTSC_HPF2 13 + +#define OS_VI_PAL_LPN1 14 /* PAL */ +#define OS_VI_PAL_LPF1 15 +#define OS_VI_PAL_LAN1 16 +#define OS_VI_PAL_LAF1 17 +#define OS_VI_PAL_LPN2 18 +#define OS_VI_PAL_LPF2 19 +#define OS_VI_PAL_LAN2 20 +#define OS_VI_PAL_LAF2 21 +#define OS_VI_PAL_HPN1 22 +#define OS_VI_PAL_HPF1 23 +#define OS_VI_PAL_HAN1 24 +#define OS_VI_PAL_HAF1 25 +#define OS_VI_PAL_HPN2 26 +#define OS_VI_PAL_HPF2 27 + +#endif diff --git a/include/variables.h b/include/variables.h index c13400a679..135d5c2e7a 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,8 +1,8 @@ #ifndef _VARIABLES_H_ #define _VARIABLES_H_ -#include -#include +#include "z64.h" +#include "segment_symbols.h" extern u8 D_02000000[]; extern u8 D_02000400[]; @@ -90,7 +90,7 @@ extern u8 D_800093F0[]; extern s8 D_80009430; extern u32 D_80009460; extern u32 gDmaMgrDmaBuffSize; -extern volatile u8 gViConfigUseDefault; +extern vu8 gViConfigUseDefault; extern u8 gViConfigAdditionalScanLines; extern u32 gViConfigFeatures; extern f32 gViConfigXScale; @@ -103,13 +103,11 @@ extern u64 osClockRate; extern s32 osViClock; extern u32 __osShutdown; extern u32 __OSGlobalIntMask; -extern __osHwInt __osHwIntTable[]; extern OSThread* __osThreadTail[]; -extern OSThread *__osRunQueue; -extern OSThread *__osActiveQueue; -extern OSThread *__osRunningThread; +extern OSThread* __osRunQueue; +extern OSThread* __osActiveQueue; +extern OSThread* __osRunningThread; extern OSThread* __osFaultedThread; -extern OSMgrArgs __osPiDevMgr; extern OSPiHandle* __osPiTable; extern OSPiHandle* __osCurrentHandle[]; extern OSTimer* __osTimerList; @@ -130,7 +128,6 @@ extern OSMesgQueue __osPiAccessQueue; extern OSPiHandle __Dom1SpeedParam; extern OSPiHandle __Dom2SpeedParam; extern OSThread __osThreadSave; -extern __OSEventState __osEventStateTab[]; extern OSTimer __osBaseTimer; extern OSTime __osCurrentTime; extern u32 __osBaseCounter; @@ -578,7 +575,7 @@ extern Mtx gMtxClear; extern MtxF gMtxFClear; extern u8 D_8012DBB0; extern u32 D_8012DBC0; -extern volatile u32 gIrqMgrResetStatus; +extern vu32 gIrqMgrResetStatus; extern volatile OSTime gIrqMgrRetraceTime; extern s32 gDebugArenaLogSeverity; //extern ? sUCodeDisasGeometryModes; diff --git a/include/z64.h b/include/z64.h index 16ae69cfd3..bd7cb633a7 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1,30 +1,29 @@ #ifndef _Z64_H_ #define _Z64_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ultra64.h" +#include "ultra64/gs2dex.h" +#include "z64light.h" +#include "z64actor.h" +#include "z64player.h" +#include "z64audio.h" +#include "z64object.h" +#include "z64cutscene.h" +#include "z64collision_check.h" +#include "z64scene.h" +#include "z64effect.h" +#include "z64item.h" +#include "z64animation.h" +#include "z64dma.h" +#include "z64math.h" +#include "z64transition.h" +#include "bgm.h" +#include "sfx.h" +#include "color.h" +#include "ichain.h" +#include "stdarg.h" +#include "stdlib.h" +#include "regs.h" #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 @@ -34,6 +33,14 @@ #define REGION_JP 2 #define REGION_EU 3 +#define Z_PRIORITY_MAIN 10 +#define Z_PRIORITY_GRAPH 11 +#define Z_PRIORITY_AUDIOMGR 12 +#define Z_PRIORITY_PADMGR 14 +#define Z_PRIORITY_SCHED 15 +#define Z_PRIORITY_DMAMGR 16 +#define Z_PRIORITY_IRQMGR 17 + // NOTE: Once we start supporting other builds, this can be changed with an ifdef #define REGION_NATIVE REGION_EU @@ -301,36 +308,10 @@ typedef struct GraphicsContext { } GraphicsContext; // size = 0x300 typedef struct { - PadInput in; - union { - u16 status; - struct { - u8 errno; - u8 statusLo; - }; - }; -} PadState; - -typedef struct -{ - /* 0x00 */ PadState cur; - /* 0x06 */ PadState prev; - /* 0x0C */ PadState press; // X/Y store delta from last frame - /* 0x12 */ PadState rel; // X/Y store adjusted - /* The old version of this struct is: - RawInput raw; - u16 status; - RawInput rawPrev; - u16 statusPrev; - u16 padPressed; - s8 xDiff; - s8 yDiff; - char unk_10[0x02]; - u16 padReleased; - s8 xAdjusted; - s8 yAdjusted; - char unk_16[0x02]; - */ + /* 0x00 */ OSContPad cur; + /* 0x06 */ OSContPad prev; + /* 0x0C */ OSContPad press; // X/Y store delta from last frame + /* 0x12 */ OSContPad rel; // X/Y store adjusted } Input; // size = 0x18 typedef struct { @@ -1624,16 +1605,16 @@ typedef struct { /* 0x0078 */ IrqMgr* irqMgr; /* 0x0080 */ OSThread thread; /* 0x0230 */ Input inputs[4]; - /* 0x0290 */ PadState pads[4]; - /* 0x02A8 */ volatile u8 validCtrlrsMask; + /* 0x0290 */ OSContPad pads[4]; + /* 0x02A8 */ vu8 validCtrlrsMask; /* 0x02A9 */ u8 ncontrollers; /* 0x02AA */ u8 ctrlrIsConnected[4]; // "Key_switch" originally /* 0x02AE */ u8 pakType[4]; // 1 if rumble pack, 2 if mempak? - /* 0x02B2 */ volatile u8 rumbleEnable[4]; + /* 0x02B2 */ vu8 rumbleEnable[4]; /* 0x02B6 */ u8 rumbleCounter[4]; // not clear exact meaning /* 0x02BC */ OSPfs pfs[4]; - /* 0x045C */ volatile u8 rumbleOffFrames; - /* 0x045D */ volatile u8 rumbleOnFrames; + /* 0x045C */ vu8 rumbleOffFrames; + /* 0x045D */ vu8 rumbleOnFrames; /* 0x045E */ u8 preNMIShutdown; /* 0x0460 */ void (*retraceCallback)(void* padmgr, u32 unk464); /* 0x0464 */ u32 retraceCallbackValue; diff --git a/include/z64actor.h b/include/z64actor.h index 4630539cad..f370078f34 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -1,10 +1,10 @@ #ifndef _Z64ACTOR_H_ #define _Z64ACTOR_H_ -#include -#include -#include -#include +#include "z64dma.h" +#include "z64animation.h" +#include "z64math.h" +#include "z64collision_check.h" #define ACTOR_NUMBER_MAX 200 #define INVISIBLE_ACTOR_MAX 20 diff --git a/include/z64animation.h b/include/z64animation.h index 0fda78aa6b..a193785523 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -1,10 +1,9 @@ #ifndef _Z64_ANIMATION_H #define _Z64_ANIMATION_H -#include -#include -#include -#include +#include "ultra64.h" +#include "z64dma.h" +#include "z64math.h" #define LINK_ANIMETION_OFFSET(addr,offset) (((u32)&_link_animetionSegmentRomStart)+((u32)addr)-((u32)&link_animetion_segment)+((u32)offset)) #define LIMB_DONE 0xFF @@ -200,7 +199,7 @@ typedef struct { typedef struct { /* 0x0000 */ u8* refIndex; - /* 0x0004 */ TransformData *transformData; + /* 0x0004 */ TransformData* transformData; /* 0x0008 */ s16* copyValues; /* 0x000C */ s16 unk_0C; /* 0x000E */ s16 unk_10; @@ -226,7 +225,7 @@ typedef struct { typedef struct { /* 0x0000 */ u8 limbCount; /* 0x0004 */ SkelCurveLimb** limbList; - /* 0x0008 */ TransformUpdateIndex *transUpdIdx; + /* 0x0008 */ TransformUpdateIndex* transUpdIdx; /* 0x000C */ f32 unk_0C; // seems to be unused /* 0x0010 */ f32 animFinalFrame; /* 0x0014 */ f32 animSpeed; diff --git a/include/z64audio.h b/include/z64audio.h index 68d3108bb3..bbd6b65c9e 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -459,7 +459,7 @@ typedef struct { // these bitfields should perhaps be merged into a single struct union { struct { - /*?0x00 */ volatile u8 enabled : 1; + /* 0x00 */ vu8 enabled : 1; /* 0x00 */ u8 needsInit : 1; /*?0x00 */ u8 finished : 1; /*?0x00 */ u8 envMixerNeedsInit : 1; diff --git a/include/z64collision_check.h b/include/z64collision_check.h index a510b0c9df..af8178e6c1 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -116,7 +116,7 @@ typedef struct { typedef struct { /* 0x00 */ Sphere16 modelSphere; // model space sphere /* 0x08 */ Sphere16 worldSphere; // world space sphere - /* 0x10 */ float scale; // world space sphere = model * scale * 0.01 + /* 0x10 */ f32 scale; // world space sphere = model * scale * 0.01 /* 0x14 */ u8 joint; } ColliderJntSphItemDim; // size = 0x18 diff --git a/include/z64cutscene.h b/include/z64cutscene.h index e8c2d32150..829af42a00 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -1,7 +1,7 @@ #ifndef _Z64CUTSCENE_H_ #define _Z64CUTSCENE_H_ -#include +#include "ultra64.h" typedef struct { /* 0x00 */ u16 entrance; // entrance index upon which the cutscene should trigger diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index c11eee3c57..f09810de94 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -1,8 +1,8 @@ #ifndef _Z64CUTSCENE_CMMANDS_H_ #define _Z64CUTSCENE_CMMANDS_H_ -#include -#include +#include "command_macros_base.h" +#include "z64cutscene.h" /** * ARGS diff --git a/include/z64dma.h b/include/z64dma.h index 4c2beb37a4..e540a8633b 100755 --- a/include/z64dma.h +++ b/include/z64dma.h @@ -1,7 +1,7 @@ #ifndef _Z64_DMA_H_ #define _Z64_DMA_H_ -#include +#include "ultra64.h" typedef struct { /* 0x00 */ u32 vromAddr; // VROM address (source) diff --git a/include/z64effect.h b/include/z64effect.h index 9be304eace..dae18f92f9 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -1,7 +1,7 @@ #ifndef _Z64EFFECT_H_ #define _Z64EFFECT_H_ -#include +#include "color.h" struct GraphicsContext; struct GlobalContext; diff --git a/include/z64light.h b/include/z64light.h index 734ac23a7d..00f27942de 100644 --- a/include/z64light.h +++ b/include/z64light.h @@ -1,10 +1,10 @@ #ifndef _Z64LIGHT_H_ #define _Z64LIGHT_H_ -#include -#include -#include -#include +#include "ultra64.h" +#include "ultra64/gbi.h" +#include "z64math.h" +#include "color.h" typedef struct { /* 0x0 */ s16 x; diff --git a/include/z64math.h b/include/z64math.h index 099e945502..a34647a2da 100644 --- a/include/z64math.h +++ b/include/z64math.h @@ -1,7 +1,7 @@ #ifndef _Z64MATH_H_ #define _Z64MATH_H_ -#include +#include "ultra64.h" #define VEC_SET(V,X,Y,Z) V.x=X;V.y=Y;V.z=Z @@ -54,10 +54,10 @@ typedef struct { } Cylinder16; // size = 0x0C typedef struct { - f32 radius; - f32 height; - f32 yShift; - Vec3f pos; + /* 0x00 */ f32 radius; + /* 0x04 */ f32 height; + /* 0x08 */ f32 yShift; + /* 0x0C */ Vec3f pos; } Cylinderf; // size = 0x18 typedef struct { @@ -72,9 +72,9 @@ typedef struct { // Defines a point in the spherical coordinate system typedef struct { - f32 r; // radius - s16 pitch; // polar (zenith) angle - s16 yaw; // azimuthal angle + /* 0x00 */ f32 r; // radius + /* 0x04 */ s16 pitch; // polar (zenith) angle + /* 0x06 */ s16 yaw; // azimuthal angle } VecSph; // size = 0x08 #define IS_ZERO(f) (fabsf(f) < 0.008f) diff --git a/include/z64player.h b/include/z64player.h index 083cbf5c0f..7843f60886 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -1,7 +1,7 @@ #ifndef _Z64PLAYER_H_ #define _Z64PLAYER_H_ -#include +#include "z64actor.h" struct Player; diff --git a/include/z64transition.h b/include/z64transition.h index ca010ec86e..563bd7eb23 100644 --- a/include/z64transition.h +++ b/include/z64transition.h @@ -1,8 +1,7 @@ #ifndef _Z64TRANSITION_H_ -#include -#include -#include +#include "ultra64.h" +#include "color.h" typedef struct { f32 unk_0; diff --git a/spec b/spec index 53f17574df..1ed41c6abb 100644 --- a/spec +++ b/spec @@ -411,8 +411,8 @@ beginseg include "build/src/code/code_800E11F0.o" include "build/data/code_800E11F0.data.o" include "build/data/code_800E11F0.rodata.o" - include "build/src/libultra_code/code_800E6840.o" - include "build/src/libultra_code/osAiSetNextBuffer.o" + include "build/src/libultra_code_O2/code_800E6840.o" + include "build/src/libultra_code_O2/osAiSetNextBuffer.o" include "build/src/code/audio_playback.o" include "build/src/code/audio_effects.o" include "build/data/audio_effects.data.o" @@ -442,71 +442,71 @@ beginseg include "build/src/code/sleep.o" include "build/src/code/jpegutils.o" include "build/src/code/jpegdecoder.o" - include "build/src/libultra_code/osPfsFreeBlocks.o" + include "build/src/libultra_code_O2/osPfsFreeBlocks.o" include "build/asm/guScale.o" - include "build/src/libultra_code/sinf.o" - include "build/src/libultra_code/sins.o" - include "build/src/libultra_code/sptask.o" - include "build/src/libultra_code/osRumblePak.o" - include "build/src/libultra_code/__osSiCreateAccessQueue.o" - include "build/src/libultra_code/osContInit.o" - include "build/src/libultra_code/osContStartReadData.o" - include "build/src/libultra_code/guPerspectiveF.o" - include "build/src/libultra_code/__osSpRawStartDma.o" - include "build/src/libultra_code/__osSiRawStartDma.o" - include "build/src/libultra_code/osSpTaskYield.o" - include "build/src/libultra_code/pfsreadwritefile.o" - include "build/src/libultra_code/__osPfsGetStatus.o" + include "build/src/libultra_code_O2/sinf.o" + include "build/src/libultra_code_O2/sins.o" + include "build/src/libultra_code_O2/sptask.o" + include "build/src/libultra_code_O2/osRumblePak.o" + include "build/src/libultra_code_O2/__osSiCreateAccessQueue.o" + include "build/src/libultra_code_O2/osContInit.o" + include "build/src/libultra_code_O2/osContStartReadData.o" + include "build/src/libultra_code_O2/guPerspectiveF.o" + include "build/src/libultra_code_O2/__osSpRawStartDma.o" + include "build/src/libultra_code_O2/__osSiRawStartDma.o" + include "build/src/libultra_code_O2/osSpTaskYield.o" + include "build/src/libultra_code_O2/pfsreadwritefile.o" + include "build/src/libultra_code_O2/__osPfsGetStatus.o" include "build/asm/guMtxIdentF.o" - include "build/src/libultra_code/guLookAt.o" - include "build/src/libultra_code/pfsallocatefile.o" - include "build/src/libultra_code/osStopTimer.o" - include "build/src/libultra_code/contpfs.o" - include "build/src/libultra_code/code_80102FA0.o" - include "build/src/libultra_code/osPfsFindFile.o" - include "build/src/libultra_code/sqrtf.o" - include "build/src/libultra_code/osAfterPreNMI.o" - include "build/src/libultra_code/contquery.o" - include "build/src/libultra_code/guLookAtHilite.o" - include "build/src/libultra_code/sp.o" + include "build/src/libultra_code_O2/guLookAt.o" + include "build/src/libultra_code_O2/pfsallocatefile.o" + include "build/src/libultra_code_O1/osStopTimer.o" + include "build/src/libultra_code_O2/contpfs.o" + include "build/src/libultra_code_O2/code_80102FA0.o" + include "build/src/libultra_code_O2/osPfsFindFile.o" + include "build/src/libultra_code_O2/sqrtf.o" + include "build/src/libultra_code_O2/osAfterPreNMI.o" + include "build/src/libultra_code_O2/contquery.o" + include "build/src/libultra_code_O2/guLookAtHilite.o" + include "build/src/libultra_code_O2/sp.o" include "build/asm/guMtxIdent.o" - include "build/src/libultra_code/guPosition.o" - include "build/src/libultra_code/osSpTaskYielded.o" - include "build/src/libultra_code/rotate.o" - include "build/src/libultra_code/osAiSetFrequency.o" - include "build/src/libultra_code/__osGetActiveQueue.o" + include "build/src/libultra_code_O2/guPosition.o" + include "build/src/libultra_code_O2/osSpTaskYielded.o" + include "build/src/libultra_code_O2/rotate.o" + include "build/src/libultra_code_O2/osAiSetFrequency.o" + include "build/src/libultra_code_O2/__osGetActiveQueue.o" include "build/asm/guNormalize.o" - include "build/src/libultra_code/osDpGetStatus.o" - include "build/src/libultra_code/osDpSetStatus.o" - include "build/src/libultra_code/osPfsDeleteFile.o" - include "build/src/libultra_code/ortho.o" - include "build/src/libultra_code/cosf.o" + include "build/src/libultra_code_O2/osDpGetStatus.o" + include "build/src/libultra_code_O2/osDpSetStatus.o" + include "build/src/libultra_code_O2/osPfsDeleteFile.o" + include "build/src/libultra_code_O2/ortho.o" + include "build/src/libultra_code_O2/cosf.o" include "build/data/__libm_qnan_f.rodata.o" - include "build/src/libultra_code/coss.o" - include "build/src/libultra_code/osViSetEvent.o" - include "build/src/libultra_code/osPfsIsPlug.o" - include "build/src/libultra_code/guS2DInitBg.o" - include "build/src/libultra_code/__osPfsSelectBank.o" - include "build/src/libultra_code/osContSetCh.o" - include "build/src/libultra_code/code_80104D60.o" - include "build/src/libultra_code/pfsinitpak.o" - include "build/src/libultra_code/pfschecker.o" - include "build/src/libultra_code/osAiGetLength.o" + include "build/src/libultra_code_O2/coss.o" + include "build/src/libultra_code_O2/osViSetEvent.o" + include "build/src/libultra_code_O2/osPfsIsPlug.o" + include "build/src/libultra_code_O2/guS2DInitBg.o" + include "build/src/libultra_code_O2/__osPfsSelectBank.o" + include "build/src/libultra_code_O2/osContSetCh.o" + include "build/src/libultra_code_O2/code_80104D60.o" + include "build/src/libultra_code_O2/pfsinitpak.o" + include "build/src/libultra_code_O2/pfschecker.o" + include "build/src/libultra_code_O2/osAiGetLength.o" include "build/asm/guTranslate.o" - include "build/src/libultra_code/__osContRamWrite.o" - include "build/src/libultra_code/__osContRamRead.o" - include "build/src/libultra_code/__osContAddressCrc.o" - include "build/src/libultra_code/osSetTimer.o" - include "build/src/libultra_code/__osSpGetStatus.o" - include "build/src/libultra_code/__osSpSetStatus.o" + include "build/src/libultra_code_O2/__osContRamWrite.o" + include "build/src/libultra_code_O2/__osContRamRead.o" + include "build/src/libultra_code_O2/__osContAddressCrc.o" + include "build/src/libultra_code_O1/osSetTimer.o" + include "build/src/libultra_code_O2/__osSpGetStatus.o" + include "build/src/libultra_code_O2/__osSpSetStatus.o" include "build/asm/osWritebackDCacheAll.o" - include "build/src/libultra_code/__osGetCurrFaultedThread.o" + include "build/src/libultra_code_O2/__osGetCurrFaultedThread.o" include "build/asm/guMtxF2L.o" - include "build/src/libultra_code/llcvt.o" - include "build/src/libultra_code/osViGetCurrentFramebuffer.o" - include "build/src/libultra_code/__osSpSetPc.o" - include "build/src/libultra_code/sqrt.o" - include "build/src/libultra_code/absf.o" + include "build/src/libultra_code_O1/llcvt.o" + include "build/src/libultra_code_O2/osViGetCurrentFramebuffer.o" + include "build/src/libultra_code_O2/__osSpSetPc.o" + include "build/src/libultra_code_O2_g3/sqrt.o" + include "build/src/libultra_code_O2_g3/absf.o" include "build/src/code/code_801067F0.o" include "build/src/code/code_80106860.o" include "build/src/code/code_801068B0.o" diff --git a/src/boot/assert.c b/src/boot/assert.c index 00dcd4f344..9ab6df2e12 100644 --- a/src/boot/assert.c +++ b/src/boot/assert.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void __assert(const char* exp, const char* file, s32 line) { char msg[256]; diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 250060bcf7..b6d1ceeb3a 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" StackEntry sBootThreadInfo; OSThread sIdleThread; @@ -25,6 +24,6 @@ void bootproc(void) { Locale_Init(); StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack + sizeof(sIdleThreadStack), 0, 256, "idle"); - osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, 0, sIdleThreadStack + sizeof(sIdleThreadStack), 10); + osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, 0, sIdleThreadStack + sizeof(sIdleThreadStack), Z_PRIORITY_MAIN); osStartThread(&sIdleThread); } diff --git a/src/boot/idle.c b/src/boot/idle.c index 0a15c24396..7723b26333 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" OSThread gMainThread; u8 sMainStack[0x900]; @@ -11,7 +10,7 @@ OSViMode gViConfigMode; u8 D_80013960; s8 D_80009430 = 1; -u8 volatile gViConfigUseDefault = 1; +vu8 gViConfigUseDefault = 1; u8 gViConfigAdditionalScanLines = 0; u32 gViConfigFeatures = OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF; f32 gViConfigXScale = 1.0; @@ -21,7 +20,7 @@ void Main_ThreadEntry(void* arg0) { OSTime var1; osSyncPrintf("mainx 実行開始\n"); - DmaMgr_Start(); + DmaMgr_Init(); osSyncPrintf("codeセグメントロード中..."); var1 = osGetTime(); DmaMgr_SendRequest1(_codeSegmentStart, (u32)_codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart, @@ -50,7 +49,7 @@ void Idle_ThreadEntry(void* a0) { osSyncPrintf("オーディオヒープのサイズは %d キロバイトです\n", ((s32)gSystemHeap - (s32)gAudioHeap) / 1024); osSyncPrintf(VT_RST); - osCreateViManager(0xFE); + osCreateViManager(OS_PRIORITY_VIMGR); gViConfigFeatures = 0x42; gViConfigXScale = 1.0f; @@ -79,11 +78,11 @@ void Idle_ThreadEntry(void* a0) { ViConfig_UpdateVi(1); osViBlack(1); osViSwapBuffer(0x803DA80); //! @bug Invalid vram address (probably intended to be 0x803DA800) - osCreatePiManager(150, &gPiMgrCmdQ, sPiMgrCmdBuff, 50); + osCreatePiManager(OS_PRIORITY_PIMGR, &gPiMgrCmdQ, sPiMgrCmdBuff, 50); StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack + sizeof(sMainStack), 0, 0x400, "main"); - osCreateThread(&gMainThread, 3, Main_ThreadEntry, a0, sMainStack + sizeof(sMainStack), 10); + osCreateThread(&gMainThread, 3, Main_ThreadEntry, a0, sMainStack + sizeof(sMainStack), Z_PRIORITY_MAIN); osStartThread(&gMainThread); - osSetThreadPri(NULL, 0); + osSetThreadPri(NULL, OS_PRIORITY_IDLE); while (1) { ; diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index 6214545275..d24c5887f0 100644 --- a/src/boot/is_debug.c +++ b/src/boot/is_debug.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" OSPiHandle* sISVHandle; // official name : is_Handle diff --git a/src/boot/logutils.c b/src/boot/logutils.c index 693109d324..e94b60dcc2 100644 --- a/src/boot/logutils.c +++ b/src/boot/logutils.c @@ -1,9 +1,8 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" -float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name, - float var2, const char* var3Name, float var3) { +f32 LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, f32 var1, const char* var2Name, f32 var2, + const char* var3Name, f32 var3) { if (var1 < var2 || var3 < var1) { osSyncPrintf("%s %d: range error %s(%f) < %s(%f) < %s(%f)\n", exp, arg1, var2Name, var2, var1Name, var1, var3Name, var3); @@ -90,7 +89,6 @@ void LogUtils_CheckNullPointer(const char* exp, void* ptr, const char* file, s32 } } -// check valid pointer void LogUtils_CheckValidPointer(const char* exp, void* ptr0, const char* file, s32 line) { u32 ptr = (u32)ptr0; if (!ptr || ptr < 0x80000000U || (0x80000000U + osMemSize) <= ptr) { diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c index 2ea3fad41b..fa7e958359 100644 --- a/src/boot/stackcheck.c +++ b/src/boot/stackcheck.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" StackEntry* sStackInfoListStart = NULL; StackEntry* sStackInfoListEnd = NULL; diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index a31aa45371..b394833963 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" // this should probably go elsewhere but right now viconfig.o is the only object between idle and z_std_dma OSPiHandle* gCartHandle = 0; diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 379d4ca467..ee304fce40 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" u8 sYaz0DataBuffer[0x400]; u32 sYaz0CurDataEnd; diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index 900a94afac..09fff3b758 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" u32 gCurrentRegion = 0; LocaleCartInfo sCartInfo; diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index aec911a3d4..0ac63c3979 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; @@ -1815,9 +1814,9 @@ void DmaMgr_ProcessMsg(DmaRequest* req) { "圧縮されたセグメントの一部だけをＤＭＡ転送することはできません"); } - osSetThreadPri(NULL, 0x0A); + osSetThreadPri(NULL, Z_PRIORITY_MAIN); Yaz0_Decompress(romStart, ram, romSize); - osSetThreadPri(NULL, 0x10); + osSetThreadPri(NULL, Z_PRIORITY_DMAMGR); found = true; " Press ROM:%X RAM:%X SIZE:%X\n"; @@ -1910,7 +1909,7 @@ s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size) { return 0; } -void DmaMgr_Start() { +void DmaMgr_Init() { const char** name; s32 idx; DmaEntry* iter; @@ -1952,7 +1951,8 @@ void DmaMgr_Start() { osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, sizeof(sDmaMgrMsgs) / sizeof(sDmaMgrMsgs[0])); StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 0x100, "dmamgr"); - osCreateThread(&sDmaMgrThread, 0x12, &DmaMgr_ThreadEntry, 0, sDmaMgrStack + sizeof(sDmaMgrStack), 0x10); + osCreateThread(&sDmaMgrThread, 0x12, &DmaMgr_ThreadEntry, 0, sDmaMgrStack + sizeof(sDmaMgrStack), + Z_PRIORITY_DMAMGR); osStartThread(&sDmaMgrThread); } diff --git a/src/buffers/gfxbuffers.c b/src/buffers/gfxbuffers.c index 9a538bf311..13206fe2b5 100644 --- a/src/buffers/gfxbuffers.c +++ b/src/buffers/gfxbuffers.c @@ -1,4 +1,4 @@ -#include +#include "z64.h" // 0x18000 bytes u64 gGfxSPTaskOutputBuffer[0x3000]; diff --git a/src/buffers/heaps.c b/src/buffers/heaps.c index e5f9a99435..e39afc33f4 100644 --- a/src/buffers/heaps.c +++ b/src/buffers/heaps.c @@ -1,4 +1,4 @@ -#include +#include "z64.h" // 0x38000 bytes u8 gAudioHeap[0x38000]; diff --git a/src/buffers/zbuffer.c b/src/buffers/zbuffer.c index 49cf0d8d85..555d9fdd72 100644 --- a/src/buffers/zbuffer.c +++ b/src/buffers/zbuffer.c @@ -1,4 +1,4 @@ -#include +#include "z64.h" // 0x25800 bytes u16 gZBuffer[SCREEN_HEIGHT][SCREEN_WIDTH]; diff --git a/src/code/PreRender.c b/src/code/PreRender.c index c0d0eb9232..94afbafb73 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void PreRender_SetValuesSave(PreRenderContext* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg) { this->widthSave = width; diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c index 23cfa00f81..fa2a6aafd3 100644 --- a/src/code/TwoHeadArena.c +++ b/src/code/TwoHeadArena.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void THGA_Ct(TwoHeadGfxArena* thga, Gfx* start, u32 size) { THA_Ct((TwoHeadArena*)thga, start, size); diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 6b4d84eafe..5a304171bf 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" #define FILL_ALLOCBLOCK (1 << 0) #define FILL_FREEBLOCK (1 << 1) diff --git a/src/code/audioMgr.c b/src/code/audioMgr.c index cdec774cba..2d3a12248d 100644 --- a/src/code/audioMgr.c +++ b/src/code/audioMgr.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void func_800C3C80(AudioMgr* audioMgr) { Sub_AudioMgr_18* sub; @@ -91,7 +90,7 @@ void AudioMgr_Unlock(AudioMgr* audioMgr) { osRecvMesg(&audioMgr->unk_C8, NULL, OS_MESG_BLOCK); } -void AudioMgr_Start(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) { +void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) { bzero(audioMgr, sizeof(AudioMgr)); audioMgr->sched = sched; diff --git a/src/code/audio_effects.c b/src/code/audio_effects.c index 41f7277718..45d267fb07 100644 --- a/src/code/audio_effects.c +++ b/src/code/audio_effects.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" void Audio_SequenceChannelProcessSound(SequenceChannel* seqChannel, s32 recalculateVolume, s32 b) { f32 channelVolume; diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index 974f5eb561..9ecc9d29c3 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" f32 func_800DDE20(f32 arg0) { return 256.0f * gAudioContext.gAudioBufferParameters.unkUpdatesPerFrameScaled / arg0; diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index d5e71ff9c6..e79e9e06be 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { f32 volRight, volLeft; diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c index 0092249b20..dc13c246d7 100644 --- a/src/code/audio_seqplayer.c +++ b/src/code/audio_seqplayer.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #define PORTAMENTO_IS_SPECIAL(x) ((x).mode & 0x80) #define PORTAMENTO_MODE(x) ((x).mode & ~0x80) diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index 0c15155b85..29eaae1e16 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_800430A0/func_800430A0.s") diff --git a/src/code/code_80043480.c b/src/code/code_80043480.c index ddd8d0e994..54f422a6f3 100644 --- a/src/code/code_80043480.c +++ b/src/code/code_80043480.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void DynaPolyInfo_SetActorMove(DynaPolyActor* dynaActor, DynaPolyMoveFlag flags) { dynaActor->dynaPolyId = -1; diff --git a/src/code/code_80069420.c b/src/code/code_80069420.c index ee9a179d7d..3d656cfb0b 100644 --- a/src/code/code_80069420.c +++ b/src/code/code_80069420.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void* MemCopy(void* dest, void* src, s32 size) { u8* destu = (u8*)dest; diff --git a/src/code/code_8006BA00.c b/src/code/code_8006BA00.c index ee5677ad33..768ece14f3 100644 --- a/src/code/code_8006BA00.c +++ b/src/code/code_8006BA00.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void func_8006BA00(GlobalContext* globalCtx) { SoundSource* sources = &globalCtx->soundSources[0]; diff --git a/src/code/code_8006C3A0.c b/src/code/code_8006C3A0.c index 7898695987..341a445956 100644 --- a/src/code/code_8006C3A0.c +++ b/src/code/code_8006C3A0.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void Flags_UnsetAllEnv(GlobalContext* globalCtx) { u8 i; diff --git a/src/code/code_8006C510.c b/src/code/code_8006C510.c index 8e9f28322a..833009e814 100644 --- a/src/code/code_8006C510.c +++ b/src/code/code_8006C510.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" f32 func_8006C510(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { char pad[0x1C]; diff --git a/src/code/code_8008E6A0.c b/src/code/code_8008E6A0.c index 6a1fe8c319..47d437e987 100644 --- a/src/code/code_8008E6A0.c +++ b/src/code/code_8008E6A0.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void func_8008E6A0(SubGlobalContext7B8* this) { this->counter = 0; @@ -6,20 +6,20 @@ void func_8008E6A0(SubGlobalContext7B8* this) { } u32 func_8008E6AC(SubGlobalContext7B8* this, Input* input) { - if (CHECK_PAD(input->cur, R_TRIG) && CHECK_PAD(input->press, D_JPAD)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_R) && CHECK_BTN_ALL(input->press.button, BTN_DDOWN)) { this->toggle = !this->toggle; } if (!this->toggle) { goto ret_true; } - if (CHECK_PAD(input->cur, Z_TRIG)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_Z)) { - if (CHECK_PAD(input->press, R_TRIG)) { + if (CHECK_BTN_ALL(input->press.button, BTN_R)) { goto ret_true; } - if (CHECK_PAD(input->cur, R_TRIG)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_R)) { this->counter++; if (this->counter >= 9) { goto ret_true; diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index 882d422d1a..b61559de60 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // Bit Flag array in which gBitFlags[n] is literally (1 << n) u32 gBitFlags[] = { diff --git a/src/code/code_800A9D40.c b/src/code/code_800A9D40.c index c32d31d4e6..17660b74e8 100644 --- a/src/code/code_800A9D40.c +++ b/src/code/code_800A9D40.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" typedef struct { /* 0x00 */ OSPiHandle piHandle; diff --git a/src/code/code_800A9F30.c b/src/code/code_800A9F30.c index f7d16a56a2..fd8d220e2f 100644 --- a/src/code/code_800A9F30.c +++ b/src/code/code_800A9F30.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" UnkRumbleStruct D_80160FD0; diff --git a/src/code/code_800ACE70.c b/src/code/code_800ACE70.c index ebb93da34c..88e86014a9 100644 --- a/src/code/code_800ACE70.c +++ b/src/code/code_800ACE70.c @@ -1,4 +1,4 @@ -#include +#include "global.h" // Note : This file is related to z_vismono, the original name was probably z_vis diff --git a/src/code/code_800AD920.c b/src/code/code_800AD920.c index 5123960068..2fbd7c452c 100644 --- a/src/code/code_800AD920.c +++ b/src/code/code_800AD920.c @@ -1,4 +1,4 @@ -#include +#include "global.h" // Note : This file is related to z_vismono, the original name was probably z_vis diff --git a/src/code/code_800BB0A0.c b/src/code/code_800BB0A0.c index f5e8a21708..8d9f37b4a5 100644 --- a/src/code/code_800BB0A0.c +++ b/src/code/code_800BB0A0.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_800BB0A0/func_800BB0A0.s") diff --git a/src/code/code_800C3C20.c b/src/code/code_800C3C20.c index 714de72549..bfe37bdfb2 100644 --- a/src/code/code_800C3C20.c +++ b/src/code/code_800C3C20.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u8 D_8012D200[] = { 0, 1, 2, 3, 4, 5, 6, diff --git a/src/code/code_800D2E30.c b/src/code/code_800D2E30.c index e7e67f0a07..ebf03760e2 100644 --- a/src/code/code_800D2E30.c +++ b/src/code/code_800D2E30.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void func_800D2E30(UnkRumbleStruct* arg0) { s32 i; diff --git a/src/code/code_800D31A0.c b/src/code/code_800D31A0.c index ec5b7a9b05..4f6b9f8c0f 100644 --- a/src/code/code_800D31A0.c +++ b/src/code/code_800D31A0.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" extern PadMgr gPadMgr; diff --git a/src/code/code_800DACC0.c b/src/code/code_800DACC0.c index 05fe08763c..10ebbce752 100644 --- a/src/code/code_800DACC0.c +++ b/src/code/code_800DACC0.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_800DACC0/pad_800DACB0.s") diff --git a/src/code/code_800E11F0.c b/src/code/code_800E11F0.c index 0cf0be4fac..3cf45a3ed7 100644 --- a/src/code/code_800E11F0.c +++ b/src/code/code_800E11F0.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" // like audio_load in sm64, but completely rewritten diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index d509867af6..962e73557b 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EC960.s") diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index c556781d85..e2f087821a 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F7260/func_800F7260.s") diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index a00535ea15..347d8270d6 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800F9280.s") diff --git a/src/code/code_800FBCE0.c b/src/code/code_800FBCE0.c index 2c17e6fa28..65156eda09 100644 --- a/src/code/code_800FBCE0.c +++ b/src/code/code_800FBCE0.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define printSpStatus(x, name) \ if (x & SP_STATUS_##name) \ diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c index 48fcf48a57..d1bb1f36d3 100644 --- a/src/code/code_800FC620.c +++ b/src/code/code_800FC620.c @@ -1,4 +1,4 @@ -#include +#include "global.h" typedef void (*arg3_800FC868)(void*); typedef void (*arg3_800FC8D8)(void*, u32); diff --git a/src/code/code_800FCE80.c b/src/code/code_800FCE80.c index 5180c24447..2acf1ed022 100644 --- a/src/code/code_800FCE80.c +++ b/src/code/code_800FCE80.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "fp.h" s32 use_cfrac; diff --git a/src/code/code_800FD970.c b/src/code/code_800FD970.c index ae2d5916d1..04d5f81188 100644 --- a/src/code/code_800FD970.c +++ b/src/code/code_800FD970.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // The latest generated random number, used to generate the next number in the sequence. static u32 sRandInt = 1; diff --git a/src/code/code_801067F0.c b/src/code/code_801067F0.c index b895ee360c..ae65e522ba 100644 --- a/src/code/code_801067F0.c +++ b/src/code/code_801067F0.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // fmodf? f32 func_801067F0(f32 arg0, f32 arg1) { diff --git a/src/code/code_80106860.c b/src/code/code_80106860.c index 9d862014fb..4c1b8480b5 100644 --- a/src/code/code_80106860.c +++ b/src/code/code_80106860.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // memset used in __osMalloc, z_quake, z_view, and z_camera void* func_80106860(void* ptr, s32 val, size_t size) { diff --git a/src/code/code_801068B0.c b/src/code/code_801068B0.c index bf3ae57447..da6f94883b 100644 --- a/src/code/code_801068B0.c +++ b/src/code/code_801068B0.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // memcpy used in __osMalloc.c void* func_801068B0(void* dst, void* src, size_t size) { diff --git a/src/code/code_80110450.c b/src/code/code_80110450.c index d312881ba9..828d757a2e 100644 --- a/src/code/code_80110450.c +++ b/src/code/code_80110450.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_80110450/func_80110450.s") diff --git a/src/code/db_camera.c b/src/code/db_camera.c index b693051d9a..fc97d1ebd6 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B3B50.s") diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index 69a4d93622..827f10a40d 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 diff --git a/src/code/fault.c b/src/code/fault.c index 7520165f4b..2dcea2667d 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -1,9 +1,6 @@ -#include -#include -#include -#include -#include -#include +#include "global.h" +#include "vt.h" +#include "alloca.h" // data const char* sExceptionNames[] = { @@ -72,7 +69,8 @@ void Fault_ProcessClientContext(FaultClientContext* ctx) { if (sFaultStructPtr->currClientThreadSp != 0) { thread = alloca(sizeof(OSThread)); - osCreateThread(thread, 2, Fault_ClientProcessThread, ctx, sFaultStructPtr->currClientThreadSp, 0x7E); + osCreateThread(thread, 2, Fault_ClientProcessThread, ctx, sFaultStructPtr->currClientThreadSp, + OS_PRIORITY_APPMAX - 1); osStartThread(thread); } else { Fault_ClientProcessThread(ctx); @@ -287,9 +285,9 @@ u32 Fault_WaitForInputImpl() { Fault_Sleep(0x10); Fault_UpdatePadImpl(); - kDown = curInput->press.in.button; + kDown = curInput->press.button; - if (kDown == L_TRIG) { + if (kDown == BTN_L) { sFaultStructPtr->faultActive = !sFaultStructPtr->faultActive; } @@ -298,19 +296,19 @@ u32 Fault_WaitForInputImpl() { return false; } } else { - if (kDown == A_BUTTON || kDown == R_JPAD) { + if (kDown == BTN_A || kDown == BTN_DRIGHT) { return false; } - if (kDown == L_JPAD) { + if (kDown == BTN_DLEFT) { return true; } - if (kDown == U_JPAD) { + if (kDown == BTN_DUP) { FaultDrawer_SetOsSyncPrintfEnabled(true); } - if (kDown == D_JPAD) { + if (kDown == BTN_DDOWN) { FaultDrawer_SetOsSyncPrintfEnabled(false); } } @@ -557,8 +555,8 @@ void Fault_WaitForButtonCombo() { Fault_Sleep(0x10); Fault_UpdatePadImpl(); - kDown = curInput->press.in.button; - kCur = curInput->cur.in.button; + kDown = curInput->press.button; + kCur = curInput->cur.button; if ((kCur == 0) && (s1 == s2)) { s1 = 0; @@ -569,20 +567,20 @@ void Fault_WaitForButtonCombo() { switch (state) { case 0: - if (kCur == (Z_TRIG | L_TRIG | R_TRIG) && kDown == Z_TRIG) { + if (kCur == (BTN_Z | BTN_L | BTN_R) && kDown == BTN_Z) { state = s2; s1 = s2; } break; case 1: - if (kDown == U_JPAD) { + if (kDown == BTN_DUP) { state = 2; } else { state = 0; } break; case 2: - if (kDown == D_CBUTTONS) { + if (kDown == BTN_CDOWN) { state = 3; s1 = s2; } else { @@ -590,14 +588,14 @@ void Fault_WaitForButtonCombo() { } break; case 3: - if (kDown == U_CBUTTONS) { + if (kDown == BTN_CUP) { state = 4; } else { state = 0; } break; case 4: - if (kDown == D_JPAD) { + if (kDown == BTN_DDOWN) { state = 5; s1 = s2; } else { @@ -605,14 +603,14 @@ void Fault_WaitForButtonCombo() { } break; case 5: - if (kDown == L_JPAD) { + if (kDown == BTN_DLEFT) { state = 6; } else { state = 0; } break; case 6: - if (kDown == L_CBUTTONS) { + if (kDown == BTN_CLEFT) { state = 7; s1 = s2; } else { @@ -620,14 +618,14 @@ void Fault_WaitForButtonCombo() { } break; case 7: - if (kDown == R_CBUTTONS) { + if (kDown == BTN_CRIGHT) { state = 8; } else { state = 0; } break; case 8: - if (kDown == R_JPAD) { + if (kDown == BTN_DRIGHT) { state = 9; s1 = s2; } else { @@ -635,32 +633,32 @@ void Fault_WaitForButtonCombo() { } break; case 9: - if (kDown == (A_BUTTON | B_BUTTON)) { + if (kDown == (BTN_A | BTN_B)) { state = 10; - } else if (kDown == A_BUTTON) { + } else if (kDown == BTN_A) { state = 0x5B; - } else if (kDown == B_BUTTON) { + } else if (kDown == BTN_B) { state = 0x5C; } else { state = 0; } break; case 0x5B: - if (kDown == B_BUTTON) { + if (kDown == BTN_B) { state = 10; } else { state = 0; } break; case 0x5C: - if (kDown == A_BUTTON) { + if (kDown == BTN_A) { state = 10; } else { state = 0; } break; case 10: - if (kDown == START_BUTTON) { + if (kDown == BTN_START) { state = 11; } else { state = 0; @@ -733,7 +731,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) { count--; Fault_Sleep(0x10); Fault_UpdatePadImpl(); - if (CHECK_PAD(curInput->press, L_TRIG)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_L)) { sFaultStructPtr->faultActive = false; } } @@ -741,40 +739,40 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) { do { Fault_Sleep(0x10); Fault_UpdatePadImpl(); - } while (curInput->press.in.button == 0); + } while (curInput->press.button == 0); - if (CHECK_PAD(curInput->press, START_BUTTON) || CHECK_PAD(curInput->cur, A_BUTTON)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_START) || CHECK_BTN_ALL(curInput->cur.button, BTN_A)) { return; } off = 0x10; - if (CHECK_PAD(curInput->cur, Z_TRIG)) { + if (CHECK_BTN_ALL(curInput->cur.button, BTN_Z)) { off = 0x100; } - if (CHECK_PAD(curInput->cur, B_BUTTON)) { + if (CHECK_BTN_ALL(curInput->cur.button, BTN_B)) { off <<= 8; } - if (CHECK_PAD(curInput->press, U_JPAD)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_DUP)) { addr -= off; } - if (CHECK_PAD(curInput->press, D_JPAD)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_DDOWN)) { addr += off; } - if (CHECK_PAD(curInput->press, U_CBUTTONS)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_CUP)) { addr = pc; } - if (CHECK_PAD(curInput->press, D_CBUTTONS)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_CDOWN)) { addr = sp; } - if (CHECK_PAD(curInput->press, L_CBUTTONS)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_CLEFT)) { addr = unk0; } - if (CHECK_PAD(curInput->press, R_CBUTTONS)) { + if (CHECK_BTN_ALL(curInput->press.button, BTN_CRIGHT)) { addr = unk1; } - } while (!CHECK_PAD(curInput->press, L_TRIG)); + } while (!CHECK_BTN_ALL(curInput->press.button, BTN_L)); sFaultStructPtr->faultActive = true; } @@ -1023,7 +1021,7 @@ void Fault_SetFB(void* fb, u16 w, u16 h) { FaultDrawer_SetDrawerFB(fb, w, h); } -void Fault_Start(void) { +void Fault_Init(void) { sFaultStructPtr = &gFaultStruct; bzero(sFaultStructPtr, sizeof(FaultThreadStruct)); FaultDrawer_SetDefault(); @@ -1038,7 +1036,8 @@ void Fault_Start(void) { gFaultStruct.faultHandlerEnabled = true; osCreateMesgQueue(&sFaultStructPtr->queue, &sFaultStructPtr->msg, 1); StackCheck_Init(&sFaultThreadInfo, &sFaultStack, sFaultStack + sizeof(sFaultStack), 0, 0x100, "fault"); - osCreateThread(&sFaultStructPtr->thread, 2, &Fault_ThreadEntry, 0, sFaultStack + sizeof(sFaultStack), 0x7f); + osCreateThread(&sFaultStructPtr->thread, 2, &Fault_ThreadEntry, 0, sFaultStack + sizeof(sFaultStack), + OS_PRIORITY_APPMAX); osStartThread(&sFaultStructPtr->thread); } diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index 9a4a81be1b..32c10cb888 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" // rodata const u32 sFaultDrawerFont[] = { diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 966c39ba2d..44707957ad 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void FlagSet_Update(GlobalContext* globalCtx) { static s32 entryIdx = 0; @@ -76,35 +75,35 @@ void FlagSet_Update(GlobalContext* globalCtx) { } } - if (CHECK_PAD(input->press, L_JPAD)) { + if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT)) { timer = 10; curBit++; } - if (CHECK_PAD(input->press, R_JPAD)) { + if (CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)) { curBit--; timer = 10; } if (timer == 0) { - if (CHECK_PAD(input->cur, L_JPAD)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_DLEFT)) { curBit++; timer = 2; } - if (CHECK_PAD(input->cur, R_JPAD)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_DRIGHT)) { curBit--; timer = 2; } } curBit %= 16; - if (CHECK_PAD(input->press, U_JPAD)) { + if (CHECK_BTN_ALL(input->press.button, BTN_DUP)) { entryIdx--; if (entryIdx < 0) { entryIdx = 0; } timer = 10; } - if (CHECK_PAD(input->press, D_JPAD)) { + if (CHECK_BTN_ALL(input->press.button, BTN_DDOWN)) { timer = 10; entryIdx++; if (!entries[entryIdx].value) { @@ -113,14 +112,14 @@ void FlagSet_Update(GlobalContext* globalCtx) { } if (timer == 0) { - if (CHECK_PAD(input->cur, U_JPAD)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_DUP)) { entryIdx--; timer = 2; if (entryIdx < 0) { entryIdx = 0; } } - if (CHECK_PAD(input->cur, D_JPAD)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_DDOWN)) { timer = 2; entryIdx++; if (!entries[entryIdx].value) { @@ -129,7 +128,7 @@ void FlagSet_Update(GlobalContext* globalCtx) { } } - if (CHECK_PAD(input->press, A_BUTTON)) { + if (CHECK_BTN_ALL(input->press.button, BTN_A)) { *entries[entryIdx].value ^= (1 << curBit); } @@ -145,7 +144,7 @@ void FlagSet_Update(GlobalContext* globalCtx) { oGfxCtx->polyOpa.p = gfx; } - if (CHECK_PAD(input->press, L_TRIG)) { + if (CHECK_BTN_ALL(input->press.button, BTN_L)) { globalCtx->pauseCtx.flag = 0; } diff --git a/src/code/game.c b/src/code/game.c index 8b53efabf6..bafc504696 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #include "vt.h" typedef struct { @@ -77,17 +77,17 @@ void func_800C4344(GameState* gameState) { if (HREG(80) == 0xC) { selectedInput = &gameState->input[HREG(81) < 4U ? HREG(81) : 0]; hReg82 = HREG(82); - HREG(83) = selectedInput->cur.in.button; - HREG(84) = selectedInput->press.in.button; - HREG(85) = selectedInput->rel.in.x; - HREG(86) = selectedInput->rel.in.y; - HREG(87) = selectedInput->rel.in.x; - HREG(88) = selectedInput->rel.in.y; - HREG(89) = selectedInput->cur.in.x; - HREG(90) = selectedInput->cur.in.y; - HREG(93) = (selectedInput->cur.in.button == hReg82); - HREG(94) = CHECK_PAD(selectedInput->cur, hReg82); - HREG(95) = CHECK_PAD(selectedInput->press, hReg82); + HREG(83) = selectedInput->cur.button; + HREG(84) = selectedInput->press.button; + HREG(85) = selectedInput->rel.stick_x; + HREG(86) = selectedInput->rel.stick_y; + HREG(87) = selectedInput->rel.stick_x; + HREG(88) = selectedInput->rel.stick_y; + HREG(89) = selectedInput->cur.stick_x; + HREG(90) = selectedInput->cur.stick_y; + HREG(93) = (selectedInput->cur.button == hReg82); + HREG(94) = CHECK_BTN_ALL(selectedInput->cur.button, hReg82); + HREG(95) = CHECK_BTN_ALL(selectedInput->press.button, hReg82); } if (D_8012DBC0 != 0) { @@ -158,7 +158,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { GameState_SetFBFilter(&newDList); } - sLastButtonPressed = gameState->input[0].press.in.button | gameState->input[0].cur.in.button; + sLastButtonPressed = gameState->input[0].press.button | gameState->input[0].cur.button; if (R_DISABLE_INPUT_DISPLAY == 0) { GameState_DrawInputDisplay(sLastButtonPressed, &newDList); } diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index 9ec6886b2f..960aeea982 100644 --- a/src/code/gamealloc.c +++ b/src/code/gamealloc.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void GameAlloc_Log(GameAlloc* this) { GameAllocEntry* iter; diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index 9b859c2129..91854f8fd0 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // .bss u8 D_801755F0; diff --git a/src/code/graph.c b/src/code/graph.c index dc958ff005..3ba23f9ff1 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -1,7 +1,5 @@ -#include -#include -#include -#include +#include "global.h" +#include "vt.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 @@ -392,8 +390,8 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { sGraphUpdateTime = time; } - if (D_8012DBC0 && CHECK_PAD(gameState->input[0].press, Z_TRIG) && - CHECK_PAD(gameState->input[0].cur, L_TRIG | R_TRIG)) { + if (D_8012DBC0 && CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) && + CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) { gSaveContext.gameMode = 0; SET_NEXT_GAMESTATE(gameState, Select_Init, SelectContext); gameState->running = false; diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index ba47ef40e3..1a8eeffec9 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -1,7 +1,7 @@ -#include -#include +#include "global.h" +#include "vt.h" -volatile u32 gIrqMgrResetStatus = 0; +vu32 gIrqMgrResetStatus = 0; volatile OSTime sIrqMgrResetTime = 0; volatile OSTime gIrqMgrRetraceTime = 0; u32 sIrqMgrRetraceCount = 0; @@ -212,7 +212,7 @@ void IrqMgr_ThreadEntry(void* arg0) { osSyncPrintf("ＩＲＱマネージャスレッド実行終了\n"); // End of IRQ manager thread execution } -void IrqMgr_Create(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) { +void IrqMgr_Init(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) { LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 346); LogUtils_CheckNullPointer("stack", stack, "../irqmgr.c", 347); this->clients = NULL; diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c index 1f73a46263..cde91207c8 100644 --- a/src/code/jpegdecoder.c +++ b/src/code/jpegdecoder.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u8* sJpegBitStreamPtr; u32 sJpegBitStreamByteIdx; diff --git a/src/code/jpegutils.c b/src/code/jpegutils.c index 52b8612dd6..c532681b93 100644 --- a/src/code/jpegutils.c +++ b/src/code/jpegutils.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void JpegUtils_ProcessQuantizationTable(u8* dqt, JpegQuantizationTable* qt, u8 count) { u8 i; diff --git a/src/code/listalloc.c b/src/code/listalloc.c index b7d97281c7..b6aefeee23 100644 --- a/src/code/listalloc.c +++ b/src/code/listalloc.c @@ -1,4 +1,4 @@ -#include +#include "global.h" ListAlloc* ListAlloc_Init(ListAlloc* this) { this->prev = NULL; diff --git a/src/code/loadfragment2.c b/src/code/loadfragment2.c index 2a304bbeb8..d651ff4e6c 100644 --- a/src/code/loadfragment2.c +++ b/src/code/loadfragment2.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd) { void* allocatedVRamAddr; diff --git a/src/code/logseverity.c b/src/code/logseverity.c index 25bc68c46f..940aa87cc8 100644 --- a/src/code/logseverity.c +++ b/src/code/logseverity.c @@ -1,3 +1,3 @@ -#include +#include "global.h" s32 gOverlayLogSeverity = 2; diff --git a/src/code/main.c b/src/code/main.c index 6e08622873..cf74a8b57b 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" s32 gScreenWidth = SCREEN_WIDTH; s32 gScreenHeight = SCREEN_HEIGHT; @@ -48,7 +48,7 @@ void Main(void* arg0) { gScreenHeight = SCREEN_HEIGHT; gAppNmiBufferPtr = (PreNmiBuff*)osAppNmiBuffer; PreNmiBuff_Init(gAppNmiBufferPtr); - Fault_Start(); + Fault_Init(); SysCfb_Init(0); sysHeap = (u32)gSystemHeap; fb = SysCfb_GetFbPtr(0); @@ -75,26 +75,26 @@ void Main(void* arg0) { osCreateMesgQueue(&irqMgrMsgQ, irqMgrMsgBuf, 0x3c); StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, sIrqMgrStack + sizeof(sIrqMgrStack), 0, 0x100, "irqmgr"); - IrqMgr_Create(&gIrqMgr, &sGraphStackInfo, 0x11, 1); + IrqMgr_Init(&gIrqMgr, &sGraphStackInfo, Z_PRIORITY_IRQMGR, 1); osSyncPrintf("タスクスケジューラの初期化\n"); // Initialize the task scheduler StackCheck_Init(&sSchedStackInfo, sSchedStack, sSchedStack + sizeof(sSchedStack), 0, 0x100, "sched"); - Sched_Init(&gSchedContext, &sAudioStack, 0xf, D_80013960, 1, &gIrqMgr); + Sched_Init(&gSchedContext, &sAudioStack, Z_PRIORITY_SCHED, D_80013960, 1, &gIrqMgr); IrqMgr_AddClient(&gIrqMgr, &irqClient, &irqMgrMsgQ); StackCheck_Init(&sAudioStackInfo, sAudioStack, sAudioStack + sizeof(sAudioStack), 0, 0x100, "audio"); - AudioMgr_Start(&gAudioMgr, sAudioStack + sizeof(sAudioStack), 0xc, 0xa, &gSchedContext, &gIrqMgr); + AudioMgr_Init(&gAudioMgr, sAudioStack + sizeof(sAudioStack), Z_PRIORITY_AUDIOMGR, 0xa, &gSchedContext, &gIrqMgr); StackCheck_Init(&sPadMgrStackInfo, sPadMgrStack, sPadMgrStack + sizeof(sPadMgrStack), 0, 0x100, "padmgr"); - PadMgr_Init(&gPadMgr, &sSiIntMsgQ, &gIrqMgr, 7, 0xe, &sIrqMgrStack); + PadMgr_Init(&gPadMgr, &sSiIntMsgQ, &gIrqMgr, 7, Z_PRIORITY_PADMGR, &sIrqMgrStack); AudioMgr_Unlock(&gAudioMgr); StackCheck_Init(&sGraphStackInfo, sGraphStack, sGraphStack + sizeof(sGraphStack), 0, 0x100, "graph"); - osCreateThread(&sGraphThread, 4, Graph_ThreadEntry, arg0, sGraphStack + sizeof(sGraphStack), 0xb); + osCreateThread(&sGraphThread, 4, Graph_ThreadEntry, arg0, sGraphStack + sizeof(sGraphStack), Z_PRIORITY_GRAPH); osStartThread(&sGraphThread); - osSetThreadPri(0, 0xf); + osSetThreadPri(0, Z_PRIORITY_SCHED); while (true) { msg = NULL; diff --git a/src/code/mempak.c b/src/code/mempak.c index 6478bb7256..9da4804eb6 100644 --- a/src/code/mempak.c +++ b/src/code/mempak.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSPfs sMempakPfsHandle; s32 sMempakFreeBytes; diff --git a/src/code/mtxuty-cvt.c b/src/code/mtxuty-cvt.c index 289e8649dd..345059dba3 100644 --- a/src/code/mtxuty-cvt.c +++ b/src/code/mtxuty-cvt.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void MtxConv_F2L(MatrixInternal* m1, MtxF* m2) { s32 i; diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 13266ab508..a3e32d584c 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -1,7 +1,5 @@ -#include -#include -#include -#include +#include "global.h" +#include "vt.h" s32 D_8012D280 = 1; @@ -206,7 +204,7 @@ void PadMgr_RumbleSet(PadMgr* padmgr, u8* ctrlrRumbles) { void PadMgr_ProcessInputs(PadMgr* padmgr) { s32 i; Input* input; - PadState* padnow1; // original name + OSContPad* padnow1; // original name s32 buttonDiff; PadMgr_LockPadData(padmgr); @@ -237,9 +235,9 @@ void PadMgr_ProcessInputs(PadMgr* padmgr) { osSyncPrintf(VT_RST); break; case 8: - input->cur.in.button = 0; - input->cur.in.x = 0; - input->cur.in.y = 0; + input->cur.button = 0; + input->cur.stick_x = 0; + input->cur.stick_y = 0; input->cur.errno = padnow1->errno; if (padmgr->ctrlrIsConnected[i]) { padmgr->ctrlrIsConnected[i] = false; @@ -255,12 +253,12 @@ void PadMgr_ProcessInputs(PadMgr* padmgr) { Fault_AddHungupAndCrash("../padmgr.c", 397); } - buttonDiff = input->prev.in.button ^ input->cur.in.button; - input->press.in.button |= (u16)(buttonDiff & input->cur.in.button); - input->rel.in.button |= (u16)(buttonDiff & input->prev.in.button); + buttonDiff = input->prev.button ^ input->cur.button; + input->press.button |= (u16)(buttonDiff & input->cur.button); + input->rel.button |= (u16)(buttonDiff & input->prev.button); PadUtils_UpdateRelXY(input); - input->press.in.x += (s8)(input->cur.in.x - input->prev.in.x); - input->press.in.y += (s8)(input->cur.in.y - input->prev.in.y); + input->press.stick_x += (s8)(input->cur.stick_x - input->prev.stick_x); + input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y); } PadMgr_UnlockPadData(padmgr); @@ -333,19 +331,19 @@ void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode) { for (i = 0; i < 4; i++) { if (mode != 0) { *newInput = *ogInput; - ogInput->press.in.button = 0; - ogInput->press.in.x = 0; - ogInput->press.in.y = 0; - ogInput->rel.in.button = 0; + ogInput->press.button = 0; + ogInput->press.stick_x = 0; + ogInput->press.stick_y = 0; + ogInput->rel.button = 0; } else { newInput->prev = newInput->cur; newInput->cur = ogInput->cur; - buttonDiff = newInput->prev.in.button ^ newInput->cur.in.button; - newInput->press.in.button = newInput->cur.in.button & buttonDiff; - newInput->rel.in.button = newInput->prev.in.button & buttonDiff; + buttonDiff = newInput->prev.button ^ newInput->cur.button; + newInput->press.button = newInput->cur.button & buttonDiff; + newInput->rel.button = newInput->prev.button & buttonDiff; PadUtils_UpdateRelXY(newInput); - newInput->press.in.x += (s8)(newInput->cur.in.x - newInput->prev.in.x); - newInput->press.in.y += (s8)(newInput->cur.in.y - newInput->prev.in.y); + newInput->press.stick_x += (s8)(newInput->cur.stick_x - newInput->prev.stick_x); + newInput->press.stick_y += (s8)(newInput->cur.stick_y - newInput->prev.stick_y); } ogInput++; newInput++; diff --git a/src/code/padsetup.c b/src/code/padsetup.c index 045724a515..745a324931 100644 --- a/src/code/padsetup.c +++ b/src/code/padsetup.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status) { s32 ret; diff --git a/src/code/padutils.c b/src/code/padutils.c index b19fdbf12f..564cfbf6fb 100644 --- a/src/code/padutils.c +++ b/src/code/padutils.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void PadUtils_Init(Input* input) { bzero(input, sizeof(Input)); @@ -8,53 +8,53 @@ void func_800FCB70() { } void PadUtils_ResetPressRel(Input* input) { - input->press.in.button = 0; - input->rel.in.button = 0; + input->press.button = 0; + input->rel.button = 0; } u32 PadUtils_CheckCurExact(Input* input, u16 value) { - return value == input->cur.in.button; + return value == input->cur.button; } u32 PadUtils_CheckCur(Input* input, u16 key) { - return key == (input->cur.in.button & key); + return key == (input->cur.button & key); } u32 PadUtils_CheckPressed(Input* input, u16 key) { - return key == (input->press.in.button & key); + return key == (input->press.button & key); } u32 PadUtils_CheckReleased(Input* input, u16 key) { - return key == (input->rel.in.button & key); + return key == (input->rel.button & key); } u16 PadUtils_GetCurButton(Input* input) { - return input->cur.in.button; + return input->cur.button; } u16 PadUtils_GetPressButton(Input* input) { - return input->press.in.button; + return input->press.button; } s8 PadUtils_GetCurX(Input* input) { - return input->cur.in.x; + return input->cur.stick_x; } s8 PadUtils_GetCurY(Input* input) { - return input->cur.in.y; + return input->cur.stick_y; } void PadUtils_SetRelXY(Input* input, s32 x, s32 y) { - input->rel.in.x = x; - input->rel.in.y = y; + input->rel.stick_x = x; + input->rel.stick_y = y; } s8 PadUtils_GetRelXImpl(Input* input) { - return input->rel.in.x; + return input->rel.stick_x; } s8 PadUtils_GetRelYImpl(Input* input) { - return input->rel.in.y; + return input->rel.stick_y; } s8 PadUtils_GetRelX(Input* input) { diff --git a/src/code/printutils.c b/src/code/printutils.c index 7cd00f71c4..043ed8782e 100644 --- a/src/code/printutils.c +++ b/src/code/printutils.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void PrintUtils_VPrintf(char** arg0, const char* fmt, va_list args) { _Printf(*arg0, arg0, fmt, args); diff --git a/src/code/relocation.c b/src/code/relocation.c index dccd6e1762..68f7ac7d03 100644 --- a/src/code/relocation.c +++ b/src/code/relocation.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void Overlay_Relocate(void* allocatedVRamAddress, OverlayRelocationSection* overlayInfo, void* vRamAddress) { u32 sections[4]; diff --git a/src/code/sched.c b/src/code/sched.c index 7bd13383a8..5b928cb1d2 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -1,12 +1,11 @@ -#include -#include +#include "global.h" #define RSP_DONE_MSG 667 #define RDP_DONE_MSG 668 #define ENTRY_MSG 670 // data -volatile s32 sLogScheduler = false; +vs32 sLogScheduler = false; // bss OSTime sRSPGFXStartTime; diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c index 212195ce6e..c995b7c034 100644 --- a/src/code/shrink_window.c +++ b/src/code/shrink_window.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 D_8012CED0 = 0; diff --git a/src/code/sleep.c b/src/code/sleep.c index 31720a0dff..f08129701e 100644 --- a/src/code/sleep.c +++ b/src/code/sleep.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void Sleep_Cycles(OSTime cycles) { OSMesgQueue mq; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 24b4e8d651..b1ee055a32 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" volatile OSTime D_8016A520; volatile OSTime D_8016A528; diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 5ee8e857fa..aab3044653 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u32 sSysCfbFbPtr[2]; u32 sSysCfbEnd; diff --git a/src/code/sys_math.c b/src/code/sys_math.c index 994f664752..87a1eacd8c 100644 --- a/src/code/sys_math.c +++ b/src/code/sys_math.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" + f32 sFactorialTbl[] = { 1.0f, 1.0f, 2.0f, 6.0f, 24.0f, 120.0f, 720.0f, 5040.0f, 40320.0f, 362880.0f, 3628800.0f, 39916800.0f, 479001600.0f }; diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 141b27fd4f..4a0006c327 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" s32 Math3D_LineSegMakePerpLineSeg(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAIntersect, Vec3f* lineBIntersect); diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c index ab62977d2e..b468818c81 100644 --- a/src/code/sys_math_atan.c +++ b/src/code/sys_math_atan.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" u16 sATan2Tbl[] = { 0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 87a1708f42..ec7b6f8ab5 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // clang-format off Mtx gMtxClear = { diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c index 6496217eb2..34e7823875 100644 --- a/src/code/sys_ucode.c +++ b/src/code/sys_ucode.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u32 D_8012DBA0 = (u32)&D_80155F50; u32 D_8012DBA4 = (u32)&D_80157580; diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index a9141043d9..be55cb76cd 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 827987d33c..94c5366250 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void TitleSetup_InitImpl(GameState* gameState) { // Zelda common data initalization diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 1f4975799e..81301f2ccd 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define F3DZEX_CONST(name) \ { name, #name } diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index ab09cbac5a..a8e8a13fcb 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { if (overlayEntry->loadedRamAddr != NULL) { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index e17084fd1a..b9638879b7 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1,8 +1,7 @@ -#include -#include -#include -#include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" +#include "global.h" +#include "vt.h" +#include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" void ActorShape_Init(ActorShape* shape, f32 arg1, void* shadowDrawFunc, f32 arg3) { diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 42a153113a..a03019b723 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "initvars.h" #define ACTOR_OVERLAY(name, allocType) \ { \ diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 318dd4838a..75d078ab37 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038600.s") @@ -23,7 +22,7 @@ void func_800387FC(u32 uParm1, u32* puParm2) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003880C.s") -void func_80038870(int iParm1) { +void func_80038870(s32 iParm1) { *(u32*)(iParm1 + 4) = 0; } @@ -31,9 +30,9 @@ u32 func_80038878(s32 iParm1) { u32 uVar1; uVar1 = *(u32*)(iParm1 + 4) & 0xffff; - *(int*)(iParm1 + 4) = *(u32*)(iParm1 + 4) + 1; + *(s32*)(iParm1 + 4) = *(u32*)(iParm1 + 4) + 1; - if (*(int*)(iParm1 + 8) <= (int)uVar1) { + if (*(s32*)(iParm1 + 8) <= (s32)uVar1) { return 0xffff; } @@ -200,7 +199,7 @@ void func_8003E6E4(u16* a0) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E750.s") -void func_8003E804(int iParm1) { +void func_8003E804(s32 iParm1) { func_8003E5B4(iParm1 + 0x14, iParm1 + 0x34); } @@ -231,7 +230,7 @@ void func_8003E8EC(u32 uParm1, u32* iParm2) { iParm2[0x0C] = iParm2[0x14]; - //int i; + //s32 i; //for (i = 0; i < 4; i++) { //iParm2[0x06 + (i * 2)] = iParm2[0x0E + (i * 2)]; //iParm2[0x07 + (i * 2)] = iParm2[0x0D + (i * 2)]; @@ -239,7 +238,7 @@ void func_8003E8EC(u32 uParm1, u32* iParm2) { } */ -u32 func_8003E934(int iParm1) { +u32 func_8003E934(s32 iParm1) { if (!((-1 < iParm1) && (iParm1 < 0x32))) { return 0; } @@ -338,13 +337,13 @@ void func_800418D0(CollisionContext* colCtx, GlobalContext* globalCtx) { } #ifdef NON_MATCHING -void func_80041978(int iParm1, int iParm2) { +void func_80041978(s32 iParm1, s32 iParm2) { u8* puVar1; puVar1 = *(u8**)(iParm1 + 8); if (puVar1 < puVar1 + iParm2) { *puVar1 = 0; - while (puVar1++ < (u8*)(*(int*)(iParm1 + 8) + iParm2)) { + while (puVar1++ < (u8*)(*(s32*)(iParm1 + 8) + iParm2)) { *puVar1 = 0; } } diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 75c536b9f7..c0822b1ab5 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" typedef struct { s16 val; @@ -3328,19 +3327,19 @@ s32 func_80058D34(Camera* camera) { if (D_8011D394 == 0) { if (camera->globalCtx->activeCamera == 0) { - if (CHECK_PAD(D_8015BD7C->state.input[2].press, U_CBUTTONS)) { + if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) { osSyncPrintf("attention sound URGENCY\n"); func_80078884(NA_SE_SY_ATTENTION_URGENCY); } - if (CHECK_PAD(D_8015BD7C->state.input[2].press, D_CBUTTONS)) { + if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) { osSyncPrintf("attention sound NORMAL\n"); func_80078884(NA_SE_SY_ATTENTION_ON); } - if (CHECK_PAD(D_8015BD7C->state.input[2].press, R_CBUTTONS)) { + if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CRIGHT)) { phi_a2 = 1; } - if (CHECK_PAD(D_8015BD7C->state.input[2].press, L_CBUTTONS)) { + if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CLEFT)) { phi_a2 = -1; } if (phi_a2 != 0) { diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c index 518b2d359f..eb9ecfa53a 100644 --- a/src/code/z_cheap_proc.c +++ b/src/code/z_cheap_proc.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index c56347e9a3..1b323dacfc 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" DamageTable D_8011DB20[] = { { { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 36aeadf5f1..0554c3d247 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" // draw red poly void func_8005B280(GraphicsContext* gfx, Vec3f* vA, Vec3f* vB, Vec3f* vC) { @@ -497,7 +496,7 @@ s32 Collider_DestroyTrisItemDim(GlobalContext* globalCtx, TriNorm* dim) { s32 Collider_SetTrisItemDim(GlobalContext* globalCtx, TriNorm* dest, ColliderTrisItemDimInit* src) { Vec3f* d; Vec3f* s; - float nx, ny, nz, nd; + f32 nx, ny, nz, nd; d = dest->vtx; s = src->vtx; @@ -1981,6 +1980,7 @@ void CollisionCheck_AC_CylVsQuad(GlobalContext* globalCtx, CollisionCheckContext } static s8 sBssDummy1; +static s8 sBssDummy2; static TriNorm D_8015E3A0; static TriNorm D_8015E3D8; @@ -2032,10 +2032,10 @@ void CollisionCheck_AC_QuadVsCyl(GlobalContext* globalCtx, CollisionCheckContext } } -static s8 sBssDummy2; static s8 sBssDummy3; static s8 sBssDummy4; static s8 sBssDummy5; +static s8 sBssDummy6; static Vec3f D_8015E420; @@ -2077,10 +2077,10 @@ void CollisionCheck_AC_TrisVsTris(GlobalContext* globalCtx, CollisionCheckContex } } -static s8 sBssDummy6; static s8 sBssDummy7; static s8 sBssDummy8; static s8 sBssDummy9; +static s8 sBssDummy10; static Vec3f D_8015E430; static TriNorm D_8015E440; @@ -2676,7 +2676,7 @@ void func_80061F64(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, C u32 flags; s32 i; f32 damage; - int tblLookup; + s32 tblLookup; if (collider->actor == NULL || !(collider->acFlags & 2)) { return; @@ -2910,10 +2910,10 @@ void func_8006285C(GlobalContext* globalCtx, ColliderTris* collider, s32 index, // In order to reproduce this behavior, we need a specific number of bss variables in the file before that point. // For this, we introduce a certain amount of dummy variables throughout the file, which we fit inside padding added // by the compiler between structs like TriNorm and/or Vec3f, so they don't take space in bss. -static s8 sBssDummy10; static s8 sBssDummy11; static s8 sBssDummy12; static s8 sBssDummy13; +static s8 sBssDummy14; void func_800628A4(s32 arg0, ColliderJntSph* collider) { static Vec3f D_8015E648; diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 53a2fa82d0..4923e56f17 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" SaveContext gSaveContext; u32 D_8015FA88; diff --git a/src/code/z_construct.c b/src/code/z_construct.c index f7970ac19b..15a8054e7c 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void func_80110990(GlobalContext* globalCtx) { Map_Destroy(globalCtx); diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 21e0eae031..0ee403868b 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" typedef struct { u8 x; @@ -15,7 +13,7 @@ typedef struct { } InputCombo; GameInfo* gGameInfo; -int D_8015FA94; // no known symbols +s32 D_8015FA94; // no known symbols PrintTextBuffer D_8015FA98[0x16]; s16 D_8011E0B0 = 0; // PrintTextBuffer index @@ -25,14 +23,12 @@ Color_RGBA8 printTextColors[] = { }; InputCombo inputCombos[REG_GROUPS] = { - { L_TRIG, U_CBUTTONS }, { L_TRIG, L_CBUTTONS }, { L_TRIG, D_CBUTTONS }, { L_TRIG, A_BUTTON }, - { R_TRIG, D_CBUTTONS }, { L_TRIG, R_CBUTTONS }, { L_TRIG, R_TRIG }, { L_TRIG, L_JPAD }, - { L_TRIG, R_JPAD }, { L_TRIG, U_JPAD }, { L_TRIG, B_BUTTON }, { L_TRIG, Z_TRIG }, - { L_TRIG, D_JPAD }, { R_TRIG, A_BUTTON }, { R_TRIG, B_BUTTON }, { R_TRIG, Z_TRIG }, - { R_TRIG, L_TRIG }, { R_TRIG, U_CBUTTONS }, { R_TRIG, R_CBUTTONS }, { R_TRIG, L_JPAD }, - { R_TRIG, L_CBUTTONS }, { R_TRIG, START_BUTTON }, { L_TRIG, START_BUTTON }, { R_TRIG, R_JPAD }, - { R_TRIG, U_JPAD }, { START_BUTTON, R_TRIG }, { START_BUTTON, A_BUTTON }, { START_BUTTON, B_BUTTON }, - { START_BUTTON, R_CBUTTONS }, + { BTN_L, BTN_CUP }, { BTN_L, BTN_CLEFT }, { BTN_L, BTN_CDOWN }, { BTN_L, BTN_A }, { BTN_R, BTN_CDOWN }, + { BTN_L, BTN_CRIGHT }, { BTN_L, BTN_R }, { BTN_L, BTN_DLEFT }, { BTN_L, BTN_DRIGHT }, { BTN_L, BTN_DUP }, + { BTN_L, BTN_B }, { BTN_L, BTN_Z }, { BTN_L, BTN_DDOWN }, { BTN_R, BTN_A }, { BTN_R, BTN_B }, + { BTN_R, BTN_Z }, { BTN_R, BTN_L }, { BTN_R, BTN_CUP }, { BTN_R, BTN_CRIGHT }, { BTN_R, BTN_DLEFT }, + { BTN_R, BTN_CLEFT }, { BTN_R, BTN_START }, { BTN_L, BTN_START }, { BTN_R, BTN_DRIGHT }, { BTN_R, BTN_DUP }, + { BTN_START, BTN_R }, { BTN_START, BTN_A }, { BTN_START, BTN_B }, { BTN_START, BTN_CRIGHT }, }; char regChar[] = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb"; @@ -114,11 +110,12 @@ void func_8006390C(Input* input) { s32 i; regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; - dpad = input->cur.in.button & (U_JPAD | L_JPAD | R_JPAD | D_JPAD); - if (CHECK_PAD(input->cur, L_TRIG) || CHECK_PAD(input->cur, R_TRIG) || CHECK_PAD(input->cur, START_BUTTON)) { + dpad = input->cur.button & (BTN_DUP | BTN_DLEFT | BTN_DRIGHT | BTN_DDOWN); + if (CHECK_BTN_ALL(input->cur.button, BTN_L) || CHECK_BTN_ALL(input->cur.button, BTN_R) || + CHECK_BTN_ALL(input->cur.button, BTN_START)) { input_combo = inputCombos; for (i = 0; i < REG_GROUPS; i++) { - if (~(~input_combo->push | input->cur.in.button) || ~(~input_combo->held | input->press.in.button)) { + if (~(~input_combo->push | input->cur.button) || ~(~input_combo->held | input->press.button)) { input_combo++; } else { break; @@ -154,25 +151,27 @@ void func_8006390C(Input* input) { gGameInfo->dpadLast = dpad; } - increment = - (dpad & R_JPAD) - ? (CHECK_PAD(input->cur, A_BUTTON | B_BUTTON) - ? 1000 - : CHECK_PAD(input->cur, A_BUTTON) ? 100 : CHECK_PAD(input->cur, B_BUTTON) ? 10 : 1) - : (dpad & L_JPAD) - ? (CHECK_PAD(input->cur, A_BUTTON | B_BUTTON) - ? -1000 - : CHECK_PAD(input->cur, A_BUTTON) ? -100 - : CHECK_PAD(input->cur, B_BUTTON) ? -10 : -1) - : 0; + increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) + ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) + ? 1000 + : CHECK_BTN_ALL(input->cur.button, BTN_A) + ? 100 + : CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 : 1) + : (CHECK_BTN_ANY(dpad, BTN_DLEFT)) + ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) + ? -1000 + : CHECK_BTN_ALL(input->cur.button, BTN_A) + ? -100 + : CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 : -1) + : 0; gGameInfo->data[gGameInfo->regCur + regGroup] += increment; - if (dpad & U_JPAD) { + if (CHECK_BTN_ANY(dpad, BTN_DUP)) { gGameInfo->regCur--; if (gGameInfo->regCur < 0) { gGameInfo->regCur = REG_PER_PAGE - 1; } - } else if (dpad & D_JPAD) { + } else if (CHECK_BTN_ANY(dpad, BTN_DDOWN)) { gGameInfo->regCur++; if (gGameInfo->regCur >= REG_PER_PAGE) { gGameInfo->regCur = 0; diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index d029d25568..571bb82400 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" typedef struct { /* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 35dc743ff6..9210fe1d13 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" u16 D_8011E1C0 = 0; u16 D_8011E1C4 = 0; @@ -98,14 +96,15 @@ void func_80064558(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) { Input* pad1 = &globalCtx->state.input[0]; - if (CHECK_PAD(pad1->press, L_JPAD) && (csCtx->state == CS_STATE_IDLE) && (gSaveContext.sceneSetupIndex >= 4)) { + if (CHECK_BTN_ALL(pad1->press.button, BTN_DLEFT) && (csCtx->state == CS_STATE_IDLE) && + (gSaveContext.sceneSetupIndex >= 4)) { D_8015FCC8 = 0; gSaveContext.cutsceneIndex = 0xFFFD; gSaveContext.cutsceneTrigger = 1; } - if (CHECK_PAD(pad1->press, U_JPAD) && (csCtx->state == CS_STATE_IDLE) && (gSaveContext.sceneSetupIndex >= 4) && - (D_8011D394 == 0)) { + if (CHECK_BTN_ALL(pad1->press.button, BTN_DUP) && (csCtx->state == CS_STATE_IDLE) && + (gSaveContext.sceneSetupIndex >= 4) && (D_8011D394 == 0)) { D_8015FCC8 = 1; gSaveContext.cutsceneIndex = 0xFFFD; gSaveContext.cutsceneTrigger = 1; @@ -442,15 +441,16 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt if ((gSaveContext.gameMode != 0) && (gSaveContext.gameMode != 3) && (globalCtx->sceneNum != SCENE_SPOT00) && (csCtx->frames > 20) && - (CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) || CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON) || - CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON)) && + (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_A) || + CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B) || + CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START)) && (gSaveContext.fileNum != 0xFEDC) && (globalCtx->sceneLoadFlag == 0)) { Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); temp = 1; } if ((csCtx->frames == cmd->startFrame) || (temp != 0) || - ((csCtx->frames > 20) && CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) && + ((csCtx->frames > 20) && CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START) && (gSaveContext.fileNum != 0xFEDC))) { csCtx->state = CS_STATE_UNSKIPPABLE_EXEC; func_800F68BC(0); @@ -1522,7 +1522,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, return; } - if (CHECK_PAD(globalCtx->state.input[0].press, R_JPAD)) { + if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_DRIGHT)) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; return; } diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 83f13ce076..885a4674f4 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // "Get Item" Model Draw Functions void func_800694E4(GlobalContext* globalCtx, s16 drawId); diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 8f256bcc59..3624a2c9f8 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) { EffectBlureElement* elem; diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 2d6763da15..a68c765612 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" static Vtx sVertices[5] = { VTX(-32, -32, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 77b7e3f2ba..6d4ef51ccc 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // original name: "spark" void EffectSpark_Init(void* thisx, void* initParamsx) { diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index 5ac7774bc2..a6eeabeb86 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { f32 cos; diff --git a/src/code/z_effect.c b/src/code/z_effect.c index a1077c13af..f035469e04 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" EffectContext sEffectContext; diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 4fa2abb885..381a24f985 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info" diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c index 8ecba2e1b5..bc7ec83b91 100644 --- a/src/code/z_effect_soft_sprite_dlftbls.c +++ b/src/code/z_effect_soft_sprite_dlftbls.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "initvars.h" #define EFFECT_SS_OVERLAY(name) \ { \ diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 4fd31db0fd..806ee878a0 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" #include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h" #include "overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h" diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index e188e1947e..d3552c419d 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // TODO: use macros to define elf messages once the format is fully documented ElfMessage sChildSariaMsgs[] = { diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 0847ad682d..34ca02864a 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 64a8dc4dc5..df18eb7f79 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000000 diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index 8bc9c6685d..56e40fd822 100644 --- a/src/code/z_face_reaction.c +++ b/src/code/z_face_reaction.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" u16 sReactionTextIds[][PLAYER_MASK_MAX] = { { 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 }, diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index f8409a7edb..426231bcb3 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" Gfx D_8012AFB0[] = { gsDPPipeSync(), diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index dfcf7e54a7..8ef9122780 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -1,4 +1,4 @@ -#include +#include "global.h" // unused Gfx sCircleNullDList[] = { diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 74d218caad..d0f99bed6b 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" static Gfx sRCPSetupFade[] = { gsDPPipeSync(), diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 4c2d0a4756..d4c3d66558 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -1,4 +1,4 @@ -#include +#include "global.h" Gfx sTriforceDList[] = { gsDPPipeSync(), diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 93b3a95118..3c0456ccea 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -1,4 +1,4 @@ -#include +#include "global.h" Vtx sWipeVtx[] = { VTX(-1299, 750, 0, 13653, 2048, 0xAD, 0x30, 0xB8, 0xFF), VTX(-750, 1299, 0, 15019, 2048, 0xD0, 0x53, 0xB8, 0xFF), diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 7e3500fc17..e5aa09dd9f 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void SkelCurve_Clear(SkelAnimeCurve* skelCurve) { skelCurve->limbCount = 0; diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c index c7bfa9dd67..d543640684 100644 --- a/src/code/z_game_dlftbls.c +++ b/src/code/z_game_dlftbls.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define GAMESTATE_OVERLAY(name, init, destroy, size) \ { \ diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 3764530dd3..3d02e175ef 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" s32 func_8006CFC0(s32 scene) { s32 validScenes[] = { SCENE_SPOT00, SCENE_SPOT06, SCENE_SPOT09, SCENE_SPOT12, SCENE_SPOT20 }; diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index ee92e02cf9..019f682160 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" #define MARKER_SOI 0xD8 #define MARKER_SOF 0xC0 diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index 861b81861d..6f80b3ae1f 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" #define KALEIDO_OVERLAY(name) \ { \ diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index d7f42b7246..09eee556b1 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,9 +1,9 @@ -#include -#include +#include "global.h" +#include "vt.h" void (*sKaleidoScopeUpdateFunc)(GlobalContext*); void (*sKaleidoScopeDrawFunc)(GlobalContext*); -float D_80161398; +f32 D_80161398; u32 D_8016139C; void* D_801613A0; diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index ce5513bb43..10140553ee 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s16 sKaleidoSetupKscpPos0[] = { 2, @@ -48,11 +48,11 @@ void KaleidoSetup_Update(GlobalContext* globalCtx) { gSaveContext.unk_13F0 != 8 && gSaveContext.unk_13F0 != 9 && (globalCtx->sceneNum != SCENE_BOWLING || !Flags_GetSwitch(globalCtx, 0x38))) { - if (CHECK_PAD(input->cur, L_TRIG) && CHECK_PAD(input->press, U_CBUTTONS)) { + if (CHECK_BTN_ALL(input->cur.button, BTN_L) && CHECK_BTN_ALL(input->press.button, BTN_CUP)) { if (BREG(0)) { pauseCtx->flag = 3; } - } else if (CHECK_PAD(input->press, START_BUTTON)) { + } else if (CHECK_BTN_ALL(input->press.button, BTN_START)) { gSaveContext.unk_13EE = gSaveContext.unk_13EA; WREG(16) = -0xAF; WREG(17) = 0x9B; diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index fc2c0b1e8f..272c235f30 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_kanfont/func_8006EE60.s") diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 7caa221e5d..70b8e2c313 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_8006F0A0.s") diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 01ea0ef866..a69770ca2d 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void Lib_MemSet(u8* dest, size_t size, u8 val) { u32 i; @@ -168,8 +167,8 @@ s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep) { } void func_80077D10(f32* arg0, s16* arg1, Input* input) { - f32 relX = input->rel.in.x; - f32 relY = input->rel.in.y; + f32 relX = input->rel.stick_x; + f32 relY = input->rel.stick_y; *arg0 = sqrtf(SQ(relX) + SQ(relY)); *arg0 = (60.0f < *arg0) ? 60.0f : *arg0; diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 9faf690260..64fe2e53e9 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" extern s16 D_8011FF10[3]; extern s16 D_8011FF24[3]; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 5fc5b1b0d2..2f6c06a62c 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #define LIGHTS_BUFFER_SIZE 32 diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index ce9b1a5996..f992755a19 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c index b0dbd6cace..f518a124ca 100644 --- a/src/code/z_map_data.c +++ b/src/code/z_map_data.c @@ -1,4 +1,4 @@ -#include +#include "global.h" static s16 sFloorTexIndexOffset[10][8] = { { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 }, diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 9336c8a85a..c409d0cf8f 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" MapData* gMapData; @@ -403,7 +402,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { } } - if (CHECK_PAD(globalCtx->state.input[0].press, L_TRIG) && !Gameplay_InCsMode(globalCtx)) { + if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_L) && !Gameplay_InCsMode(globalCtx)) { osSyncPrintf("Game_play_demo_mode_check=%d\n", Gameplay_InCsMode(globalCtx)); // clang-format off if (!R_MINIMAP_TOGGLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &D_801333D4, 4, @@ -484,7 +483,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { Minimap_DrawCompassIcons(globalCtx); // Draw icons for the player spawn and current position } - if (CHECK_PAD(globalCtx->state.input[0].press, L_TRIG) && !Gameplay_InCsMode(globalCtx)) { + if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_L) && !Gameplay_InCsMode(globalCtx)) { // clang-format off if (!R_MINIMAP_TOGGLED) { Audio_PlaySoundGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 5597c77114..c8e447f641 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" typedef struct { /* 0x00 */ void* texture; diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index b8e4434355..1dd79776ca 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801069B0.s") diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 17886ba8b0..42f5704bc8 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" u32 sFontColorRed = 255; u32 sFontColorGreen = 255; diff --git a/src/code/z_msgevent.c b/src/code/z_msgevent.c index 652d498994..d09ab08d3a 100644 --- a/src/code/z_msgevent.c +++ b/src/code/z_msgevent.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void MsgEvent_SendNullTask() { s32 pad[4]; diff --git a/src/code/z_olib.c b/src/code/z_olib.c index c9f278b0bb..b4b9899290 100644 --- a/src/code/z_olib.c +++ b/src/code/z_olib.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" /** * Calculates the distances between `a` and `b` diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index faf7ca6b7d..176a11f7a8 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" typedef struct { /* 0x00 */ u32 unk_00; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index ca8fc1d22d..97ef34dc45 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,7 +1,5 @@ -#include -#include -#include -#include +#include "global.h" +#include "vt.h" typedef struct { /* 0x00 */ u8 scene; @@ -3920,13 +3918,13 @@ void Interface_Update(GlobalContext* globalCtx) { u16 action; Input* input = &globalCtx->state.input[2]; - if (CHECK_PAD(input->press, L_JPAD)) { + if (CHECK_BTN_ALL(input->press.button, BTN_DLEFT)) { gSaveContext.language = 0; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); - } else if (CHECK_PAD(input->press, U_JPAD)) { + } else if (CHECK_BTN_ALL(input->press.button, BTN_DUP)) { gSaveContext.language = 1; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); - } else if (CHECK_PAD(input->press, R_JPAD)) { + } else if (CHECK_BTN_ALL(input->press.button, BTN_DRIGHT)) { gSaveContext.language = 2; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } diff --git a/src/code/z_path.c b/src/code/z_path.c index 03dc6d6f60..f9bcac0848 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max) { Path* path; diff --git a/src/code/z_play.c b/src/code/z_play.c index 20c2567bd5..29cad25382 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" void* D_8012D1F0 = NULL; UNK_TYPE D_8012D1F4 = 0; // unused @@ -921,7 +920,7 @@ void Gameplay_Update(GlobalContext* globalCtx) { } if (globalCtx->unk_1242B != 0) { - if (CHECK_PAD(input[0].press, U_CBUTTONS)) { + if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) { if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { // Translates to: "Changing viewpoint is prohibited due to the kaleidoscope" osSyncPrintf(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST); diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index e408cc9890..616f1e4b37 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define FLAGS 0x06000035 diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 7bdacf68b3..e5a87bb78b 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" typedef struct { /* 0x00 */ u8 flag; diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index eeae441cea..678e393b09 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" void func_80092320(PreNMIContext* prenmiCtx) { prenmiCtx->state.running = false; diff --git a/src/code/z_prenmi_buff.c b/src/code/z_prenmi_buff.c index 9c5924bc98..340309e697 100644 --- a/src/code/z_prenmi_buff.c +++ b/src/code/z_prenmi_buff.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #define COLD_RESET 0 #define NMI 1 diff --git a/src/code/z_quake.c b/src/code/z_quake.c index e8f31aa57f..9869fa6fb6 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "vt.h" QuakeRequest sQuakeRequest[4]; s16 D_80126250 = 1; diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 93fb384696..7af688f2e9 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" Gfx sSetupDL[] = { /* 0x00 */ diff --git a/src/code/z_room.c b/src/code/z_room.c index 388c41b742..9dbb122038 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags); void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags); diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 59ad5a59b3..d5383b3732 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -1,9 +1,7 @@ -#include -#include -#include +#include "global.h" void Sample_HandleStateChange(SampleContext* this) { - if (CHECK_PAD(this->state.input[0].press, START_BUTTON)) { + if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) { SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext); this->state.running = false; } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 733d08fa44..04bcb358c2 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" RomFile sNaviMsgFiles[]; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 4473697d32..0ddb3ca5bd 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #define ENTRANCE(scene, spawn, continueBgm, displayTitleCard, fadeIn, fadeOut) \ { \ diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 2bccd4db10..a890c9a7f4 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" s32 func_800A3D70(GlobalContext*, SkelAnime*); s32 func_800A3E0C(GlobalContext*, SkelAnime*); diff --git a/src/code/z_skin.c b/src/code/z_skin.c index ca907bb17e..9d8f9004f1 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin/func_800A57C0.s") diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index 4e4530025f..b506d002fc 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin_awb/func_800A6460.s") diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 9920fe76ef..62513bc0e1 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" // clang-format off MtxF sMtxFClear = { diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 0f2bcaa64f..06517245f3 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_sram/func_800A81A0.s") diff --git a/src/code/z_view.c b/src/code/z_view.c index 5ef8808dee..5807cc0fb7 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -1,8 +1,7 @@ -#include -#include -#include +#include "global.h" +#include "vt.h" -volatile u32 D_8012ABF0 = true; +vu32 D_8012ABF0 = true; void View_ViewportToVp(Vp* dest, Viewport* src) { s32 width = src->rightX - src->leftX; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index 1fa3ba4521..0dedd07924 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_vimode/func_800AC030.s") diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index 112f64c00d..be0600ba1d 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" // (Note: 80 = SCREEN_HEIGHT/3, see VisMono_DrawTexture) // Did the devs forget to update this? 1+1+1+80*(7+2+2+3)+1+1 makes more sense diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 8008c6aca7..09c872365a 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/z_vr_box/func_800ADBB0.s") diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index b8cd7f3367..f08feaf929 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -1,4 +1,4 @@ -#include +#include "global.h" Mtx* sSkyboxDrawMatrix; diff --git a/src/libultra_boot_O1/__osDequeueThread.c b/src/libultra_boot_O1/__osDequeueThread.c index 50b6aeeff8..a29f007c90 100644 --- a/src/libultra_boot_O1/__osDequeueThread.c +++ b/src/libultra_boot_O1/__osDequeueThread.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void __osDequeueThread(OSThread** queue, OSThread* thread) { register OSThread** a2; diff --git a/src/libultra_boot_O1/__osGetHWIntrRoutine.c b/src/libultra_boot_O1/__osGetHWIntrRoutine.c index a9b633adb4..4ccfb032a3 100644 --- a/src/libultra_boot_O1/__osGetHWIntrRoutine.c +++ b/src/libultra_boot_O1/__osGetHWIntrRoutine.c @@ -1,4 +1,5 @@ -#include +#include "global.h" +#include "ultra64/internal.h" void __osGetHWIntrRoutine(s32 idx, OSMesgQueue** outQueue, OSMesg* outMsg) { *outQueue = __osHwIntTable[idx].queue; diff --git a/src/libultra_boot_O1/__osResetGlobalIntMask.c b/src/libultra_boot_O1/__osResetGlobalIntMask.c index 9479289fb1..bf5a2466f3 100644 --- a/src/libultra_boot_O1/__osResetGlobalIntMask.c +++ b/src/libultra_boot_O1/__osResetGlobalIntMask.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void __osResetGlobalIntMask(u32 mask) { register s32 prevInt; diff --git a/src/libultra_boot_O1/__osSetGlobalIntMask.c b/src/libultra_boot_O1/__osSetGlobalIntMask.c index 15200ac55e..4f46523f28 100644 --- a/src/libultra_boot_O1/__osSetGlobalIntMask.c +++ b/src/libultra_boot_O1/__osSetGlobalIntMask.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void __osSetGlobalIntMask(u32 mask) { register s32 prevInt; diff --git a/src/libultra_boot_O1/__osSetHWIntrRoutine.c b/src/libultra_boot_O1/__osSetHWIntrRoutine.c index 48f5a85dbb..03b6d974d2 100644 --- a/src/libultra_boot_O1/__osSetHWIntrRoutine.c +++ b/src/libultra_boot_O1/__osSetHWIntrRoutine.c @@ -1,7 +1,8 @@ -#include +#include "global.h" +#include "ultra64/internal.h" void __osSetHWIntrRoutine(s32 idx, OSMesgQueue* queue, OSMesg msg) { - register int prevInt; + register s32 prevInt; prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O1/initialize.c b/src/libultra_boot_O1/initialize.c index 29d4846617..e850919f09 100644 --- a/src/libultra_boot_O1/initialize.c +++ b/src/libultra_boot_O1/initialize.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" typedef struct { u32 ins_00; // lui k0, 0x8000 diff --git a/src/libultra_boot_O1/osCreateMesgQueue.c b/src/libultra_boot_O1/osCreateMesgQueue.c index 3282c16ffe..31f1e2522e 100644 --- a/src/libultra_boot_O1/osCreateMesgQueue.c +++ b/src/libultra_boot_O1/osCreateMesgQueue.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 count) { mq->mtqueue = __osThreadTail; diff --git a/src/libultra_boot_O1/osCreateThread.c b/src/libultra_boot_O1/osCreateThread.c index d62f0c2cc6..af14674148 100644 --- a/src/libultra_boot_O1/osCreateThread.c +++ b/src/libultra_boot_O1/osCreateThread.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSThread* __osThreadTail[2] = { NULL, (OSThread*)-1 }; OSThread* __osRunQueue = __osThreadTail; diff --git a/src/libultra_boot_O1/osDestroyThread.c b/src/libultra_boot_O1/osDestroyThread.c index 5fa3186647..079cd78e06 100644 --- a/src/libultra_boot_O1/osDestroyThread.c +++ b/src/libultra_boot_O1/osDestroyThread.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osDestroyThread(OSThread* thread) { register s32 int_disabled; diff --git a/src/libultra_boot_O1/osGetMemSize.c b/src/libultra_boot_O1/osGetMemSize.c index f1f175224a..00d180dc39 100644 --- a/src/libultra_boot_O1/osGetMemSize.c +++ b/src/libultra_boot_O1/osGetMemSize.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #define STEP 0x100000 diff --git a/src/libultra_boot_O1/osGetThreadId.c b/src/libultra_boot_O1/osGetThreadId.c index 5c2dd5d092..792229c9bf 100644 --- a/src/libultra_boot_O1/osGetThreadId.c +++ b/src/libultra_boot_O1/osGetThreadId.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSId osGetThreadId(OSThread* thread) { if (thread == NULL) { diff --git a/src/libultra_boot_O1/osGetThreadPri.c b/src/libultra_boot_O1/osGetThreadPri.c index d6a7c91607..6c36a7c3b1 100644 --- a/src/libultra_boot_O1/osGetThreadPri.c +++ b/src/libultra_boot_O1/osGetThreadPri.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSPri osGetThreadPri(OSThread* thread) { if (thread == NULL) { diff --git a/src/libultra_boot_O1/osGetTime.c b/src/libultra_boot_O1/osGetTime.c index 9cf6e53079..f053ba8192 100644 --- a/src/libultra_boot_O1/osGetTime.c +++ b/src/libultra_boot_O1/osGetTime.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSTime osGetTime(void) { u32 sp34; diff --git a/src/libultra_boot_O1/osJamMesg.c b/src/libultra_boot_O1/osJamMesg.c index 87c49979d2..c0aa9a4b12 100644 --- a/src/libultra_boot_O1/osJamMesg.c +++ b/src/libultra_boot_O1/osJamMesg.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osJamMesg(OSMesgQueue* mq, OSMesg msg, s32 flag) { register s32 int_disabled; diff --git a/src/libultra_boot_O1/osRecvMesg.c b/src/libultra_boot_O1/osRecvMesg.c index f49716cd63..3cb5a8a47f 100644 --- a/src/libultra_boot_O1/osRecvMesg.c +++ b/src/libultra_boot_O1/osRecvMesg.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag) { register s32 s0 = __osDisableInt(); diff --git a/src/libultra_boot_O1/osSendMesg.c b/src/libultra_boot_O1/osSendMesg.c index 53b9147546..617d3bb127 100644 --- a/src/libultra_boot_O1/osSendMesg.c +++ b/src/libultra_boot_O1/osSendMesg.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osSendMesg(OSMesgQueue* mq, OSMesg mesg, s32 flag) { register u32 s0 = __osDisableInt(); diff --git a/src/libultra_boot_O1/osSetEventMesg.c b/src/libultra_boot_O1/osSetEventMesg.c index 97123969de..615ee24457 100644 --- a/src/libultra_boot_O1/osSetEventMesg.c +++ b/src/libultra_boot_O1/osSetEventMesg.c @@ -1,6 +1,7 @@ -#include +#include "global.h" +#include "ultra64/internal.h" -__OSEventState __osEventStateTab[16]; +__OSEventState __osEventStateTab[OS_NUM_EVENTS + 1]; u32 __osPreNMI = 0; diff --git a/src/libultra_boot_O1/osSetThreadPri.c b/src/libultra_boot_O1/osSetThreadPri.c index 483488e507..b0134d27f1 100644 --- a/src/libultra_boot_O1/osSetThreadPri.c +++ b/src/libultra_boot_O1/osSetThreadPri.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osSetThreadPri(OSThread* thread, OSPri pri) { register u32 s0 = __osDisableInt(); diff --git a/src/libultra_boot_O1/osStartThread.c b/src/libultra_boot_O1/osStartThread.c index f64fa902d9..6b4a53de25 100644 --- a/src/libultra_boot_O1/osStartThread.c +++ b/src/libultra_boot_O1/osStartThread.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osStartThread(OSThread* thread) { register u32 s0 = __osDisableInt(); diff --git a/src/libultra_boot_O1/osStopThread.c b/src/libultra_boot_O1/osStopThread.c index 4d5db6afde..5f005d41a9 100644 --- a/src/libultra_boot_O1/osStopThread.c +++ b/src/libultra_boot_O1/osStopThread.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osStopThread(OSThread* thread) { register u32 s0 = __osDisableInt(); diff --git a/src/libultra_boot_O1/osViExtendVStart.c b/src/libultra_boot_O1/osViExtendVStart.c index 8a09b2ae9d..4808b0e29c 100644 --- a/src/libultra_boot_O1/osViExtendVStart.c +++ b/src/libultra_boot_O1/osViExtendVStart.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osViExtendVStart(u32 arg0) { __additional_scanline = arg0; diff --git a/src/libultra_boot_O1/osViModePalLan1.c b/src/libultra_boot_O1/osViModePalLan1.c index 30df53a7d2..2f69c8197b 100644 --- a/src/libultra_boot_O1/osViModePalLan1.c +++ b/src/libultra_boot_O1/osViModePalLan1.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSViMode osViModePalLan1 = { 0x10, // type diff --git a/src/libultra_boot_O1/osVirtualToPhysical.c b/src/libultra_boot_O1/osVirtualToPhysical.c index b7c118b4bc..30ada113c9 100644 --- a/src/libultra_boot_O1/osVirtualToPhysical.c +++ b/src/libultra_boot_O1/osVirtualToPhysical.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u32 osVirtualToPhysical(void* vaddr) { if ((u32)vaddr >= 0x80000000 && (u32)vaddr < 0xA0000000) { diff --git a/src/libultra_boot_O1/osYieldThread.c b/src/libultra_boot_O1/osYieldThread.c index e289cc9731..3c716032db 100644 --- a/src/libultra_boot_O1/osYieldThread.c +++ b/src/libultra_boot_O1/osYieldThread.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osYieldThread() { register u32 prevInt; diff --git a/src/libultra_boot_O1/piacs.c b/src/libultra_boot_O1/piacs.c index e48cfbcc0b..9a28659455 100644 --- a/src/libultra_boot_O1/piacs.c +++ b/src/libultra_boot_O1/piacs.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u32 __osPiAccessQueueEnabled = 0; diff --git a/src/libultra_boot_O1/timerintr.c b/src/libultra_boot_O1/timerintr.c index 83c882a3b2..f2209cc0d8 100644 --- a/src/libultra_boot_O1/timerintr.c +++ b/src/libultra_boot_O1/timerintr.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSTimer __osBaseTimer; OSTime __osCurrentTime; diff --git a/src/libultra_boot_O2/_Ldtob.c b/src/libultra_boot_O2/_Ldtob.c index 57a49cc8cc..68a9c5404e 100644 --- a/src/libultra_boot_O2/_Ldtob.c +++ b/src/libultra_boot_O2/_Ldtob.c @@ -1,14 +1,11 @@ -#include -#include -#include -#include +#include "global.h" #define BUFF_LEN 0x20 s16 _Ldunscale(s16*, _Pft*); void _Genld(_Pft*, u8, u8*, s16, s16); -const double D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L }; +const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L }; /* float properties */ #define _D0 0 @@ -161,8 +158,8 @@ void _Ldtob(_Pft* args, u8 type) { s16 _Ldunscale(s16* pex, _Pft* px) { - unsigned short* ps = (unsigned short*)px; - short xchar = (ps[_D0] & _DMASK) >> _DOFF; + u16* ps = (u16*)px; + s16 xchar = (ps[_D0] & _DMASK) >> _DOFF; if (xchar == _DMAX) { /* NaN or INF */ *pex = 0; return (s16)(ps[_D0] & _DFRAC || ps[_D1] || ps[_D2] || ps[_D3] ? NAN : INF); @@ -275,7 +272,7 @@ void _Genld(_Pft* px, u8 code, u8* p, s16 nsig, s16 xexp) { px->n2 = p - (u8*)&px->s[px->n1]; } if ((px->flags & (FLAGS_ZERO | FLAGS_MINUS)) == FLAGS_ZERO) { /* pad with leading zeros */ - int n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2; + s32 n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2; if (n < px->width) { px->nz0 = px->width - n; diff --git a/src/libultra_boot_O2/_Litob.c b/src/libultra_boot_O2/_Litob.c index 5b2329cd34..0f9452124f 100644 --- a/src/libultra_boot_O2/_Litob.c +++ b/src/libultra_boot_O2/_Litob.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "global.h" #define BUFF_LEN 0x18 diff --git a/src/libultra_boot_O2/_Printf.c b/src/libultra_boot_O2/_Printf.c index a5f922d562..e8fa2c6961 100644 --- a/src/libultra_boot_O2/_Printf.c +++ b/src/libultra_boot_O2/_Printf.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "global.h" #define ATOI(i, a) \ for (i = 0; *a >= '0' && *a <= '9'; a++) \ @@ -17,8 +14,8 @@ } #define _PAD(m, src, extracond) \ if (extracond && m > 0) { \ - int i; \ - int j; \ + s32 i; \ + s32 j; \ for (j = m; j > 0; j -= i) { \ if ((u32)j > 32) \ i = 32; \ @@ -203,7 +200,7 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { break; case 'p': - px->v.ll = (long)va_arg(*pap, void*); + px->v.ll = (s64)va_arg(*pap, void*); px->s = (char*)&ac[px->n0]; _Litob(px, 'x'); break; diff --git a/src/libultra_boot_O2/__osDevMgrMain.c b/src/libultra_boot_O2/__osDevMgrMain.c index 9065b903c0..e481c33fb1 100644 --- a/src/libultra_boot_O2/__osDevMgrMain.c +++ b/src/libultra_boot_O2/__osDevMgrMain.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "ultra64/internal.h" void __osDevMgrMain(void* arg) { OSIoMesg* ioMesg; diff --git a/src/libultra_boot_O2/__osEPiRawReadIo.c b/src/libultra_boot_O2/__osEPiRawReadIo.c index b1e9b88d00..6aa0bf0b68 100644 --- a/src/libultra_boot_O2/__osEPiRawReadIo.c +++ b/src/libultra_boot_O2/__osEPiRawReadIo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { s32 status; diff --git a/src/libultra_boot_O2/__osEPiRawStartDma.c b/src/libultra_boot_O2/__osEPiRawStartDma.c index cc28a6ca9d..9246484486 100644 --- a/src/libultra_boot_O2/__osEPiRawStartDma.c +++ b/src/libultra_boot_O2/__osEPiRawStartDma.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size) { s32 status; diff --git a/src/libultra_boot_O2/__osEPiRawWriteIo.c b/src/libultra_boot_O2/__osEPiRawWriteIo.c index 08d817bfa3..7c5701e0d1 100644 --- a/src/libultra_boot_O2/__osEPiRawWriteIo.c +++ b/src/libultra_boot_O2/__osEPiRawWriteIo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { s32 status; diff --git a/src/libultra_boot_O2/__osPiRawStartDma.c b/src/libultra_boot_O2/__osPiRawStartDma.c index 589a63b3ba..d323a66b3b 100644 --- a/src/libultra_boot_O2/__osPiRawStartDma.c +++ b/src/libultra_boot_O2/__osPiRawStartDma.c @@ -1,16 +1,15 @@ -#include -#include +#include "global.h" -s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void* dram_addr, size_t size) { - register int status; +s32 __osPiRawStartDma(s32 dir, u32 cartAddr, void* dramAddr, size_t size) { + register s32 status; status = HW_REG(PI_STATUS_REG, u32); while (status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) { status = HW_REG(PI_STATUS_REG, u32); } - HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dram_addr); + HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dramAddr); - HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cart_addr) & 0x1fffffff); + HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cartAddr) & 0x1fffffff); switch (dir) { case OS_READ: diff --git a/src/libultra_boot_O2/__osSiDeviceBusy.c b/src/libultra_boot_O2/__osSiDeviceBusy.c index 86833fd365..ec2462f83e 100644 --- a/src/libultra_boot_O2/__osSiDeviceBusy.c +++ b/src/libultra_boot_O2/__osSiDeviceBusy.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 __osSiDeviceBusy() { register u32 status; diff --git a/src/libultra_boot_O2/__osSiRawReadIo.c b/src/libultra_boot_O2/__osSiRawReadIo.c index fa26c8e2aa..b68f475e99 100644 --- a/src/libultra_boot_O2/__osSiRawReadIo.c +++ b/src/libultra_boot_O2/__osSiRawReadIo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 __osSiRawReadIo(void* a0, u32* a1) { if (__osSiDeviceBusy()) { diff --git a/src/libultra_boot_O2/__osSiRawWriteIo.c b/src/libultra_boot_O2/__osSiRawWriteIo.c index 7658b5a97b..91d03f9708 100644 --- a/src/libultra_boot_O2/__osSiRawWriteIo.c +++ b/src/libultra_boot_O2/__osSiRawWriteIo.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 __osSiRawWriteIo(void* a0, u32 a1) { if (__osSiDeviceBusy()) { diff --git a/src/libultra_boot_O2/__osViGetCurrentContext.c b/src/libultra_boot_O2/__osViGetCurrentContext.c index fea88be8fd..f83a2d0ee0 100644 --- a/src/libultra_boot_O2/__osViGetCurrentContext.c +++ b/src/libultra_boot_O2/__osViGetCurrentContext.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSViContext* __osViGetCurrentContext() { return __osViCurr; diff --git a/src/libultra_boot_O2/__osViInit.c b/src/libultra_boot_O2/__osViInit.c index becce34ab9..43f2abb028 100644 --- a/src/libultra_boot_O2/__osViInit.c +++ b/src/libultra_boot_O2/__osViInit.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" OSViContext vi[2] = { 0 }; OSViContext* __osViCurr = &vi[0]; diff --git a/src/libultra_boot_O2/__osViSwapContext.c b/src/libultra_boot_O2/__osViSwapContext.c index 4dcc4c8703..8f202d17c3 100644 --- a/src/libultra_boot_O2/__osViSwapContext.c +++ b/src/libultra_boot_O2/__osViSwapContext.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void __osViSwapContext() { register OSViMode* s0; diff --git a/src/libultra_boot_O2/ldiv.c b/src/libultra_boot_O2/ldiv.c index 391fe79c47..8c53d3d4cc 100644 --- a/src/libultra_boot_O2/ldiv.c +++ b/src/libultra_boot_O2/ldiv.c @@ -1,7 +1,6 @@ -#include -#include +#include "global.h" -ldiv_t ldiv(long num, long denom) { +ldiv_t ldiv(s32 num, s32 denom) { ldiv_t ret; ret.quot = num / denom; @@ -14,7 +13,7 @@ ldiv_t ldiv(long num, long denom) { return ret; } -lldiv_t lldiv(long long num, long long denom) { +lldiv_t lldiv(s64 num, s64 denom) { lldiv_t ret; ret.quot = num / denom; diff --git a/src/libultra_boot_O2/osCartRomInit.c b/src/libultra_boot_O2/osCartRomInit.c index eef5be9fdb..a46e0e09b6 100644 --- a/src/libultra_boot_O2/osCartRomInit.c +++ b/src/libultra_boot_O2/osCartRomInit.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" OSPiHandle __CartRomHandle; diff --git a/src/libultra_boot_O2/osDriveRomInit.c b/src/libultra_boot_O2/osDriveRomInit.c index 4dd49a6299..83b3c9fc66 100644 --- a/src/libultra_boot_O2/osDriveRomInit.c +++ b/src/libultra_boot_O2/osDriveRomInit.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" OSPiHandle __DriveRomHandle; diff --git a/src/libultra_boot_O2/osEPiReadIo.c b/src/libultra_boot_O2/osEPiReadIo.c index 964330c305..d05604a589 100644 --- a/src/libultra_boot_O2/osEPiReadIo.c +++ b/src/libultra_boot_O2/osEPiReadIo.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { register s32 ret; diff --git a/src/libultra_boot_O2/osEPiStartDma.c b/src/libultra_boot_O2/osEPiStartDma.c index 83fc694a34..f1dccc8333 100644 --- a/src/libultra_boot_O2/osEPiStartDma.c +++ b/src/libultra_boot_O2/osEPiStartDma.c @@ -1,4 +1,5 @@ -#include +#include "global.h" +#include "ultra64/internal.h" s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) { s32 ret; diff --git a/src/libultra_boot_O2/osEPiWriteIo.c b/src/libultra_boot_O2/osEPiWriteIo.c index 5d4f61a2fc..0547e69991 100644 --- a/src/libultra_boot_O2/osEPiWriteIo.c +++ b/src/libultra_boot_O2/osEPiWriteIo.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { register s32 ret; diff --git a/src/libultra_boot_O2/osPiGetCmdQueue.c b/src/libultra_boot_O2/osPiGetCmdQueue.c index 1f097a9269..a4454ec825 100644 --- a/src/libultra_boot_O2/osPiGetCmdQueue.c +++ b/src/libultra_boot_O2/osPiGetCmdQueue.c @@ -1,4 +1,5 @@ -#include +#include "global.h" +#include "ultra64/internal.h" OSMesgQueue* osPiGetCmdQueue() { if (!__osPiDevMgr.initialized) { diff --git a/src/libultra_boot_O2/osViBlack.c b/src/libultra_boot_O2/osViBlack.c index 753619b8b1..3e877a387c 100644 --- a/src/libultra_boot_O2/osViBlack.c +++ b/src/libultra_boot_O2/osViBlack.c @@ -1,4 +1,4 @@ -#include +#include "global.h" // TODO: name magic constants void osViBlack(u8 active) { diff --git a/src/libultra_boot_O2/osViGetNextFramebuffer.c b/src/libultra_boot_O2/osViGetNextFramebuffer.c index a8b642603a..86f8549ab5 100644 --- a/src/libultra_boot_O2/osViGetNextFramebuffer.c +++ b/src/libultra_boot_O2/osViGetNextFramebuffer.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void* osViGetNextFramebuffer() { s32 prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViModeFpalLan1.c b/src/libultra_boot_O2/osViModeFpalLan1.c index 357b5837aa..f3e7421bab 100644 --- a/src/libultra_boot_O2/osViModeFpalLan1.c +++ b/src/libultra_boot_O2/osViModeFpalLan1.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSViMode osViModeFpalLan1 = { 0x2C, // type diff --git a/src/libultra_boot_O2/osViModeMpalLan1.c b/src/libultra_boot_O2/osViModeMpalLan1.c index 5e75ea39aa..b872b897ec 100644 --- a/src/libultra_boot_O2/osViModeMpalLan1.c +++ b/src/libultra_boot_O2/osViModeMpalLan1.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSViMode osViModeMpalLan1 = { 0x1E, // type diff --git a/src/libultra_boot_O2/osViModeNtscLan1.c b/src/libultra_boot_O2/osViModeNtscLan1.c index 267c5eaf0d..80330f21e1 100644 --- a/src/libultra_boot_O2/osViModeNtscLan1.c +++ b/src/libultra_boot_O2/osViModeNtscLan1.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSViMode osViModeNtscLan1 = { 2, // type diff --git a/src/libultra_boot_O2/osViSetMode.c b/src/libultra_boot_O2/osViSetMode.c index 6b7a5e21a2..db3e7fc2a6 100644 --- a/src/libultra_boot_O2/osViSetMode.c +++ b/src/libultra_boot_O2/osViSetMode.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osViSetMode(OSViMode* mode) { register u32 int_disabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSetSpecialFeatures.c b/src/libultra_boot_O2/osViSetSpecialFeatures.c index ab949ba317..63e8ab5f31 100644 --- a/src/libultra_boot_O2/osViSetSpecialFeatures.c +++ b/src/libultra_boot_O2/osViSetSpecialFeatures.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osViSetSpecialFeatures(u32 func) { register u32 int_disabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSetXScale.c b/src/libultra_boot_O2/osViSetXScale.c index 3c3103c462..e6a9ec6bb6 100644 --- a/src/libultra_boot_O2/osViSetXScale.c +++ b/src/libultra_boot_O2/osViSetXScale.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osViSetXScale(f32 value) { register u32 nomValue; diff --git a/src/libultra_boot_O2/osViSetYScale.c b/src/libultra_boot_O2/osViSetYScale.c index 91f12fed2c..cde3b56b03 100644 --- a/src/libultra_boot_O2/osViSetYScale.c +++ b/src/libultra_boot_O2/osViSetYScale.c @@ -1,6 +1,6 @@ -#include +#include "global.h" -void osViSetYScale(float scale) { +void osViSetYScale(f32 scale) { register s32 prevInt; prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSwapBuffer.c b/src/libultra_boot_O2/osViSwapBuffer.c index c671a50f00..13995291de 100644 --- a/src/libultra_boot_O2/osViSwapBuffer.c +++ b/src/libultra_boot_O2/osViSwapBuffer.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osViSwapBuffer(void* vaddr) { u32 int_disabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/pimgr.c b/src/libultra_boot_O2/pimgr.c index 581f66f480..4239f8f786 100644 --- a/src/libultra_boot_O2/pimgr.c +++ b/src/libultra_boot_O2/pimgr.c @@ -1,4 +1,5 @@ -#include +#include "global.h" +#include "ultra64/internal.h" OSMgrArgs __osPiDevMgr = { 0 }; diff --git a/src/libultra_boot_O2/sprintf.c b/src/libultra_boot_O2/sprintf.c index 2ff0b33e06..96698b79e1 100644 --- a/src/libultra_boot_O2/sprintf.c +++ b/src/libultra_boot_O2/sprintf.c @@ -1,4 +1,4 @@ -#include +#include "global.h" char* proutSprintf(char* dst, const char* fmt, size_t size) { return (char*)memcpy(dst, fmt, size) + size; diff --git a/src/libultra_boot_O2/string.c b/src/libultra_boot_O2/string.c index 529ba37d8f..cea07c2533 100644 --- a/src/libultra_boot_O2/string.c +++ b/src/libultra_boot_O2/string.c @@ -1,4 +1,4 @@ -#include +#include "global.h" const u8* strchr(const u8* str, s32 ch) { u8 c = ch; diff --git a/src/libultra_boot_O2/vimgr.c b/src/libultra_boot_O2/vimgr.c index d2839078ef..5525ec74f5 100644 --- a/src/libultra_boot_O2/vimgr.c +++ b/src/libultra_boot_O2/vimgr.c @@ -1,4 +1,5 @@ -#include +#include "global.h" +#include "ultra64/internal.h" typedef struct { u16 unk00; diff --git a/src/libultra_code/__osSpGetStatus.c b/src/libultra_code/__osSpGetStatus.c deleted file mode 100644 index cd68e408c7..0000000000 --- a/src/libultra_code/__osSpGetStatus.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include -#include - -u32 __osSpGetStatus() { - return HW_REG(SP_STATUS_REG, u32); -} diff --git a/src/libultra_code/libultra_internal.h b/src/libultra_code/libultra_internal.h deleted file mode 100644 index 6a6e7caacc..0000000000 --- a/src/libultra_code/libultra_internal.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef _LIBULTRA_INTERNAL_H_ -#define _LIBULTRA_INTERNAL_H_ -#include - -// TODO: rename these -// SM64 OOT -s32 __osDisableInt(); -void __osRestoreInt(s32); -void __osEnqueueAndYield(OSThread**); -void __osDequeueThread(OSThread**, OSThread*); -void __osEnqueueThread(OSThread**, OSThread*); -OSThread* __osPopThread(OSThread**); -s32 __osSiRawStartDma(s32, void*); -void __osSiCreateAccessQueue(); -void __osSiGetAccess(); -void __osSiRelAccess(); -u32 __osProbeTLB(void*); -void __osPiCreateAccessQueue(); -void __osPiGetAccess(); -void __osSetSR(u32); -u32 __osGetSR(); -void __osSetFpcCsr(u32); -u32 __osGetFpcCsr(); -s32 __osSiRawReadIo(void*, u32*); -s32 __osSiRawWriteIo(void*, u32); -s32 osPiRawReadIo(u32 a0, u32 *a1); -void __osSpSetStatus(u32); -u32 __osSpGetStatus(); -s32 __osSpSetPc(void*); -s32 __osSpDeviceBusy(); -s32 __osSiDeviceBusy(); -s32 __osSpRawStartDma(u32 dir, void *sp_ptr, void *dram_ptr, size_t size); -void __osViInit(); -//OSViContext * __osViGetCurrentContext(); -void __osViSwapContext(); -void __osSetTimerIntr(OSTime); -OSTime __osInsertTimer(OSTimer *); -void __osSetCompare(u32); -s32 __osAiDeviceBusy(); -void __osDispatchThread(); -u32 __osGetCause(); -s32 __osAtomicDec(u32*); -#endif diff --git a/src/libultra_code/osAi.h b/src/libultra_code/osAi.h deleted file mode 100644 index 276fa071ad..0000000000 --- a/src/libultra_code/osAi.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _OSAI_H_ -#define _OSAI_H_ - -s32 osAiSetFrequency(u32); -s32 osAiSetNextBuffer(void *, u32); -u32 osAiGetLength(void); -#endif diff --git a/src/libultra_code/osAiGetLength.c b/src/libultra_code/osAiGetLength.c deleted file mode 100644 index cd37a222b6..0000000000 --- a/src/libultra_code/osAiGetLength.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "libultra_internal.h" -#include "osAi.h" -#include - -u32 osAiGetLength() { - return HW_REG(AI_LEN_REG, u32); -} diff --git a/src/libultra_code/llcvt.c b/src/libultra_code_O1/llcvt.c similarity index 94% rename from src/libultra_code/llcvt.c rename to src/libultra_code_O1/llcvt.c index c3da2e49e1..c88d6f04fd 100644 --- a/src/libultra_code/llcvt.c +++ b/src/libultra_code_O1/llcvt.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s64 __d_to_ll(f64 d) { return d; diff --git a/src/libultra_code/osSetTimer.c b/src/libultra_code_O1/osSetTimer.c similarity index 97% rename from src/libultra_code/osSetTimer.c rename to src/libultra_code_O1/osSetTimer.c index fd78ba184b..90e31ecbeb 100644 --- a/src/libultra_code/osSetTimer.c +++ b/src/libultra_code_O1/osSetTimer.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osSetTimer(OSTimer* timer, OSTime countdown, OSTime interval, OSMesgQueue* mq, OSMesg msg) { OSTime time; diff --git a/src/libultra_code/osStopTimer.c b/src/libultra_code_O1/osStopTimer.c similarity index 96% rename from src/libultra_code/osStopTimer.c rename to src/libultra_code_O1/osStopTimer.c index 6e8a94fc8d..627d57b75d 100644 --- a/src/libultra_code/osStopTimer.c +++ b/src/libultra_code_O1/osStopTimer.c @@ -1,4 +1,4 @@ -#include +#include "global.h" s32 osStopTimer(OSTimer* timer) { register s32 prevInt; diff --git a/src/libultra_code/__osContAddressCrc.c b/src/libultra_code_O2/__osContAddressCrc.c similarity index 85% rename from src/libultra_code/__osContAddressCrc.c rename to src/libultra_code_O2/__osContAddressCrc.c index 64b7749bde..9b0c779ec1 100644 --- a/src/libultra_code/__osContAddressCrc.c +++ b/src/libultra_code_O2/__osContAddressCrc.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" // Valid addr up to 0x7FF // It's the address of a block of 0x20 bytes in the mempak @@ -11,8 +9,8 @@ u8 __osContAddressCrc(u16 addr) { u32 bit; s32 i; - for (bit = 0x400; bit; bit /= 2) { - ret *= 2; + for (bit = 0x400; bit; bit >>= 1) { + ret <<= 1; if (addr32 & bit) { if (ret & 0x20) { ret ^= 0x14; @@ -41,8 +39,8 @@ u8 __osContDataCrc(u8* data) { ret = 0; for (byte = 0x20; byte; --byte, ++data) { - for (bit = 0x80; bit; bit /= 2) { - ret *= 2; + for (bit = 0x80; bit; bit >>= 1) { + ret <<= 1; if ((*data & bit) != 0) { if ((ret & 0x100) != 0) { ret ^= 0x84; @@ -57,7 +55,7 @@ u8 __osContDataCrc(u8* data) { } } do { - ret *= 2; + ret <<= 1; if (ret & 0x100) { ret ^= 0x85; } diff --git a/src/libultra_code/__osContRamRead.c b/src/libultra_code_O2/__osContRamRead.c similarity index 96% rename from src/libultra_code/__osContRamRead.c rename to src/libultra_code_O2/__osContRamRead.c index be6d3e2894..07c72e54b0 100644 --- a/src/libultra_code/__osContRamRead.c +++ b/src/libultra_code_O2/__osContRamRead.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" #define BLOCKSIZE 32 diff --git a/src/libultra_code/__osContRamWrite.c b/src/libultra_code_O2/__osContRamWrite.c similarity index 93% rename from src/libultra_code/__osContRamWrite.c rename to src/libultra_code_O2/__osContRamWrite.c index d26ca579ef..4c5c166962 100644 --- a/src/libultra_code/__osContRamWrite.c +++ b/src/libultra_code_O2/__osContRamWrite.c @@ -1,6 +1,5 @@ -#include -#include -#include +#include "ultra64.h" +#include "global.h" s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 force) { s32 ret = 0; @@ -23,7 +22,7 @@ s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 __osPfsLastChannel = channel; // clang-format off - for (i = 0; i < channel; i++) { *ptr++ = 0; } + for (i = 0; i < channel; i++) { *ptr++ = 0; } // clang-format on pifMempakBuf.status = 1; diff --git a/src/libultra_code/__osGetActiveQueue.c b/src/libultra_code_O2/__osGetActiveQueue.c similarity index 76% rename from src/libultra_code/__osGetActiveQueue.c rename to src/libultra_code_O2/__osGetActiveQueue.c index a218582cfb..36919dc59a 100644 --- a/src/libultra_code/__osGetActiveQueue.c +++ b/src/libultra_code_O2/__osGetActiveQueue.c @@ -1,4 +1,4 @@ -#include +#include "global.h" OSThread* __osGetActiveQueue() { return __osActiveQueue; diff --git a/src/libultra_code/__osGetCurrFaultedThread.c b/src/libultra_code_O2/__osGetCurrFaultedThread.c similarity index 63% rename from src/libultra_code/__osGetCurrFaultedThread.c rename to src/libultra_code_O2/__osGetCurrFaultedThread.c index 23b73d853e..b10b5f5086 100644 --- a/src/libultra_code/__osGetCurrFaultedThread.c +++ b/src/libultra_code_O2/__osGetCurrFaultedThread.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" OSThread* __osGetCurrFaultedThread() { return __osFaultedThread; diff --git a/src/libultra_code/__osPfsGetStatus.c b/src/libultra_code_O2/__osPfsGetStatus.c similarity index 97% rename from src/libultra_code/__osPfsGetStatus.c rename to src/libultra_code_O2/__osPfsGetStatus.c index a05f722b16..aa2b8a6ff0 100644 --- a/src/libultra_code/__osPfsGetStatus.c +++ b/src/libultra_code_O2/__osPfsGetStatus.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" OSPifRam pifMempakBuf; diff --git a/src/libultra_code/__osPfsSelectBank.c b/src/libultra_code_O2/__osPfsSelectBank.c similarity index 87% rename from src/libultra_code/__osPfsSelectBank.c rename to src/libultra_code_O2/__osPfsSelectBank.c index 6e7acc82f9..d257e04911 100644 --- a/src/libultra_code/__osPfsSelectBank.c +++ b/src/libultra_code_O2/__osPfsSelectBank.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64/pfs.h" +#include "global.h" s32 __osPfsSelectBank(OSPfs* pfs, u8 bank) { u8 temp[BLOCKSIZE]; diff --git a/src/libultra_code/__osSiCreateAccessQueue.c b/src/libultra_code_O2/__osSiCreateAccessQueue.c similarity index 88% rename from src/libultra_code/__osSiCreateAccessQueue.c rename to src/libultra_code_O2/__osSiCreateAccessQueue.c index 5f886339d1..c46df56f62 100644 --- a/src/libultra_code/__osSiCreateAccessQueue.c +++ b/src/libultra_code_O2/__osSiCreateAccessQueue.c @@ -1,7 +1,4 @@ -#include -#include - -#include +#include "global.h" OSMesg osSiMesgBuff[SIAccessQueueSize]; OSMesgQueue gOSSiMessageQueue; diff --git a/src/libultra_code/__osSiRawStartDma.c b/src/libultra_code_O2/__osSiRawStartDma.c similarity index 90% rename from src/libultra_code/__osSiRawStartDma.c rename to src/libultra_code_O2/__osSiRawStartDma.c index d440366575..00b80b4b0a 100644 --- a/src/libultra_code/__osSiRawStartDma.c +++ b/src/libultra_code_O2/__osSiRawStartDma.c @@ -1,5 +1,4 @@ -#include "libultra_internal.h" -#include +#include "global.h" s32 __osSiRawStartDma(s32 dir, void* addr) { if (HW_REG(SI_STATUS_REG, u32) & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) { diff --git a/src/libultra_code_O2/__osSpGetStatus.c b/src/libultra_code_O2/__osSpGetStatus.c new file mode 100644 index 0000000000..8987b2414a --- /dev/null +++ b/src/libultra_code_O2/__osSpGetStatus.c @@ -0,0 +1,5 @@ +#include "global.h" + +u32 __osSpGetStatus() { + return HW_REG(SP_STATUS_REG, u32); +} diff --git a/src/libultra_code/__osSpRawStartDma.c b/src/libultra_code_O2/__osSpRawStartDma.c similarity index 59% rename from src/libultra_code/__osSpRawStartDma.c rename to src/libultra_code_O2/__osSpRawStartDma.c index 2b2a7fa3e1..6a1b01b2af 100644 --- a/src/libultra_code/__osSpRawStartDma.c +++ b/src/libultra_code_O2/__osSpRawStartDma.c @@ -1,12 +1,10 @@ -#include -#include -#include +#include "global.h" -s32 __osSpRawStartDma(s32 direction, u32 devAddr, void* dramAddr, u32 size) { +s32 __osSpRawStartDma(s32 direction, void* devAddr, void* dramAddr, u32 size) { if (__osSpDeviceBusy()) { return -1; } - HW_REG(SP_MEM_ADDR_REG, u32) = devAddr; + HW_REG(SP_MEM_ADDR_REG, u32) = (u32)devAddr; HW_REG(SP_DRAM_ADDR_REG, u32) = osVirtualToPhysical(dramAddr); if (direction == OS_READ) { HW_REG(SP_WR_LEN_REG, u32) = size - 1; diff --git a/src/libultra_code/__osSpSetPc.c b/src/libultra_code_O2/__osSpSetPc.c similarity index 75% rename from src/libultra_code/__osSpSetPc.c rename to src/libultra_code_O2/__osSpSetPc.c index 55f78259b8..2c3cc32ba0 100644 --- a/src/libultra_code/__osSpSetPc.c +++ b/src/libultra_code_O2/__osSpSetPc.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" s32 __osSpSetPc(void* pc) { register u32 spStatus = HW_REG(SP_STATUS_REG, u32); diff --git a/src/libultra_code/__osSpSetStatus.c b/src/libultra_code_O2/__osSpSetStatus.c similarity index 50% rename from src/libultra_code/__osSpSetStatus.c rename to src/libultra_code_O2/__osSpSetStatus.c index 01cf1adc1a..670dc1f3bc 100644 --- a/src/libultra_code/__osSpSetStatus.c +++ b/src/libultra_code_O2/__osSpSetStatus.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" void __osSpSetStatus(u32 a0) { HW_REG(SP_STATUS_REG, u32) = a0; diff --git a/src/libultra_code/code_800E6840.c b/src/libultra_code_O2/code_800E6840.c similarity index 93% rename from src/libultra_code/code_800E6840.c rename to src/libultra_code_O2/code_800E6840.c index 085f2acf55..b5099ce9f8 100644 --- a/src/libultra_code/code_800E6840.c +++ b/src/libultra_code_O2/code_800E6840.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void func_800E6840(void* buf, s32 size) { OSIntMask prevMask = osSetIntMask(1); diff --git a/src/libultra_code/code_80102FA0.c b/src/libultra_code_O2/code_80102FA0.c similarity index 64% rename from src/libultra_code/code_80102FA0.c rename to src/libultra_code_O2/code_80102FA0.c index cd2a089618..fe6c1d3ee2 100644 --- a/src/libultra_code/code_80102FA0.c +++ b/src/libultra_code_O2/code_80102FA0.c @@ -1,4 +1,4 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_80102FA0/func_80102FA0.s") diff --git a/src/libultra_code/code_80104D60.c b/src/libultra_code_O2/code_80104D60.c similarity index 65% rename from src/libultra_code/code_80104D60.c rename to src/libultra_code_O2/code_80104D60.c index 379ed79c29..12cb746a58 100644 --- a/src/libultra_code/code_80104D60.c +++ b/src/libultra_code_O2/code_80104D60.c @@ -1,4 +1,4 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/code/code_80104D60/osPfsFileState.s") diff --git a/src/libultra_code/contpfs.c b/src/libultra_code_O2/contpfs.c similarity index 99% rename from src/libultra_code/contpfs.c rename to src/libultra_code_O2/contpfs.c index 4f0aa41cea..a9b2028eee 100644 --- a/src/libultra_code/contpfs.c +++ b/src/libultra_code_O2/contpfs.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" extern __OSInode __osPfsInodeCache; // bss s32 __osPfsInodeCacheChannel = -1; diff --git a/src/libultra_code/contquery.c b/src/libultra_code_O2/contquery.c similarity index 94% rename from src/libultra_code/contquery.c rename to src/libultra_code_O2/contquery.c index 6f6def55bb..ffcdea0416 100644 --- a/src/libultra_code/contquery.c +++ b/src/libultra_code_O2/contquery.c @@ -1,5 +1,4 @@ -#include "libultra_internal.h" -#include +#include "global.h" /** * osContStartQuery: diff --git a/src/libultra_code/cosf.c b/src/libultra_code_O2/cosf.c similarity index 93% rename from src/libultra_code/cosf.c rename to src/libultra_code_O2/cosf.c index 75dce4efdd..56ef995c78 100644 --- a/src/libultra_code/cosf.c +++ b/src/libultra_code_O2/cosf.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" static const du P[] = { { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, @@ -30,7 +30,7 @@ f32 cosf(f32 x) { if (xpt < 0x136) { - absx = ULTRA_ABS(x); + absx = (x > 0) ? x : -x; dx = absx; diff --git a/src/libultra_code/coss.c b/src/libultra_code_O2/coss.c similarity index 53% rename from src/libultra_code/coss.c rename to src/libultra_code_O2/coss.c index 1f2a260dd6..2dca0234b2 100644 --- a/src/libultra_code/coss.c +++ b/src/libultra_code_O2/coss.c @@ -1,5 +1,4 @@ -#include "libultra_internal.h" -#include +#include "global.h" s16 coss(u16 angle) { return sins(angle + 0x4000); diff --git a/src/libultra_code/guLookAt.c b/src/libultra_code_O2/guLookAt.c similarity index 97% rename from src/libultra_code/guLookAt.c rename to src/libultra_code_O2/guLookAt.c index 0c95c7f5ee..ca55602143 100644 --- a/src/libultra_code/guLookAt.c +++ b/src/libultra_code_O2/guLookAt.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) { f32 length; diff --git a/src/libultra_code/guLookAtHilite.c b/src/libultra_code_O2/guLookAtHilite.c similarity index 98% rename from src/libultra_code/guLookAtHilite.c rename to src/libultra_code_O2/guLookAtHilite.c index a15dd7b54e..4af14abae5 100644 --- a/src/libultra_code/guLookAtHilite.c +++ b/src/libultra_code_O2/guLookAtHilite.c @@ -1,5 +1,4 @@ -#include "libultra_internal.h" -#include +#include "global.h" #define FTOFRAC8(x) ((s32)MIN(((x) * (128.0f)), 127.0f) & 0xff) diff --git a/src/libultra_code/guPerspectiveF.c b/src/libultra_code_O2/guPerspectiveF.c similarity index 65% rename from src/libultra_code/guPerspectiveF.c rename to src/libultra_code_O2/guPerspectiveF.c index 503bcc25a4..df69888cf6 100644 --- a/src/libultra_code/guPerspectiveF.c +++ b/src/libultra_code_O2/guPerspectiveF.c @@ -1,9 +1,9 @@ -#include "libultra_internal.h" +#include "global.h" -void guPerspectiveF(float mf[4][4], u16* perspNorm, float fovy, float aspect, float near, float far, float scale) { - float yscale; - int row; - int col; +void guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale) { + f32 yscale; + s32 row; + s32 col; guMtxIdentF(mf); fovy *= GU_PI / 180.0; yscale = cosf(fovy / 2) / sinf(fovy / 2); @@ -22,15 +22,15 @@ void guPerspectiveF(float mf[4][4], u16* perspNorm, float fovy, float aspect, fl if (near + far <= 2.0) { *perspNorm = 65535; } else { - *perspNorm = (double)(1 << 17) / (near + far); + *perspNorm = (f64)(1 << 17) / (near + far); if (*perspNorm <= 0) { *perspNorm = 1; } } } } -void guPerspective(Mtx* m, u16* perspNorm, float fovy, float aspect, float near, float far, float scale) { - float mat[4][4]; +void guPerspective(Mtx* m, u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale) { + f32 mat[4][4]; guPerspectiveF(mat, perspNorm, fovy, aspect, near, far, scale); guMtxF2L(mat, m); } diff --git a/src/libultra_code/guPosition.c b/src/libultra_code_O2/guPosition.c similarity index 97% rename from src/libultra_code/guPosition.c rename to src/libultra_code_O2/guPosition.c index 11eae1034d..25dfe5c8ef 100644 --- a/src/libultra_code/guPosition.c +++ b/src/libultra_code_O2/guPosition.c @@ -1,4 +1,4 @@ -#include "libultra_internal.h" +#include "global.h" /** * guPositionF diff --git a/src/libultra_code/guS2DInitBg.c b/src/libultra_code_O2/guS2DInitBg.c similarity index 97% rename from src/libultra_code/guS2DInitBg.c rename to src/libultra_code_O2/guS2DInitBg.c index 32c46f1693..0d75648f94 100644 --- a/src/libultra_code/guS2DInitBg.c +++ b/src/libultra_code_O2/guS2DInitBg.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void guS2DInitBg(uObjBg* bg) { u16 shift; diff --git a/src/libultra_code/ortho.c b/src/libultra_code_O2/ortho.c similarity index 94% rename from src/libultra_code/ortho.c rename to src/libultra_code_O2/ortho.c index 259aca5e71..70e64e9d20 100644 --- a/src/libultra_code/ortho.c +++ b/src/libultra_code_O2/ortho.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" void guOrthoF(f32 mf[4][4], f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) { s32 i, j; diff --git a/src/libultra_code/osAfterPreNMI.c b/src/libultra_code_O2/osAfterPreNMI.c similarity index 57% rename from src/libultra_code/osAfterPreNMI.c rename to src/libultra_code_O2/osAfterPreNMI.c index 19ccdb6f69..b59814763f 100644 --- a/src/libultra_code/osAfterPreNMI.c +++ b/src/libultra_code_O2/osAfterPreNMI.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" s32 osAfterPreNMI(void) { return __osSpSetPc(0); diff --git a/src/libultra_code_O2/osAiGetLength.c b/src/libultra_code_O2/osAiGetLength.c new file mode 100644 index 0000000000..90be706cbc --- /dev/null +++ b/src/libultra_code_O2/osAiGetLength.c @@ -0,0 +1,5 @@ +#include "global.h" + +u32 osAiGetLength() { + return HW_REG(AI_LEN_REG, u32); +} diff --git a/src/libultra_code/osAiSetFrequency.c b/src/libultra_code_O2/osAiSetFrequency.c similarity index 89% rename from src/libultra_code/osAiSetFrequency.c rename to src/libultra_code_O2/osAiSetFrequency.c index f16d8cec3b..f0606809e4 100644 --- a/src/libultra_code/osAiSetFrequency.c +++ b/src/libultra_code_O2/osAiSetFrequency.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 osAiSetFrequency(u32 frequency) { u32 dacRate; diff --git a/src/libultra_code/osAiSetNextBuffer.c b/src/libultra_code_O2/osAiSetNextBuffer.c similarity index 91% rename from src/libultra_code/osAiSetNextBuffer.c rename to src/libultra_code_O2/osAiSetNextBuffer.c index 9896e55f0a..0669ee506c 100644 --- a/src/libultra_code/osAiSetNextBuffer.c +++ b/src/libultra_code_O2/osAiSetNextBuffer.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" s32 osAiSetNextBuffer(void* buf, u32 size) { static u8 D_80130500 = false; diff --git a/src/libultra_code/osContInit.c b/src/libultra_code_O2/osContInit.c similarity index 97% rename from src/libultra_code/osContInit.c rename to src/libultra_code_O2/osContInit.c index 8a0bd6b103..8f10e854df 100644 --- a/src/libultra_code/osContInit.c +++ b/src/libultra_code_O2/osContInit.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" OSPifRam __osPifInternalBuff; u8 __osContLastPoll; diff --git a/src/libultra_code_O2/osContQuery.c b/src/libultra_code_O2/osContQuery.c new file mode 100644 index 0000000000..ffcdea0416 --- /dev/null +++ b/src/libultra_code_O2/osContQuery.c @@ -0,0 +1,32 @@ +#include "global.h" + +/** + * osContStartQuery: + * Starts to read the values for SI device status and type which are connected to the controller port and joyport + * connector. + **/ + +s32 osContStartQuery(OSMesgQueue* mq) { + s32 ret; + ret = 0; + + __osSiGetAccess(); + if (__osContLastPoll != CONT_CMD_REQUEST_STATUS) { + __osPackRequestData(CONT_CMD_REQUEST_STATUS); + ret = __osSiRawStartDma(OS_WRITE, &__osPifInternalBuff); + osRecvMesg(mq, NULL, OS_MESG_BLOCK); + } + ret = __osSiRawStartDma(OS_READ, &__osPifInternalBuff); + __osContLastPoll = CONT_CMD_REQUEST_STATUS; + __osSiRelAccess(); + return ret; +} + +/** + * osContGetQuery: + * Returns the values from osContStartQuery to status. Both functions must be paired for use. + **/ +void osContGetQuery(OSContStatus* data) { + u8 pattern; + __osContGetInitData(&pattern, data); +} diff --git a/src/libultra_code/osContSetCh.c b/src/libultra_code_O2/osContSetCh.c similarity index 91% rename from src/libultra_code/osContSetCh.c rename to src/libultra_code_O2/osContSetCh.c index cd5c09de96..0e7502b0cf 100644 --- a/src/libultra_code/osContSetCh.c +++ b/src/libultra_code_O2/osContSetCh.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" /* * s32 osContSetCh(u8 ch) diff --git a/src/libultra_code/osContStartReadData.c b/src/libultra_code_O2/osContStartReadData.c similarity index 95% rename from src/libultra_code/osContStartReadData.c rename to src/libultra_code_O2/osContStartReadData.c index d45b07f6e8..59ead072c8 100644 --- a/src/libultra_code/osContStartReadData.c +++ b/src/libultra_code_O2/osContStartReadData.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" s32 osContStartReadData(OSMesgQueue* mq) { s32 ret; diff --git a/src/libultra_code/osDpGetStatus.c b/src/libultra_code_O2/osDpGetStatus.c similarity index 73% rename from src/libultra_code/osDpGetStatus.c rename to src/libultra_code_O2/osDpGetStatus.c index f9c87f1fb2..b5267b060d 100644 --- a/src/libultra_code/osDpGetStatus.c +++ b/src/libultra_code_O2/osDpGetStatus.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u32 osDpGetStatus(void) { return DPC_STATUS_REG; diff --git a/src/libultra_code/osDpSetStatus.c b/src/libultra_code_O2/osDpSetStatus.c similarity index 76% rename from src/libultra_code/osDpSetStatus.c rename to src/libultra_code_O2/osDpSetStatus.c index d57ca509e3..ecd3f77e07 100644 --- a/src/libultra_code/osDpSetStatus.c +++ b/src/libultra_code_O2/osDpSetStatus.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osDpSetStatus(u32 status) { DPC_STATUS_REG = status; diff --git a/src/libultra_code_O2/osMempakAddrCRC.c b/src/libultra_code_O2/osMempakAddrCRC.c new file mode 100644 index 0000000000..c902651bab --- /dev/null +++ b/src/libultra_code_O2/osMempakAddrCRC.c @@ -0,0 +1,65 @@ +#include "global.h" + +// Valid addr up to 0x7FF +// It's the address of a block of 0x20 bytes in the mempak +// So that means the whole mempak has a 16-bit address space +u8 __osContAddressCrc(u16 addr) { + u32 addr32 = addr; + u32 ret = 0; + u32 bit; + s32 i; + + for (bit = 0x400; bit; bit /= 2) { + ret *= 2; + if (addr32 & bit) { + if (ret & 0x20) { + ret ^= 0x14; + } else { + ++ret; + } + } else { + if (ret & 0x20) { + ret ^= 0x15; + } + } + } + for (i = 0; i < 5; ++i) { + ret <<= 1; + if (ret & 0x20) { + ret ^= 0x15; + } + } + return ret & 0x1f; +} + +u8 __osContDataCrc(u8* data) { + s32 ret; + u32 bit; + u32 byte; + + ret = 0; + for (byte = 0x20; byte; --byte, ++data) { + for (bit = 0x80; bit; bit /= 2) { + ret *= 2; + if ((*data & bit) != 0) { + if ((ret & 0x100) != 0) { + ret ^= 0x84; + } else { + ++ret; + } + } else { + if (ret & 0x100) { + ret ^= 0x85; + } + } + } + } + do { + ret *= 2; + if (ret & 0x100) { + ret ^= 0x85; + } + ++byte; + } while (byte < 8U); + return ret; +} diff --git a/src/libultra_code/osPfsDeleteFile.c b/src/libultra_code_O2/osPfsDeleteFile.c similarity index 85% rename from src/libultra_code/osPfsDeleteFile.c rename to src/libultra_code_O2/osPfsDeleteFile.c index e44a5633ce..b9ec018c20 100644 --- a/src/libultra_code/osPfsDeleteFile.c +++ b/src/libultra_code_O2/osPfsDeleteFile.c @@ -1,7 +1,7 @@ -#include -#include +#include "ultra64/pfs.h" +#include "global.h" -s32 osPfsDeleteFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8* ext_name) { +s32 osPfsDeleteFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName) { s32 file_no; s32 ret; @@ -11,10 +11,10 @@ s32 osPfsDeleteFile(OSPfs* pfs, u16 company_code, u32 game_code, u8* game_name, u8 startpage; u8 bank; - if ((company_code == 0) || (game_code == 0)) { + if ((companyCode == 0) || (gameCode == 0)) { return PFS_ERR_INVALID; } - if ((ret = osPfsFindFile(pfs, company_code, game_code, game_name, ext_name, &file_no)) != 0) { + if ((ret = osPfsFindFile(pfs, companyCode, gameCode, gameName, extName, &file_no)) != 0) { return ret; } if ((pfs->activebank != 0) && (ret = __osPfsSelectBank(pfs, 0)) != 0) { diff --git a/src/libultra_code/osPfsFindFile.c b/src/libultra_code_O2/osPfsFindFile.c similarity index 97% rename from src/libultra_code/osPfsFindFile.c rename to src/libultra_code_O2/osPfsFindFile.c index 4320aca4b3..0ee5e538d3 100644 --- a/src/libultra_code/osPfsFindFile.c +++ b/src/libultra_code_O2/osPfsFindFile.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" s32 osPfsFindFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32* fileNo) { s32 j; diff --git a/src/libultra_code/osPfsFreeBlocks.c b/src/libultra_code_O2/osPfsFreeBlocks.c similarity index 92% rename from src/libultra_code/osPfsFreeBlocks.c rename to src/libultra_code_O2/osPfsFreeBlocks.c index 912af74157..c7e7adcbfe 100644 --- a/src/libultra_code/osPfsFreeBlocks.c +++ b/src/libultra_code_O2/osPfsFreeBlocks.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "ultra64.h" +#include "global.h" +#include "ultra64/pfs.h" s32 osPfsFreeBlocks(OSPfs* pfs, s32* leftoverBytes) { s32 j; diff --git a/src/libultra_code/osPfsIsPlug.c b/src/libultra_code_O2/osPfsIsPlug.c similarity index 98% rename from src/libultra_code/osPfsIsPlug.c rename to src/libultra_code_O2/osPfsIsPlug.c index bb221a07e2..329610ac50 100644 --- a/src/libultra_code/osPfsIsPlug.c +++ b/src/libultra_code_O2/osPfsIsPlug.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern) { s32 ret = 0; diff --git a/src/libultra_code_O2/osReadMempak.c b/src/libultra_code_O2/osReadMempak.c new file mode 100644 index 0000000000..07c72e54b0 --- /dev/null +++ b/src/libultra_code_O2/osReadMempak.c @@ -0,0 +1,60 @@ +#include "global.h" + +#define BLOCKSIZE 32 + +s32 __osPfsLastChannel = -1; + +s32 __osContRamRead(OSMesgQueue* ctrlrqueue, s32 channel, u16 addr, u8* data) { + s32 ret; + s32 i; + u8* bufptr; + s32 retryCount = 2; + + __osSiGetAccess(); + do { + bufptr = &pifMempakBuf; + if ((__osContLastPoll != 2) || (__osPfsLastChannel != channel)) { + + __osContLastPoll = 2; + __osPfsLastChannel = channel; + // clang-format off + for (i = 0; i < channel; i++) { *bufptr++ = 0; } + // clang-format on + pifMempakBuf.status = 1; + ((__OSContRamHeader*)bufptr)->unk_00 = 0xFF; + ((__OSContRamHeader*)bufptr)->txsize = 3; + ((__OSContRamHeader*)bufptr)->rxsize = 0x21; + ((__OSContRamHeader*)bufptr)->poll = CONT_CMD_READ_MEMPACK; // read mempak; send byte 0 + ((__OSContRamHeader*)bufptr)->datacrc = 0xFF; // read mempak; send byte 0 + // Received bytes are 6-26 inclusive + bufptr[sizeof(__OSContRamHeader)] = CONT_CMD_END; // End of commands + } else { + bufptr += channel; + } + ((__OSContRamHeader*)bufptr)->hi = addr >> 3; // send byte 1 + ((__OSContRamHeader*)bufptr)->lo = (s8)(__osContAddressCrc(addr) | (addr << 5)); // send byte 2 + __osSiRawStartDma(OS_WRITE, &pifMempakBuf); + osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK); + __osSiRawStartDma(OS_READ, &pifMempakBuf); + osRecvMesg(ctrlrqueue, NULL, OS_MESG_BLOCK); + ret = (((__OSContRamHeader*)bufptr)->rxsize & 0xC0) >> 4; + if (!ret) { + if (((__OSContRamHeader*)bufptr)->datacrc != __osContDataCrc(bufptr + 6)) { + ret = __osPfsGetStatus(ctrlrqueue, channel); + if (ret) { + break; + } + ret = 4; // Retry + } else { + bcopy(bufptr + 6, data, BLOCKSIZE); + } + } else { + ret = 1; // Error + } + if (ret != 4) { + break; + } + } while (0 <= retryCount--); + __osSiRelAccess(); + return ret; +} diff --git a/src/libultra_code/osRumblePak.c b/src/libultra_code_O2/osRumblePak.c similarity index 97% rename from src/libultra_code/osRumblePak.c rename to src/libultra_code_O2/osRumblePak.c index d71a066abe..96e86c4dfa 100644 --- a/src/libultra_code/osRumblePak.c +++ b/src/libultra_code_O2/osRumblePak.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" #define BANK_ADDR 0x400 #define MOTOR_ID 0x80 diff --git a/src/libultra_code/osSpTaskYield.c b/src/libultra_code_O2/osSpTaskYield.c similarity index 75% rename from src/libultra_code/osSpTaskYield.c rename to src/libultra_code_O2/osSpTaskYield.c index ec98ec332c..ab852cb71e 100644 --- a/src/libultra_code/osSpTaskYield.c +++ b/src/libultra_code_O2/osSpTaskYield.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void osSpTaskYield() { __osSpSetStatus(SP_STATUS_SIG3); diff --git a/src/libultra_code/osSpTaskYielded.c b/src/libultra_code_O2/osSpTaskYielded.c similarity index 94% rename from src/libultra_code/osSpTaskYielded.c rename to src/libultra_code_O2/osSpTaskYielded.c index ed151a6153..be1dcc09c3 100644 --- a/src/libultra_code/osSpTaskYielded.c +++ b/src/libultra_code_O2/osSpTaskYielded.c @@ -1,4 +1,4 @@ -#include +#include "global.h" u32 osSpTaskYielded(OSTask* task) { u32 ret; diff --git a/src/libultra_code/osViGetCurrentFramebuffer.c b/src/libultra_code_O2/osViGetCurrentFramebuffer.c similarity index 80% rename from src/libultra_code/osViGetCurrentFramebuffer.c rename to src/libultra_code_O2/osViGetCurrentFramebuffer.c index 03aa515aeb..f605f16836 100644 --- a/src/libultra_code/osViGetCurrentFramebuffer.c +++ b/src/libultra_code_O2/osViGetCurrentFramebuffer.c @@ -1,5 +1,4 @@ -#include -#include +#include "global.h" u32* osViGetCurrentFramebuffer() { register u32 sMask = __osDisableInt(); diff --git a/src/libultra_code/osViSetEvent.c b/src/libultra_code_O2/osViSetEvent.c similarity index 90% rename from src/libultra_code/osViSetEvent.c rename to src/libultra_code_O2/osViSetEvent.c index 1c042dc27d..0f29bc681d 100644 --- a/src/libultra_code/osViSetEvent.c +++ b/src/libultra_code_O2/osViSetEvent.c @@ -1,4 +1,4 @@ -#include "libultra_internal.h" +#include "global.h" extern OSViContext* __osViNext; diff --git a/src/libultra_code/pfsallocatefile.c b/src/libultra_code_O2/pfsallocatefile.c similarity index 98% rename from src/libultra_code/pfsallocatefile.c rename to src/libultra_code_O2/pfsallocatefile.c index 3cdc592187..03a87d0480 100644 --- a/src/libultra_code/pfsallocatefile.c +++ b/src/libultra_code_O2/pfsallocatefile.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "ultra64.h" +#include "global.h" +#include "ultra64/pfs.h" s32 osPfsAllocateFile(OSPfs* pfs, u16 companyCode, u32 gameCode, u8* gameName, u8* extName, s32 fileSize, s32* fileNo) { s32 startPage, decleared, prevPage; diff --git a/src/libultra_code/pfschecker.c b/src/libultra_code_O2/pfschecker.c similarity index 98% rename from src/libultra_code/pfschecker.c rename to src/libultra_code_O2/pfschecker.c index abfcf41857..e4934a17ab 100644 --- a/src/libultra_code/pfschecker.c +++ b/src/libultra_code_O2/pfschecker.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include "ultra64.h" +#include "global.h" +#include "ultra64/pfs.h" #define CHECK_IPAGE(p) \ (((p).ipage >= pfs->inodeStartPage) && ((p).inode_t.bank < pfs->banks) && ((p).inode_t.page >= 0x01) && \ diff --git a/src/libultra_code/pfsinitpak.c b/src/libultra_code_O2/pfsinitpak.c similarity index 98% rename from src/libultra_code/pfsinitpak.c rename to src/libultra_code_O2/pfsinitpak.c index a83619e597..377c4f6a5b 100644 --- a/src/libultra_code/pfsinitpak.c +++ b/src/libultra_code_O2/pfsinitpak.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" s32 osPfsInitPak(OSMesgQueue* queue, OSPfs* pfs, s32 channel) { s32 ret; diff --git a/src/libultra_code/pfsreadwritefile.c b/src/libultra_code_O2/pfsreadwritefile.c similarity index 98% rename from src/libultra_code/pfsreadwritefile.c rename to src/libultra_code_O2/pfsreadwritefile.c index 7ef65736c5..4a6d7755c2 100644 --- a/src/libultra_code/pfsreadwritefile.c +++ b/src/libultra_code_O2/pfsreadwritefile.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" #define CHECK_IPAGE(p, pfs) \ (((p).ipage >= (pfs).inodeStartPage) && ((p).inode_t.bank < (pfs).banks) && ((p).inode_t.page >= 0x01) && \ diff --git a/src/libultra_code/rotate.c b/src/libultra_code_O2/rotate.c similarity index 97% rename from src/libultra_code/rotate.c rename to src/libultra_code_O2/rotate.c index 79752bfa60..a3fd9b978d 100644 --- a/src/libultra_code/rotate.c +++ b/src/libultra_code_O2/rotate.c @@ -1,4 +1,4 @@ -#include +#include "global.h" void guRotateF(f32 m[4][4], f32 a, f32 x, f32 y, f32 z) { static f32 D_80134D10 = M_PI / 180.0f; diff --git a/src/libultra_code/sinf.c b/src/libultra_code_O2/sinf.c similarity index 97% rename from src/libultra_code/sinf.c rename to src/libultra_code_O2/sinf.c index d38e128ad9..0ebc955ca2 100644 --- a/src/libultra_code/sinf.c +++ b/src/libultra_code_O2/sinf.c @@ -1,5 +1,5 @@ -#include -#include +#include "global.h" +#include "ultra64.h" static const du P[] = { { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, diff --git a/src/libultra_code/sins.c b/src/libultra_code_O2/sins.c similarity index 92% rename from src/libultra_code/sins.c rename to src/libultra_code_O2/sins.c index ee69849204..4b538f67dc 100644 --- a/src/libultra_code/sins.c +++ b/src/libultra_code_O2/sins.c @@ -1,5 +1,4 @@ -#include - +#include "ultra64.h" #include "sintable.c" s16 sins(u16 x) { diff --git a/src/libultra_code/sintable.c b/src/libultra_code_O2/sintable.c similarity index 99% rename from src/libultra_code/sintable.c rename to src/libultra_code_O2/sintable.c index 705b609e3d..d430d65ae3 100644 --- a/src/libultra_code/sintable.c +++ b/src/libultra_code_O2/sintable.c @@ -1,4 +1,4 @@ -#include +#include "ultra64/types.h" static s16 sintable[0x400] = { 0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E, diff --git a/src/libultra_code/sp.c b/src/libultra_code_O2/sp.c similarity index 74% rename from src/libultra_code/sp.c rename to src/libultra_code_O2/sp.c index 17474ae928..fcfb8880eb 100644 --- a/src/libultra_code/sp.c +++ b/src/libultra_code_O2/sp.c @@ -1,6 +1,4 @@ -#include -#include -#include +#include "global.h" u32 __osSpDeviceBusy() { register u32 status = HW_REG(SP_STATUS_REG, u32); diff --git a/src/libultra_code/sptask.c b/src/libultra_code_O2/sptask.c similarity index 96% rename from src/libultra_code/sptask.c rename to src/libultra_code_O2/sptask.c index 3766059da0..aecb41d225 100644 --- a/src/libultra_code/sptask.c +++ b/src/libultra_code_O2/sptask.c @@ -1,5 +1,4 @@ -#include "libultra_internal.h" -#include +#include "global.h" #define _osVirtualToPhysical(ptr) \ if (ptr != NULL) { \ diff --git a/src/libultra_code/sqrtf.c b/src/libultra_code_O2/sqrtf.c similarity index 86% rename from src/libultra_code/sqrtf.c rename to src/libultra_code_O2/sqrtf.c index 59ab57ce81..1e0ea1221a 100644 --- a/src/libultra_code/sqrtf.c +++ b/src/libultra_code_O2/sqrtf.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #ifndef __GNUC__ #pragma intrinsic(sqrtf) diff --git a/src/libultra_code/absf.c b/src/libultra_code_O2_g3/absf.c similarity index 67% rename from src/libultra_code/absf.c rename to src/libultra_code_O2_g3/absf.c index d78355af54..ebdbb72c08 100644 --- a/src/libultra_code/absf.c +++ b/src/libultra_code_O2_g3/absf.c @@ -1,4 +1,4 @@ -#include +#include "global.h" f32 absf(f32 a) { return fabsf(a); diff --git a/src/libultra_code/sqrt.c b/src/libultra_code_O2_g3/sqrt.c similarity index 86% rename from src/libultra_code/sqrt.c rename to src/libultra_code_O2_g3/sqrt.c index 98b338362f..d280fadd08 100644 --- a/src/libultra_code/sqrt.c +++ b/src/libultra_code_O2_g3/sqrt.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #ifndef __GNUC__ #pragma intrinsic(sqrt) diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 2c124b0d76..88c1aa326c 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -284,9 +284,8 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { return; } } - - if ((globalCtx->state.input[0].press.in.button & - (A_BUTTON | B_BUTTON | R_TRIG | U_CBUTTONS | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))) { + if ((CHECK_BTN_ANY(globalCtx->state.input[0].press.button, + (BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)))) { this->timer = 0; } } diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index e0793716e6..8ea380b180 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -1,8 +1,8 @@ #ifndef _Z_ARMS_HOOK_H_ #define _Z_ARMS_HOOK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ArmsHook; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h index 37d4cab8f5..4176475aeb 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_ARROW_FIRE_H_ #define _Z_ARROW_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ArrowFire; diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h index 17e10502f5..afbbc9fb8c 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h @@ -1,8 +1,8 @@ #ifndef _Z_ARROW_ICE_H_ #define _Z_ARROW_ICE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ArrowIce; diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h index 75e8c897b1..ebaf18f9c8 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h @@ -1,8 +1,8 @@ #ifndef _Z_ARROW_LIGHT_H_ #define _Z_ARROW_LIGHT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ArrowLight; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h index b195ac52c0..299ddea9db 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_BDAN_OBJECTS_H_ #define _Z_BG_BDAN_OBJECTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgBdanObjects; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h index a02f5dcfa8..f42ddbcbfc 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_BDAN_SWITCH_H_ #define _Z_BG_BDAN_SWITCH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" // BgBdanSwitch.actor.params & 0xFF typedef enum { diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 1fec36cb0e..573f6b1528 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -4,9 +4,9 @@ * Description: Bombchu Bowling Alley Walls */ +#include "vt.h" #include "z_bg_bom_guard.h" #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" -#include #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h index 431b8caa68..4405a9073e 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_BOM_GUARD_H_ #define _Z_BG_BOM_GUARD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgBomGuard; diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h index d91a8b1715..92348d235e 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_BOMBWALL_H_ #define _Z_BG_BOMBWALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgBombwall; diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h index 792f82c0eb..d2cd7197a8 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_BOWL_WALL_H_ #define _Z_BG_BOWL_WALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgBowlWall; diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h index bdcad1af30..b69110e8cb 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_BREAKWALL_H_ #define _Z_BG_BREAKWALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgBreakwall; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h index 4da8716eaa..668d3b7503 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_DDAN_JD_H_ #define _Z_BG_DDAN_JD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgDdanJd; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h index 7dd699f0a1..20225225ec 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_DDAN_KD_H_ #define _Z_BG_DDAN_KD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgDdanKd; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h index e7e1dcca29..920949d9c7 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_DODOAGO_H_ #define _Z_BG_DODOAGO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgDodoago; diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index 56cd8d891e..b4f77712df 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_DY_YOSEIZO_H_ #define _Z_BG_DY_YOSEIZO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgDyYoseizo; diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h index d552bb831e..f361718ed9 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GANON_OTYUKA_H_ #define _Z_BG_GANON_OTYUKA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGanonOtyuka; diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index eb7349eea6..27de2b09bc 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -4,8 +4,8 @@ * Description: Death Mountain Trail Gate */ +#include "vt.h" #include "z_bg_gate_shutter.h" -#include #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h index 830f8fd593..b773c1dd6e 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GATE_SHUTTER_H_ #define _Z_BG_GATE_SHUTTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGateShutter; diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h index dc5eb1d86b..45b4d563c8 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GJYO_BRIDGE_H_ #define _Z_BG_GJYO_BRIDGE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGjyoBridge; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h index 49b6e48cd6..d457bee65c 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GND_DARKMEIRO_H_ #define _Z_BG_GND_DARKMEIRO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGndDarkmeiro; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h index af1ec630fe..eb863c37f9 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GND_FIREMEIRO_H_ #define _Z_BG_GND_FIREMEIRO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGndFiremeiro; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h index 531db41f6e..a80c4e0931 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GND_ICEBLOCK_H_ #define _Z_BG_GND_ICEBLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGndIceblock; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h index b468ef85e4..ec82a0e45f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GND_NISEKABE_H_ #define _Z_BG_GND_NISEKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGndNisekabe; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h index 66d2ce2d58..41ae0cec57 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_GND_SOULMEIRO_H_ #define _Z_BG_GND_SOULMEIRO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgGndSoulmeiro; diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h index d801998cc5..4f6cc3b7a6 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_H_ #define _Z_BG_HAKA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHaka; diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h index 7ce8dde9f9..6f002cd170 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_GATE_H_ #define _Z_BG_HAKA_GATE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaGate; diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h index d14bf7c952..38903cff2e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_HUTA_H_ #define _Z_BG_HAKA_HUTA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaHuta; diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h index 71e7d075ed..9f2722437d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_MEGANE_H_ #define _Z_BG_HAKA_MEGANE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaMegane; diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h index ceacdb72b9..f407928cc6 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_MEGANEBG_H_ #define _Z_BG_HAKA_MEGANEBG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaMeganeBG; diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h index fb7232936d..c12ce4e33a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_SGAMI_H_ #define _Z_BG_HAKA_SGAMI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaSgami; diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h index 6a119d3b91..575e0a4bed 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_SHIP_H_ #define _Z_BG_HAKA_SHIP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaShip; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h index c044d9d380..f7641d44c1 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_TRAP_H_ #define _Z_BG_HAKA_TRAP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef enum { /* 0x00 */ HAKA_TRAP_GUILLOTINE_SLOW, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h index 944cee93b9..c03c53091f 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_TUBO_H_ #define _Z_BG_HAKA_TUBO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaTubo; diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h index 1bab8032b8..fc6989af26 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_WATER_H_ #define _Z_BG_HAKA_WATER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaWater; diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h index 2abba6d5c1..10f711a035 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HAKA_ZOU_H_ #define _Z_BG_HAKA_ZOU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHakaZou; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index fc25e47c9b..1af709622d 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -5,7 +5,7 @@ */ #include "z_bg_heavy_block.h" -#include +#include "vt.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h index 1dbdde6338..18e4175290 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HEAVY_BLOCK_H_ #define _Z_BG_HEAVY_BLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHeavyBlock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h index ba5adcf94c..e985223292 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_CURTAIN_H_ #define _Z_BG_HIDAN_CURTAIN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanCurtain; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h index c4c7e0790d..1044a0b988 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_DALM_H_ #define _Z_BG_HIDAN_DALM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanDalm; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h index 2209a41395..0f27e509bb 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_FIREWALL_H_ #define _Z_BG_HIDAN_FIREWALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanFirewall; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h index a6fa657d55..fe8cfa9ec0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_FSLIFT_H_ #define _Z_BG_HIDAN_FSLIFT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanFslift; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h index 9140eff87e..864e97d5df 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_FWBIG_H_ #define _Z_BG_HIDAN_FWBIG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanFwbig; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h index 383d3f473d..2ae8ce6948 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_HAMSTEP_H_ #define _Z_BG_HIDAN_HAMSTEP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanHamstep; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h index 0f6c0afa26..213abcca92 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_HROCK_H_ #define _Z_BG_HIDAN_HROCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanHrock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h index 24a348e083..76dca708c5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_KOUSI_H_ #define _Z_BG_HIDAN_KOUSI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanKousi; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h index 283034ca93..3fe3504643 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_KOWARERUKABE_H_ #define _Z_BG_HIDAN_KOWARERUKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanKowarerukabe; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h index 14b65dd5a7..48d4abb715 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_ROCK_H_ #define _Z_BG_HIDAN_ROCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanRock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h index 732e466e12..fd44d68ef9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_RSEKIZOU_H_ #define _Z_BG_HIDAN_RSEKIZOU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanRsekizou; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h index c05c86798e..93e9198bff 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_SEKIZOU_H_ #define _Z_BG_HIDAN_SEKIZOU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanSekizou; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h index f28d087bdf..43d76eea3d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_SIMA_H_ #define _Z_BG_HIDAN_SIMA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanSima; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h index 3ad6d2e862..a7b3964586 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_HIDAN_SYOKU_H_ #define _Z_BG_HIDAN_SYOKU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgHidanSyoku; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h index 6ac928487c..4dd09357da 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_ICE_OBJECTS_H_ #define _Z_BG_ICE_OBJECTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgIceObjects; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h index 9c64fac681..10b9692557 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_ICE_SHELTER_H_ #define _Z_BG_ICE_SHELTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgIceShelter; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h index 27a3dfb73d..3b57f1735b 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_ICE_SHUTTER_H_ #define _Z_BG_ICE_SHUTTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgIceShutter; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h index 07e6253bfc..c469cdaf2a 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_ICE_TURARA_H_ #define _Z_BG_ICE_TURARA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgIceTurara; diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index bc90a7f8a3..f4f2fb97be 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_INGATE_H_ #define _Z_BG_INGATE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgIngate; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h index a06c528113..36dc8540f6 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_1FLIFT_H_ #define _Z_BG_JYA_1FLIFT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJya1flift; diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h index db491bba61..b0915c8c2e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_AMISHUTTER_H_ #define _Z_BG_JYA_AMISHUTTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaAmishutter; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h index 9d8dcefef3..60c5ef5567 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_BIGMIRROR_H_ #define _Z_BG_JYA_BIGMIRROR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaBigmirror; diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h index 5095bc1ee1..f49470994d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_BLOCK_H_ #define _Z_BG_JYA_BLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaBlock; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h index 27ff595318..2f9069976e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_BOMBCHUIWA_H_ #define _Z_BG_JYA_BOMBCHUIWA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaBombchuiwa; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 604e17bacf..c6c2c796bc 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -1,6 +1,6 @@ #include "z_bg_jya_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include +#include "vt.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h index 416459889a..965c3a2ccd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_BOMBIWA_H_ #define _Z_BG_JYA_BOMBIWA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaBombiwa; diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h index 3ab9087ec4..54ef603506 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_COBRA_H_ #define _Z_BG_JYA_COBRA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaCobra; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h index e2b4435bdc..7859396a1e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_GOROIWA_H_ #define _Z_BG_JYA_GOROIWA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaGoroiwa; diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h index 2d111eacfa..1af8a965e8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_HAHENIRON_H_ #define _Z_BG_JYA_HAHENIRON_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaHaheniron; diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h index c358bd67d9..fbe1acc7d6 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_IRONOBJ_H_ #define _Z_BG_JYA_IRONOBJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaIronobj; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h index 0d7557c492..916ac54eb2 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_KANAAMI_H_ #define _Z_BG_JYA_KANAAMI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaKanaami; diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h index 6ec71f025e..6fc9b52aa5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_LIFT_H_ #define _Z_BG_JYA_LIFT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaLift; typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*); diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h index f5ec4e6f2b..7a52d11a28 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_MEGAMI_H_ #define _Z_BG_JYA_MEGAMI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaMegami; diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 436e4c0c8b..477ce72967 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -5,8 +5,7 @@ */ #include "z_bg_jya_zurerukabe.h" - -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h index da59223c72..95c2881f88 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_JYA_ZURERUKABE_H_ #define _Z_BG_JYA_ZURERUKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgJyaZurerukabe; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h index 6af6d75705..07b5fba7e9 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MENKURI_EYE_H_ #define _Z_BG_MENKURI_EYE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMenkuriEye; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h index bf78d0cb08..347798058b 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MENKURI_KAITEN_H_ #define _Z_BG_MENKURI_KAITEN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMenkuriKaiten; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h index 8a8a6bfff1..3554168611 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MENKURI_NISEKABE_H_ #define _Z_BG_MENKURI_NISEKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMenkuriNisekabe; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h index ab0b1bffe6..b282ea36bf 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MIZU_BWALL_H_ #define _Z_BG_MIZU_BWALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMizuBwall; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h index c9bbb06242..319d21b97a 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MIZU_MOVEBG_H_ #define _Z_BG_MIZU_MOVEBG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMizuMovebg; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h index 879f4286c7..656e526b77 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MIZU_SHUTTER_H_ #define _Z_BG_MIZU_SHUTTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMizuShutter; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h index 775d963ada..aa80a8d1c6 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MIZU_UZU_H_ #define _Z_BG_MIZU_UZU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMizuUzu; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h index a1f0b51889..628dd9acee 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MIZU_WATER_H_ #define _Z_BG_MIZU_WATER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMizuWater; diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h index 9d55c38e2a..77756d0a7d 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MJIN_H_ #define _Z_BG_MJIN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMjin; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h index 0900447327..a7de2aa3d1 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_BIGST_H_ #define _Z_BG_MORI_BIGST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriBigst; diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h index 6467bb3a31..3b79053c0a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_ELEVATOR_H_ #define _Z_BG_MORI_ELEVATOR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriElevator; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h index 12b6ff4bea..0cb728dd98 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_HASHIGO_H_ #define _Z_BG_MORI_HASHIGO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriHashigo; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h index 303c369ea6..d15ffe866f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_HASHIRA4_H_ #define _Z_BG_MORI_HASHIRA4_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriHashira4; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h index ebc5e73951..3eb11ce29f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_HINERI_H_ #define _Z_BG_MORI_HINERI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriHineri; diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h index 8e5bdda045..a4ebef8169 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_IDOMIZU_H_ #define _Z_BG_MORI_IDOMIZU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriIdomizu; diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h index 2c7ddf53ac..ac941f86ec 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_KAITENKABE_H_ #define _Z_BG_MORI_KAITENKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriKaitenkabe; diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h index b3a522f879..d6c07f2992 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_MORI_RAKKATENJO_H_ #define _Z_BG_MORI_RAKKATENJO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgMoriRakkatenjo; diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h index 304b3d0163..a908b42b48 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_PO_EVENT_H_ #define _Z_BG_PO_EVENT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgPoEvent; diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h index 27128ff372..f0f05bc5d3 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_PO_SYOKUDAI_H_ #define _Z_BG_PO_SYOKUDAI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgPoSyokudai; diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h index cc0de6a7de..3ccdc62d48 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_PUSHBOX_H_ #define _Z_BG_PUSHBOX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgPushbox; diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h index 3310589f18..416d8c5488 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_RELAY_OBJECTS_H_ #define _Z_BG_RELAY_OBJECTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgRelayObjects; diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h index 63826359a1..85e4d03bad 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT00_BREAK_H #define _Z_BG_SPOT00_BREAK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot00Break; diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h index cc5c55d272..27a73d3806 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT00_HANEBASI_H_ #define _Z_BG_SPOT00_HANEBASI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot00Hanebasi; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h index 5460b62fe8..460a11506c 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT01_FUSYA_H_ #define _Z_BG_SPOT01_FUSYA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot01Fusya; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h index 56ac647996..d4e9aedba0 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT01_IDOHASHIRA_H_ #define _Z_BG_SPOT01_IDOHASHIRA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot01Idohashira; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h index 09a44114d0..8142d3fa70 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT01_IDOMIZU_H_ #define _Z_BG_SPOT01_IDOMIZU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot01Idomizu; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h index d939085284..cb826bc766 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT01_IDOSOKO_H_ #define _Z_BG_SPOT01_IDOSOKO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot01Idosoko; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h index f19ff5e22a..99c22b3dfb 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT01_OBJECTS2_H_ #define _Z_BG_SPOT01_OBJECTS2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot01Objects2; diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h index 052a83a98c..07ab1a2b79 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT02_OBJECTS_H_ #define _Z_BG_SPOT02_OBJECTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot02Objects; diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h index 73925fd8f0..e31e3ad9f9 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT03_TAKI_H_ #define _Z_BG_SPOT03_TAKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot03Taki; diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h index 38382bc32f..7286599b01 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT05_SOKO_H_ #define _Z_BG_SPOT05_SOKO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot05Soko; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h index 0315ca616e..03fb0b2f1c 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT06_OBJECTS_H_ #define _Z_BG_SPOT06_OBJECTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot06Objects; diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h index 9cbd7e916e..139ad9cc64 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT07_TAKI_H_ #define _Z_BG_SPOT07_TAKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot07Taki; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h index 86094995c4..65c6f28858 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT08_BAKUDANKABE_H_ #define _Z_BG_SPOT08_BAKUDANKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot08Bakudankabe; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h index cae25cc2d7..0c7931ff0a 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT08_ICEBLOCK_H_ #define _Z_BG_SPOT08_ICEBLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot08Iceblock; diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h index 54eb977caa..3b41a4da18 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT09_OBJ_H_ #define _Z_BG_SPOT09_OBJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot09Obj; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h index 579a801476..b1242fd154 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT11_BAKUDANKABE_H_ #define _Z_BG_SPOT11_BAKUDANKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot11Bakudankabe; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h index 87148d0d41..7f76bf30e4 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT11_OASIS_H_ #define _Z_BG_SPOT11_OASIS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot11Oasis; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h index 4c05283071..db14e1d27a 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT12_GATE_H_ #define _Z_BG_SPOT12_GATE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot12Gate; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h index 74fba23957..92ef07771f 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT12_SAKU_H_ #define _Z_BG_SPOT12_SAKU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot12Saku; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h index a2c1762df8..b511d5bdb4 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT15_RRBOX_H_ #define _Z_BG_SPOT15_RRBOX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot15Rrbox; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h index 9410f33c94..13deb86b26 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT15_SAKU_H_ #define _Z_BG_SPOT15_SAKU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot15Saku; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h index 16b878ab32..90bd7e4f57 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT16_BOMBSTONE_H_ #define _Z_BG_SPOT16_BOMBSTONE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot16Bombstone; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 2cf5dc520d..3f38bc6b94 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -5,7 +5,7 @@ */ #include "z_bg_spot16_doughnut.h" -#include +#include "vt.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h index ae8048c24c..5bc0494f99 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT16_DOUGHNUT_H_ #define _Z_BG_SPOT16_DOUGHNUT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot16Doughnut; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h index 2fd606a370..69f3db4fc2 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT17_BAKUDANKABE_H_ #define _Z_BG_SPOT17_BAKUDANKABE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot17Bakudankabe; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h index 98194d57e9..b67f1a914f 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT17_FUNEN_H_ #define _Z_BG_SPOT17_FUNEN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot17Funen; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h index 3e76f3e8f7..12d44f5f08 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT18_BASKET_H_ #define _Z_BG_SPOT18_BASKET_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot18Basket; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h index c4a7cf9665..46bee16977 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT18_FUTA_H_ #define _Z_BG_SPOT18_FUTA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot18Futa; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h index 22f8c770d3..0fa9350394 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT18_OBJ_H_ #define _Z_BG_SPOT18_OBJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot18Obj; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h index 003174c0ba..ae2e3b6c56 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SPOT18_SHUTTER_H_ #define _Z_BG_SPOT18_SHUTTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSpot18Shutter; diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h index 5bb3066101..43b4453a30 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_SST_FLOOR_H_ #define _Z_BG_SST_FLOOR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgSstFloor; diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h index 82851b375d..e1df819d68 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_TOKI_HIKARI_H_ #define _Z_BG_TOKI_HIKARI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgTokiHikari; diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h index 13062ca365..1b52e64c17 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_TOKI_SWD_H_ #define _Z_BG_TOKI_SWD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgTokiSwd; diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c index ef0733075d..404b16c647 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c @@ -1,5 +1,5 @@ #include "z_bg_toki_swd.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_808BB2F0[] = { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c index b3f580a846..4f8eaa14fb 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c @@ -1,5 +1,5 @@ #include "z_bg_toki_swd.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_808BB7A0[] = { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c index e837c82de8..6159d36b02 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c @@ -1,5 +1,5 @@ #include "z_bg_toki_swd.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_808BBD90[] = { diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h index f94157035d..b7f9c3ba01 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_TREEMOUTH_H_ #define _Z_BG_TREEMOUTH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgTreemouth; diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c index 9389675535..e6aba7a0b7 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_bg_treemouth.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_808BCE20[] = { diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h index 13c37d91fb..0d8ace5fb9 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_UMAJUMP_H_ #define _Z_BG_UMAJUMP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgUmaJump; diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h index ee7666a6bf..3c296fa379 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_VB_SIMA_H_ #define _Z_BG_VB_SIMA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgVbSima; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h index 2dda84a36f..76ce339b3f 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_YDAN_HASI_H_ #define _Z_BG_YDAN_HASI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgYdanHasi; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h index 7c540bd584..4b6af1c4c4 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_YDAN_MARUTA_H_ #define _Z_BG_YDAN_MARUTA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgYdanMaruta; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h index edff5f0816..1511c8b72a 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_YDAN_SP_H_ #define _Z_BG_YDAN_SP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgYdanSp; diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index b7e1570283..f0090ba1f5 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -5,7 +5,7 @@ */ #include "z_bg_zg.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h index e1834e004b..28e60cd307 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h @@ -1,8 +1,8 @@ #ifndef _Z_BG_ZG_H_ #define _Z_BG_ZG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BgZg; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h index 833e1362b4..8942325897 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_DODONGO_H_ #define _Z_BOSS_DODONGO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossDodongo; diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h index 9d587e3480..ea3351936a 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_FD_H_ #define _Z_BOSS_FD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossFd; diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h index 5593348d29..ef0f6f4016 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_FD2_H_ #define _Z_BOSS_FD2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossFd2; diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h index a488d4a602..45cfa96766 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_GANON_H_ #define _Z_BOSS_GANON_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossGanon; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h index 06315b2d60..c062ef9143 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_GANON2_H_ #define _Z_BOSS_GANON2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossGanon2; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h index b0d1fe1fb1..170111a4e8 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_GANONDROF_H_ #define _Z_BOSS_GANONDROF_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossGanondrof; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h index 71664783ab..53033a5251 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_GOMA_H_ #define _Z_BOSS_GOMA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossGoma; diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h index c26e343d38..e9323a37c7 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_MO_H_ #define _Z_BOSS_MO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossMo; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h index c97664cefa..7bd0085641 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_SST_H_ #define _Z_BOSS_SST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossSst; diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h index 64dbe156c5..ca60e98b9b 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_TW_H_ #define _Z_BOSS_TW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossTw; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h index b9d6082a8a..1075d5037b 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h @@ -1,8 +1,8 @@ #ifndef _Z_BOSS_VA_H_ #define _Z_BOSS_VA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct BossVa; diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h index 1be658e4a2..e637ad94b7 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_6K_H_ #define _Z_DEMO_6K_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct Demo6K; diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h index 40ccf5302f..fb6adf8e6a 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_DU_H_ #define _Z_DEMO_DU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoDu; diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h index 7ad33e4385..ed55c4db7e 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_EC_H_ #define _Z_DEMO_EC_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoEc; diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h index 08887d1568..ddb094474a 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_EFFECT_H_ #define _Z_DEMO_EFFECT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoEffect; diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h index 7cd966c739..034b20bfca 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_EXT_H_ #define _Z_DEMO_EXT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoExt; diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 1d1a13ca59..2b9eda1388 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -5,8 +5,7 @@ */ #include "z_demo_geff.h" - -#include +#include "vt.h" #define FLAGS 0x00000030 diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h index 5de1fdcab7..af8b2effe8 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_GEFF_H_ #define _Z_DEMO_GEFF_H_ -#include -#include +#include "ultra64.h" +#include "global.h" #include "../ovl_Demo_Gt/z_demo_gt.h" diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h index 0656d24a49..c750e4ec03 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_GJ_H_ #define _Z_DEMO_GJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoGj; diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index ef55f10c0e..0fdba9cf02 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -5,8 +5,7 @@ */ #include "z_demo_go.h" - -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h index 4edfcf2d2c..7ad2883ac2 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_GO_H_ #define _Z_DEMO_GO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoGo; diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h index 9647b64b76..cdd124404e 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_GT_H_ #define _Z_DEMO_GT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoGt; diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h index 24931721a2..941949cbec 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_IK_H_ #define _Z_DEMO_IK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoIk; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index e0a893f5de..919cd22d40 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -6,7 +6,7 @@ #include "z_demo_im.h" -#include +#include "vt.h" #define FLAGS 0x00000011 diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h index f4f00fe254..4a3308f796 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_IM_H_ #define _Z_DEMO_IM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoIm; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c index aa2ee5f028..b2d23f755c 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_demo_im.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_8098786C[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index 034b03d965..f16653a37f 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_KANKYO_H_ #define _Z_DEMO_KANKYO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoKankyo; diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h index ac761848b6..708eae610f 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_KEKKAI_H_ #define _Z_DEMO_KEKKAI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoKekkai; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 97f8be83d3..ca22a7c17c 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -6,7 +6,7 @@ #include "z_demo_sa.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h index ac98e7c130..c291d012e2 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_SA_H_ #define _Z_DEMO_SA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoSa; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c index bc256a2228..d482cf53d0 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_demo_sa.h" -#include +#include "z64cutscene_commands.h" // clang-format off static CutsceneData D_8099010C[] = { diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h index 3e09bcbc48..14a902564b 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_SHD_H_ #define _Z_DEMO_SHD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoShd; diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c index 71e4b692dc..19b0a2e8a1 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c @@ -1,5 +1,5 @@ -#include -#include +#include "ultra64.h" +#include "global.h" UNK_TYPE D_80991680[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h index 3c01fe6915..431c093ee8 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h @@ -1,8 +1,8 @@ #ifndef _Z_DEMO_TRE_LGT_H_ #define _Z_DEMO_TRE_LGT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DemoTreLgt; diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h index b5df93c65a..5c3c55d85e 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h @@ -1,8 +1,8 @@ #ifndef _Z_DOOR_ANA_H_ #define _Z_DOOR_ANA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DoorAna; diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h index 9ae55f6d67..ecb7148530 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h @@ -1,8 +1,8 @@ #ifndef _Z_DOOR_GERUDO_H_ #define _Z_DOOR_GERUDO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DoorGerudo; diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h index 91c80a7d66..d2223e4e25 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h @@ -1,8 +1,8 @@ #ifndef _Z_DOOR_KILLER_H_ #define _Z_DOOR_KILLER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DoorKiller; diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h index 67c2885ba8..9a586aa0c8 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -1,8 +1,8 @@ #ifndef _Z_DOOR_SHUTTER_H_ #define _Z_DOOR_SHUTTER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DoorShutter; diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h index 332c64aad5..cf31fc28e9 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.h +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.h @@ -1,8 +1,8 @@ #ifndef _Z_DOOR_TOKI_H_ #define _Z_DOOR_TOKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DoorToki; diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index 83e4dff704..292587e80a 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -1,8 +1,8 @@ #ifndef _Z_DOOR_WARP1_H_ #define _Z_DOOR_WARP1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct DoorWarp1; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h index 7aa8953e2c..60bdf9e1be 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h @@ -1,8 +1,8 @@ #ifndef _Z_EFC_ERUPC_H_ #define _Z_EFC_ERUPC_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EfcErupc; diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h index cd951ae0f3..6df1016812 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_DUST_H_ #define _Z_EFF_DUST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EffDust; diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 8f5584c501..a804a2b54b 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -5,7 +5,7 @@ */ #include "z_elf_msg.h" -#include +#include "vt.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h index 61830c3b38..a6ba75334b 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h @@ -1,8 +1,8 @@ #ifndef _Z_ELF_MSG_H_ #define _Z_ELF_MSG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ElfMsg; diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 33f130f6c0..3167138b41 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -5,7 +5,7 @@ */ #include "z_elf_msg2.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h index b299840e00..c12a56fa8a 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h @@ -1,8 +1,8 @@ #ifndef _Z_ELF_MSG2_H_ #define _Z_ELF_MSG2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ElfMsg2; diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h index fbe6c0c57c..132c6253e0 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_AM_H_ #define _Z_EN_AM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnAm; diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h index 522afcaddc..10a8930a5d 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ANI_H_ #define _Z_EN_ANI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnAni; diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h index bac6489e9d..53b2b01ead 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ANUBICE_H_ #define _Z_EN_ANUBICE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnAnubice; diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h index 79c42e5855..cfc447ca61 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ANUBICE_FIRE_H_ #define _Z_EN_ANUBICE_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnAnubiceFire; diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 4dcbc8a58a..749651b72b 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -5,7 +5,7 @@ */ #include "z_en_anubice_tag.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h index 2182ff6870..df87858c3d 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ANUBICE_TAG_H_ #define _Z_EN_ANUBICE_TAG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" #include "overlays/actors/ovl_En_Anubice/z_en_anubice.h" struct EnAnubiceTag; diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h index a14116481a..c5268ee60c 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.h @@ -1,9 +1,9 @@ #ifndef _Z_EN_AROW_TRAP_H_ #define _Z_EN_AROW_TRAP_H_ -#include -#include -#include +#include "ultra64.h" +#include "global.h" +#include "z64.h" struct EnArowTrap; diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index b166157e5d..dc9e80202f 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ARROW_H_ #define _Z_EN_ARROW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnArrow; diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h index 552ca18b50..91346e15a0 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ATTACK_NIW_H_ #define _Z_EN_ATTACK_NIW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnAttackNiw; diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.h b/src/overlays/actors/ovl_En_Ba/z_en_ba.h index 0c8cba3560..bee5999806 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.h +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BA_H_ #define _Z_EN_BA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBa; diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h index 518d6013c2..db269304b4 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BB_H_ #define _Z_EN_BB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBb; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h index def74cb62c..a9a1d81691 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BDFIRE_H_ #define _Z_EN_BDFIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBdfire; diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h index c5ab344e8c..a35552521e 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BIGOKUTA_H_ #define _Z_EN_BIGOKUTA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBigokuta; diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.h b/src/overlays/actors/ovl_En_Bili/z_en_bili.h index f4f2f6dbce..176541c203 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.h +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BILI_H_ #define _Z_EN_BILI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBili; diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.h b/src/overlays/actors/ovl_En_Bird/z_en_bird.h index a111728320..8a2d75eabe 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.h +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BIRD_H_ #define _Z_EN_BIRD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBird; diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h index df3a7a4819..4104d578b7 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BLKOBJ_H_ #define _Z_EN_BLKOBJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBlkobj; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h index 18ae1f8d6f..6660253089 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOM_H_ #define _Z_EN_BOM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBom; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h index 9ebe2a2854..d43056810e 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOM_BOWL_MAN_H_ #define _Z_EN_BOM_BOWL_MAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBomBowlMan; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h index e041695f71..909dde98e5 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOM_BOWL_PIT_H_ #define _Z_EN_BOM_BOWL_PIT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBomBowlPit; diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h index f90124d73e..0da3c24e09 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOM_CHU_H_ #define _Z_EN_BOM_CHU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBomChu; diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h index d2c28f8f1a..3dbc7d6ec9 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOMBF_H_ #define _Z_EN_BOMBF_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBombf; diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 80a84a7f88..d9c928d834 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOOM_H_ #define _Z_EN_BOOM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBoom; diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index 7b847af326..8171438ae2 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BOX_H_ #define _Z_EN_BOX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBox; diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.h b/src/overlays/actors/ovl_En_Brob/z_en_brob.h index e0790ce986..678911d1c3 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.h +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BROB_H_ #define _Z_EN_BROB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBrob; diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h index bec3a84a4e..253b4b3740 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BUBBLE_H_ #define _Z_EN_BUBBLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBubble; diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h index bb5dc8d2d6..c6cae2f099 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BUTTE_H_ #define _Z_EN_BUTTE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnButte; diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h index 5b2777ce38..64c12492df 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BW_H_ #define _Z_EN_BW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBw; diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.h b/src/overlays/actors/ovl_En_Bx/z_en_bx.h index 304dc69e42..9dd47cb251 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.h +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_BX_H_ #define _Z_EN_BX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnBx; diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.h b/src/overlays/actors/ovl_En_Changer/z_en_changer.h index 04d4441877..d36bdbe989 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.h +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_CHANGER_H_ #define _Z_EN_CHANGER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnChanger; diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h index 9406a6e842..28221ef39d 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_CLEAR_TAG_H_ #define _Z_EN_CLEAR_TAG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnClearTag; diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h index ab48c8db56..d8db141e6d 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_COW_H_ #define _Z_EN_COW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnCow; diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h index 1aacbaa326..abaa36754a 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_CROW_H_ #define _Z_EN_CROW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnCrow; diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.h b/src/overlays/actors/ovl_En_Cs/z_en_cs.h index a7baf94618..ffd9592c35 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.h +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_CS_H_ #define _Z_EN_CS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnCs; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h index 15bbd1f025..a7e02d36c2 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DAIKU_H_ #define _Z_EN_DAIKU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDaiku; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h index f43d27166e..ec07a3a077 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DAIKU_KAKARIKO_H_ #define _Z_EN_DAIKU_KAKARIKO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDaikuKakariko; diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h index 39f73552fe..e68486c84a 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DEKUBABA_H_ #define _Z_EN_DEKUBABA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDekubaba; diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h index 386eeabdec..18a221aa12 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DEKUNUTS_H_ #define _Z_EN_DEKUNUTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDekunuts; diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h index 405c8cc562..8b0047e476 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DH_H_ #define _Z_EN_DH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDh; diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.h b/src/overlays/actors/ovl_En_Dha/z_en_dha.h index fddc3cbf80..e4eabe4f0b 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.h +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DHA_H_ #define _Z_EN_DHA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDha; diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h index 74f89ae22e..3100df5ea6 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DIVING_GAME_H_ #define _Z_EN_DIVING_GAME_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDivingGame; diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h index 927d383056..473e43c835 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DNS_H_ #define _Z_EN_DNS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDns; diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h index 3f1f033a82..2bc1b3c54f 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DNT_DEMO_H_ #define _Z_EN_DNT_DEMO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDntDemo; diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h index 68c5c5f743..ecd923095b 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DNT_JIJI_H_ #define _Z_EN_DNT_JIJI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDntJiji; diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h index aa6204b7e4..a171658e0b 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DNT_NOMAL_H_ #define _Z_EN_DNT_NOMAL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDntNomal; diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h index 0573ab7a4b..b16146f1f3 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DODOJR_H_ #define _Z_EN_DODOJR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDodojr; diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h index 6349bcd482..83bd8bf5ae 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DODONGO_H_ #define _Z_EN_DODONGO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDodongo; diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h index 19e09a1157..a6f20e7f9f 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DOG_H_ #define _Z_EN_DOG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDog; diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h index 1d43b30247..03e8f45625 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.h +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DOOR_H_ #define _Z_EN_DOOR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDoor; diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index dea5061fe1..351840fb95 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -158,7 +158,7 @@ void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) { } } -int EnDs_CheckRupeesAndBottle() { +s32 EnDs_CheckRupeesAndBottle() { if (gSaveContext.rupees < 100) { return 0; } else if (Inventory_HasEmptyBottle() == 0) { diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/src/overlays/actors/ovl_En_Ds/z_en_ds.h index 345caf52aa..46d3e2ee21 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.h +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DS_H_ #define _Z_EN_DS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDs; @@ -17,7 +17,7 @@ typedef struct EnDs { /* 0x01BA */ char unk_1B8[0x1E]; /* 0x01D8 */ Vec3s unk_1D8; /* 0x01DE */ Vec3s unk_1DE; - /* 0x01E4 */ float unk_1E4; + /* 0x01E4 */ f32 unk_1E4; /* 0x01E8 */ u16 unk_1E8; /* 0x01EA */ u16 brewTimer; /* 0x01EC */ EnDsActionFunc actionFunc; diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h index 906800b3a8..f2fe848d0b 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.h +++ b/src/overlays/actors/ovl_En_Du/z_en_du.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DU_H_ #define _Z_EN_DU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDu; diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h index b07de73e88..cd56529f8c 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_DY_EXTRA_H_ #define _Z_EN_DY_EXTRA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnDyExtra; diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index e838fd359c..1824e54abb 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -5,7 +5,7 @@ */ #include "z_en_eg.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.h b/src/overlays/actors/ovl_En_Eg/z_en_eg.h index a4da5acbd5..82569487ff 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.h +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_EG_H_ #define _Z_EN_EG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnEg; diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h index b79a7bf2b2..64275fe18f 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_EIYER_H_ #define _Z_EN_EIYER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnEiyer; diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index ca88554b5d..bbb73f8b31 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ELF_H_ #define _Z_EN_ELF_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnElf; diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h index 0778b7b217..d7f37d33e7 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ENCOUNT1_H_ #define _Z_EN_ENCOUNT1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnEncount1; diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h index 12dca7338d..41e89c7247 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ENCOUNT2_H_ #define _Z_EN_ENCOUNT2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnEncount2; diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h index 2b3c072d1b..62c32cd7ae 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_EX_ITEM_H_ #define _Z_EN_EX_ITEM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnExItem; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h index 74c8170b55..5679e100e3 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_EX_RUPPY_H_ #define _Z_EN_EX_RUPPY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnExRuppy; diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.h b/src/overlays/actors/ovl_En_Fd/z_en_fd.h index 031f8b6238..f475b31593 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.h +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FD_H_ #define _Z_EN_FD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFd; diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h index c07f031f1f..1ba4432c8a 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FD_FIRE_H_ #define _Z_EN_FD_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFdFire; diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h index 4b6e56c5d0..883af9c300 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FHG_FIRE_H_ #define _Z_EN_FHG_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFhgFire; diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h index 8dfa21d74f..262e01e39c 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FIRE_ROCK_H_ #define _Z_EN_FIRE_ROCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFireRock; diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h index c1c2fc2b61..4816c0b6a2 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FIREFLY_H_ #define _Z_EN_FIREFLY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFirefly; diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h index 0f60266431..f417220b68 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FISH_H_ #define _Z_EN_FISH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFish; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h index a4bcf5e032..23e3cbd8ee 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FLOORMAS_H_ #define _Z_EN_FLOORMAS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct EnFloormas EnFloormas; diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h index 954173f9ce..1eb0b2bda9 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FR_H_ #define _Z_EN_FR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFr; diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h index 316ff1d94d..a4b65ba031 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FU_H_ #define _Z_EN_FU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFu; diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.h b/src/overlays/actors/ovl_En_Fw/z_en_fw.h index bcebd12e56..1b9a2df9e4 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.h +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FW_H_ #define _Z_EN_FW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFw; diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h index 80f75c6479..b5a354343a 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FZ_H_ #define _Z_EN_FZ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnFz; diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h index 1f1fa288c5..0db9de716b 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_G_SWITCH_H_ #define _Z_EN_G_SWITCH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGSwitch; diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h index 3c53d88616..c508289a4c 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GANON_MANT_H_ #define _Z_EN_GANON_MANT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGanonMant; diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h index 4e2f302755..2a66d06978 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GANON_ORGAN_H_ #define _Z_EN_GANON_ORGAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGanonOrgan; diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.h b/src/overlays/actors/ovl_En_Gb/z_en_gb.h index f85342e06b..902dddf304 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.h +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GB_H_ #define _Z_EN_GB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGb; diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h index f740dd0ef0..cd77352f22 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GE1_H_ #define _Z_EN_GE1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGe1; diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h index 57176472e8..2c758bc70f 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GE2_H_ #define _Z_EN_GE2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGe2; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h index b5f8f5e50c..c35bb41ccf 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GE3_H_ #define _Z_EN_GE3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGe3; diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h index 90fc07ac95..226fc00531 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GELDB_H_ #define _Z_EN_GELDB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGeldB; diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index 648823a4c0..09f1e73611 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GIRLA_H_ #define _Z_EN_GIRLA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGirlA; diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h index 55b75ddf32..4cf1f7885c 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GM_H_ #define _Z_EN_GM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGm; diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h index f4cbace7a4..0cc54c7d78 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.h +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GO_H_ #define _Z_EN_GO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGo; diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h index 613ae66038..c8a73d467c 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GO2_H_ #define _Z_EN_GO2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGo2; diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.h b/src/overlays/actors/ovl_En_Goma/z_en_goma.h index d4f8da102c..b44527e6ab 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.h +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GOMA_H_ #define _Z_EN_GOMA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGoma; diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 54122ebbdd..35aae79be3 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -7,7 +7,7 @@ #include "z_en_goroiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h index 246d14eeec..03de3a9a11 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GOROIWA_H_ #define _Z_EN_GOROIWA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGoroiwa; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h index e70d2bff14..04c45e9fcd 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GS_H_ #define _Z_EN_GS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGs; diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index dcee678078..2225c36d2e 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -5,7 +5,7 @@ */ #include "z_en_guest.h" -#include +#include "vt.h" #define FLAGS 0x00000019 diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.h b/src/overlays/actors/ovl_En_Guest/z_en_guest.h index c6183520cf..15e5f0df16 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.h +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_GUEST_H_ #define _Z_EN_GUEST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnGuest; diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h index 027e255470..09e81f3e17 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HATA_H_ #define _Z_EN_HATA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 7b7668e01c..9962446b90 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -5,7 +5,7 @@ */ #include "z_en_heishi1.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h index 71e3778fef..b31c1026e1 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HEISHI1_H_ #define _Z_EN_HEISHI1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHeishi1; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index fb7ba8712c..da7958dffe 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -4,11 +4,11 @@ * Description: Hyrulian Guards */ +#include "vt.h" #include "z_en_heishi2.h" #include "overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h" -#include #define FLAGS 0x00000009 diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h index fbb32cdc4f..11bba414db 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HEISHI2_H_ #define _Z_EN_HEISHI2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHeishi2; diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 9acd6f230a..b7a03e0969 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -5,7 +5,7 @@ */ #include "z_en_heishi3.h" -#include +#include "vt.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h index 4ae1a1cded..56cbd41dd1 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HEISHI3_H_ #define _Z_EN_HEISHI3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHeishi3; diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h index c4e69dfff0..74a6bd595c 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HEISHI4_H_ #define _Z_EN_HEISHI4_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef enum { /* 0x00 */ HEISHI4_AT_KAKRIKO_ENTRANCE, diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h index aa97beb7a4..341d6f5738 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HINTNUTS_H_ #define _Z_EN_HINTNUTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHintnuts; diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h index d96d81a515..0602fa4ce3 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HOLL_H_ #define _Z_EN_HOLL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHoll; diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h index 862d898446..cd935a15cf 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HONOTRAP_H_ #define _Z_EN_HONOTRAP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHonotrap; diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 16791b6d89..646c688515 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HORSE_H_ #define _Z_EN_HORSE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHorse; diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h index f20aa87764..f99223e64e 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HORSE_GAME_CHECK_H_ #define _Z_EN_HORSE_GAME_CHECK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHorseGameCheck; diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h index cb2d91d943..6d6e7bdda7 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HORSE_GANON_H_ #define _Z_EN_HORSE_GANON_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHorseGanon; diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h index cde2bb8772..349ad61051 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HORSE_LINK_CHILD_H_ #define _Z_EN_HORSE_LINK_CHILD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHorseLinkChild; diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h index 0223fbf5ce..8ccc1357b2 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HORSE_NORMAL_H_ #define _Z_EN_HORSE_NORMAL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHorseNormal; diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h index a739413a3a..41b3ffb4af 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HORSE_ZELDA_H_ #define _Z_EN_HORSE_ZELDA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHorseZelda; diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h index d9ade04b3b..707a137c05 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HS_H_ #define _Z_EN_HS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHs; diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index a58fb00e0d..abfc9ae5fc 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -5,8 +5,7 @@ */ #include "z_en_hs2.h" - -#include +#include "vt.h" #define FLAGS 0x00000009 diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h index fc44277e0f..8684127d67 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HS2_H_ #define _Z_EN_HS2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHs2; diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.h b/src/overlays/actors/ovl_En_Hy/z_en_hy.h index c89a6e3260..c0908015a7 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.h +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_HY_H_ #define _Z_EN_HY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnHy; diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h index 3836db99fd..680394613e 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ICE_HONO_H_ #define _Z_EN_ICE_HONO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnIceHono; diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h index 2cebf9be92..484d8ca6ef 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_IK_H_ #define _Z_EN_IK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnIk; diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h index f35244ffc0..c38e11c3d7 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_IN_H_ #define _Z_EN_IN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnIn; diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 60958b8b1d..973c46a365 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -1,5 +1,5 @@ #include "z_en_insect.h" -#include +#include "vt.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h index d45d760559..44a524419c 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_INSECT_H_ #define _Z_EN_INSECT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" #include "overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h" struct EnInsect; diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h index 5035f3d72d..028f07ae2b 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ISHI_H_ #define _Z_EN_ISHI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnIshi; diff --git a/src/overlays/actors/ovl_En_It/z_en_it.h b/src/overlays/actors/ovl_En_It/z_en_it.h index 62a031ae6e..1bbb4218ac 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.h +++ b/src/overlays/actors/ovl_En_It/z_en_it.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_IT_H_ #define _Z_EN_IT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnIt; diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.h b/src/overlays/actors/ovl_En_Jj/z_en_jj.h index bba41b4903..2780a2ca91 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.h +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_JJ_H_ #define _Z_EN_JJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnJj; diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h index 024dd3151d..d216d6c495 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.h +++ b/src/overlays/actors/ovl_En_Js/z_en_js.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_JS_H_ #define _Z_EN_JS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnJs; diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h index b6905a7316..a368d79c85 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_JSJUTAN_H_ #define _Z_EN_JSJUTAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnJsjutan; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h index 4a4543753e..be2d3ca0c2 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KAKASI_H_ #define _Z_EN_KAKASI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKakasi; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h index 3c26c9051d..e8843604f2 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KAKASI2_H_ #define _Z_EN_KAKASI2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKakasi2; diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h index c3efd3a570..bae8c09ba8 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KAKASI3_H_ #define _Z_EN_KAKASI3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKakasi3; diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h index a1d2138826..89d5fb2ed4 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KANBAN_H_ #define _Z_EN_KANBAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKanban; diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h index b1c2bd83ba..d9a4132ddf 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KAREBABA_H_ #define _Z_EN_KAREBABA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKarebaba; diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/src/overlays/actors/ovl_En_Ko/z_en_ko.h index faed45ed04..9f93a43b33 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.h +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KO_H_ #define _Z_EN_KO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKo; diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h index aa15f10d77..1d817db167 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KUSA_H_ #define _Z_EN_KUSA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKusa; diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.h b/src/overlays/actors/ovl_En_Kz/z_en_kz.h index 043b595e13..d9061da5e5 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.h +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_KZ_H_ #define _Z_EN_KZ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnKz; diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h index c780538f08..7b5301de2e 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.h +++ b/src/overlays/actors/ovl_En_Light/z_en_light.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_LIGHT_H_ #define _Z_EN_LIGHT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnLight; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h index d42f5e6a8f..b0f9682804 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_LIGHTBOX_H_ #define _Z_EN_LIGHTBOX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnLightbox; diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h index 5a0426ec18..985af26cb2 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_M_FIRE1_H_ #define _Z_EN_M_FIRE1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMFire1; diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h index 9a27b89c14..cb6db0d41f 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_M_THUNDER_H_ #define _Z_EN_M_THUNDER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMThunder; diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h index 70c9e1255c..c38f78ab74 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MA1_H_ #define _Z_EN_MA1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMa1; diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h index c759974a41..fea3e648dd 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MA2_H_ #define _Z_EN_MA2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMa2; diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h index 532d9e4ae5..068a0830e6 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MA3_H_ #define _Z_EN_MA3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMa3; diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index d282c0a519..0261c146c9 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -115,9 +115,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) { if (gSaveContext.fileNum != 0xFEDC) { if (this->globalState < MAG_STATE_DISPLAY) { - if (CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) || - CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) || - CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON)) { + if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START) || + CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_A) || + CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) { Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); @@ -142,9 +142,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) { } } else if (this->globalState >= MAG_STATE_DISPLAY) { if (sDelayTimer == 0) { - if (CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) || - CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) || - CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON)) { + if (CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_START) || + CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_A) || + CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) { if (globalCtx->sceneLoadFlag != 20) { func_800F68BC(0); diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h index 9ce947ffe7..9eba318aa8 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MAG_H_ #define _Z_EN_MAG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMag; diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h index da81a39def..d48d035ba1 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MB_H_ #define _Z_EN_MB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMb; diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h index 08973c3d19..cb2c19c756 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.h +++ b/src/overlays/actors/ovl_En_Md/z_en_md.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MD_H_ #define _Z_EN_MD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMd; diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h index 8206f6f54a..4761131da9 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MK_H_ #define _Z_EN_MK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMk; diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h index 581cc164a3..5aecded8b4 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.h +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MM_H_ #define _Z_EN_MM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMm; diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h index bfae3aaa7a..9c790601af 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MM2_H_ #define _Z_EN_MM2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMm2; diff --git a/src/overlays/actors/ovl_En_Ms/dlists.h b/src/overlays/actors/ovl_En_Ms/dlists.h index f2ce5d4393..3a9b6cf7fb 100644 --- a/src/overlays/actors/ovl_En_Ms/dlists.h +++ b/src/overlays/actors/ovl_En_Ms/dlists.h @@ -1,8 +1,8 @@ #ifndef _DLISTS_H_ #define _DLISTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" extern const ActorInit InitVars; diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h index 731adc45a6..2bdb12e7ff 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MS_H_ #define _Z_EN_MS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMs; diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.h b/src/overlays/actors/ovl_En_Mu/z_en_mu.h index aa7c75ffd0..4ddf949bb4 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.h +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_MU_H_ #define _Z_EN_MU_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnMu; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h index a89c14b7ea..4f731845e8 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NB_H_ #define _Z_EN_NB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnNb; diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h index 30c562089f..e75c7050bd 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NIW_H_ #define _Z_EN_NIW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnNiw; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index d60e9db362..846b433d01 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -5,7 +5,7 @@ */ #include "z_en_niw_girl.h" -#include +#include "vt.h" #define FLAGS 0x00000019 diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h index 73c9dc875e..284e58a870 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NIW_GIRL_H_ #define _Z_EN_NIW_GIRL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" #include "../ovl_En_Niw/z_en_niw.h" struct EnNiwGirl; diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h index fc67a925dd..0a4afefaa6 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NIW_LADY_H_ #define _Z_EN_NIW_LADY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnNiwLady; diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h index 732fbfd3e2..a43e9d47ac 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NUTSBALL_H_ #define _Z_EN_NUTSBALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnNutsball; diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h index acec11d705..5d6871a3a4 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NWC_H_ #define _Z_EN_NWC_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnNwc; diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h index 168ff96a94..db9e3235b3 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_NY_H_ #define _Z_EN_NY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnNy; diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h index cfc985a7be..4945bedbea 100644 --- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.h +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_OE2_H_ #define _Z_EN_OE2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnOE2; diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 1302210f1c..7affec989f 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -5,7 +5,7 @@ */ #include "z_en_okarina_effect.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h index 7a3f1361c3..575cc5ba84 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_OKARINA_EFFECT_H_ #define _Z_EN_OKARINA_EFFECT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnOkarinaEffect; diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 2fa9db91ff..e6afa9516c 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -5,7 +5,7 @@ */ #include "z_en_okarina_tag.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h index 5ff95ab05a..d094261fd1 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_OKARINA_TAG_H_ #define _Z_EN_OKARINA_TAG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnOkarinaTag; diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c index 74b5604390..e4471236ea 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_en_okarina_tag.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_80ABF9D0[] = { diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h index 9e76b74b58..11bc2b3467 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_OKUTA_H_ #define _Z_EN_OKUTA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnOkuta; diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 22d9f0305e..429ef58466 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_OSSAN_H_ #define _Z_EN_OSSAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnOssan; diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h index 33465e36a5..f36a82090b 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_OWL_H_ #define _Z_EN_OWL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnOwl; diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h index 4324d34cba..92ce925578 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PART_H_ #define _Z_EN_PART_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPart; diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h index f7ee264615..c2dc45ddd2 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PEEHAT_H_ #define _Z_EN_PEEHAT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPeehat; diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h index 77cc9615e0..260ff4eac9 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PO_DESERT_H_ #define _Z_EN_PO_DESERT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPoDesert; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h index 353693c849..752c0b56ae 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PO_FIELD_H_ #define _Z_EN_PO_FIELD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPoField; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h index 6062e004b4..b4fd76f1b0 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PO_RELAY_H_ #define _Z_EN_PO_RELAY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPoRelay; diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h index 086ce50d9a..ca00287df5 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PO_SISTERS_H_ #define _Z_EN_PO_SISTERS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPoSisters; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h index 915d7853d7..f3b50339fa 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_POH_H_ #define _Z_EN_POH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPoh; diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h index a8171a9a6f..e71346ac41 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_PU_BOX_H_ #define _Z_EN_PU_BOX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnPubox; diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index 7fcfde0816..035d0fd94d 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_RD_H_ #define _Z_EN_RD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnRd; diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h index d6fed6b798..299d19bdf0 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_REEBA_H_ #define _Z_EN_REEBA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnReeba; diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h index 909925387c..31716d9dae 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_RIVER_SOUND_H_ #define _Z_EN_RIVER_SOUND_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnRiverSound; diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h index 2d7ebeb36f..c0ab9c7d6c 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_RL_H_ #define _Z_EN_RL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnRl; diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h index 5a1321e3ac..fa57319c10 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_RR_H_ #define _Z_EN_RR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnRr; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 5a47e1cf75..676d93c4d9 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -5,8 +5,7 @@ */ #include "z_en_ru1.h" - -#include +#include "vt.h" #define FLAGS 0x04000011 diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 01fc087e79..50b3e7ecb1 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -1,11 +1,11 @@ #ifndef _Z_EN_RU1_H_ #define _Z_EN_RU1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" -#include -#include +#include "overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h" +#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" struct EnRu1; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c index c6870e407e..3d606538f2 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_en_ru1.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_80AF0880[] = { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 1403bc1983..d92fbb4799 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -5,7 +5,7 @@ */ #include "z_en_ru2.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 82d0bee9bc..cad92e04f2 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_RU2_H_ #define _Z_EN_RU2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnRu2; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c index 5f17537404..3b87d8988f 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_en_ru2.h" -#include +#include "z64cutscene_commands.h" // clang-format off static CutsceneData D_80AF411C[] = { diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/src/overlays/actors/ovl_En_Sa/z_en_sa.h index 5d3435943b..568e3204c4 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.h +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SA_H_ #define _Z_EN_SA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSa; diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index da4772846b..057778140d 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -5,7 +5,7 @@ */ #include "z_en_sb.h" -#include +#include "vt.h" #define FLAGS 0x00000005 diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h index 1c2f3384bd..b35f79c850 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SB_H_ #define _Z_EN_SB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSb; diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h index 9b2b299fe8..1cbd0d1935 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.h @@ -1,8 +1,8 @@ #ifndef _Z_ITEM_SCENE_CHANGE_H_ #define _Z_ITEM_SCENE_CHANGE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSceneChange; diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h index 34cb558958..412297bec1 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SDA_H_ #define _Z_EN_SDA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSda; diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h index 87a7ab8626..a24899e53a 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SHOPNUTS_H_ #define _Z_EN_SHOPNUTS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnShopnuts; diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h index 3273c906b8..32dc0e9a8f 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SI_H_ #define _Z_EN_SI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSi; diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h index 3c7659bc6a..cf0762431e 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SIOFUKI_H_ #define _Z_EN_SIOFUKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSiofuki; diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index 5a454127d2..b8d4ff12e5 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SKB_H_ #define _Z_EN_SKB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSkb; diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/src/overlays/actors/ovl_En_Skj/z_en_skj.h index a57754aa5c..8e459ceeb3 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.h +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SKJ_H_ #define _Z_EN_SKJ_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSkj; diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h index d68581d638..ec9830f5a2 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SKJNEEDLE_H_ #define _Z_EN_SKJNEEDLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSkjneedle; diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h index f33f1e476e..21563ce120 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SSH_H_ #define _Z_EN_SSH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSsh; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h index 78caadada4..ac9d0920ba 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.h +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ST_H_ #define _Z_EN_ST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSt; diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h index 401ab7dbdb..3d78061fed 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_STH_H_ #define _Z_EN_STH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSth; diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h index 73f8418e4d..33faea46a0 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_STREAM_H_ #define _Z_EN_STREAM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnStream; diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index 948d64241d..2e83971bb7 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SW_H_ #define _Z_EN_SW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSw; diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h index dd78f0c1e0..3df19d7fc6 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SYATEKI_ITM_H_ #define _Z_EN_SYATEKI_ITM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSyatekiItm; diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h index bc00641550..2900f973cf 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SYATEKI_MAN_H_ #define _Z_EN_SYATEKI_MAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSyatekiMan; diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 750eaa35b4..4768bfb045 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -5,7 +5,7 @@ */ #include "z_en_syateki_niw.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h index 7e11735c31..1c61f9fa24 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_SYATEKI_NIW_H_ #define _Z_EN_SYATEKI_NIW_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnSyatekiNiw; diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h index c67f293141..9b9f63bf91 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TA_H_ #define _Z_EN_TA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTa; diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index ed105c4c9b..e07be92745 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -5,7 +5,7 @@ */ #include "z_en_takara_man.h" -#include +#include "vt.h" #define FLAGS 0x08000039 diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h index ba63a57a06..5ac82ad76e 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TAKARA_MAN_H_ #define _Z_EN_TAKARA_MAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTakaraMan; diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h index dfa5a606d0..8706ad47e4 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TANA_H_ #define _Z_EN_TANA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTana; diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index ec06fc3f13..941b9695d4 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TEST_H_ #define _Z_EN_TEST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTest; diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h index ac8ade4841..55e8b54423 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TG_H_ #define _Z_EN_TG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTg; diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h index 90a315f0e6..9bb4a4e3fe 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TITE_H_ #define _Z_EN_TITE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTite; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 60aec43288..5e08655d8f 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TK_H_ #define _Z_EN_TK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" /* Dirt particle effect */ struct EnTkEff; diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h index 84c7d7e4e2..e21290109b 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.h +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TORCH_H_ #define _Z_EN_TORCH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTorch; diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h index a3136641ac..8325eb3801 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TORCH2_H_ #define _Z_EN_TORCH2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" // Uses the Player struct (from z64player.h) diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h index e5b4cbc43c..c8913c7fb2 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TORYO_H_ #define _Z_EN_TORYO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnToryo; diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h index 6235e704d1..7bc4944eac 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TP_H_ #define _Z_EN_TP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTp; diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.h b/src/overlays/actors/ovl_En_Tr/z_en_tr.h index 5ec1b93924..1fed972c75 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.h +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TR_H_ #define _Z_EN_TR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTr; diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.h b/src/overlays/actors/ovl_En_Trap/z_en_trap.h index abddfd3d79..d09942829c 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.h +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TRAP_H_ #define _Z_EN_TRAP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTrap; diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index fd96567ebc..65f2563080 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -6,8 +6,7 @@ #include "z_en_tubo_trap.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" - -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h index cad5552542..d9fd6f27d7 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_TUBO_TRAP_H_ #define _Z_EN_TUBO_TRAP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnTuboTrap; diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.h b/src/overlays/actors/ovl_En_Vali/z_en_vali.h index e7c4a90133..2d18a409d3 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.h +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_VALI_H_ #define _Z_EN_VALI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnVali; diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.h b/src/overlays/actors/ovl_En_Vase/z_en_vase.h index 1b2311928f..84dc6ecacd 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.h +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_VASE_H_ #define _Z_EN_VASE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnVase; diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h index f6967a6da9..11a60c04e3 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_VB_BALL_H_ #define _Z_EN_VB_BALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnVbBall; diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h index fcc0325015..e1a9b82a1d 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_VIEWER_H_ #define _Z_EN_VIEWER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnViewer; diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h index f71fef04d4..a5c1175d98 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_VM_H_ #define _Z_EN_VM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnVm; diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h index e47bdfb494..9aab46d21d 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WALL_TUBO_H_ #define _Z_EN_WALL_TUBO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWallTubo; diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h index d640ebab90..2296b0f17b 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WALLMAS_H_ #define _Z_EN_WALLMAS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef enum { /* 0x00 */ WMT_TIMER, diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h index 19c1b7a2b7..ac427354d0 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WEATHER_TAG_H_ #define _Z_EN_WEATHER_TAG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWeatherTag; diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h index ed92ba81d5..16c33692d8 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WEIYER_H_ #define _Z_EN_WEIYER_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWeiyer; diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h index 37bf9dadfa..5163af3db3 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WF_H_ #define _Z_EN_WF_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWf; diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h index db6f66f668..d177e8dc5f 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WONDER_ITEM_H_ #define _Z_EN_WONDER_ITEM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWonderItem; diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index 435c66120f..fe2358205f 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -5,7 +5,7 @@ */ #include "z_en_wonder_talk.h" -#include +#include "vt.h" #define FLAGS 0x08000009 diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h index e7cb19f5c7..19082b6fdd 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WONDER_TALK_H_ #define _Z_EN_WONDER_TALK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWonderTalk; diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 636eca1455..81d44a3d9b 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -5,7 +5,7 @@ */ #include "z_en_wonder_talk2.h" -#include +#include "vt.h" #define FLAGS 0x08000009 diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h index c399e678ec..22f63096df 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WONDER_TALK2_H_ #define _Z_EN_WONDER_TALK2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWonderTalk2; diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h index 0fa0860d13..d74f86e321 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_WOOD02_H_ #define _Z_EN_WOOD02_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnWood02; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h index 7e81be023a..65b94bb6ba 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_XC_H_ #define _Z_EN_XC_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnXc; diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h index c32f87eebc..6221fdba50 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_YABUSAME_MARK_H_ #define _Z_EN_YABUSAME_MARK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnYabusameMark; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h index f335e4d1b4..d30e0836d1 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_YUKABYUN_H_ #define _Z_EN_YUKABYUN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnYukabyun; diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h index f20cce8675..89e1580230 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ZF_H_ #define _Z_EN_ZF_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnZf; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h index 340bfb67d2..3fcd477bac 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ZL1_H_ #define _Z_EN_ZL1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnZl1; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c index 1b7e1be53a..99acb3f9c8 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -1,5 +1,5 @@ #include "z_en_zl1.h" -#include +#include "z64cutscene_commands.h" // clang-format off CutsceneData D_80B4C5D0[] = { diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 91fc259add..b3d59cd962 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -5,7 +5,7 @@ */ #include "z_en_zl2.h" -#include +#include "vt.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h index 57fc6f7cda..6ec9d637a7 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ZL2_H_ #define _Z_EN_ZL2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnZl2; diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h index 1e23d17fee..d5a19812ec 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ZL3_H_ #define _Z_EN_ZL3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnZl3; diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h index 4cba98ac4e..44dc3733b8 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ZL4_H_ #define _Z_EN_ZL4_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnZl4; diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h index 02be99454e..c0ca0d51a2 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_ZO_H_ #define _Z_EN_ZO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnZo; diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h index 81f3311939..412ff6158f 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h @@ -1,8 +1,8 @@ #ifndef _Z_EN_FHG_H_ #define _Z_EN_FHG_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EnfHG; diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.h b/src/overlays/actors/ovl_End_Title/z_end_title.h index 1b4bcbb960..4fbb39c8ef 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.h +++ b/src/overlays/actors/ovl_End_Title/z_end_title.h @@ -1,8 +1,8 @@ #ifndef _Z_END_TITLE_H_ #define _Z_END_TITLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct EndTitle; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.h b/src/overlays/actors/ovl_Fishing/z_fishing.h index 288dba5030..be047ba03a 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.h +++ b/src/overlays/actors/ovl_Fishing/z_fishing.h @@ -1,8 +1,8 @@ #ifndef _Z_FISHING_H_ #define _Z_FISHING_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct Fishing; diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h index 07eb7d855c..eef5467163 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h @@ -1,8 +1,8 @@ #ifndef _Z_ITEM_B_HEART_H_ #define _Z_ITEM_B_HEART_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ItemBHeart; diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h index bd8f2004fd..420680601e 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h @@ -1,8 +1,8 @@ #ifndef _Z_ITEM_ETCETERA_H_ #define _Z_ITEM_ETCETERA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ItemEtcetera; diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h index 4e72eb3904..1aee38f9df 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -1,8 +1,8 @@ #ifndef _Z_ITEM_INBOX_H_ #define _Z_ITEM_INBOX_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ItemInbox; diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h index a67e73cf3d..f7ba4236ea 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h @@ -1,8 +1,8 @@ #ifndef _Z_ITEM_OCARINA_H_ #define _Z_ITEM_OCARINA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ItemOcarina; diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h index 2222f700c1..5a3bbaff88 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h @@ -1,8 +1,8 @@ #ifndef _Z_ITEM_SHIELD_H_ #define _Z_ITEM_SHIELD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ItemShield; diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h index 9c97fbc3e6..d57f29109c 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h @@ -1,8 +1,8 @@ #ifndef _Z_MAGIC_DARK_H_ #define _Z_MAGIC_DARK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct MagicDark; diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h index 1ead62f48e..221c0fb01c 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_MAGIC_FIRE_H_ #define _Z_MAGIC_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct MagicFire; diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h index 0b76e7ac28..03f0374482 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h @@ -1,8 +1,8 @@ #ifndef _Z_MAGIC_WIND_H_ #define _Z_MAGIC_WIND_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct MagicWind; diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c index 7a6a03a4b4..d665e4a99d 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c @@ -1,4 +1,4 @@ -#include +#include "global.h" Vtx sCylinderVtx[] = { VTX(0, 0, -6000, 1024, 2048, 0xFF, 0xFF, 0xFF, 0xFF), diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h index 454b5202e7..4ca0bfa1d5 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -1,8 +1,8 @@ #ifndef _Z_MIR_RAY_H_ #define _Z_MIR_RAY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct MirRay; diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h index 4f48407f5b..5b97f7d3a7 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_BEAN_H_ #define _Z_OBJ_BEAN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjBean; diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h index b333617740..36de69821c 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_BLOCKSTOP_H_ #define _Z_OBJ_BLOCKSTOP_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjBlockstop; diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h index b8a537eda9..e1e9c0aa3b 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_BOMBIWA_H_ #define _Z_OBJ_BOMBIWA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjBombiwa; diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h index 89c8e50039..83945325bf 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_COMB_H_ #define _Z_OBJ_COMB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjComb; diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h index c3d20eca73..ac02c320c0 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_DEKUJR_H_ #define _Z_OBJ_DEKUJR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjDekujr; diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h index 03472a90d7..f9d4c99845 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_ELEVATOR_H_ #define _Z_OBJ_ELEVATOR_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjElevator; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h index 221701bc9f..01987a8a10 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_HAMISHI_H_ #define _Z_OBJ_HAMISHI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjHamishi; diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h index cffc9036ad..5456525911 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_HANA_H_ #define _Z_OBJ_HANA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjHana; diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h index 36d614e849..3af7ff1cc9 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_HSBLOCK_H_ #define _Z_OBJ_HSBLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjHsblock; diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h index 7457dc2dfd..fc1894d80f 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_ICE_POLY_H_ #define _Z_OBJ_ICE_POLY_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjIcePoly; diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h index 37c0aac1b9..5bdb58faca 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_KIBAKO_H_ #define _Z_OBJ_KIBAKO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjKibako; diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h index 92521430f7..f7280fe446 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_KIBAKO2_H_ #define _Z_OBJ_KIBAKO2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjKibako2; diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h index 68e5043e4b..2ef2599f2d 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_LIFT_H_ #define _Z_OBJ_LIFT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjLift; diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index b4eadca98b..4ac979e121 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -5,7 +5,7 @@ */ #include "z_obj_lightswitch.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h index 11d67f1f49..9a36dca8cb 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_LIGHTSWITCH_H_ #define _Z_OBJ_LIGHTSWITCH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjLightswitch; diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 5e59ca9c39..ac2020d8ca 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -5,7 +5,7 @@ */ #include "z_obj_makekinsuta.h" -#include +#include "vt.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h index 4d6b421afe..a091c7fd34 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_MAKEKINSUTA_H_ #define _Z_OBJ_MAKEKINSUTA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjMakekinsuta; diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index ba07ee8888..796601ba1d 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" -#include +#include "vt.h" #define FLAGS 0x00000020 diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h index 4f2b6e4ef3..ea0669b190 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_MAKEOSHIHIKI_H_ #define _Z_OBJ_MAKEOSHIHIKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjMakeoshihiki; diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h index a07043f806..6acb71fc0b 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_MURE_H_ #define _Z_OBJ_MURE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjMure; diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h index ccee5be788..38519365eb 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_MURE2_H_ #define _Z_OBJ_MURE2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjMure2; diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h index 13bfecba73..ec4fd273a6 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_MURE3_H_ #define _Z_OBJ_MURE3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjMure3; diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h index fc0819c014..14677efb0b 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_OSHIHIKI_H_ #define _Z_OBJ_OSHIHIKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjOshihiki; diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h index b3f37ce01f..d9d75322d1 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h @@ -1,9 +1,9 @@ #ifndef _Z_OBJ_ROOMTIMER_H_ #define _Z_OBJ_ROOMTIMER_H_ -#include -#include -#include +#include "ultra64.h" +#include "global.h" +#include "z64.h" struct ObjRoomtimer; diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h index 372ff89e40..d13119ab1a 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_SWITCH_H_ #define _Z_OBJ_SWITCH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjSwitch; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h index b5f0bbc55b..1c2a780889 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_SYOKUDAI_H_ #define _Z_OBJ_SYOKUDAI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjSyokudai; diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h index 0277c0f523..0a2cf9e406 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_TIMEBLOCK_H_ #define _Z_OBJ_TIMEBLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjTimeblock; diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h index cebf786a7c..9706d8f0ec 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_TSUBO_H_ #define _Z_OBJ_TSUBO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjTsubo; diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h index d4b5a3a3eb..e17d417e02 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJ_WARP2BLOCK_H_ #define _Z_OBJ_WARP2BLOCK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjWarp2block; diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h index 067fc6b851..5fad2a08d2 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h @@ -1,8 +1,8 @@ #ifndef _Z_OBJECT_KANKYO_H_ #define _Z_OBJECT_KANKYO_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ObjectKankyo; diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 2bc500d698..040ffc1569 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -5,7 +5,7 @@ */ #include "z_oceff_spot.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h index ab366c3478..4aedd62b1d 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h @@ -1,8 +1,8 @@ #ifndef _Z_OCEFF_SPOT_H_ #define _Z_OCEFF_SPOT_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct OceffSpot; diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h index 0ed633183b..e5ad561486 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -1,8 +1,8 @@ #ifndef _Z_OCEFF_STORM_H_ #define _Z_OCEFF_STORM_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct OceffStorm; diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 29fbd18e02..92468a9f0c 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h index 2b3367a903..3a2950629b 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h @@ -1,8 +1,8 @@ #ifndef _Z_OCEFF_WIPE_H_ #define _Z_OCEFF_WIPE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct OceffWipe; diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index e68d3943c0..7e8b3b818b 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe2.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h index d2f03ee51a..25b32f19d4 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -1,8 +1,8 @@ #ifndef _Z_OCEFF_WIPE2_H_ #define _Z_OCEFF_WIPE2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct OceffWipe2; diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index a3614affa4..eb26284df2 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe3.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h index deb9da40ea..cb9324a23b 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h @@ -1,8 +1,8 @@ #ifndef _Z_OCEFF_WIPE3_H_ #define _Z_OCEFF_WIPE3_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct OceffWipe3; diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index e45621deea..d3449f812e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -5,7 +5,7 @@ */ #include "z_oceff_wipe4.h" -#include +#include "vt.h" #define FLAGS 0x02000010 diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h index b53b8d1c0e..15e81f58e0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -1,8 +1,8 @@ #ifndef _Z_OCEFF_WIPE4_H_ #define _Z_OCEFF_WIPE4_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct OceffWipe4; diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 14be022822..7dd9c5a98d 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -5,7 +5,7 @@ */ #include "z_shot_sun.h" -#include +#include "vt.h" #define FLAGS 0x00000009 diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h index d796e4cabe..70a6a4ffec 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -1,8 +1,8 @@ #ifndef _Z_SHOT_SUN_H_ #define _Z_SHOT_SUN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" struct ShotSun; diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c index f5d105f823..2e7edd60ff 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -1,4 +1,4 @@ -#include +#include "global.h" #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s") @@ -47,8 +47,8 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3188); - pauseCtx->inputX = input->rel.in.x; - pauseCtx->inputY = input->rel.in.y; + pauseCtx->inputX = input->rel.stick_x; + pauseCtx->inputY = input->rel.stick_y; gSPSegment(oGfxCtx->polyOpa.p++, 0x02, interfaceCtx->parameterSegment); gSPSegment(oGfxCtx->polyOpa.p++, 0x07, pauseCtx->unk_13C); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 43c4109f8e..049eacbed3 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4,8 +4,8 @@ * Description: Link */ -#include -#include +#include "ultra64.h" +#include "global.h" #include "overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h" #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" @@ -1009,7 +1009,7 @@ LinkAnimetionEntry* D_80854378[] = { u8 D_80854380[2] = { 0x18, 0x19 }; u8 D_80854384[2] = { 0x1A, 0x1B }; -u16 D_80854388[] = { B_BUTTON, L_CBUTTONS, D_CBUTTONS, R_CBUTTONS }; +u16 D_80854388[] = { BTN_B, BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT }; u8 sMagicSpellCosts[] = { 12, 24, 24, 12, 24, 12 }; @@ -1309,7 +1309,7 @@ s32 func_80832594(Player* this, s32 arg1, s32 arg2) { this->unk_850 += arg1 + (s16)(ABS(temp) * fabsf(D_808535D4) * 2.5415802156203426e-06f); - if (sControlInput->press.in.button & (A_BUTTON | B_BUTTON)) { + if (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B)) { this->unk_850 += 5; } @@ -1949,7 +1949,7 @@ void func_80833DF8(Player* this, GlobalContext* globalCtx) { } for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { - if (CHECK_PAD(sControlInput->press, D_80854388[i])) { + if (CHECK_BTN_ALL(sControlInput->press.button, D_80854388[i])) { break; } } @@ -1957,7 +1957,7 @@ void func_80833DF8(Player* this, GlobalContext* globalCtx) { item = func_80833CDC(globalCtx, i); if (item >= ITEM_NONE_FE) { for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { - if (CHECK_PAD(sControlInput->cur, D_80854388[i])) { + if (CHECK_BTN_ALL(sControlInput->cur.button, D_80854388[i])) { break; } } @@ -2149,7 +2149,8 @@ s32 func_80834758(GlobalContext* globalCtx, Player* this) { if (!(this->stateFlags1 & 0x20C00000) && (globalCtx->unk_11E5C == 0) && (this->heldItemActionParam == this->itemActionParam) && (this->currentShield != PLAYER_SHIELD_NONE) && - !Player_IsChildWithHylianShield(this) && func_80833BCC(this) && CHECK_PAD(sControlInput->cur, R_TRIG)) { + !Player_IsChildWithHylianShield(this) && func_80833BCC(this) && + CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { anim = func_808346C4(globalCtx, this); frame = SkelAnime_GetFrameCount(&anim->genericHeader); @@ -2238,7 +2239,7 @@ s32 func_80834A2C(Player* this, GlobalContext* globalCtx) { s32 func_80834B5C(Player* this, GlobalContext* globalCtx) { func_800A3BC0(globalCtx, &this->skelAnime2); - if (!CHECK_PAD(sControlInput->cur, R_TRIG)) { + if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { func_80834894(this); return 1; } else { @@ -2308,13 +2309,13 @@ s32 func_80834D2C(Player* this, GlobalContext* globalCtx) { } s32 func_80834E44(GlobalContext* globalCtx) { - return (globalCtx->unk_11E5C > 0) && CHECK_PAD(sControlInput->press, B_BUTTON); + return (globalCtx->unk_11E5C > 0) && CHECK_BTN_ALL(sControlInput->press.button, BTN_B); } s32 func_80834E7C(GlobalContext* globalCtx) { return (globalCtx->unk_11E5C != 0) && ((globalCtx->unk_11E5C < 0) || - (sControlInput->cur.in.button & (A_BUTTON | B_BUTTON | U_CBUTTONS | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))); + CHECK_BTN_ANY(sControlInput->cur.button, BTN_A | BTN_B | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)); } s32 func_80834EB8(Player* this, GlobalContext* globalCtx) { @@ -3013,7 +3014,7 @@ s32 func_80836AB8(Player* this, s32 arg1) { void func_80836BEC(Player* this, GlobalContext* globalCtx) { s32 sp1C = 0; - s32 zTrigPressed = CHECK_PAD(sControlInput->cur, Z_TRIG); + s32 zTrigPressed = CHECK_BTN_ALL(sControlInput->cur.button, BTN_Z); Actor* actorToTarget; s32 pad; s32 holdTarget; @@ -3047,7 +3048,7 @@ void func_80836BEC(Player* this, GlobalContext* globalCtx) { if (!cond) { if (!(this->stateFlags1 & 0x2000000) && ((this->heldItemActionParam != PLAYER_AP_FISHING_POLE) || (this->unk_860 == 0)) && - CHECK_PAD(sControlInput->press, Z_TRIG)) { + CHECK_BTN_ALL(sControlInput->press.button, BTN_Z)) { if (this->actor.type == ACTORTYPE_PLAYER) { actorToTarget = globalCtx->actorCtx.targetCtx.arrowPointedActor; @@ -3863,11 +3864,11 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) { if ((this->actor.wallPolySource != 50) && (D_808535F0 & 0x40)) { if (this->unk_88D >= 6) { this->stateFlags2 |= 4; - if (CHECK_PAD(sControlInput->press, A_BUTTON)) { + if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { sp3C = 1; } } - } else if ((this->unk_88D >= 6) || CHECK_PAD(sControlInput->press, A_BUTTON)) { + } else if ((this->unk_88D >= 6) || CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { sp3C = 1; } @@ -4160,7 +4161,7 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { if ((this->doorType != 0) && (!(this->stateFlags1 & 0x800) || ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) { - if (CHECK_PAD(sControlInput->press, A_BUTTON) || (func_8084F9A0 == this->func_674)) { + if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (func_8084F9A0 == this->func_674)) { doorActor = this->doorActor; if (this->doorType < 0) { @@ -4913,7 +4914,7 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { if (sp34 != NULL) { this->stateFlags2 |= 2; - if (CHECK_PAD(sControlInput->press, A_BUTTON) || (sp34->flags & 0x10000)) { + if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (sp34->flags & 0x10000)) { sp2C = NULL; } else if (sp2C == NULL) { return 0; @@ -4925,7 +4926,7 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= 0x200000; } - if (!CHECK_PAD(sControlInput->press, U_CBUTTONS) && !sp28) { + if (!CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && !sp28) { return 0; } @@ -4977,8 +4978,9 @@ s32 func_8083B998(Player* this, GlobalContext* globalCtx) { if ((this->unk_664 != NULL) && (((this->unk_664->flags & 0x40001) == 0x40001) || (this->unk_664->naviEnemyId != 0xFF))) { this->stateFlags2 |= 0x200000; - } else if ((this->naviMessageId == 0) && !func_8008E9C4(this) && CHECK_PAD(sControlInput->press, U_CBUTTONS) && - (YREG(15) != 0x10) && (YREG(15) != 0x20) && !func_8083B8F4(this, globalCtx)) { + } else if ((this->naviMessageId == 0) && !func_8008E9C4(this) && + CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && (YREG(15) != 0x10) && (YREG(15) != 0x20) && + !func_8083B8F4(this, globalCtx)) { func_80078884(NA_SE_SY_ERROR); } @@ -5004,7 +5006,8 @@ void func_8083BA90(GlobalContext* globalCtx, Player* this, s32 arg2, f32 xzVeloc s32 func_8083BB20(Player* this) { if (!(this->stateFlags1 & 0x400000) && (Player_GetSwordHeld(this) != 0)) { - if (D_80853614 || ((this->actor.type != ACTORTYPE_PLAYER) && CHECK_PAD(sControlInput->press, B_BUTTON))) { + if (D_80853614 || + ((this->actor.type != ACTORTYPE_PLAYER) && CHECK_BTN_ALL(sControlInput->press.button, BTN_B))) { return 1; } } @@ -5055,7 +5058,8 @@ void func_8083BCD0(Player* this, GlobalContext* globalCtx, s32 arg2) { s32 func_8083BDBC(Player* this, GlobalContext* globalCtx) { s32 sp2C; - if (CHECK_PAD(sControlInput->press, A_BUTTON) && (globalCtx->roomCtx.curRoom.unk_03 != 2) && (D_808535E4 != 7) && + if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && (globalCtx->roomCtx.curRoom.unk_03 != 2) && + (D_808535E4 != 7) && (func_80041F7C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource) != 1)) { sp2C = this->unk_84B[this->unk_846]; @@ -5144,7 +5148,7 @@ void func_8083C148(Player* this, GlobalContext* globalCtx) { s32 func_8083C1DC(Player* this, GlobalContext* globalCtx) { if (!func_80833B54(this) && (D_808535E0 == 0) && !(this->stateFlags1 & 0x800000) && - CHECK_PAD(sControlInput->press, A_BUTTON)) { + CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { if (func_8083BC7C(this, globalCtx)) { return 1; } @@ -5163,7 +5167,7 @@ s32 func_8083C2B0(Player* this, GlobalContext* globalCtx) { f32 frame; if ((globalCtx->unk_11E5C == 0) && (this->currentShield != PLAYER_SHIELD_NONE) && - CHECK_PAD(sControlInput->cur, R_TRIG) && + CHECK_BTN_ALL(sControlInput->cur.button, BTN_R) && (Player_IsChildWithHylianShield(this) || (!func_80833B2C(this) && (this->unk_664 == NULL)))) { func_80832318(this); @@ -5221,13 +5225,13 @@ s32 func_8083C484(Player* this, f32* arg1, s16* arg2) { } void func_8083C50C(Player* this) { - if ((this->unk_844 > 0) && !CHECK_PAD(sControlInput->cur, B_BUTTON)) { + if ((this->unk_844 > 0) && !CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { this->unk_844 = -this->unk_844; } } s32 func_8083C544(Player* this, GlobalContext* globalCtx) { - if (CHECK_PAD(sControlInput->cur, B_BUTTON)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { if (!(this->stateFlags1 & 0x400000) && (Player_GetSwordHeld(this) != 0) && (this->unk_844 == 1) && (this->heldItemActionParam != PLAYER_AP_STICK)) { if ((this->heldItemActionParam != PLAYER_AP_SWORD_BGS) || (gSaveContext.swordHealth > 0.0f)) { @@ -5487,7 +5491,7 @@ void func_8083D0A8(GlobalContext* globalCtx, Player* this, f32 arg2) { s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) { if (!(this->stateFlags1 & 0x400) && !(this->stateFlags2 & 0x400)) { - if ((arg2 == NULL) || (CHECK_PAD(arg2->press, A_BUTTON) && (ABS(this->unk_6C2) < 12000) && + if ((arg2 == NULL) || (CHECK_BTN_ALL(arg2->press.button, BTN_A) && (ABS(this->unk_6C2) < 12000) && (this->currentBoots != PLAYER_BOOTS_IRON))) { func_80835C58(globalCtx, this, func_8084DC48, 0); @@ -5808,7 +5812,7 @@ s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { f32 sp34; s32 temp; - if ((rideActor != NULL) && CHECK_PAD(sControlInput->press, A_BUTTON)) { + if ((rideActor != NULL) && CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { sp38 = Math_Coss(rideActor->actor.shape.rot.y); sp34 = Math_Sins(rideActor->actor.shape.rot.y); @@ -5955,7 +5959,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { func_8083E4C4(globalCtx, this, giEntry); this->getItemId = GI_NONE; } - } else if (CHECK_PAD(sControlInput->press, A_BUTTON) && !(this->stateFlags1 & 0x800) && + } else if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && !(this->stateFlags1 & 0x800) && !(this->stateFlags2 & 0x400)) { if (this->getItemId != GI_NONE) { GetItemEntry* giEntry = &sGetItemTable[-this->getItemId - 1]; @@ -6044,7 +6048,7 @@ s32 func_8083EAF0(Player* this, Actor* actor) { s32 func_8083EB44(Player* this, GlobalContext* globalCtx) { if ((this->stateFlags1 & 0x800) && (this->heldActor != NULL) && - (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))) { + CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)) { if (!func_80835644(globalCtx, this, this->heldActor)) { if (!func_8083EAF0(this, this->heldActor)) { func_80835C58(globalCtx, this, func_808464B0, 1); @@ -6218,7 +6222,7 @@ s32 func_8083F0C8(Player* this, GlobalContext* globalCtx, u32 arg2) { this->stateFlags2 |= 0x10000; - if (CHECK_PAD(sControlInput->press, A_BUTTON)) { + if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { f32 sp38 = wallPoly->norm.x * (1.0f / 32767.0f); f32 sp34 = wallPoly->norm.z * (1.0f / 32767.0f); f32 sp30 = this->wallDistance; @@ -6356,7 +6360,7 @@ s32 func_8083F7BC(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= 1; - if (CHECK_PAD(sControlInput->cur, A_BUTTON)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A)) { if ((this->actor.wallPolySource != 50) && ((wallPolyActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.wallPolySource)) != NULL)) { @@ -6392,7 +6396,8 @@ s32 func_8083F7BC(Player* this, GlobalContext* globalCtx) { } s32 func_8083F9D0(GlobalContext* globalCtx, Player* this) { - if ((this->actor.bgCheckFlags & 0x200) && ((this->stateFlags2 & 0x10) || CHECK_PAD(sControlInput->cur, A_BUTTON))) { + if ((this->actor.bgCheckFlags & 0x200) && + ((this->stateFlags2 & 0x10) || CHECK_BTN_ALL(sControlInput->cur.button, BTN_A))) { DynaPolyActor* wallPolyActor = NULL; if (this->actor.wallPolySource != 50) { @@ -6433,7 +6438,7 @@ void func_8083FB7C(Player* this, GlobalContext* globalCtx) { } s32 func_8083FBC0(Player* this, GlobalContext* globalCtx) { - if (!CHECK_PAD(sControlInput->press, A_BUTTON) && (this->actor.bgCheckFlags & 0x200) && + if (!CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && (this->actor.bgCheckFlags & 0x200) && ((D_808535F0 & 8) || (D_808535F0 & 2) || func_80041E4C(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallPolySource))) { return 0; @@ -6479,7 +6484,7 @@ s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) if (this->unk_664 != NULL) { func_8083DB98(this, 1); } else { - Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sControlInput->rel.in.y * 240.0f, 14, 4000, 30); + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sControlInput->rel.stick_y * 240.0f, 14, 4000, 30); func_80836AB8(this, 1); } } else { @@ -7669,8 +7674,8 @@ void func_80843188(Player* this, GlobalContext* globalCtx) { func_8083721C(this); if (this->unk_850 != 0) { - sp54 = sControlInput->rel.in.y * 100; - sp50 = sControlInput->rel.in.x * -120; + sp54 = sControlInput->rel.stick_y * 100; + sp50 = sControlInput->rel.stick_x * -120; sp4E = this->actor.shape.rot.y - func_8005A948(ACTIVE_CAM); sp40 = Math_Coss(sp4E); @@ -8033,7 +8038,7 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) { Actor* heldActor = this->heldActor; if (!func_80835644(globalCtx, this, heldActor) && (heldActor->id == ACTOR_EN_NIW) && - (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))) { + CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)) { func_8084409C(globalCtx, this, this->linearVelocity + 2.0f, this->actor.velocity.y + 2.0f); } } @@ -8259,7 +8264,7 @@ s32 func_80844BE4(Player* this, GlobalContext* globalCtx) { if (func_8083ADD4(globalCtx, this)) { this->stateFlags2 |= 0x20000; } else { - if (!CHECK_PAD(sControlInput->cur, B_BUTTON)) { + if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { if ((this->unk_858 >= 0.85f) || func_808375D8(this)) { temp = D_80854384[Player_HoldsTwoHandedWeapon(this)]; } else { @@ -8331,7 +8336,7 @@ void func_80844E68(Player* this, GlobalContext* globalCtx) { if (this->unk_858 >= 0.1f) { this->unk_845 = 0; this->unk_850 = 1; - } else if (!CHECK_PAD(sControlInput->cur, B_BUTTON)) { + } else if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { func_80844D68(this, globalCtx); } } else if (!func_80844BE4(this, globalCtx)) { @@ -8820,7 +8825,7 @@ void func_80846260(Player* this, GlobalContext* globalCtx) { return; } - } else if (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS)) { + } else if (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)) { func_80835C58(globalCtx, this, func_80846358, 1); func_80832264(globalCtx, this, &D_040032B8); } @@ -10317,8 +10322,8 @@ void Player_Update(Actor* thisx, GlobalContext* globalCtx) { } else { sp44 = globalCtx->state.input[0]; if (this->unk_88E != 0) { - sp44.cur.in.button &= ~(A_BUTTON | B_BUTTON | U_CBUTTONS); - sp44.press.in.button &= ~(A_BUTTON | B_BUTTON | U_CBUTTONS); + sp44.cur.button &= ~(BTN_A | BTN_B | BTN_CUP); + sp44.press.button &= ~(BTN_A | BTN_B | BTN_CUP); } } @@ -10533,22 +10538,22 @@ s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3) { s16 temp2; if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) { - temp2 = sControlInput->rel.in.y * 240.0f; + temp2 = sControlInput->rel.stick_y * 240.0f; Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, temp2, 14, 4000, 30); - temp2 = sControlInput->rel.in.x * -16.0f; + temp2 = sControlInput->rel.stick_x * -16.0f; temp2 = CLAMP(temp2, -3000, 3000); this->actor.posRot2.rot.y += temp2; } else { temp1 = (this->stateFlags1 & 0x800000) ? 3500 : 14000; - this->actor.posRot2.rot.x += (s32)((1.0f - Math_Coss(sControlInput->rel.in.y * 200)) * 1500.0f) * - ((sControlInput->rel.in.y >= 0) ? 1 : -1); + this->actor.posRot2.rot.x += (s32)((1.0f - Math_Coss(sControlInput->rel.stick_y * 200)) * 1500.0f) * + ((sControlInput->rel.stick_y >= 0) ? 1 : -1); this->actor.posRot2.rot.x = CLAMP(this->actor.posRot2.rot.x, -temp1, temp1); temp1 = 19114; temp2 = this->actor.posRot2.rot.y - this->actor.shape.rot.y; - temp2 += (s32)((1.0f - Math_Coss(sControlInput->rel.in.x * 200)) * -1500.0f) * - ((sControlInput->rel.in.x >= 0) ? 1 : -1); + temp2 += (s32)((1.0f - Math_Coss(sControlInput->rel.stick_x * 200)) * -1500.0f) * + ((sControlInput->rel.stick_x >= 0) ? 1 : -1); this->actor.posRot2.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; } @@ -10634,7 +10639,7 @@ void func_8084B000(Player* this) { void func_8084B158(GlobalContext* globalCtx, Player* this, Input* input, f32 arg3) { f32 temp; - if ((input != NULL) && (input->press.in.button & (A_BUTTON | B_BUTTON))) { + if ((input != NULL) && CHECK_BTN_ANY(input->press.button, BTN_A | BTN_B)) { temp = 1.0f; } else { temp = 0.5f; @@ -10664,10 +10669,11 @@ void func_8084B1D8(Player* this, GlobalContext* globalCtx) { if ((this->csMode != 0) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) || func_80833B54(this) || (this->unk_664 != NULL) || !func_8083AD4C(globalCtx, this) || - (((this->unk_6AD == 2) && ((sControlInput->press.in.button & (A_BUTTON | B_BUTTON | R_TRIG)) || + (((this->unk_6AD == 2) && (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R) || func_80833B2C(this) || (!func_8002DD78(this) && !func_808334B4(this)))) || - ((this->unk_6AD == 1) && (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | R_TRIG | U_CBUTTONS | - L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))))) { + ((this->unk_6AD == 1) && + CHECK_BTN_ANY(sControlInput->press.button, + BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)))) { func_8083C148(this, globalCtx); func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); } else if ((DECR(this->unk_850) == 0) || (this->unk_6AD != 2)) { @@ -10948,7 +10954,7 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) { return; } - if (CHECK_PAD(sControlInput->cur, A_BUTTON) || (this->actor.shape.unk_15 != 0)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A) || (this->actor.shape.unk_15 != 0)) { func_80837B60(this); if (this->unk_84F < 0) { this->linearVelocity = -0.8f; @@ -10996,8 +11002,8 @@ void func_8084BF1C(Player* this, GlobalContext* globalCtx) { LinkAnimetionEntry* sp54; LinkAnimetionEntry* sp50; - sp84 = sControlInput->rel.in.y; - sp80 = sControlInput->rel.in.x; + sp84 = sControlInput->rel.stick_y; + sp80 = sControlInput->rel.stick_x; this->fallStartHeight = this->actor.posRot.pos.y; this->stateFlags2 |= 0x40; @@ -11192,7 +11198,7 @@ void func_8084C760(Player* this, GlobalContext* globalCtx) { } if (!func_8083F570(this, globalCtx)) { - this->linearVelocity = sControlInput->rel.in.y * 0.03f; + this->linearVelocity = sControlInput->rel.stick_y * 0.03f; } } return; @@ -11275,7 +11281,7 @@ s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { this->stateFlags2 |= 0x400000; if (EN_HORSE_CHECK_1(rideActor) || - (EN_HORSE_CHECK_4(rideActor) && CHECK_PAD(sControlInput->press, A_BUTTON))) { + (EN_HORSE_CHECK_4(rideActor) && CHECK_BTN_ALL(sControlInput->press.button, BTN_A))) { rideActor->actor.child = NULL; func_80835DAC(globalCtx, this, func_8084D3E4, 0); this->unk_878 = sp34 - rideActor->actor.posRot.pos.y; @@ -11473,7 +11479,8 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) { } if (this->stateFlags1 & 0x100000) { - if (!func_8083AD4C(globalCtx, this) || (sControlInput->press.in.button & A_BUTTON) || func_80833BCC(this)) { + if (!func_8083AD4C(globalCtx, this) || CHECK_BTN_ANY(sControlInput->press.button, BTN_A) || + func_80833BCC(this)) { this->unk_6AD = 0; this->stateFlags1 &= ~0x100000; } else { @@ -11726,7 +11733,7 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) { if (this->unk_84F == 0) { if (this->unk_850 == 0) { if (func_800A3BC0(globalCtx, &this->skelAnime) || - ((this->skelAnime.animCurrentFrame >= 22.0f) && !CHECK_PAD(sControlInput->cur, A_BUTTON))) { + ((this->skelAnime.animCurrentFrame >= 22.0f) && !CHECK_BTN_ALL(sControlInput->cur.button, BTN_A))) { func_8083D330(globalCtx, this); } else if (func_800A4530(&this->skelAnime, 20.0f) != 0) { this->actor.velocity.y = -2.0f; @@ -11739,7 +11746,7 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) { func_8084B158(globalCtx, this, sControlInput, this->actor.velocity.y); this->unk_6C2 = 16000; - if (CHECK_PAD(sControlInput->cur, A_BUTTON) && !func_8083E5A8(this, globalCtx) && + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A) && !func_8083E5A8(this, globalCtx) && !(this->actor.bgCheckFlags & 1) && (this->actor.waterY < D_80854784[CUR_UPG_VALUE(UPG_SCALE)])) { func_8084DBC4(globalCtx, this, -2.0f); } else { @@ -12530,8 +12537,9 @@ void func_8084FBF4(Player* this, GlobalContext* globalCtx) { s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { sControlInput = &globalCtx->state.input[0]; - if ((CHECK_PAD(sControlInput->cur, A_BUTTON | L_TRIG | R_TRIG) && CHECK_PAD(sControlInput->press, B_BUTTON)) || - (CHECK_PAD(sControlInput->cur, L_TRIG) && CHECK_PAD(sControlInput->press, R_JPAD))) { + if ((CHECK_BTN_ALL(sControlInput->cur.button, BTN_A | BTN_L | BTN_R) && + CHECK_BTN_ALL(sControlInput->press.button, BTN_B)) || + (CHECK_BTN_ALL(sControlInput->cur.button, BTN_L) && CHECK_BTN_ALL(sControlInput->press.button, BTN_DRIGHT))) { D_808535D0 ^= 1; @@ -12543,7 +12551,7 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { if (D_808535D0) { f32 speed; - if (CHECK_PAD(sControlInput->cur, R_TRIG)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { speed = 100.0f; } else { speed = 20.0f; @@ -12551,24 +12559,24 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { func_8006375C(3, 2, "DEBUG MODE"); - if (!CHECK_PAD(sControlInput->cur, L_TRIG)) { - if (CHECK_PAD(sControlInput->cur, B_BUTTON)) { + if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_L)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { this->actor.posRot.pos.y += speed; - } else if (CHECK_PAD(sControlInput->cur, A_BUTTON)) { + } else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_A)) { this->actor.posRot.pos.y -= speed; } - if (sControlInput->cur.in.button & (U_JPAD | L_JPAD | D_JPAD | R_JPAD)) { + if (CHECK_BTN_ANY(sControlInput->cur.button, BTN_DUP | BTN_DLEFT | BTN_DDOWN | BTN_DRIGHT)) { s16 angle; s16 temp; angle = temp = func_8005A948(ACTIVE_CAM); - if (CHECK_PAD(sControlInput->cur, D_JPAD)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DDOWN)) { angle = temp + 0x8000; - } else if (CHECK_PAD(sControlInput->cur, L_JPAD)) { + } else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DLEFT)) { angle = temp + 0x4000; - } else if (CHECK_PAD(sControlInput->cur, R_JPAD)) { + } else if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_DRIGHT)) { angle = temp - 0x4000; } @@ -12584,7 +12592,7 @@ s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { this->actor.velocity.y = 0.0f; this->actor.velocity.x = 0.0f; - if (CHECK_PAD(sControlInput->cur, L_TRIG) && CHECK_PAD(sControlInput->press, L_JPAD)) { + if (CHECK_BTN_ALL(sControlInput->cur.button, BTN_L) && CHECK_BTN_ALL(sControlInput->press.button, BTN_DLEFT)) { Flags_SetTempClear(globalCtx, globalCtx->roomCtx.curRoom.num); } @@ -13645,7 +13653,7 @@ void func_808524B0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg } void func_808524D0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { - sControlInput->press.in.button |= B_BUTTON; + sControlInput->press.button |= BTN_B; func_80844E68(this, globalCtx); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h index 0f92fdcc9d..f086f0c7e4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_BLAST_H_ #define _Z_EFF_SS_BLAST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h index 3b16bd5609..95416414bc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_BOMB_H_ #define _Z_EFF_SS_BOMB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h index bbcd141520..4c2412d30e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_BOMB2_H_ #define _Z_EFF_SS_BOMB2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h index d1410d4e56..fef1d59e23 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_BUBBLE_H_ #define _Z_EFF_SS_BUBBLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h index 07204b018b..905eb391b2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_D_FIRE_H_ #define _Z_EFF_SS_D_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h index dad1b3731e..cf6f349282 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_DEAD_DB_H_ #define _Z_EFF_SS_DEAD_DB_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h index 8759565e9a..c3b2c39064 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_DEAD_DD_H_ #define _Z_EFF_SS_DEAD_DD_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h index c2111284d6..a7eb941be7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_DEAD_DS_H_ #define _Z_EFF_SS_DEAD_DS_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h index 22314e3e3f..87cbcb76d5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_DEAD_SOUND_H_ #define _Z_EFF_SS_DEAD_SOUND_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h index c1c0a0db20..9383066565 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_DT_BUBBLE_H_ #define _Z_EFF_SS_DT_BUBBLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h index d92f6d5bb2..912909632c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_DUST_H_ #define _Z_EFF_SS_DUST_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h index b5395f0802..c23fe43030 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_EN_FIRE_H_ #define _Z_EFF_SS_EN_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h index 798d44664a..b3a352b5cb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_EN_ICE_H_ #define _Z_EFF_SS_EN_ICE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h index 3c5e893279..a62f82272d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_EXTRA_H_ #define _Z_EFF_SS_EXTRA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h index 8a3cf008b8..d4d9df8166 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_FCIRCLE_H_ #define _Z_EFF_SS_FCIRCLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h index 7e280c202b..5c33ba2307 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_FHGFLASH_h_ #define _Z_EFF_SS_FHGFLASH_h_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h index 5368760edb..3d209d0721 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_FIRE_TAIL_H_ #define _Z_EFF_SS_FIRE_TAIL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h index 827b543cce..2155a4c54d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_G_FIRE_H_ #define _Z_EFF_SS_G_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h index 4191a88b0e..845c6aeb1a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_G_MAGMA_H_ #define _Z_EFF_SS_G_MAGMA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h index 8e77df9e1e..9bd0e89925 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_G_MAGMA2_H_ #define _Z_EFF_SS_G_MAGMA2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h index a98f270910..a012d09957 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_G_RIPPLE_H_ #define _Z_EFF_SS_G_RIPPLE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h index 7fa4239ab2..d3d75b5e3a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_G_SPK_H_ #define _Z_EFF_SS_G_SPK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Actor* actor; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h index eef432a958..ef6c065b3a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_G_SPLASH_H_ #define _Z_EFF_SS_G_SPLASH_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h index 53bd9e3d61..24e62bc03e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_HAHEN_H_ #define _Z_EFF_SS_HAHEN_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h index a30ff596ba..92c0734c22 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_HITMARK_H_ #define _Z_EFF_SS_HITMARK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ s32 type; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h index 50b156d520..dbe6d57420 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_ICE_PIECE_H_ #define _Z_EFF_SS_ICE_PIECE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h index f0ae42da4a..d7b44d9a56 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_ICE_SMOKE_H_ #define _Z_EFF_SS_ICE_SMOKE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h index 2324f0f4b5..281f786079 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_K_FIRE_H_ #define _Z_EFF_SS_K_FIRE_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h index 1727d5efb9..9bd6bf6aa8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_KAKERA_H_ #define _Z_EFF_SS_KAKERA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h index a8fe4c24d2..2a94edf076 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_KIRAKIRA_H_ #define _Z_EFF_SS_KIRAKIRA_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h index 6732075053..a02f56dc28 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_LIGHTNING_H_ #define _Z_EFF_SS_LIGHTNING_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h index d95736a3ae..075562b8bc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_SIBUKI_H_ #define _Z_EFF_SS_SIBUKI_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h index f35c531048..a6b9b1fd46 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_SIBUKI2_H_ #define _Z_EFF_SS_SIBUKI2_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h index 5e8ba8ecd7..ff0dc746d3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_SOLDERSRCHBALL_H_ #define _Z_EFF_SS_SOLDERSRCHBALL_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h index 0e2b88dcd7..2da77cbe9e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_STICK_H_ #define _Z_EFF_SS_STICK_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h index 12933eab7b..26b6c86962 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h @@ -1,8 +1,8 @@ #ifndef _Z_EFF_SS_STONE1_H_ #define _Z_EFF_SS_STONE1_H_ -#include -#include +#include "ultra64.h" +#include "global.h" typedef struct { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index 84619ea824..149b1e2b73 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -4,8 +4,7 @@ * Description: Initializes the game into the title screen */ -#include -#include +#include "global.h" void Opening_SetupTitleScreen(OpeningContext* this) { gSaveContext.gameMode = 1; diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index fb9fb1b8ca..309139e03d 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -4,10 +4,10 @@ * Description: Debug Scene Select Menu */ -#include -#include -#include -#include +#include "ultra64.h" +#include "global.h" +#include "vt.h" +#include "alloca.h" void Select_LoadTitle(SelectContext* this) { this->state.running = false; @@ -181,14 +181,14 @@ void Select_UpdateMenu(SelectContext* this) { if (this->unk_21C == 0) { - if (CHECK_PAD(controller1->press, A_BUTTON) || CHECK_PAD(controller1->press, START_BUTTON)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_A) || CHECK_BTN_ALL(controller1->press.button, BTN_START)) { selectedScene = &this->scenes[this->currentScene]; if (selectedScene->loadFunc != NULL) { selectedScene->loadFunc(this, selectedScene->entranceIndex); } } - if (CHECK_PAD(controller1->press, B_BUTTON)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_B)) { if (LINK_AGE_IN_YEARS == YEARS_ADULT) { gSaveContext.linkAge = 1; } else { @@ -196,7 +196,7 @@ void Select_UpdateMenu(SelectContext* this) { } } - if (CHECK_PAD(controller1->press, Z_TRIG)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_Z)) { if (gSaveContext.cutsceneIndex == 0x8000) { gSaveContext.cutsceneIndex = 0; } else if (gSaveContext.cutsceneIndex == 0) { @@ -224,7 +224,7 @@ void Select_UpdateMenu(SelectContext* this) { } else if (gSaveContext.cutsceneIndex == 0xFFFA) { gSaveContext.cutsceneIndex = 0x8000; } - } else if (CHECK_PAD(controller1->press, R_TRIG)) { + } else if (CHECK_BTN_ALL(controller1->press.button, BTN_R)) { if (gSaveContext.cutsceneIndex == 0x8000) { gSaveContext.cutsceneIndex = 0xFFFA; } else if (gSaveContext.cutsceneIndex == 0) { @@ -260,14 +260,14 @@ void Select_UpdateMenu(SelectContext* this) { } // user can change "opt", but it doesn't do anything - if (CHECK_PAD(controller1->press, U_CBUTTONS)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_CUP)) { this->opt--; } - if (CHECK_PAD(controller1->press, D_CBUTTONS)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_CDOWN)) { this->opt++; } - if (CHECK_PAD(controller1->press, U_JPAD)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_DUP)) { if (this->unk_22C == 1) { this->unk_224 = 0; } @@ -279,12 +279,12 @@ void Select_UpdateMenu(SelectContext* this) { } } - if (CHECK_PAD(controller1->cur, U_JPAD) && this->unk_224 == 0) { + if (CHECK_BTN_ALL(controller1->cur.button, BTN_DUP) && this->unk_224 == 0) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); this->unk_220 = SREG(30) * 3; } - if (CHECK_PAD(controller1->press, D_JPAD)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_DDOWN)) { if (this->unk_230 == 1) { this->unk_228 = 0; } @@ -296,23 +296,24 @@ void Select_UpdateMenu(SelectContext* this) { } } - if (CHECK_PAD(controller1->cur, D_JPAD) && (this->unk_228 == 0)) { + if (CHECK_BTN_ALL(controller1->cur.button, BTN_DDOWN) && (this->unk_228 == 0)) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); this->unk_220 = -SREG(30) * 3; } - if (CHECK_PAD(controller1->press, L_JPAD) || CHECK_PAD(controller1->cur, L_JPAD)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_DLEFT) || CHECK_BTN_ALL(controller1->cur.button, BTN_DLEFT)) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); this->unk_220 = SREG(30); } - if (CHECK_PAD(controller1->press, R_JPAD) || CHECK_PAD(controller1->cur, R_JPAD)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_DRIGHT) || + CHECK_BTN_ALL(controller1->cur.button, BTN_DRIGHT)) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_IMPACT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); this->unk_220 = -SREG(30); } } - if (CHECK_PAD(controller1->press, L_TRIG)) { + if (CHECK_BTN_ALL(controller1->press.button, BTN_L)) { this->unk_1DC++; this->unk_1DC = (this->unk_1DC + 7) % 7; this->currentScene = this->unk_20C = this->unk_1E0[this->unk_1DC]; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 41cc66f636..ee1408768e 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -4,9 +4,8 @@ * Description: Displays the Nintendo Logo */ -#include -#include -#include +#include "global.h" +#include "alloca.h" extern Gfx D_01002720[]; extern u8 D_01001800[]; From e270cd96bf783dea107b523718494d4a90203223 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 4 Oct 2020 00:42:10 +0200 Subject: [PATCH 6/6] ovl_En_Box OK, documented (#356) * ovl_En_Box OK, documented * Update spec * Removed useless union * renames, remove comments, move internal enums from header * stylistic changes * Remove unneeded prototypes and use documentation format for doc comments * Misread git's merge solution * EnBox_SetupAction and Actor_SpawnAsChild * Cleanup * Merge effects, defines for movement flags, swap dList and dListHead, cleanup... --- .../actors/ovl_En_Box/EnBox_Destroy.s | 14 - .../overlays/actors/ovl_En_Box/EnBox_Draw.s | 169 ----- .../overlays/actors/ovl_En_Box/EnBox_Init.s | 318 --------- .../overlays/actors/ovl_En_Box/EnBox_Update.s | 89 --- .../actors/ovl_En_Box/func_809C8DC0.s | 3 - .../actors/ovl_En_Box/func_809C8DC8.s | 37 - .../actors/ovl_En_Box/func_809C92F4.s | 72 -- .../actors/ovl_En_Box/func_809C93F8.s | 47 -- .../actors/ovl_En_Box/func_809C94AC.s | 114 --- .../actors/ovl_En_Box/func_809C9630.s | 60 -- .../actors/ovl_En_Box/func_809C9700.s | 115 ---- .../actors/ovl_En_Box/func_809C988C.s | 37 - .../actors/ovl_En_Box/func_809C990C.s | 54 -- .../actors/ovl_En_Box/func_809C99C4.s | 51 -- .../actors/ovl_En_Box/func_809C9A7C.s | 48 -- .../actors/ovl_En_Box/func_809C9B28.s | 167 ----- .../actors/ovl_En_Box/func_809C9D70.s | 118 ---- .../actors/ovl_En_Box/func_809C9EF8.s | 203 ------ .../actors/ovl_En_Box/func_809CA2D8.s | 107 --- .../actors/ovl_En_Box/func_809CA448.s | 36 - .../actors/ovl_En_Box/func_809CA4A0.s | 44 -- .../actors/ovl_En_Box/func_809CA518.s | 44 -- data/overlays/actors/z_en_box.bss.s | 13 - data/overlays/actors/z_en_box.data.s | 26 - data/overlays/actors/z_en_box.reloc.s | 13 - include/functions.h | 8 +- spec | 4 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 647 +++++++++++++++++- src/overlays/actors/ovl_En_Box/z_en_box.h | 42 +- .../actors/ovl_player_actor/z_player.c | 6 +- undefined_syms.txt | 11 + 31 files changed, 680 insertions(+), 2037 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s delete mode 100644 data/overlays/actors/z_en_box.bss.s delete mode 100644 data/overlays/actors/z_en_box.data.s delete mode 100644 data/overlays/actors/z_en_box.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s deleted file mode 100644 index 0aeaf3f9fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnBox_Destroy -/* 00504 809C92C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00508 809C92C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0050C 809C92CC 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00510 809C92D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 809C92D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00518 809C92D8 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 0051C 809C92DC 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00520 809C92E0 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00524 809C92E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00528 809C92E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0052C 809C92EC 03E00008 */ jr $ra -/* 00530 809C92F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s deleted file mode 100644 index 75e702008e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s +++ /dev/null @@ -1,169 +0,0 @@ -.rdata -glabel D_809CA8D0 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA8E0 - .asciz "../z_en_box.c" - .balign 4 - -.text -glabel EnBox_Draw -/* 017D0 809CA590 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 017D4 809CA594 AFBF002C */ sw $ra, 0x002C($sp) -/* 017D8 809CA598 AFB10028 */ sw $s1, 0x0028($sp) -/* 017DC 809CA59C AFB00024 */ sw $s0, 0x0024($sp) -/* 017E0 809CA5A0 AFA50074 */ sw $a1, 0x0074($sp) -/* 017E4 809CA5A4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 017E8 809CA5A8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 017EC 809CA5AC 3C06809D */ lui $a2, %hi(D_809CA8D0) ## $a2 = 809D0000 -/* 017F0 809CA5B0 24C6A8D0 */ addiu $a2, $a2, %lo(D_809CA8D0) ## $a2 = 809CA8D0 -/* 017F4 809CA5B4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 017F8 809CA5B8 2407062D */ addiu $a3, $zero, 0x062D ## $a3 = 0000062D -/* 017FC 809CA5BC 0C031AB1 */ jal Graph_OpenDisps -/* 01800 809CA5C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01804 809CA5C4 922301F7 */ lbu $v1, 0x01F7($s1) ## 000001F7 -/* 01808 809CA5C8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0180C 809CA5CC 54610008 */ bnel $v1, $at, .L809CA5F0 -/* 01810 809CA5D0 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 -/* 01814 809CA5D4 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 -/* 01818 809CA5D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0181C 809CA5DC 10410003 */ beq $v0, $at, .L809CA5EC -/* 01820 809CA5E0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01824 809CA5E4 5441000D */ bnel $v0, $at, .L809CA61C -/* 01828 809CA5E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L809CA5EC: -/* 0182C 809CA5EC 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 -.L809CA5F0: -/* 01830 809CA5F0 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 01834 809CA5F4 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 01838 809CA5F8 13010030 */ beq $t8, $at, .L809CA6BC -/* 0183C 809CA5FC 00000000 */ nop -/* 01840 809CA600 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 -/* 01844 809CA604 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01848 809CA608 10410003 */ beq $v0, $at, .L809CA618 -/* 0184C 809CA60C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01850 809CA610 1441002A */ bne $v0, $at, .L809CA6BC -/* 01854 809CA614 00000000 */ nop -.L809CA618: -/* 01858 809CA618 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L809CA61C: -/* 0185C 809CA61C 3C08E700 */ lui $t0, 0xE700 ## $t0 = E7000000 -/* 01860 809CA620 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 01864 809CA624 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01868 809CA628 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 0186C 809CA62C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 01870 809CA630 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01874 809CA634 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01878 809CA638 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0187C 809CA63C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 01880 809CA640 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01884 809CA644 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 01888 809CA648 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0188C 809CA64C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01890 809CA650 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01894 809CA654 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01898 809CA658 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0189C 809CA65C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 018A0 809CA660 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 018A4 809CA664 8FAE0074 */ lw $t6, 0x0074($sp) -/* 018A8 809CA668 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 018AC 809CA66C 0C272912 */ jal func_809CA448 -/* 018B0 809CA670 AFA2004C */ sw $v0, 0x004C($sp) -/* 018B4 809CA674 8FA3004C */ lw $v1, 0x004C($sp) -/* 018B8 809CA678 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 018BC 809CA67C 8FAF0074 */ lw $t7, 0x0074($sp) -/* 018C0 809CA680 0C024F46 */ jal func_80093D18 -/* 018C4 809CA684 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 018C8 809CA688 8E250168 */ lw $a1, 0x0168($s1) ## 00000168 -/* 018CC 809CA68C 8E260184 */ lw $a2, 0x0184($s1) ## 00000184 -/* 018D0 809CA690 3C18809D */ lui $t8, %hi(func_809CA2D8) ## $t8 = 809D0000 -/* 018D4 809CA694 2718A2D8 */ addiu $t8, $t8, %lo(func_809CA2D8) ## $t8 = 809CA2D8 -/* 018D8 809CA698 AFB80010 */ sw $t8, 0x0010($sp) -/* 018DC 809CA69C AFB10014 */ sw $s1, 0x0014($sp) -/* 018E0 809CA6A0 8E1902C0 */ lw $t9, 0x02C0($s0) ## 000002C0 -/* 018E4 809CA6A4 8FA40074 */ lw $a0, 0x0074($sp) -/* 018E8 809CA6A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 018EC 809CA6AC 0C0288A2 */ jal SkelAnime_Draw2 -/* 018F0 809CA6B0 AFB90018 */ sw $t9, 0x0018($sp) -/* 018F4 809CA6B4 1000003E */ beq $zero, $zero, .L809CA7B0 -/* 018F8 809CA6B8 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -.L809CA6BC: -/* 018FC 809CA6BC 5060003D */ beql $v1, $zero, .L809CA7B4 -/* 01900 809CA6C0 8FAD0074 */ lw $t5, 0x0074($sp) -/* 01904 809CA6C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01908 809CA6C8 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 -/* 0190C 809CA6CC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 01910 809CA6D0 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 01914 809CA6D4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01918 809CA6D8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0191C 809CA6DC 8FAA0074 */ lw $t2, 0x0074($sp) -/* 01920 809CA6E0 0C024F61 */ jal func_80093D84 -/* 01924 809CA6E4 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 01928 809CA6E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0192C 809CA6EC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 01930 809CA6F0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01934 809CA6F4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01938 809CA6F8 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0193C 809CA6FC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01940 809CA700 922E01F7 */ lbu $t6, 0x01F7($s1) ## 000001F7 -/* 01944 809CA704 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01948 809CA708 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 -/* 0194C 809CA70C 10410003 */ beq $v0, $at, .L809CA71C -/* 01950 809CA710 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01954 809CA714 5441000F */ bnel $v0, $at, .L809CA754 -/* 01958 809CA718 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L809CA71C: -/* 0195C 809CA71C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01960 809CA720 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01964 809CA724 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01968 809CA728 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0196C 809CA72C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 01970 809CA730 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01974 809CA734 8FB90074 */ lw $t9, 0x0074($sp) -/* 01978 809CA738 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0197C 809CA73C 0C272946 */ jal func_809CA518 -/* 01980 809CA740 AFA20040 */ sw $v0, 0x0040($sp) -/* 01984 809CA744 8FA30040 */ lw $v1, 0x0040($sp) -/* 01988 809CA748 1000000D */ beq $zero, $zero, .L809CA780 -/* 0198C 809CA74C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01990 809CA750 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L809CA754: -/* 01994 809CA754 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 01998 809CA758 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0199C 809CA75C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 019A0 809CA760 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 019A4 809CA764 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 019A8 809CA768 8FAA0074 */ lw $t2, 0x0074($sp) -/* 019AC 809CA76C 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 019B0 809CA770 0C272928 */ jal func_809CA4A0 -/* 019B4 809CA774 AFA2003C */ sw $v0, 0x003C($sp) -/* 019B8 809CA778 8FA3003C */ lw $v1, 0x003C($sp) -/* 019BC 809CA77C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -.L809CA780: -/* 019C0 809CA780 8E250168 */ lw $a1, 0x0168($s1) ## 00000168 -/* 019C4 809CA784 8E260184 */ lw $a2, 0x0184($s1) ## 00000184 -/* 019C8 809CA788 3C0B809D */ lui $t3, %hi(func_809CA2D8) ## $t3 = 809D0000 -/* 019CC 809CA78C 256BA2D8 */ addiu $t3, $t3, %lo(func_809CA2D8) ## $t3 = 809CA2D8 -/* 019D0 809CA790 AFAB0010 */ sw $t3, 0x0010($sp) -/* 019D4 809CA794 AFB10014 */ sw $s1, 0x0014($sp) -/* 019D8 809CA798 8E0C02D0 */ lw $t4, 0x02D0($s0) ## 000002D0 -/* 019DC 809CA79C 8FA40074 */ lw $a0, 0x0074($sp) -/* 019E0 809CA7A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 019E4 809CA7A4 0C0288A2 */ jal SkelAnime_Draw2 -/* 019E8 809CA7A8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 019EC 809CA7AC AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L809CA7B0: -/* 019F0 809CA7B0 8FAD0074 */ lw $t5, 0x0074($sp) -.L809CA7B4: -/* 019F4 809CA7B4 3C06809D */ lui $a2, %hi(D_809CA8E0) ## $a2 = 809D0000 -/* 019F8 809CA7B8 24C6A8E0 */ addiu $a2, $a2, %lo(D_809CA8E0) ## $a2 = 809CA8E0 -/* 019FC 809CA7BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 01A00 809CA7C0 24070667 */ addiu $a3, $zero, 0x0667 ## $a3 = 00000667 -/* 01A04 809CA7C4 0C031AD5 */ jal Graph_CloseDisps -/* 01A08 809CA7C8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 01A0C 809CA7CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A10 809CA7D0 8FB00024 */ lw $s0, 0x0024($sp) -/* 01A14 809CA7D4 8FB10028 */ lw $s1, 0x0028($sp) -/* 01A18 809CA7D8 03E00008 */ jr $ra -/* 01A1C 809CA7DC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s deleted file mode 100644 index 11df0c3715..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s +++ /dev/null @@ -1,318 +0,0 @@ -glabel EnBox_Init -/* 00094 809C8E54 3C028016 */ lui $v0, %hi(gSaveContext+4) -/* 00098 809C8E58 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* 0009C 809C8E5C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 000A0 809C8E60 AFB00024 */ sw $s0, 0x0024($sp) -/* 000A4 809C8E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000A8 809C8E68 3C04809D */ lui $a0, %hi(D_809CA800) ## $a0 = 809D0000 -/* 000AC 809C8E6C 00027080 */ sll $t6, $v0, 2 -/* 000B0 809C8E70 008E2021 */ addu $a0, $a0, $t6 -/* 000B4 809C8E74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 000B8 809C8E78 8C84A800 */ lw $a0, %lo(D_809CA800)($a0) -/* 000BC 809C8E7C AFBF002C */ sw $ra, 0x002C($sp) -/* 000C0 809C8E80 AFB10028 */ sw $s1, 0x0028($sp) -/* 000C4 809C8E84 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 000C8 809C8E88 AFA00048 */ sw $zero, 0x0048($sp) -/* 000CC 809C8E8C E7A40044 */ swc1 $f4, 0x0044($sp) -/* 000D0 809C8E90 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000D4 809C8E94 AFA4004C */ sw $a0, 0x004C($sp) -/* 000D8 809C8E98 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 000DC 809C8E9C 3C05809D */ lui $a1, %hi(D_809CA810) ## $a1 = 809D0000 -/* 000E0 809C8EA0 24A5A810 */ addiu $a1, $a1, %lo(D_809CA810) ## $a1 = 809CA810 -/* 000E4 809C8EA4 46803220 */ cvt.s.w $f8, $f6 -/* 000E8 809C8EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000EC 809C8EAC 0C01E037 */ jal Actor_ProcessInitChain - -/* 000F0 809C8EB0 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 000F4 809C8EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000F8 809C8EB8 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 000FC 809C8EBC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00100 809C8EC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00104 809C8EC4 24845FC8 */ addiu $a0, $a0, 0x5FC8 ## $a0 = 06005FC8 -/* 00108 809C8EC8 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0010C 809C8ECC 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFF0 -/* 00110 809C8ED0 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 00114 809C8ED4 AFA50030 */ sw $a1, 0x0030($sp) -/* 00118 809C8ED8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0011C 809C8EDC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00120 809C8EE0 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00124 809C8EE4 8FA70048 */ lw $a3, 0x0048($sp) -/* 00128 809C8EE8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0012C 809C8EEC 8FA50030 */ lw $a1, 0x0030($sp) -/* 00130 809C8EF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 809C8EF4 0C00FB2A */ jal func_8003ECA8 -/* 00138 809C8EF8 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 0013C 809C8EFC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00140 809C8F00 3C01C0B0 */ lui $at, 0xC0B0 ## $at = C0B00000 -/* 00144 809C8F04 44815000 */ mtc1 $at, $f10 ## $f10 = -5.50 -/* 00148 809C8F08 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 0014C 809C8F0C 86080034 */ lh $t0, 0x0034($s0) ## 00000034 -/* 00150 809C8F10 44818000 */ mtc1 $at, $f16 ## $f16 = -50.00 -/* 00154 809C8F14 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00158 809C8F18 000FC303 */ sra $t8, $t7, 12 -/* 0015C 809C8F1C 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 -/* 00160 809C8F20 A20001F6 */ sb $zero, 0x01F6($s0) ## 000001F6 -/* 00164 809C8F24 A21901F9 */ sb $t9, 0x01F9($s0) ## 000001F9 -/* 00168 809C8F28 A20001FA */ sb $zero, 0x01FA($s0) ## 000001FA -/* 0016C 809C8F2C A20001FB */ sb $zero, 0x01FB($s0) ## 000001FB -/* 00170 809C8F30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00174 809C8F34 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00178 809C8F38 A20801F8 */ sb $t0, 0x01F8($s0) ## 000001F8 -/* 0017C 809C8F3C E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070 -/* 00180 809C8F40 0C00B32C */ jal Flags_GetTreasure - -/* 00184 809C8F44 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00188 809C8F48 1040000E */ beq $v0, $zero, .L809C8F84 -/* 0018C 809C8F4C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00190 809C8F50 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 00194 809C8F54 3C05809D */ lui $a1, %hi(func_809C9D70) ## $a1 = 809D0000 -/* 00198 809C8F58 A20901F7 */ sb $t1, 0x01F7($s0) ## 000001F7 -/* 0019C 809C8F5C A20A01FA */ sb $t2, 0x01FA($s0) ## 000001FA -/* 001A0 809C8F60 24A59D70 */ addiu $a1, $a1, %lo(func_809C9D70) ## $a1 = 809C9D70 -/* 001A4 809C8F64 0C272370 */ jal func_809C8DC0 -/* 001A8 809C8F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001AC 809C8F6C 920B01F6 */ lbu $t3, 0x01F6($s0) ## 000001F6 -/* 001B0 809C8F70 356C0010 */ ori $t4, $t3, 0x0010 ## $t4 = 00000010 -/* 001B4 809C8F74 A20C01F6 */ sb $t4, 0x01F6($s0) ## 000001F6 -/* 001B8 809C8F78 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 001BC 809C8F7C 10000092 */ beq $zero, $zero, .L809C91C8 -/* 001C0 809C8F80 E7B20044 */ swc1 $f18, 0x0044($sp) -.L809C8F84: -/* 001C4 809C8F84 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -/* 001C8 809C8F88 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001CC 809C8F8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001D0 809C8F90 10410003 */ beq $v0, $at, .L809C8FA0 -/* 001D4 809C8F94 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 001D8 809C8F98 54410021 */ bnel $v0, $at, .L809C9020 -/* 001DC 809C8F9C 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -.L809C8FA0: -/* 001E0 809C8FA0 0C00B2D0 */ jal Flags_GetSwitch - -/* 001E4 809C8FA4 920501F8 */ lbu $a1, 0x01F8($s0) ## 000001F8 -/* 001E8 809C8FA8 1440001C */ bne $v0, $zero, .L809C901C -/* 001EC 809C8FAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001F0 809C8FB0 8FA50030 */ lw $a1, 0x0030($sp) -/* 001F4 809C8FB4 0C00FAFE */ jal func_8003EBF8 -/* 001F8 809C8FB8 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 001FC 809C8FBC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00200 809C8FC0 00000000 */ nop -/* 00204 809C8FC4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00208 809C8FC8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0020C 809C8FCC 3C05809D */ lui $a1, %hi(func_809C9630) ## $a1 = 809D0000 -/* 00210 809C8FD0 240FFFF4 */ addiu $t7, $zero, 0xFFF4 ## $t7 = FFFFFFF4 -/* 00214 809C8FD4 4604003C */ c.lt.s $f0, $f4 -/* 00218 809C8FD8 24A59630 */ addiu $a1, $a1, %lo(func_809C9630) ## $a1 = 809C9630 -/* 0021C 809C8FDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 809C8FE0 45000004 */ bc1f .L809C8FF4 -/* 00224 809C8FE4 00000000 */ nop -/* 00228 809C8FE8 920D01F6 */ lbu $t5, 0x01F6($s0) ## 000001F6 -/* 0022C 809C8FEC 35AE0004 */ ori $t6, $t5, 0x0004 ## $t6 = 00000004 -/* 00230 809C8FF0 A20E01F6 */ sb $t6, 0x01F6($s0) ## 000001F6 -.L809C8FF4: -/* 00234 809C8FF4 0C272370 */ jal func_809C8DC0 -/* 00238 809C8FF8 AE0F01A8 */ sw $t7, 0x01A8($s0) ## 000001A8 -/* 0023C 809C8FFC 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 -/* 00240 809C9000 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 00244 809C9004 A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 00248 809C9008 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0024C 809C900C 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 -/* 00250 809C9010 A21901F6 */ sb $t9, 0x01F6($s0) ## 000001F6 -/* 00254 809C9014 1000006C */ beq $zero, $zero, .L809C91C8 -/* 00258 809C9018 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -.L809C901C: -/* 0025C 809C901C 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -.L809C9020: -/* 00260 809C9020 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00264 809C9024 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00268 809C9028 10410003 */ beq $v0, $at, .L809C9038 -/* 0026C 809C902C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00270 809C9030 5441001A */ bnel $v0, $at, .L809C909C -/* 00274 809C9034 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -.L809C9038: -/* 00278 809C9038 0C00B337 */ jal Flags_GetClear - -/* 0027C 809C903C 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00280 809C9040 14400015 */ bne $v0, $zero, .L809C9098 -/* 00284 809C9044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00288 809C9048 3C05809D */ lui $a1, %hi(func_809C990C) ## $a1 = 809D0000 -/* 0028C 809C904C 0C272370 */ jal func_809C8DC0 -/* 00290 809C9050 24A5990C */ addiu $a1, $a1, %lo(func_809C990C) ## $a1 = 809C990C -/* 00294 809C9054 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00298 809C9058 8FA50030 */ lw $a1, 0x0030($sp) -/* 0029C 809C905C 0C00FAFE */ jal func_8003EBF8 -/* 002A0 809C9060 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 002A4 809C9064 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 002A8 809C9068 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 002AC 809C906C C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 002B0 809C9070 920A01F6 */ lbu $t2, 0x01F6($s0) ## 000001F6 -/* 002B4 809C9074 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 002B8 809C9078 46083281 */ sub.s $f10, $f6, $f8 -/* 002BC 809C907C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 002C0 809C9080 358D0010 */ ori $t5, $t4, 0x0010 ## $t5 = 00000010 -/* 002C4 809C9084 A20B01F6 */ sb $t3, 0x01F6($s0) ## 000001F6 -/* 002C8 809C9088 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 002CC 809C908C A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 002D0 809C9090 1000004D */ beq $zero, $zero, .L809C91C8 -/* 002D4 809C9094 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -.L809C9098: -/* 002D8 809C9098 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -.L809C909C: -/* 002DC 809C909C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 002E0 809C90A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E4 809C90A4 10410004 */ beq $v0, $at, .L809C90B8 -/* 002E8 809C90A8 3C05809D */ lui $a1, %hi(func_809C9700) ## $a1 = 809D0000 -/* 002EC 809C90AC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 002F0 809C90B0 54410019 */ bnel $v0, $at, .L809C9118 -/* 002F4 809C90B4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -.L809C90B8: -/* 002F8 809C90B8 0C272370 */ jal func_809C8DC0 -/* 002FC 809C90BC 24A59700 */ addiu $a1, $a1, %lo(func_809C9700) ## $a1 = 809C9700 -/* 00300 809C90C0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00304 809C90C4 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 00308 809C90C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0030C 809C90CC 01C17825 */ or $t7, $t6, $at ## $t7 = 02000000 -/* 00310 809C90D0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00314 809C90D4 8FA50030 */ lw $a1, 0x0030($sp) -/* 00318 809C90D8 0C00FAFE */ jal func_8003EBF8 -/* 0031C 809C90DC 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 00320 809C90E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00324 809C90E4 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 00328 809C90E8 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 0032C 809C90EC 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 -/* 00330 809C90F0 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 00334 809C90F4 46128101 */ sub.s $f4, $f16, $f18 -/* 00338 809C90F8 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0033C 809C90FC 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 -/* 00340 809C9100 A21901F6 */ sb $t9, 0x01F6($s0) ## 000001F6 -/* 00344 809C9104 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 00348 809C9108 A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 0034C 809C910C 1000002E */ beq $zero, $zero, .L809C91C8 -/* 00350 809C9110 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 00354 809C9114 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -.L809C9118: -/* 00358 809C9118 14410019 */ bne $v0, $at, .L809C9180 -/* 0035C 809C911C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00360 809C9120 0C00B2D0 */ jal Flags_GetSwitch - -/* 00364 809C9124 920501F8 */ lbu $a1, 0x01F8($s0) ## 000001F8 -/* 00368 809C9128 14400015 */ bne $v0, $zero, .L809C9180 -/* 0036C 809C912C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00370 809C9130 3C05809D */ lui $a1, %hi(func_809C988C) ## $a1 = 809D0000 -/* 00374 809C9134 0C272370 */ jal func_809C8DC0 -/* 00378 809C9138 24A5988C */ addiu $a1, $a1, %lo(func_809C988C) ## $a1 = 809C988C -/* 0037C 809C913C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00380 809C9140 8FA50030 */ lw $a1, 0x0030($sp) -/* 00384 809C9144 0C00FAFE */ jal func_8003EBF8 -/* 00388 809C9148 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 0038C 809C914C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00390 809C9150 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 00394 809C9154 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00398 809C9158 920A01F6 */ lbu $t2, 0x01F6($s0) ## 000001F6 -/* 0039C 809C915C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 003A0 809C9160 46083281 */ sub.s $f10, $f6, $f8 -/* 003A4 809C9164 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 003A8 809C9168 358D0010 */ ori $t5, $t4, 0x0010 ## $t5 = 00000010 -/* 003AC 809C916C A20B01F6 */ sb $t3, 0x01F6($s0) ## 000001F6 -/* 003B0 809C9170 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 003B4 809C9174 A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 003B8 809C9178 10000013 */ beq $zero, $zero, .L809C91C8 -/* 003BC 809C917C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -.L809C9180: -/* 003C0 809C9180 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -/* 003C4 809C9184 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 003C8 809C9188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003CC 809C918C 10410004 */ beq $v0, $at, .L809C91A0 -/* 003D0 809C9190 3C05809D */ lui $a1, %hi(func_809C9B28) ## $a1 = 809D0000 -/* 003D4 809C9194 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 003D8 809C9198 14410004 */ bne $v0, $at, .L809C91AC -/* 003DC 809C919C 00000000 */ nop -.L809C91A0: -/* 003E0 809C91A0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 003E4 809C91A4 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 -/* 003E8 809C91A8 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L809C91AC: -/* 003EC 809C91AC 0C272370 */ jal func_809C8DC0 -/* 003F0 809C91B0 24A59B28 */ addiu $a1, $a1, %lo(func_809C9B28) ## $a1 = 809C9B28 -/* 003F4 809C91B4 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 -/* 003F8 809C91B8 37080001 */ ori $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 003FC 809C91BC A20801F6 */ sb $t0, 0x01F6($s0) ## 000001F6 -/* 00400 809C91C0 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000011 -/* 00404 809C91C4 A20901F6 */ sb $t1, 0x01F6($s0) ## 000001F6 -.L809C91C8: -/* 00408 809C91C8 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 0040C 809C91CC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 00410 809C91D0 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 00414 809C91D4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00418 809C91D8 01415821 */ addu $t3, $t2, $at -/* 0041C 809C91DC A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 00420 809C91E0 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 -/* 00424 809C91E4 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 00428 809C91E8 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 -/* 0042C 809C91EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00430 809C91F0 260C01B8 */ addiu $t4, $s0, 0x01B8 ## $t4 = 000001B8 -/* 00434 809C91F4 260D01D6 */ addiu $t5, $s0, 0x01D6 ## $t5 = 000001D6 -/* 00438 809C91F8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0043C 809C91FC AFAE0018 */ sw $t6, 0x0018($sp) -/* 00440 809C9200 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00444 809C9204 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00448 809C9208 24C647D8 */ addiu $a2, $a2, 0x47D8 ## $a2 = 060047D8 -/* 0044C 809C920C AFA50034 */ sw $a1, 0x0034($sp) -/* 00450 809C9210 8FA7004C */ lw $a3, 0x004C($sp) -/* 00454 809C9214 0C02915F */ jal SkelAnime_Init - -/* 00458 809C9218 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0045C 809C921C C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 00460 809C9220 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00464 809C9224 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00468 809C9228 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0046C 809C922C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00470 809C9230 8FA5004C */ lw $a1, 0x004C($sp) -/* 00474 809C9234 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00478 809C9238 8FA70044 */ lw $a3, 0x0044($sp) -/* 0047C 809C923C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00480 809C9240 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00484 809C9244 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00488 809C9248 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -/* 0048C 809C924C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00490 809C9250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 809C9254 10410008 */ beq $v0, $at, .L809C9278 -/* 00498 809C9258 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 -/* 0049C 809C925C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 004A0 809C9260 10410005 */ beq $v0, $at, .L809C9278 -/* 004A4 809C9264 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 004A8 809C9268 10410003 */ beq $v0, $at, .L809C9278 -/* 004AC 809C926C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 004B0 809C9270 54410009 */ bnel $v0, $at, .L809C9298 -/* 004B4 809C9274 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -.L809C9278: -/* 004B8 809C9278 0C00B58B */ jal Actor_SetScale - -/* 004BC 809C927C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 004C0 809C9280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C4 809C9284 0C00B56E */ jal Actor_SetHeight - -/* 004C8 809C9288 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 004CC 809C928C 10000009 */ beq $zero, $zero, .L809C92B4 -/* 004D0 809C9290 8FBF002C */ lw $ra, 0x002C($sp) -/* 004D4 809C9294 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -.L809C9298: -/* 004D8 809C9298 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 004DC 809C929C 0C00B58B */ jal Actor_SetScale - -/* 004E0 809C92A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004E4 809C92A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004E8 809C92A8 0C00B56E */ jal Actor_SetHeight - -/* 004EC 809C92AC 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 004F0 809C92B0 8FBF002C */ lw $ra, 0x002C($sp) -.L809C92B4: -/* 004F4 809C92B4 8FB00024 */ lw $s0, 0x0024($sp) -/* 004F8 809C92B8 8FB10028 */ lw $s1, 0x0028($sp) -/* 004FC 809C92BC 03E00008 */ jr $ra -/* 00500 809C92C0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s deleted file mode 100644 index 75e0df342c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel EnBox_Update -/* 013E0 809CA1A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013E4 809CA1A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013E8 809CA1A8 AFB00020 */ sw $s0, 0x0020($sp) -/* 013EC 809CA1AC AFA5002C */ sw $a1, 0x002C($sp) -/* 013F0 809CA1B0 908201F6 */ lbu $v0, 0x01F6($a0) ## 000001F6 -/* 013F4 809CA1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013F8 809CA1B8 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 -/* 013FC 809CA1BC 11C00004 */ beq $t6, $zero, .L809CA1D0 -/* 01400 809CA1C0 304FFFEF */ andi $t7, $v0, 0xFFEF ## $t7 = 00000000 -/* 01404 809CA1C4 A08F01F6 */ sb $t7, 0x01F6($a0) ## 000001F6 -/* 01408 809CA1C8 0C272372 */ jal func_809C8DC8 -/* 0140C 809CA1CC 8FA5002C */ lw $a1, 0x002C($sp) -.L809CA1D0: -/* 01410 809CA1D0 8E1901B4 */ lw $t9, 0x01B4($s0) ## 000001B4 -/* 01414 809CA1D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01418 809CA1D8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0141C 809CA1DC 0320F809 */ jalr $ra, $t9 -/* 01420 809CA1E0 00000000 */ nop -/* 01424 809CA1E4 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 -/* 01428 809CA1E8 33080001 */ andi $t0, $t8, 0x0001 ## $t0 = 00000000 -/* 0142C 809CA1EC 5500000D */ bnel $t0, $zero, .L809CA224 -/* 01430 809CA1F0 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -/* 01434 809CA1F4 0C00B638 */ jal Actor_MoveForward - -/* 01438 809CA1F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0143C 809CA1FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01440 809CA200 2409001C */ addiu $t1, $zero, 0x001C ## $t1 = 0000001C -/* 01444 809CA204 AFA90014 */ sw $t1, 0x0014($sp) -/* 01448 809CA208 44060000 */ mfc1 $a2, $f0 -/* 0144C 809CA20C 44070000 */ mfc1 $a3, $f0 -/* 01450 809CA210 8FA4002C */ lw $a0, 0x002C($sp) -/* 01454 809CA214 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01458 809CA218 0C00B92D */ jal func_8002E4B4 -/* 0145C 809CA21C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01460 809CA220 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -.L809CA224: -/* 01464 809CA224 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01468 809CA228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0146C 809CA22C 10410007 */ beq $v0, $at, .L809CA24C -/* 01470 809CA230 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01474 809CA234 10410005 */ beq $v0, $at, .L809CA24C -/* 01478 809CA238 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0147C 809CA23C 10410003 */ beq $v0, $at, .L809CA24C -/* 01480 809CA240 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01484 809CA244 14410005 */ bne $v0, $at, .L809CA25C -/* 01488 809CA248 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -.L809CA24C: -/* 0148C 809CA24C 0C00B56E */ jal Actor_SetHeight - -/* 01490 809CA250 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 01494 809CA254 10000004 */ beq $zero, $zero, .L809CA268 -/* 01498 809CA258 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -.L809CA25C: -/* 0149C 809CA25C 0C00B56E */ jal Actor_SetHeight - -/* 014A0 809CA260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 809CA264 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -.L809CA268: -/* 014A8 809CA268 2401007C */ addiu $at, $zero, 0x007C ## $at = 0000007C -/* 014AC 809CA26C 000A5943 */ sra $t3, $t2, 5 -/* 014B0 809CA270 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 -/* 014B4 809CA274 55810014 */ bnel $t4, $at, .L809CA2C8 -/* 014B8 809CA278 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014BC 809CA27C 8E0E01B4 */ lw $t6, 0x01B4($s0) ## 000001B4 -/* 014C0 809CA280 3C0D809D */ lui $t5, %hi(func_809C9D70) ## $t5 = 809D0000 -/* 014C4 809CA284 25AD9D70 */ addiu $t5, $t5, %lo(func_809C9D70) ## $t5 = 809C9D70 -/* 014C8 809CA288 15AE000E */ bne $t5, $t6, .L809CA2C4 -/* 014CC 809CA28C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 014D0 809CA290 44812000 */ mtc1 $at, $f4 ## $f4 = 45.00 -/* 014D4 809CA294 C606017C */ lwc1 $f6, 0x017C($s0) ## 0000017C -/* 014D8 809CA298 4606203C */ c.lt.s $f4, $f6 -/* 014DC 809CA29C 00000000 */ nop -/* 014E0 809CA2A0 45020009 */ bc1fl .L809CA2C8 -/* 014E4 809CA2A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014E8 809CA2A8 920F01FA */ lbu $t7, 0x01FA($s0) ## 000001FA -/* 014EC 809CA2AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F0 809CA2B0 29E10064 */ slti $at, $t7, 0x0064 -/* 014F4 809CA2B4 50200004 */ beql $at, $zero, .L809CA2C8 -/* 014F8 809CA2B8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014FC 809CA2BC 0C2727BE */ jal func_809C9EF8 -/* 01500 809CA2C0 8FA5002C */ lw $a1, 0x002C($sp) -.L809CA2C4: -/* 01504 809CA2C4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809CA2C8: -/* 01508 809CA2C8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0150C 809CA2CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01510 809CA2D0 03E00008 */ jr $ra -/* 01514 809CA2D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s deleted file mode 100644 index 4d62602504..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_809C8DC0 -/* 00000 809C8DC0 03E00008 */ jr $ra -/* 00004 809C8DC4 AC8501B4 */ sw $a1, 0x01B4($a0) ## 000001B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s deleted file mode 100644 index 60aa4734fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809C8DC8 -/* 00008 809C8DC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 809C8DCC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 809C8DD0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00014 809C8DD4 8C8F0024 */ lw $t7, 0x0024($a0) ## 00000024 -/* 00018 809C8DD8 27A20020 */ addiu $v0, $sp, 0x0020 ## $v0 = FFFFFFE8 -/* 0001C 809C8DDC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00020 809C8DE0 AC4F0000 */ sw $t7, 0x0000($v0) ## FFFFFFE8 -/* 00024 809C8DE4 8C8E0028 */ lw $t6, 0x0028($a0) ## 00000028 -/* 00028 809C8DE8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0002C 809C8DEC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00030 809C8DF0 AC4E0004 */ sw $t6, 0x0004($v0) ## FFFFFFEC -/* 00034 809C8DF4 8C8F002C */ lw $t7, 0x002C($a0) ## 0000002C -/* 00038 809C8DF8 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 0003C 809C8DFC 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFF4 -/* 00040 809C8E00 AC4F0008 */ sw $t7, 0x0008($v0) ## FFFFFFF0 -/* 00044 809C8E04 C7A40024 */ lwc1 $f4, 0x0024($sp) -/* 00048 809C8E08 8FA4003C */ lw $a0, 0x003C($sp) -/* 0004C 809C8E0C AFA70038 */ sw $a3, 0x0038($sp) -/* 00050 809C8E10 46062200 */ add.s $f8, $f4, $f6 -/* 00054 809C8E14 AFA20010 */ sw $v0, 0x0010($sp) -/* 00058 809C8E18 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0005C 809C8E1C 0C00F269 */ jal func_8003C9A4 -/* 00060 809C8E20 E7A80024 */ swc1 $f8, 0x0024($sp) -/* 00064 809C8E24 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 00068 809C8E28 44815000 */ mtc1 $at, $f10 ## $f10 = -32000.00 -/* 0006C 809C8E2C 8FA70038 */ lw $a3, 0x0038($sp) -/* 00070 809C8E30 460A0032 */ c.eq.s $f0, $f10 -/* 00074 809C8E34 00000000 */ nop -/* 00078 809C8E38 45030003 */ bc1tl .L809C8E48 -/* 0007C 809C8E3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00080 809C8E40 E4E00028 */ swc1 $f0, 0x0028($a3) ## 00000028 -/* 00084 809C8E44 8FBF001C */ lw $ra, 0x001C($sp) -.L809C8E48: -/* 00088 809C8E48 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0008C 809C8E4C 03E00008 */ jr $ra -/* 00090 809C8E50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s deleted file mode 100644 index bc68a9d04f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_809C92F4 -/* 00534 809C92F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00538 809C92F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0053C 809C92FC AFB00018 */ sw $s0, 0x0018($sp) -/* 00540 809C9300 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00544 809C9304 AFA40028 */ sw $a0, 0x0028($sp) -/* 00548 809C9308 AFA60030 */ sw $a2, 0x0030($sp) -/* 0054C 809C930C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00550 809C9310 AFA70034 */ sw $a3, 0x0034($sp) -/* 00554 809C9314 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00558 809C9318 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 -/* 0055C 809C931C 00000000 */ nop -/* 00560 809C9320 46040182 */ mul.s $f6, $f0, $f4 -/* 00564 809C9324 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00568 809C9328 E7A60024 */ swc1 $f6, 0x0024($sp) -/* 0056C 809C932C 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 00570 809C9330 44814000 */ mtc1 $at, $f8 ## $f8 = 65536.00 -/* 00574 809C9334 8FAF0028 */ lw $t7, 0x0028($sp) -/* 00578 809C9338 46080282 */ mul.s $f10, $f0, $f8 -/* 0057C 809C933C 4600540D */ trunc.w.s $f16, $f10 -/* 00580 809C9340 44028000 */ mfc1 $v0, $f16 -/* 00584 809C9344 00000000 */ nop -/* 00588 809C9348 A7A20022 */ sh $v0, 0x0022($sp) -/* 0058C 809C934C 8DF90024 */ lw $t9, 0x0024($t7) ## 00000024 -/* 00590 809C9350 00022400 */ sll $a0, $v0, 16 -/* 00594 809C9354 00042403 */ sra $a0, $a0, 16 -/* 00598 809C9358 AE190000 */ sw $t9, 0x0000($s0) ## 00000000 -/* 0059C 809C935C 8DF80028 */ lw $t8, 0x0028($t7) ## 00000028 -/* 005A0 809C9360 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 005A4 809C9364 8DF9002C */ lw $t9, 0x002C($t7) ## 0000002C -/* 005A8 809C9368 0C01DE1C */ jal Math_Sins - ## sins? -/* 005AC 809C936C AE190008 */ sw $t9, 0x0008($s0) ## 00000008 -/* 005B0 809C9370 C7A40024 */ lwc1 $f4, 0x0024($sp) -/* 005B4 809C9374 C6120000 */ lwc1 $f18, 0x0000($s0) ## 00000000 -/* 005B8 809C9378 46040182 */ mul.s $f6, $f0, $f4 -/* 005BC 809C937C 46069200 */ add.s $f8, $f18, $f6 -/* 005C0 809C9380 E6080000 */ swc1 $f8, 0x0000($s0) ## 00000000 -/* 005C4 809C9384 0C01DE0D */ jal Math_Coss - ## coss? -/* 005C8 809C9388 87A40022 */ lh $a0, 0x0022($sp) -/* 005CC 809C938C C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 005D0 809C9390 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 00000008 -/* 005D4 809C9394 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 005D8 809C9398 46100102 */ mul.s $f4, $f0, $f16 -/* 005DC 809C939C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 005E0 809C93A0 46045480 */ add.s $f18, $f10, $f4 -/* 005E4 809C93A4 E6120008 */ swc1 $f18, 0x0008($s0) ## 00000008 -/* 005E8 809C93A8 8FA80030 */ lw $t0, 0x0030($sp) -/* 005EC 809C93AC E5060004 */ swc1 $f6, 0x0004($t0) ## 00000004 -/* 005F0 809C93B0 0C01DE1C */ jal Math_Sins - ## sins? -/* 005F4 809C93B4 87A40022 */ lh $a0, 0x0022($sp) -/* 005F8 809C93B8 8FA90030 */ lw $t1, 0x0030($sp) -/* 005FC 809C93BC E5200000 */ swc1 $f0, 0x0000($t1) ## 00000000 -/* 00600 809C93C0 0C01DE0D */ jal Math_Coss - ## coss? -/* 00604 809C93C4 87A40022 */ lh $a0, 0x0022($sp) -/* 00608 809C93C8 8FA20034 */ lw $v0, 0x0034($sp) -/* 0060C 809C93CC 8FAA0030 */ lw $t2, 0x0030($sp) -/* 00610 809C93D0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00614 809C93D4 E5400008 */ swc1 $f0, 0x0008($t2) ## 00000008 -/* 00618 809C93D8 E4420000 */ swc1 $f2, 0x0000($v0) ## 00000000 -/* 0061C 809C93DC E4420004 */ swc1 $f2, 0x0004($v0) ## 00000004 -/* 00620 809C93E0 E4420008 */ swc1 $f2, 0x0008($v0) ## 00000008 -/* 00624 809C93E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00628 809C93E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0062C 809C93EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00630 809C93F0 03E00008 */ jr $ra -/* 00634 809C93F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s deleted file mode 100644 index b214dd48ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809C93F8 -/* 00638 809C93F8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0063C 809C93FC AFB60040 */ sw $s6, 0x0040($sp) -/* 00640 809C9400 AFB5003C */ sw $s5, 0x003C($sp) -/* 00644 809C9404 AFB40038 */ sw $s4, 0x0038($sp) -/* 00648 809C9408 AFB30034 */ sw $s3, 0x0034($sp) -/* 0064C 809C940C AFB20030 */ sw $s2, 0x0030($sp) -/* 00650 809C9410 AFB1002C */ sw $s1, 0x002C($sp) -/* 00654 809C9414 AFB00028 */ sw $s0, 0x0028($sp) -/* 00658 809C9418 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 0065C 809C941C 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 00660 809C9420 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00664 809C9424 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 00668 809C9428 27B10060 */ addiu $s1, $sp, 0x0060 ## $s1 = FFFFFFF0 -/* 0066C 809C942C 27B20054 */ addiu $s2, $sp, 0x0054 ## $s2 = FFFFFFE4 -/* 00670 809C9430 27B30048 */ addiu $s3, $sp, 0x0048 ## $s3 = FFFFFFD8 -/* 00674 809C9434 24160014 */ addiu $s6, $zero, 0x0014 ## $s6 = 00000014 -/* 00678 809C9438 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -.L809C943C: -/* 0067C 809C943C 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFF0 -/* 00680 809C9440 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE4 -/* 00684 809C9444 0C2724BD */ jal func_809C92F4 -/* 00688 809C9448 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFD8 -/* 0068C 809C944C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00690 809C9450 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 00694 809C9454 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 00698 809C9458 AFB80018 */ sw $t8, 0x0018($sp) -/* 0069C 809C945C AFAF0014 */ sw $t7, 0x0014($sp) -/* 006A0 809C9460 AFAE0010 */ sw $t6, 0x0010($sp) -/* 006A4 809C9464 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 006A8 809C9468 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFF0 -/* 006AC 809C946C 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE4 -/* 006B0 809C9470 0C00A1CF */ jal func_8002873C -/* 006B4 809C9474 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFD8 -/* 006B8 809C9478 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 006BC 809C947C 5616FFEF */ bnel $s0, $s6, .L809C943C -/* 006C0 809C9480 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 006C4 809C9484 8FBF0044 */ lw $ra, 0x0044($sp) -/* 006C8 809C9488 8FB00028 */ lw $s0, 0x0028($sp) -/* 006CC 809C948C 8FB1002C */ lw $s1, 0x002C($sp) -/* 006D0 809C9490 8FB20030 */ lw $s2, 0x0030($sp) -/* 006D4 809C9494 8FB30034 */ lw $s3, 0x0034($sp) -/* 006D8 809C9498 8FB40038 */ lw $s4, 0x0038($sp) -/* 006DC 809C949C 8FB5003C */ lw $s5, 0x003C($sp) -/* 006E0 809C94A0 8FB60040 */ lw $s6, 0x0040($sp) -/* 006E4 809C94A4 03E00008 */ jr $ra -/* 006E8 809C94A8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s deleted file mode 100644 index 942be22beb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s +++ /dev/null @@ -1,114 +0,0 @@ -.late_rodata -glabel D_809CA8F0 - .word 0x3F0CCCCD -glabel D_809CA8F4 - .word 0x3F266666 - -.text -glabel func_809C94AC -/* 006EC 809C94AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006F0 809C94B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006F4 809C94B4 AFB00020 */ sw $s0, 0x0020($sp) -/* 006F8 809C94B8 AFA5002C */ sw $a1, 0x002C($sp) -/* 006FC 809C94BC 908F01F6 */ lbu $t7, 0x01F6($a0) ## 000001F6 -/* 00700 809C94C0 94990088 */ lhu $t9, 0x0088($a0) ## 00000088 -/* 00704 809C94C4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00708 809C94C8 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 0070C 809C94CC 01E1C024 */ and $t8, $t7, $at -/* 00710 809C94D0 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00714 809C94D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00718 809C94D8 A08E01F7 */ sb $t6, 0x01F7($a0) ## 000001F7 -/* 0071C 809C94DC 11000039 */ beq $t0, $zero, .L809C95C4 -/* 00720 809C94E0 A09801F6 */ sb $t8, 0x01F6($a0) ## 000001F6 -/* 00724 809C94E4 370A0002 */ ori $t2, $t8, 0x0002 ## $t2 = 00000002 -/* 00728 809C94E8 314200FF */ andi $v0, $t2, 0x00FF ## $v0 = 00000002 -/* 0072C 809C94EC 304B0004 */ andi $t3, $v0, 0x0004 ## $t3 = 00000000 -/* 00730 809C94F0 11600004 */ beq $t3, $zero, .L809C9504 -/* 00734 809C94F4 A08A01F6 */ sb $t2, 0x01F6($a0) ## 000001F6 -/* 00738 809C94F8 304CFFFB */ andi $t4, $v0, 0xFFFB ## $t4 = 00000002 -/* 0073C 809C94FC 10000003 */ beq $zero, $zero, .L809C950C -/* 00740 809C9500 A08C01F6 */ sb $t4, 0x01F6($a0) ## 000001F6 -.L809C9504: -/* 00744 809C9504 344D0004 */ ori $t5, $v0, 0x0004 ## $t5 = 00000006 -/* 00748 809C9508 A20D01F6 */ sb $t5, 0x01F6($s0) ## 000001F6 -.L809C950C: -/* 0074C 809C950C 920E01F9 */ lbu $t6, 0x01F9($s0) ## 000001F9 -/* 00750 809C9510 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00754 809C9514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00758 809C9518 15C10008 */ bne $t6, $at, .L809C953C -/* 0075C 809C951C 3C05809D */ lui $a1, %hi(func_809C9B28) ## $a1 = 809D0000 -/* 00760 809C9520 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00764 809C9524 3C01809D */ lui $at, %hi(D_809CA8F0) ## $at = 809D0000 -/* 00768 809C9528 C428A8F0 */ lwc1 $f8, %lo(D_809CA8F0)($at) -/* 0076C 809C952C 46002187 */ neg.s $f6, $f4 -/* 00770 809C9530 46083282 */ mul.s $f10, $f6, $f8 -/* 00774 809C9534 10000007 */ beq $zero, $zero, .L809C9554 -/* 00778 809C9538 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -.L809C953C: -/* 0077C 809C953C C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 00780 809C9540 3C01809D */ lui $at, %hi(D_809CA8F4) ## $at = 809D0000 -/* 00784 809C9544 C424A8F4 */ lwc1 $f4, %lo(D_809CA8F4)($at) -/* 00788 809C9548 46008487 */ neg.s $f18, $f16 -/* 0078C 809C954C 46049182 */ mul.s $f6, $f18, $f4 -/* 00790 809C9550 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -.L809C9554: -/* 00794 809C9554 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 -/* 00798 809C9558 44815000 */ mtc1 $at, $f10 ## $f10 = 5.50 -/* 0079C 809C955C C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 007A0 809C9560 24A59B28 */ addiu $a1, $a1, %lo(func_809C9B28) ## $a1 = 809C9B28 -/* 007A4 809C9564 460A403C */ c.lt.s $f8, $f10 -/* 007A8 809C9568 00000000 */ nop -/* 007AC 809C956C 45000008 */ bc1f .L809C9590 -/* 007B0 809C9570 00000000 */ nop -/* 007B4 809C9574 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 007B8 809C9578 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 007BC 809C957C 0C272370 */ jal func_809C8DC0 -/* 007C0 809C9580 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 007C4 809C9584 8FA4002C */ lw $a0, 0x002C($sp) -/* 007C8 809C9588 0C0200FC */ jal func_800803F0 -/* 007CC 809C958C 860501AE */ lh $a1, 0x01AE($s0) ## 000001AE -.L809C9590: -/* 007D0 809C9590 3C078013 */ lui $a3, %hi(D_801333E0) -/* 007D4 809C9594 3C0F8013 */ lui $t7, %hi(D_801333E8) -/* 007D8 809C9598 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 007DC 809C959C 25EF33E8 */ addiu $t7, %lo(D_801333E8) -/* 007E0 809C95A0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 007E4 809C95A4 AFA70010 */ sw $a3, 0x0010($sp) -/* 007E8 809C95A8 24042856 */ addiu $a0, $zero, 0x2856 ## $a0 = 00002856 -/* 007EC 809C95AC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 007F0 809C95B0 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 007F4 809C95B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 007F8 809C95B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007FC 809C95BC 0C2724FE */ jal func_809C93F8 -/* 00800 809C95C0 8FA5002C */ lw $a1, 0x002C($sp) -.L809C95C4: -/* 00804 809C95C4 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 -/* 00808 809C95C8 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0080C 809C95CC C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 00810 809C95D0 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 00814 809C95D4 13200009 */ beq $t9, $zero, .L809C95FC -/* 00818 809C95D8 46049001 */ sub.s $f0, $f18, $f4 -/* 0081C 809C95DC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00820 809C95E0 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00824 809C95E4 00000000 */ nop -/* 00828 809C95E8 46060202 */ mul.s $f8, $f0, $f6 -/* 0082C 809C95EC 4600428D */ trunc.w.s $f10, $f8 -/* 00830 809C95F0 44095000 */ mfc1 $t1, $f10 -/* 00834 809C95F4 10000009 */ beq $zero, $zero, .L809C961C -/* 00838 809C95F8 A60900B8 */ sh $t1, 0x00B8($s0) ## 000000B8 -.L809C95FC: -/* 0083C 809C95FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00840 809C9600 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 00844 809C9604 46000407 */ neg.s $f16, $f0 -/* 00848 809C9608 46128102 */ mul.s $f4, $f16, $f18 -/* 0084C 809C960C 4600218D */ trunc.w.s $f6, $f4 -/* 00850 809C9610 440B3000 */ mfc1 $t3, $f6 -/* 00854 809C9614 00000000 */ nop -/* 00858 809C9618 A60B00B8 */ sh $t3, 0x00B8($s0) ## 000000B8 -.L809C961C: -/* 0085C 809C961C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00860 809C9620 8FB00020 */ lw $s0, 0x0020($sp) -/* 00864 809C9624 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00868 809C9628 03E00008 */ jr $ra -/* 0086C 809C962C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s deleted file mode 100644 index baa4e60cf4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_809C9630 -/* 00870 809C9630 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00874 809C9634 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00878 809C9638 AFB10020 */ sw $s1, 0x0020($sp) -/* 0087C 809C963C AFB0001C */ sw $s0, 0x001C($sp) -/* 00880 809C9640 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00884 809C9644 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00888 809C9648 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0088C 809C964C 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 00890 809C9650 28410014 */ slti $at, $v0, 0x0014 -/* 00894 809C9654 14200005 */ bne $at, $zero, .L809C966C -/* 00898 809C9658 28410020 */ slti $at, $v0, 0x0020 -/* 0089C 809C965C 50200004 */ beql $at, $zero, .L809C9670 -/* 008A0 809C9660 8E0201A8 */ lw $v0, 0x01A8($s0) ## 000001A8 -/* 008A4 809C9664 0C00BD7C */ jal func_8002F5F0 -/* 008A8 809C9668 00000000 */ nop -.L809C966C: -/* 008AC 809C966C 8E0201A8 */ lw $v0, 0x01A8($s0) ## 000001A8 -.L809C9670: -/* 008B0 809C9670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008B4 809C9674 3C05809D */ lui $a1, %hi(func_809C94AC) ## $a1 = 809D0000 -/* 008B8 809C9678 04400010 */ bltz $v0, .L809C96BC -/* 008BC 809C967C 2841FFF5 */ slti $at, $v0, 0xFFF5 -/* 008C0 809C9680 0C272370 */ jal func_809C8DC0 -/* 008C4 809C9684 24A594AC */ addiu $a1, $a1, %lo(func_809C94AC) ## $a1 = 809C94AC -/* 008C8 809C9688 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008CC 809C968C 24051194 */ addiu $a1, $zero, 0x1194 ## $a1 = 00001194 -/* 008D0 809C9690 2406270F */ addiu $a2, $zero, 0x270F ## $a2 = 0000270F -/* 008D4 809C9694 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 008D8 809C9698 0C02003E */ jal func_800800F8 -/* 008DC 809C969C AFA00010 */ sw $zero, 0x0010($sp) -/* 008E0 809C96A0 AE0201AC */ sw $v0, 0x01AC($s0) ## 000001AC -/* 008E4 809C96A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008E8 809C96A8 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 008EC 809C96AC 0C00FB14 */ jal func_8003EC50 -/* 008F0 809C96B0 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 008F4 809C96B4 1000000E */ beq $zero, $zero, .L809C96F0 -/* 008F8 809C96B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809C96BC: -/* 008FC 809C96BC 14200004 */ bne $at, $zero, .L809C96D0 -/* 00900 809C96C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00904 809C96C4 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 00908 809C96C8 10000008 */ beq $zero, $zero, .L809C96EC -/* 0090C 809C96CC AE0E01A8 */ sw $t6, 0x01A8($s0) ## 000001A8 -.L809C96D0: -/* 00910 809C96D0 0C00B2D0 */ jal Flags_GetSwitch - -/* 00914 809C96D4 920501F8 */ lbu $a1, 0x01F8($s0) ## 000001F8 -/* 00918 809C96D8 50400005 */ beql $v0, $zero, .L809C96F0 -/* 0091C 809C96DC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00920 809C96E0 8E0F01A8 */ lw $t7, 0x01A8($s0) ## 000001A8 -/* 00924 809C96E4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00928 809C96E8 AE1801A8 */ sw $t8, 0x01A8($s0) ## 000001A8 -.L809C96EC: -/* 0092C 809C96EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L809C96F0: -/* 00930 809C96F0 8FB0001C */ lw $s0, 0x001C($sp) -/* 00934 809C96F4 8FB10020 */ lw $s1, 0x0020($sp) -/* 00938 809C96F8 03E00008 */ jr $ra -/* 0093C 809C96FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s deleted file mode 100644 index 239f8a4515..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s +++ /dev/null @@ -1,115 +0,0 @@ -.late_rodata -glabel D_809CA8F8 - .word 0x46AFC800 - -.text -glabel func_809C9700 -/* 00940 809C9700 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00944 809C9704 AFBF001C */ sw $ra, 0x001C($sp) -/* 00948 809C9708 AFB00018 */ sw $s0, 0x0018($sp) -/* 0094C 809C970C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00950 809C9710 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00954 809C9714 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00958 809C9718 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 0095C 809C971C 28410014 */ slti $at, $v0, 0x0014 -/* 00960 809C9720 14200009 */ bne $at, $zero, .L809C9748 -/* 00964 809C9724 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00968 809C9728 28410020 */ slti $at, $v0, 0x0020 -/* 0096C 809C972C 50200007 */ beql $at, $zero, .L809C974C -/* 00970 809C9730 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00974 809C9734 AFA30020 */ sw $v1, 0x0020($sp) -/* 00978 809C9738 0C00BD7C */ jal func_8002F5F0 -/* 0097C 809C973C AFA6002C */ sw $a2, 0x002C($sp) -/* 00980 809C9740 8FA30020 */ lw $v1, 0x0020($sp) -/* 00984 809C9744 8FA6002C */ lw $a2, 0x002C($sp) -.L809C9748: -/* 00988 809C9748 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -.L809C974C: -/* 0098C 809C974C 24650024 */ addiu $a1, $v1, 0x0024 ## $a1 = 00000024 -/* 00990 809C9750 AFA30020 */ sw $v1, 0x0020($sp) -/* 00994 809C9754 0C032D94 */ jal Math3D_Vec3fDistSq -/* 00998 809C9758 AFA6002C */ sw $a2, 0x002C($sp) -/* 0099C 809C975C 3C01809D */ lui $at, %hi(D_809CA8F8) ## $at = 809D0000 -/* 009A0 809C9760 C424A8F8 */ lwc1 $f4, %lo(D_809CA8F8)($at) -/* 009A4 809C9764 8FA30020 */ lw $v1, 0x0020($sp) -/* 009A8 809C9768 8FA6002C */ lw $a2, 0x002C($sp) -/* 009AC 809C976C 4600203C */ c.lt.s $f4, $f0 -/* 009B0 809C9770 00000000 */ nop -/* 009B4 809C9774 45020004 */ bc1fl .L809C9788 -/* 009B8 809C9778 920201FB */ lbu $v0, 0x01FB($s0) ## 000001FB -/* 009BC 809C977C 1000003E */ beq $zero, $zero, .L809C9878 -/* 009C0 809C9780 A20001FB */ sb $zero, 0x01FB($s0) ## 000001FB -/* 009C4 809C9784 920201FB */ lbu $v0, 0x01FB($s0) ## 000001FB -.L809C9788: -/* 009C8 809C9788 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 009CC 809C978C 1440000C */ bne $v0, $zero, .L809C97C0 -/* 009D0 809C9790 00000000 */ nop -/* 009D4 809C9794 8C620680 */ lw $v0, 0x0680($v1) ## 00000680 -/* 009D8 809C9798 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 009DC 809C979C 000271C0 */ sll $t6, $v0, 7 -/* 009E0 809C97A0 05C20006 */ bltzl $t6, .L809C97BC -/* 009E4 809C97A4 A21801FB */ sb $t8, 0x01FB($s0) ## 000001FB -/* 009E8 809C97A8 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 009EC 809C97AC 00417825 */ or $t7, $v0, $at ## $t7 = 00800000 -/* 009F0 809C97B0 10000031 */ beq $zero, $zero, .L809C9878 -/* 009F4 809C97B4 AC6F0680 */ sw $t7, 0x0680($v1) ## 00000680 -/* 009F8 809C97B8 A21801FB */ sb $t8, 0x01FB($s0) ## 000001FB -.L809C97BC: -/* 009FC 809C97BC 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 00000001 -.L809C97C0: -/* 00A00 809C97C0 14410006 */ bne $v0, $at, .L809C97DC -/* 00A04 809C97C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00A08 809C97C8 0C042F56 */ jal func_8010BD58 -/* 00A0C 809C97CC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00A10 809C97D0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00A14 809C97D4 10000028 */ beq $zero, $zero, .L809C9878 -/* 00A18 809C97D8 A21901FB */ sb $t9, 0x01FB($s0) ## 000001FB -.L809C97DC: -/* 00A1C 809C97DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00A20 809C97E0 14410025 */ bne $v0, $at, .L809C9878 -/* 00A24 809C97E4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A28 809C97E8 00C11021 */ addu $v0, $a2, $at -/* 00A2C 809C97EC 944804C6 */ lhu $t0, 0x04C6($v0) ## 000004C6 -/* 00A30 809C97F0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00A34 809C97F4 55010021 */ bnel $t0, $at, .L809C987C -/* 00A38 809C97F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A3C 809C97FC 944304C4 */ lhu $v1, 0x04C4($v0) ## 000004C4 -/* 00A40 809C9800 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00A44 809C9804 54610005 */ bnel $v1, $at, .L809C981C -/* 00A48 809C9808 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00A4C 809C980C 920901F9 */ lbu $t1, 0x01F9($s0) ## 000001F9 -/* 00A50 809C9810 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00A54 809C9814 11210007 */ beq $t1, $at, .L809C9834 -/* 00A58 809C9818 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -.L809C981C: -/* 00A5C 809C981C 54610016 */ bnel $v1, $at, .L809C9878 -/* 00A60 809C9820 A20001FB */ sb $zero, 0x01FB($s0) ## 000001FB -/* 00A64 809C9824 920A01F9 */ lbu $t2, 0x01F9($s0) ## 000001F9 -/* 00A68 809C9828 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00A6C 809C982C 55410012 */ bnel $t2, $at, .L809C9878 -/* 00A70 809C9830 A20001FB */ sb $zero, 0x01FB($s0) ## 000001FB -.L809C9834: -/* 00A74 809C9834 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 00A78 809C9838 3C01FDFF */ lui $at, 0xFDFF ## $at = FDFF0000 -/* 00A7C 809C983C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FDFFFFFF -/* 00A80 809C9840 01616024 */ and $t4, $t3, $at -/* 00A84 809C9844 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00A88 809C9848 3C05809D */ lui $a1, %hi(func_809C99C4) ## $a1 = 809D0000 -/* 00A8C 809C984C 24A599C4 */ addiu $a1, $a1, %lo(func_809C99C4) ## $a1 = 809C99C4 -/* 00A90 809C9850 AFA6002C */ sw $a2, 0x002C($sp) -/* 00A94 809C9854 0C272370 */ jal func_809C8DC0 -/* 00A98 809C9858 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A9C 809C985C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00AA0 809C9860 0C020120 */ jal func_80080480 -/* 00AA4 809C9864 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AA8 809C9868 AE0001A8 */ sw $zero, 0x01A8($s0) ## 000001A8 -/* 00AAC 809C986C 10000002 */ beq $zero, $zero, .L809C9878 -/* 00AB0 809C9870 A20001FB */ sb $zero, 0x01FB($s0) ## 000001FB -/* 00AB4 809C9874 A20001FB */ sb $zero, 0x01FB($s0) ## 000001FB -.L809C9878: -/* 00AB8 809C9878 8FBF001C */ lw $ra, 0x001C($sp) -.L809C987C: -/* 00ABC 809C987C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AC0 809C9880 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AC4 809C9884 03E00008 */ jr $ra -/* 00AC8 809C9888 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s deleted file mode 100644 index fbcb3e7512..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809C988C -/* 00ACC 809C988C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00AD0 809C9890 AFBF001C */ sw $ra, 0x001C($sp) -/* 00AD4 809C9894 AFB00018 */ sw $s0, 0x0018($sp) -/* 00AD8 809C9898 AFA50024 */ sw $a1, 0x0024($sp) -/* 00ADC 809C989C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00AE0 809C98A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AE4 809C98A4 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 00AE8 809C98A8 28410014 */ slti $at, $v0, 0x0014 -/* 00AEC 809C98AC 14200005 */ bne $at, $zero, .L809C98C4 -/* 00AF0 809C98B0 28410020 */ slti $at, $v0, 0x0020 -/* 00AF4 809C98B4 50200004 */ beql $at, $zero, .L809C98C8 -/* 00AF8 809C98B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00AFC 809C98BC 0C00BD7C */ jal func_8002F5F0 -/* 00B00 809C98C0 00000000 */ nop -.L809C98C4: -/* 00B04 809C98C4 8FA40024 */ lw $a0, 0x0024($sp) -.L809C98C8: -/* 00B08 809C98C8 0C00B2D0 */ jal Flags_GetSwitch - -/* 00B0C 809C98CC 920501F8 */ lbu $a1, 0x01F8($s0) ## 000001F8 -/* 00B10 809C98D0 10400009 */ beq $v0, $zero, .L809C98F8 -/* 00B14 809C98D4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00B18 809C98D8 0C020120 */ jal func_80080480 -/* 00B1C 809C98DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B20 809C98E0 3C05809D */ lui $a1, %hi(func_809C99C4) ## $a1 = 809D0000 -/* 00B24 809C98E4 24A599C4 */ addiu $a1, $a1, %lo(func_809C99C4) ## $a1 = 809C99C4 -/* 00B28 809C98E8 0C272370 */ jal func_809C8DC0 -/* 00B2C 809C98EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B30 809C98F0 240EFFE2 */ addiu $t6, $zero, 0xFFE2 ## $t6 = FFFFFFE2 -/* 00B34 809C98F4 AE0E01A8 */ sw $t6, 0x01A8($s0) ## 000001A8 -.L809C98F8: -/* 00B38 809C98F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B3C 809C98FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B40 809C9900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B44 809C9904 03E00008 */ jr $ra -/* 00B48 809C9908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s deleted file mode 100644 index 450c29c394..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_809C990C -/* 00B4C 809C990C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B50 809C9910 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B54 809C9914 AFB10018 */ sw $s1, 0x0018($sp) -/* 00B58 809C9918 AFB00014 */ sw $s0, 0x0014($sp) -/* 00B5C 809C991C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00B60 809C9920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B64 809C9924 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B68 809C9928 3042001F */ andi $v0, $v0, 0x001F ## $v0 = 00000000 -/* 00B6C 809C992C 28410014 */ slti $at, $v0, 0x0014 -/* 00B70 809C9930 14200005 */ bne $at, $zero, .L809C9948 -/* 00B74 809C9934 28410020 */ slti $at, $v0, 0x0020 -/* 00B78 809C9938 50200004 */ beql $at, $zero, .L809C994C -/* 00B7C 809C993C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B80 809C9940 0C00BD7C */ jal func_8002F5F0 -/* 00B84 809C9944 00000000 */ nop -.L809C9948: -/* 00B88 809C9948 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L809C994C: -/* 00B8C 809C994C 0C00B349 */ jal Flags_GetTempClear - -/* 00B90 809C9950 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00B94 809C9954 50400017 */ beql $v0, $zero, .L809C99B4 -/* 00B98 809C9958 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B9C 809C995C 0C023A62 */ jal Player_InCsMode -/* 00BA0 809C9960 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BA4 809C9964 14400012 */ bne $v0, $zero, .L809C99B0 -/* 00BA8 809C9968 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BAC 809C996C 0C00B33C */ jal Flags_SetClear - -/* 00BB0 809C9970 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00BB4 809C9974 3C05809D */ lui $a1, %hi(func_809C99C4) ## $a1 = 809D0000 -/* 00BB8 809C9978 24A599C4 */ addiu $a1, $a1, %lo(func_809C99C4) ## $a1 = 809C99C4 -/* 00BBC 809C997C 0C272370 */ jal func_809C8DC0 -/* 00BC0 809C9980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BC4 809C9984 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BC8 809C9988 0C020120 */ jal func_80080480 -/* 00BCC 809C998C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00BD0 809C9990 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BD4 809C9994 0C0201CA */ jal func_80080728 -/* 00BD8 809C9998 92050002 */ lbu $a1, 0x0002($s0) ## 00000002 -/* 00BDC 809C999C 10400003 */ beq $v0, $zero, .L809C99AC -/* 00BE0 809C99A0 240EFFE2 */ addiu $t6, $zero, 0xFFE2 ## $t6 = FFFFFFE2 -/* 00BE4 809C99A4 10000002 */ beq $zero, $zero, .L809C99B0 -/* 00BE8 809C99A8 AE0001A8 */ sw $zero, 0x01A8($s0) ## 000001A8 -.L809C99AC: -/* 00BEC 809C99AC AE0E01A8 */ sw $t6, 0x01A8($s0) ## 000001A8 -.L809C99B0: -/* 00BF0 809C99B0 8FBF001C */ lw $ra, 0x001C($sp) -.L809C99B4: -/* 00BF4 809C99B4 8FB00014 */ lw $s0, 0x0014($sp) -/* 00BF8 809C99B8 8FB10018 */ lw $s1, 0x0018($sp) -/* 00BFC 809C99BC 03E00008 */ jr $ra -/* 00C00 809C99C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s deleted file mode 100644 index f4f73e847e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_809C99C4 -/* 00C04 809C99C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00C08 809C99C8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00C0C 809C99CC AFB00030 */ sw $s0, 0x0030($sp) -/* 00C10 809C99D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C14 809C99D4 0C016C66 */ jal func_8005B198 -/* 00C18 809C99D8 AFA5003C */ sw $a1, 0x003C($sp) -/* 00C1C 809C99DC 920E0002 */ lbu $t6, 0x0002($s0) ## 00000002 -/* 00C20 809C99E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C24 809C99E4 3C05809D */ lui $a1, %hi(func_809C9A7C) ## $a1 = 809D0000 -/* 00C28 809C99E8 104E0004 */ beq $v0, $t6, .L809C99FC -/* 00C2C 809C99EC 00000000 */ nop -/* 00C30 809C99F0 8E0F01A8 */ lw $t7, 0x01A8($s0) ## 000001A8 -/* 00C34 809C99F4 51E0001D */ beql $t7, $zero, .L809C9A6C -/* 00C38 809C99F8 8FBF0034 */ lw $ra, 0x0034($sp) -.L809C99FC: -/* 00C3C 809C99FC 0C272370 */ jal func_809C8DC0 -/* 00C40 809C9A00 24A59A7C */ addiu $a1, $a1, %lo(func_809C9A7C) ## $a1 = 809C9A7C -/* 00C44 809C9A04 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 00C48 809C9A08 8FA5003C */ lw $a1, 0x003C($sp) -/* 00C4C 809C9A0C AE0001A8 */ sw $zero, 0x01A8($s0) ## 000001A8 -/* 00C50 809C9A10 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00C54 809C9A14 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00C58 809C9A18 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 00C5C 809C9A1C 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 00C60 809C9A20 AFB80024 */ sw $t8, 0x0024($sp) -/* 00C64 809C9A24 AFA00020 */ sw $zero, 0x0020($sp) -/* 00C68 809C9A28 AFA0001C */ sw $zero, 0x001C($sp) -/* 00C6C 809C9A2C AFA00018 */ sw $zero, 0x0018($sp) -/* 00C70 809C9A30 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 00C74 809C9A34 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00C78 809C9A38 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00C7C 809C9A3C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00C80 809C9A40 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00C84 809C9A44 3C198013 */ lui $t9, %hi(D_801333E8) -/* 00C88 809C9A48 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00C8C 809C9A4C 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 00C90 809C9A50 AFB90014 */ sw $t9, 0x0014($sp) -/* 00C94 809C9A54 AFA70010 */ sw $a3, 0x0010($sp) -/* 00C98 809C9A58 2404287B */ addiu $a0, $zero, 0x287B ## $a0 = 0000287B -/* 00C9C 809C9A5C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00CA0 809C9A60 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00CA4 809C9A64 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00CA8 809C9A68 8FBF0034 */ lw $ra, 0x0034($sp) -.L809C9A6C: -/* 00CAC 809C9A6C 8FB00030 */ lw $s0, 0x0030($sp) -/* 00CB0 809C9A70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00CB4 809C9A74 03E00008 */ jr $ra -/* 00CB8 809C9A78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s deleted file mode 100644 index ece24c5def..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_809C9A7C -/* 00CBC 809C9A7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CC0 809C9A80 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00CC4 809C9A84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CC8 809C9A88 AFA5001C */ sw $a1, 0x001C($sp) -/* 00CCC 809C9A8C 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 00CD0 809C9A90 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00CD4 809C9A94 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00CD8 809C9A98 0C00FB14 */ jal func_8003EC50 -/* 00CDC 809C9A9C AFA70018 */ sw $a3, 0x0018($sp) -/* 00CE0 809C9AA0 8FA70018 */ lw $a3, 0x0018($sp) -/* 00CE4 809C9AA4 8CE201A8 */ lw $v0, 0x01A8($a3) ## 000001A8 -/* 00CE8 809C9AA8 04410004 */ bgez $v0, .L809C9ABC -/* 00CEC 809C9AAC 28410028 */ slti $at, $v0, 0x0028 -/* 00CF0 809C9AB0 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 -/* 00CF4 809C9AB4 10000018 */ beq $zero, $zero, .L809C9B18 -/* 00CF8 809C9AB8 ACEF01A8 */ sw $t7, 0x01A8($a3) ## 000001A8 -.L809C9ABC: -/* 00CFC 809C9ABC 10200008 */ beq $at, $zero, .L809C9AE0 -/* 00D00 809C9AC0 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 00D04 809C9AC4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.25 -/* 00D08 809C9AC8 C4E40028 */ lwc1 $f4, 0x0028($a3) ## 00000028 -/* 00D0C 809C9ACC 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 00D10 809C9AD0 ACF801A8 */ sw $t8, 0x01A8($a3) ## 000001A8 -/* 00D14 809C9AD4 46062200 */ add.s $f8, $f4, $f6 -/* 00D18 809C9AD8 1000000F */ beq $zero, $zero, .L809C9B18 -/* 00D1C 809C9ADC E4E80028 */ swc1 $f8, 0x0028($a3) ## 00000028 -.L809C9AE0: -/* 00D20 809C9AE0 2841003C */ slti $at, $v0, 0x003C -/* 00D24 809C9AE4 10200009 */ beq $at, $zero, .L809C9B0C -/* 00D28 809C9AE8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D2C 809C9AEC 90F901F7 */ lbu $t9, 0x01F7($a3) ## 000001F7 -/* 00D30 809C9AF0 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 00D34 809C9AF4 24490001 */ addiu $t1, $v0, 0x0001 ## $t1 = 00000001 -/* 00D38 809C9AF8 2728000C */ addiu $t0, $t9, 0x000C ## $t0 = 0000000C -/* 00D3C 809C9AFC A0E801F7 */ sb $t0, 0x01F7($a3) ## 000001F7 -/* 00D40 809C9B00 ACE901A8 */ sw $t1, 0x01A8($a3) ## 000001A8 -/* 00D44 809C9B04 10000004 */ beq $zero, $zero, .L809C9B18 -/* 00D48 809C9B08 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -.L809C9B0C: -/* 00D4C 809C9B0C 3C05809D */ lui $a1, %hi(func_809C9B28) ## $a1 = 809D0000 -/* 00D50 809C9B10 0C272370 */ jal func_809C8DC0 -/* 00D54 809C9B14 24A59B28 */ addiu $a1, $a1, %lo(func_809C9B28) ## $a1 = 809C9B28 -.L809C9B18: -/* 00D58 809C9B18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D5C 809C9B1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D60 809C9B20 03E00008 */ jr $ra -/* 00D64 809C9B24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s deleted file mode 100644 index 2b82619dd9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s +++ /dev/null @@ -1,167 +0,0 @@ -.rdata -glabel D_809CA830 - .asciz "Actor_Environment_Tbox_On() %d\n" - .balign 4 - -.text -glabel func_809C9B28 -/* 00D68 809C9B28 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00D6C 809C9B2C AFBF003C */ sw $ra, 0x003C($sp) -/* 00D70 809C9B30 AFB00038 */ sw $s0, 0x0038($sp) -/* 00D74 809C9B34 AFA5006C */ sw $a1, 0x006C($sp) -/* 00D78 809C9B38 908F01F6 */ lbu $t7, 0x01F6($a0) ## 000001F6 -/* 00D7C 809C9B3C 848201F4 */ lh $v0, 0x01F4($a0) ## 000001F4 -/* 00D80 809C9B40 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00D84 809C9B44 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00D88 809C9B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D8C 809C9B4C A08E01F7 */ sb $t6, 0x01F7($a0) ## 000001F7 -/* 00D90 809C9B50 1040004C */ beq $v0, $zero, .L809C9C84 -/* 00D94 809C9B54 A09801F6 */ sb $t8, 0x01F6($a0) ## 000001F6 -/* 00D98 809C9B58 3C038016 */ lui $v1, %hi(gSaveContext+4) -/* 00D9C 809C9B5C 04410003 */ bgez $v0, .L809C9B6C -/* 00DA0 809C9B60 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) -/* 00DA4 809C9B64 10000002 */ beq $zero, $zero, .L809C9B70 -/* 00DA8 809C9B68 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L809C9B6C: -/* 00DAC 809C9B6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809C9B70: -/* 00DB0 809C9B70 0002C880 */ sll $t9, $v0, 2 -/* 00DB4 809C9B74 00034080 */ sll $t0, $v1, 2 -/* 00DB8 809C9B78 03284821 */ addu $t1, $t9, $t0 -/* 00DBC 809C9B7C 3C05809D */ lui $a1, %hi(D_809CA800) ## $a1 = 809D0000 -/* 00DC0 809C9B80 00A92821 */ addu $a1, $a1, $t1 -/* 00DC4 809C9B84 8CA4A800 */ lw $a0, %lo(D_809CA800)($a1) -/* 00DC8 809C9B88 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00DCC 809C9B8C AFA40060 */ sw $a0, 0x0060($sp) -/* 00DD0 809C9B90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00DD4 809C9B94 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00DD8 809C9B98 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00DDC 809C9B9C 468021A0 */ cvt.s.w $f6, $f4 -/* 00DE0 809C9BA0 8FA50060 */ lw $a1, 0x0060($sp) -/* 00DE4 809C9BA4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00DE8 809C9BA8 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 00DEC 809C9BAC 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00DF0 809C9BB0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DF4 809C9BB4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00DF8 809C9BB8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00DFC 809C9BBC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00E00 809C9BC0 3C05809D */ lui $a1, %hi(func_809C9D70) ## $a1 = 809D0000 -/* 00E04 809C9BC4 24A59D70 */ addiu $a1, $a1, %lo(func_809C9D70) ## $a1 = 809C9D70 -/* 00E08 809C9BC8 0C272370 */ jal func_809C8DC0 -/* 00E0C 809C9BCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E10 809C9BD0 860B01F4 */ lh $t3, 0x01F4($s0) ## 000001F4 -/* 00E14 809C9BD4 59600021 */ blezl $t3, .L809C9C5C -/* 00E18 809C9BD8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00E1C 809C9BDC 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -/* 00E20 809C9BE0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00E24 809C9BE4 1041001C */ beq $v0, $at, .L809C9C58 -/* 00E28 809C9BE8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00E2C 809C9BEC 1041001A */ beq $v0, $at, .L809C9C58 -/* 00E30 809C9BF0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00E34 809C9BF4 10410018 */ beq $v0, $at, .L809C9C58 -/* 00E38 809C9BF8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00E3C 809C9BFC 50410017 */ beql $v0, $at, .L809C9C5C -/* 00E40 809C9C00 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00E44 809C9C04 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00E48 809C9C08 8FA6006C */ lw $a2, 0x006C($sp) -/* 00E4C 809C9C0C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00E50 809C9C10 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00E54 809C9C14 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00E58 809C9C18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E5C 809C9C1C 240700AA */ addiu $a3, $zero, 0x00AA ## $a3 = 000000AA -/* 00E60 809C9C20 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00E64 809C9C24 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00E68 809C9C28 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00E6C 809C9C2C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00E70 809C9C30 860C00B4 */ lh $t4, 0x00B4($s0) ## 000000B4 -/* 00E74 809C9C34 AFAC001C */ sw $t4, 0x001C($sp) -/* 00E78 809C9C38 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 00E7C 809C9C3C AFAD0020 */ sw $t5, 0x0020($sp) -/* 00E80 809C9C40 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 00E84 809C9C44 AFAF0028 */ sw $t7, 0x0028($sp) -/* 00E88 809C9C48 0C00C916 */ jal Actor_SpawnAsChild - -/* 00E8C 809C9C4C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00E90 809C9C50 0C03D719 */ jal func_800F5C64 -/* 00E94 809C9C54 2404092B */ addiu $a0, $zero, 0x092B ## $a0 = 0000092B -.L809C9C58: -/* 00E98 809C9C58 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -.L809C9C5C: -/* 00E9C 809C9C5C 3C04809D */ lui $a0, %hi(D_809CA830) ## $a0 = 809D0000 -/* 00EA0 809C9C60 2484A830 */ addiu $a0, $a0, %lo(D_809CA830) ## $a0 = 809CA830 -/* 00EA4 809C9C64 0C00084C */ jal osSyncPrintf - -/* 00EA8 809C9C68 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00EAC 809C9C6C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00EB0 809C9C70 8FA4006C */ lw $a0, 0x006C($sp) -/* 00EB4 809C9C74 0C00B331 */ jal Flags_SetTreasure - -/* 00EB8 809C9C78 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00EBC 809C9C7C 10000038 */ beq $zero, $zero, .L809C9D60 -/* 00EC0 809C9C80 8FBF003C */ lw $ra, 0x003C($sp) -.L809C9C84: -/* 00EC4 809C9C84 8FB8006C */ lw $t8, 0x006C($sp) -/* 00EC8 809C9C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ECC 809C9C8C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFE4 -/* 00ED0 809C9C90 8F021C44 */ lw $v0, 0x1C44($t8) ## 00001C44 -/* 00ED4 809C9C94 0C00B6F4 */ jal func_8002DBD0 -/* 00ED8 809C9C98 24460024 */ addiu $a2, $v0, 0x0024 ## $a2 = 00000024 -/* 00EDC 809C9C9C 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 00EE0 809C9CA0 C7A00054 */ lwc1 $f0, 0x0054($sp) -/* 00EE4 809C9CA4 44812000 */ mtc1 $at, $f4 ## $f4 = -50.00 -/* 00EE8 809C9CA8 00000000 */ nop -/* 00EEC 809C9CAC 4600203C */ c.lt.s $f4, $f0 -/* 00EF0 809C9CB0 00000000 */ nop -/* 00EF4 809C9CB4 45020021 */ bc1fl .L809C9D3C -/* 00EF8 809C9CB8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00EFC 809C9CBC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00F00 809C9CC0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F04 809C9CC4 4606003C */ c.lt.s $f0, $f6 -/* 00F08 809C9CC8 C7A00050 */ lwc1 $f0, 0x0050($sp) -/* 00F0C 809C9CCC 4502001B */ bc1fl .L809C9D3C -/* 00F10 809C9CD0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00F14 809C9CD4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00F18 809C9CD8 46000005 */ abs.s $f0, $f0 -/* 00F1C 809C9CDC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00F20 809C9CE0 4608003C */ c.lt.s $f0, $f8 -/* 00F24 809C9CE4 C7A0004C */ lwc1 $f0, 0x004C($sp) -/* 00F28 809C9CE8 45020014 */ bc1fl .L809C9D3C -/* 00F2C 809C9CEC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00F30 809C9CF0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00F34 809C9CF4 46000005 */ abs.s $f0, $f0 -/* 00F38 809C9CF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F3C 809C9CFC 460A003C */ c.lt.s $f0, $f10 -/* 00F40 809C9D00 24053000 */ addiu $a1, $zero, 0x3000 ## $a1 = 00003000 -/* 00F44 809C9D04 4502000D */ bc1fl .L809C9D3C -/* 00F48 809C9D08 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00F4C 809C9D0C 0C00B7F2 */ jal func_8002DFC8 -/* 00F50 809C9D10 8FA6006C */ lw $a2, 0x006C($sp) -/* 00F54 809C9D14 50400009 */ beql $v0, $zero, .L809C9D3C -/* 00F58 809C9D18 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00F5C 809C9D1C 8606001C */ lh $a2, 0x001C($s0) ## 0000001C -/* 00F60 809C9D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F64 809C9D24 8FA5006C */ lw $a1, 0x006C($sp) -/* 00F68 809C9D28 00063143 */ sra $a2, $a2, 5 -/* 00F6C 809C9D2C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 00F70 809C9D30 0C00BD55 */ jal func_8002F554 -/* 00F74 809C9D34 00063023 */ subu $a2, $zero, $a2 -/* 00F78 809C9D38 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -.L809C9D3C: -/* 00F7C 809C9D3C 8FA4006C */ lw $a0, 0x006C($sp) -/* 00F80 809C9D40 0C00B32C */ jal Flags_GetTreasure - -/* 00F84 809C9D44 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00F88 809C9D48 10400004 */ beq $v0, $zero, .L809C9D5C -/* 00F8C 809C9D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F90 809C9D50 3C05809D */ lui $a1, %hi(func_809C9D70) ## $a1 = 809D0000 -/* 00F94 809C9D54 0C272370 */ jal func_809C8DC0 -/* 00F98 809C9D58 24A59D70 */ addiu $a1, $a1, %lo(func_809C9D70) ## $a1 = 809C9D70 -.L809C9D5C: -/* 00F9C 809C9D5C 8FBF003C */ lw $ra, 0x003C($sp) -.L809C9D60: -/* 00FA0 809C9D60 8FB00038 */ lw $s0, 0x0038($sp) -/* 00FA4 809C9D64 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00FA8 809C9D68 03E00008 */ jr $ra -/* 00FAC 809C9D6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s deleted file mode 100644 index 7961a6f568..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s +++ /dev/null @@ -1,118 +0,0 @@ -.late_rodata -glabel D_809CA8FC - .word 0x387BA882 - -.text -glabel func_809C9D70 -/* 00FB0 809C9D70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FB4 809C9D74 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FB8 809C9D78 AFB00020 */ sw $s0, 0x0020($sp) -/* 00FBC 809C9D7C AFA50034 */ sw $a1, 0x0034($sp) -/* 00FC0 809C9D80 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00FC4 809C9D84 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 00FC8 809C9D88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FCC 809C9D8C 01C17824 */ and $t7, $t6, $at -/* 00FD0 809C9D90 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00FD4 809C9D94 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00FD8 809C9D98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00FDC 809C9D9C AFA40028 */ sw $a0, 0x0028($sp) -/* 00FE0 809C9DA0 1040001D */ beq $v0, $zero, .L809C9E18 -/* 00FE4 809C9DA4 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 00FE8 809C9DA8 860201F4 */ lh $v0, 0x01F4($s0) ## 000001F4 -/* 00FEC 809C9DAC 1840000E */ blez $v0, .L809C9DE8 -/* 00FF0 809C9DB0 2841FF89 */ slti $at, $v0, 0xFF89 -/* 00FF4 809C9DB4 28410078 */ slti $at, $v0, 0x0078 -/* 00FF8 809C9DB8 10200003 */ beq $at, $zero, .L809C9DC8 -/* 00FFC 809C9DBC 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 01000 809C9DC0 10000048 */ beq $zero, $zero, .L809C9EE4 -/* 01004 809C9DC4 A61801F4 */ sh $t8, 0x01F4($s0) ## 000001F4 -.L809C9DC8: -/* 01008 809C9DC8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0100C 809C9DCC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 01010 809C9DD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 01014 809C9DD4 44051000 */ mfc1 $a1, $f2 -/* 01018 809C9DD8 0C01DE80 */ jal Math_ApproxF - -/* 0101C 809C9DDC 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 01020 809C9DE0 10000041 */ beq $zero, $zero, .L809C9EE8 -/* 01024 809C9DE4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809C9DE8: -/* 01028 809C9DE8 14200003 */ bne $at, $zero, .L809C9DF8 -/* 0102C 809C9DEC 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01030 809C9DF0 1000003C */ beq $zero, $zero, .L809C9EE4 -/* 01034 809C9DF4 A61901F4 */ sh $t9, 0x01F4($s0) ## 000001F4 -.L809C9DF8: -/* 01038 809C9DF8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0103C 809C9DFC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 01040 809C9E00 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 01044 809C9E04 44051000 */ mfc1 $a1, $f2 -/* 01048 809C9E08 0C01DE80 */ jal Math_ApproxF - -/* 0104C 809C9E0C 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 01050 809C9E10 10000035 */ beq $zero, $zero, .L809C9EE8 -/* 01054 809C9E14 8FBF0024 */ lw $ra, 0x0024($sp) -.L809C9E18: -/* 01058 809C9E18 A7A0002E */ sh $zero, 0x002E($sp) -/* 0105C 809C9E1C 0C0295B2 */ jal func_800A56C8 -/* 01060 809C9E20 8FA40028 */ lw $a0, 0x0028($sp) -/* 01064 809C9E24 10400004 */ beq $v0, $zero, .L809C9E38 -/* 01068 809C9E28 8FA40028 */ lw $a0, 0x0028($sp) -/* 0106C 809C9E2C 2404281F */ addiu $a0, $zero, 0x281F ## $a0 = 0000281F -/* 01070 809C9E30 10000006 */ beq $zero, $zero, .L809C9E4C -/* 01074 809C9E34 A7A4002E */ sh $a0, 0x002E($sp) -.L809C9E38: -/* 01078 809C9E38 0C0295B2 */ jal func_800A56C8 -/* 0107C 809C9E3C 3C0542B4 */ lui $a1, 0x42B4 ## $a1 = 42B40000 -/* 01080 809C9E40 10400002 */ beq $v0, $zero, .L809C9E4C -/* 01084 809C9E44 24082820 */ addiu $t0, $zero, 0x2820 ## $t0 = 00002820 -/* 01088 809C9E48 A7A8002E */ sh $t0, 0x002E($sp) -.L809C9E4C: -/* 0108C 809C9E4C 97A4002E */ lhu $a0, 0x002E($sp) -/* 01090 809C9E50 3C078013 */ lui $a3, %hi(D_801333E0) -/* 01094 809C9E54 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 01098 809C9E58 10800007 */ beq $a0, $zero, .L809C9E78 -/* 0109C 809C9E5C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 010A0 809C9E60 3C098013 */ lui $t1, %hi(D_801333E8) -/* 010A4 809C9E64 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 010A8 809C9E68 AFA90014 */ sw $t1, 0x0014($sp) -/* 010AC 809C9E6C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 010B0 809C9E70 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 010B4 809C9E74 AFA70010 */ sw $a3, 0x0010($sp) -.L809C9E78: -/* 010B8 809C9E78 8E0A0184 */ lw $t2, 0x0184($s0) ## 00000184 -/* 010BC 809C9E7C 240B7D00 */ addiu $t3, $zero, 0x7D00 ## $t3 = 00007D00 -/* 010C0 809C9E80 85420016 */ lh $v0, 0x0016($t2) ## 00000016 -/* 010C4 809C9E84 18400017 */ blez $v0, .L809C9EE4 -/* 010C8 809C9E88 01626023 */ subu $t4, $t3, $v0 -/* 010CC 809C9E8C 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 010D0 809C9E90 3C01809D */ lui $at, %hi(D_809CA8FC) ## $at = 809D0000 -/* 010D4 809C9E94 C428A8FC */ lwc1 $f8, %lo(D_809CA8FC)($at) -/* 010D8 809C9E98 468021A0 */ cvt.s.w $f6, $f4 -/* 010DC 809C9E9C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 010E0 809C9EA0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 010E4 809C9EA4 46083282 */ mul.s $f10, $f6, $f8 -/* 010E8 809C9EA8 E60A01B0 */ swc1 $f10, 0x01B0($s0) ## 000001B0 -/* 010EC 809C9EAC C60001B0 */ lwc1 $f0, 0x01B0($s0) ## 000001B0 -/* 010F0 809C9EB0 4602003C */ c.lt.s $f0, $f2 -/* 010F4 809C9EB4 00000000 */ nop -/* 010F8 809C9EB8 45020004 */ bc1fl .L809C9ECC -/* 010FC 809C9EBC 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 01100 809C9EC0 10000008 */ beq $zero, $zero, .L809C9EE4 -/* 01104 809C9EC4 E60201B0 */ swc1 $f2, 0x01B0($s0) ## 000001B0 -/* 01108 809C9EC8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -.L809C9ECC: -/* 0110C 809C9ECC 00000000 */ nop -/* 01110 809C9ED0 4600103C */ c.lt.s $f2, $f0 -/* 01114 809C9ED4 00000000 */ nop -/* 01118 809C9ED8 45020003 */ bc1fl .L809C9EE8 -/* 0111C 809C9EDC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01120 809C9EE0 E60201B0 */ swc1 $f2, 0x01B0($s0) ## 000001B0 -.L809C9EE4: -/* 01124 809C9EE4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809C9EE8: -/* 01128 809C9EE8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0112C 809C9EEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01130 809C9EF0 03E00008 */ jr $ra -/* 01134 809C9EF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s deleted file mode 100644 index 92c85b6e1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s +++ /dev/null @@ -1,203 +0,0 @@ -.late_rodata -glabel D_809CA900 - .float 0.3 - -glabel D_809CA904 - .float 0.8 - -glabel D_809CA908 - .word 0x3FE66666 -glabel D_809CA90C - .float 1.6 - -glabel D_809CA910 - .word 0x3FE66666, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_809C9EF8 -/* 01138 809C9EF8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0113C 809C9EFC 3C0F809D */ lui $t7, %hi(D_809CA814) ## $t7 = 809D0000 -/* 01140 809C9F00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01144 809C9F04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01148 809C9F08 AFA5005C */ sw $a1, 0x005C($sp) -/* 0114C 809C9F0C 25EFA814 */ addiu $t7, $t7, %lo(D_809CA814) ## $t7 = 809CA814 -/* 01150 809C9F10 8DF90000 */ lw $t9, 0x0000($t7) ## 809CA814 -/* 01154 809C9F14 27AE0040 */ addiu $t6, $sp, 0x0040 ## $t6 = FFFFFFE8 -/* 01158 809C9F18 8DF80004 */ lw $t8, 0x0004($t7) ## 809CA818 -/* 0115C 809C9F1C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE8 -/* 01160 809C9F20 8DF90008 */ lw $t9, 0x0008($t7) ## 809CA81C -/* 01164 809C9F24 3C09809D */ lui $t1, %hi(D_809CA820) ## $t1 = 809D0000 -/* 01168 809C9F28 2529A820 */ addiu $t1, $t1, %lo(D_809CA820) ## $t1 = 809CA820 -/* 0116C 809C9F2C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFEC -/* 01170 809C9F30 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF0 -/* 01174 809C9F34 8D2B0000 */ lw $t3, 0x0000($t1) ## 809CA820 -/* 01178 809C9F38 27A80034 */ addiu $t0, $sp, 0x0034 ## $t0 = FFFFFFDC -/* 0117C 809C9F3C 8D2A0004 */ lw $t2, 0x0004($t1) ## 809CA824 -/* 01180 809C9F40 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC -/* 01184 809C9F44 8D2B0008 */ lw $t3, 0x0008($t1) ## 809CA828 -/* 01188 809C9F48 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 0118C 809C9F4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01190 809C9F50 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 -/* 01194 809C9F54 908C01FA */ lbu $t4, 0x01FA($a0) ## 000001FA -/* 01198 809C9F58 240531F1 */ addiu $a1, $zero, 0x31F1 ## $a1 = 000031F1 -/* 0119C 809C9F5C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 011A0 809C9F60 0C00BE5D */ jal func_8002F974 -/* 011A4 809C9F64 A08D01FA */ sb $t5, 0x01FA($a0) ## 000001FA -/* 011A8 809C9F68 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 011AC 809C9F6C 00000000 */ nop -/* 011B0 809C9F70 3C01809D */ lui $at, %hi(D_809CA900) ## $at = 809D0000 -/* 011B4 809C9F74 C424A900 */ lwc1 $f4, %lo(D_809CA900)($at) -/* 011B8 809C9F78 4604003C */ c.lt.s $f0, $f4 -/* 011BC 809C9F7C 00000000 */ nop -/* 011C0 809C9F80 45020083 */ bc1fl .L809CA190 -/* 011C4 809C9F84 8FBF0024 */ lw $ra, 0x0024($sp) -/* 011C8 809C9F88 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 011CC 809C9F8C 00000000 */ nop -/* 011D0 809C9F90 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 -/* 011D4 809C9F94 27AE004C */ addiu $t6, $sp, 0x004C ## $t6 = FFFFFFF4 -/* 011D8 809C9F98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 011DC 809C9F9C ADD80000 */ sw $t8, 0x0000($t6) ## FFFFFFF4 -/* 011E0 809C9FA0 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 -/* 011E4 809C9FA4 46000180 */ add.s $f6, $f0, $f0 -/* 011E8 809C9FA8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 011EC 809C9FAC ADCF0004 */ sw $t7, 0x0004($t6) ## FFFFFFF8 -/* 011F0 809C9FB0 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C -/* 011F4 809C9FB4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 011F8 809C9FB8 46083081 */ sub.s $f2, $f6, $f8 -/* 011FC 809C9FBC ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFFC -/* 01200 809C9FC0 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 -/* 01204 809C9FC4 10410007 */ beq $v0, $at, .L809C9FE4 -/* 01208 809C9FC8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0120C 809C9FCC 10410005 */ beq $v0, $at, .L809C9FE4 -/* 01210 809C9FD0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01214 809C9FD4 10410003 */ beq $v0, $at, .L809C9FE4 -/* 01218 809C9FD8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0121C 809C9FDC 54410034 */ bnel $v0, $at, .L809CA0B0 -/* 01220 809C9FE0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -.L809C9FE4: -/* 01224 809C9FE4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01228 809C9FE8 E7A20030 */ swc1 $f2, 0x0030($sp) -/* 0122C 809C9FEC 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 01230 809C9FF0 00042400 */ sll $a0, $a0, 16 -/* 01234 809C9FF4 0C01DE1C */ jal Math_Sins - ## sins? -/* 01238 809C9FF8 00042403 */ sra $a0, $a0, 16 -/* 0123C 809C9FFC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01240 809CA000 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01244 809CA004 C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 01248 809CA008 C7B0004C */ lwc1 $f16, 0x004C($sp) -/* 0124C 809CA00C 460A1302 */ mul.s $f12, $f2, $f10 -/* 01250 809CA010 00000000 */ nop -/* 01254 809CA014 46006482 */ mul.s $f18, $f12, $f0 -/* 01258 809CA018 46128100 */ add.s $f4, $f16, $f18 -/* 0125C 809CA01C E7A4004C */ swc1 $f4, 0x004C($sp) -/* 01260 809CA020 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01264 809CA024 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 01268 809CA028 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 0126C 809CA02C 00042400 */ sll $a0, $a0, 16 -/* 01270 809CA030 0C01DE0D */ jal Math_Coss - ## coss? -/* 01274 809CA034 00042403 */ sra $a0, $a0, 16 -/* 01278 809CA038 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 0127C 809CA03C C7A60054 */ lwc1 $f6, 0x0054($sp) -/* 01280 809CA040 46006202 */ mul.s $f8, $f12, $f0 -/* 01284 809CA044 46083280 */ add.s $f10, $f6, $f8 -/* 01288 809CA048 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0128C 809CA04C E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 01290 809CA050 46000400 */ add.s $f16, $f0, $f0 -/* 01294 809CA054 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01298 809CA058 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0129C 809CA05C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 012A0 809CA060 46128081 */ sub.s $f2, $f16, $f18 -/* 012A4 809CA064 0C01DE1C */ jal Math_Sins - ## sins? -/* 012A8 809CA068 E7A20030 */ swc1 $f2, 0x0030($sp) -/* 012AC 809CA06C 3C01809D */ lui $at, %hi(D_809CA904) ## $at = 809D0000 -/* 012B0 809CA070 C424A904 */ lwc1 $f4, %lo(D_809CA904)($at) -/* 012B4 809CA074 C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 012B8 809CA078 3C01809D */ lui $at, %hi(D_809CA908) ## $at = 809D0000 -/* 012BC 809CA07C C428A908 */ lwc1 $f8, %lo(D_809CA908)($at) -/* 012C0 809CA080 46041302 */ mul.s $f12, $f2, $f4 -/* 012C4 809CA084 E7A80044 */ swc1 $f8, 0x0044($sp) -/* 012C8 809CA088 460C0182 */ mul.s $f6, $f0, $f12 -/* 012CC 809CA08C E7A60040 */ swc1 $f6, 0x0040($sp) -/* 012D0 809CA090 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 012D4 809CA094 0C01DE0D */ jal Math_Coss - ## coss? -/* 012D8 809CA098 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 012DC 809CA09C C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 012E0 809CA0A0 460C0282 */ mul.s $f10, $f0, $f12 -/* 012E4 809CA0A4 10000032 */ beq $zero, $zero, .L809CA170 -/* 012E8 809CA0A8 E7AA0048 */ swc1 $f10, 0x0048($sp) -/* 012EC 809CA0AC 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -.L809CA0B0: -/* 012F0 809CA0B0 E7A20030 */ swc1 $f2, 0x0030($sp) -/* 012F4 809CA0B4 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 012F8 809CA0B8 00042400 */ sll $a0, $a0, 16 -/* 012FC 809CA0BC 0C01DE1C */ jal Math_Sins - ## sins? -/* 01300 809CA0C0 00042403 */ sra $a0, $a0, 16 -/* 01304 809CA0C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01308 809CA0C8 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 0130C 809CA0CC C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 01310 809CA0D0 C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 01314 809CA0D4 46101302 */ mul.s $f12, $f2, $f16 -/* 01318 809CA0D8 00000000 */ nop -/* 0131C 809CA0DC 46006102 */ mul.s $f4, $f12, $f0 -/* 01320 809CA0E0 46049180 */ add.s $f6, $f18, $f4 -/* 01324 809CA0E4 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 01328 809CA0E8 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 0132C 809CA0EC E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 01330 809CA0F0 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 01334 809CA0F4 00042400 */ sll $a0, $a0, 16 -/* 01338 809CA0F8 0C01DE0D */ jal Math_Coss - ## coss? -/* 0133C 809CA0FC 00042403 */ sra $a0, $a0, 16 -/* 01340 809CA100 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 01344 809CA104 C7A80054 */ lwc1 $f8, 0x0054($sp) -/* 01348 809CA108 46006282 */ mul.s $f10, $f12, $f0 -/* 0134C 809CA10C 460A4400 */ add.s $f16, $f8, $f10 -/* 01350 809CA110 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01354 809CA114 E7B00054 */ swc1 $f16, 0x0054($sp) -/* 01358 809CA118 46000480 */ add.s $f18, $f0, $f0 -/* 0135C 809CA11C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01360 809CA120 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01364 809CA124 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01368 809CA128 46049081 */ sub.s $f2, $f18, $f4 -/* 0136C 809CA12C 0C01DE1C */ jal Math_Sins - ## sins? -/* 01370 809CA130 E7A20030 */ swc1 $f2, 0x0030($sp) -/* 01374 809CA134 3C01809D */ lui $at, %hi(D_809CA90C) ## $at = 809D0000 -/* 01378 809CA138 C426A90C */ lwc1 $f6, %lo(D_809CA90C)($at) -/* 0137C 809CA13C C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 01380 809CA140 3C01809D */ lui $at, %hi(D_809CA910) ## $at = 809D0000 -/* 01384 809CA144 C42AA910 */ lwc1 $f10, %lo(D_809CA910)($at) -/* 01388 809CA148 46061302 */ mul.s $f12, $f2, $f6 -/* 0138C 809CA14C E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 01390 809CA150 460C0202 */ mul.s $f8, $f0, $f12 -/* 01394 809CA154 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 01398 809CA158 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 0139C 809CA15C 0C01DE0D */ jal Math_Coss - ## coss? -/* 013A0 809CA160 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 013A4 809CA164 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 013A8 809CA168 460C0402 */ mul.s $f16, $f0, $f12 -/* 013AC 809CA16C E7B00048 */ swc1 $f16, 0x0048($sp) -.L809CA170: -/* 013B0 809CA170 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 013B4 809CA174 AFB90010 */ sw $t9, 0x0010($sp) -/* 013B8 809CA178 8FA4005C */ lw $a0, 0x005C($sp) -/* 013BC 809CA17C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 -/* 013C0 809CA180 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFE8 -/* 013C4 809CA184 0C00AA91 */ jal EffectSsIceSmoke_Spawn -/* 013C8 809CA188 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFDC -/* 013CC 809CA18C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809CA190: -/* 013D0 809CA190 8FB00020 */ lw $s0, 0x0020($sp) -/* 013D4 809CA194 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 013D8 809CA198 03E00008 */ jr $ra -/* 013DC 809CA19C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s deleted file mode 100644 index 8155708c2c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s +++ /dev/null @@ -1,107 +0,0 @@ -.rdata -glabel D_809CA850 - .asciz "../z_en_box.c" - .balign 4 - -glabel D_809CA860 - .asciz "../z_en_box.c" - .balign 4 - -.text -glabel func_809CA2D8 -/* 01518 809CA2D8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0151C 809CA2DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01520 809CA2E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01524 809CA2E4 AFA40030 */ sw $a0, 0x0030($sp) -/* 01528 809CA2E8 AFA60038 */ sw $a2, 0x0038($sp) -/* 0152C 809CA2EC 14A10029 */ bne $a1, $at, .L809CA394 -/* 01530 809CA2F0 AFA7003C */ sw $a3, 0x003C($sp) -/* 01534 809CA2F4 8FA70044 */ lw $a3, 0x0044($sp) -/* 01538 809CA2F8 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 0153C 809CA2FC 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 01540 809CA300 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 01544 809CA304 3C05809D */ lui $a1, %hi(D_809CA850) ## $a1 = 809D0000 -/* 01548 809CA308 24A5A850 */ addiu $a1, $a1, %lo(D_809CA850) ## $a1 = 809CA850 -/* 0154C 809CA30C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01550 809CA310 ACEE0000 */ sw $t6, 0x0000($a3) ## 00000000 -/* 01554 809CA314 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01558 809CA318 8FB80030 */ lw $t8, 0x0030($sp) -/* 0155C 809CA31C 240605D4 */ addiu $a2, $zero, 0x05D4 ## $a2 = 000005D4 -/* 01560 809CA320 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 01564 809CA324 0C0346A2 */ jal Matrix_NewMtx -/* 01568 809CA328 AFA20024 */ sw $v0, 0x0024($sp) -/* 0156C 809CA32C 8FA30024 */ lw $v1, 0x0024($sp) -/* 01570 809CA330 8FA70044 */ lw $a3, 0x0044($sp) -/* 01574 809CA334 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01578 809CA338 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0157C 809CA33C 8FB90040 */ lw $t9, 0x0040($sp) -/* 01580 809CA340 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 01584 809CA344 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 01588 809CA348 932801F9 */ lbu $t0, 0x01F9($t9) ## 000001F9 -/* 0158C 809CA34C 5101000A */ beql $t0, $at, .L809CA378 -/* 01590 809CA350 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 01594 809CA354 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 01598 809CA358 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 0159C 809CA35C 256B06F0 */ addiu $t3, $t3, 0x06F0 ## $t3 = 060006F0 -/* 015A0 809CA360 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 015A4 809CA364 ACE90000 */ sw $t1, 0x0000($a3) ## 00000000 -/* 015A8 809CA368 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 015AC 809CA36C 10000032 */ beq $zero, $zero, .L809CA438 -/* 015B0 809CA370 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 015B4 809CA374 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -.L809CA378: -/* 015B8 809CA378 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 015BC 809CA37C 25CE0AE8 */ addiu $t6, $t6, 0x0AE8 ## $t6 = 06000AE8 -/* 015C0 809CA380 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 015C4 809CA384 ACEC0000 */ sw $t4, 0x0000($a3) ## 00000000 -/* 015C8 809CA388 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 015CC 809CA38C 1000002A */ beq $zero, $zero, .L809CA438 -/* 015D0 809CA390 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -.L809CA394: -/* 015D4 809CA394 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 015D8 809CA398 14A10027 */ bne $a1, $at, .L809CA438 -/* 015DC 809CA39C 8FA70044 */ lw $a3, 0x0044($sp) -/* 015E0 809CA3A0 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 015E4 809CA3A4 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 015E8 809CA3A8 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 015EC 809CA3AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 015F0 809CA3B0 ACEF0000 */ sw $t7, 0x0000($a3) ## 00000000 -/* 015F4 809CA3B4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 015F8 809CA3B8 8FB90030 */ lw $t9, 0x0030($sp) -/* 015FC 809CA3BC 3C05809D */ lui $a1, %hi(D_809CA860) ## $a1 = 809D0000 -/* 01600 809CA3C0 24A5A860 */ addiu $a1, $a1, %lo(D_809CA860) ## $a1 = 809CA860 -/* 01604 809CA3C4 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 01608 809CA3C8 240605DE */ addiu $a2, $zero, 0x05DE ## $a2 = 000005DE -/* 0160C 809CA3CC 0C0346A2 */ jal Matrix_NewMtx -/* 01610 809CA3D0 AFA20018 */ sw $v0, 0x0018($sp) -/* 01614 809CA3D4 8FA30018 */ lw $v1, 0x0018($sp) -/* 01618 809CA3D8 8FA70044 */ lw $a3, 0x0044($sp) -/* 0161C 809CA3DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01620 809CA3E0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01624 809CA3E4 8FA80040 */ lw $t0, 0x0040($sp) -/* 01628 809CA3E8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 0162C 809CA3EC 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 01630 809CA3F0 910901F9 */ lbu $t1, 0x01F9($t0) ## 000001F9 -/* 01634 809CA3F4 5121000A */ beql $t1, $at, .L809CA420 -/* 01638 809CA3F8 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 0163C 809CA3FC 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 01640 809CA400 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 01644 809CA404 258C10C0 */ addiu $t4, $t4, 0x10C0 ## $t4 = 060010C0 -/* 01648 809CA408 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0164C 809CA40C ACEA0000 */ sw $t2, 0x0000($a3) ## 00000000 -/* 01650 809CA410 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01654 809CA414 10000008 */ beq $zero, $zero, .L809CA438 -/* 01658 809CA418 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0165C 809CA41C 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -.L809CA420: -/* 01660 809CA420 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 01664 809CA424 25EF1678 */ addiu $t7, $t7, 0x1678 ## $t7 = 06001678 -/* 01668 809CA428 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0166C 809CA42C ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 -/* 01670 809CA430 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01674 809CA434 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -.L809CA438: -/* 01678 809CA438 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0167C 809CA43C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01680 809CA440 03E00008 */ jr $ra -/* 01684 809CA444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s deleted file mode 100644 index 723a8b525e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_809CA870 - .asciz "gfxp != NULL" - .balign 4 - -glabel D_809CA880 - .asciz "../z_en_box.c" - .balign 4 - -.text -glabel func_809CA448 -/* 01688 809CA448 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0168C 809CA44C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01690 809CA450 0C031A73 */ jal Graph_Alloc - -/* 01694 809CA454 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01698 809CA458 14400009 */ bne $v0, $zero, .L809CA480 -/* 0169C 809CA45C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 016A0 809CA460 3C04809D */ lui $a0, %hi(D_809CA870) ## $a0 = 809D0000 -/* 016A4 809CA464 3C05809D */ lui $a1, %hi(D_809CA880) ## $a1 = 809D0000 -/* 016A8 809CA468 24A5A880 */ addiu $a1, $a1, %lo(D_809CA880) ## $a1 = 809CA880 -/* 016AC 809CA46C 2484A870 */ addiu $a0, $a0, %lo(D_809CA870) ## $a0 = 809CA870 -/* 016B0 809CA470 240605F8 */ addiu $a2, $zero, 0x05F8 ## $a2 = 000005F8 -/* 016B4 809CA474 0C0007FC */ jal __assert - -/* 016B8 809CA478 AFA20018 */ sw $v0, 0x0018($sp) -/* 016BC 809CA47C 8FA30018 */ lw $v1, 0x0018($sp) -.L809CA480: -/* 016C0 809CA480 3C0EDF00 */ lui $t6, 0xDF00 ## $t6 = DF000000 -/* 016C4 809CA484 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 016C8 809CA488 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 016CC 809CA48C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016D0 809CA490 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 016D4 809CA494 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 016D8 809CA498 03E00008 */ jr $ra -/* 016DC 809CA49C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s deleted file mode 100644 index 4741d7cdcb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s +++ /dev/null @@ -1,44 +0,0 @@ -.rdata -glabel D_809CA890 - .asciz "gfxp != NULL" - .balign 4 - -glabel D_809CA8A0 - .asciz "../z_en_box.c" - .balign 4 - -.text -glabel func_809CA4A0 -/* 016E0 809CA4A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016E4 809CA4A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 016E8 809CA4A8 0C031A73 */ jal Graph_Alloc - -/* 016EC 809CA4AC 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 016F0 809CA4B0 14400009 */ bne $v0, $zero, .L809CA4D8 -/* 016F4 809CA4B4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 016F8 809CA4B8 3C04809D */ lui $a0, %hi(D_809CA890) ## $a0 = 809D0000 -/* 016FC 809CA4BC 3C05809D */ lui $a1, %hi(D_809CA8A0) ## $a1 = 809D0000 -/* 01700 809CA4C0 24A5A8A0 */ addiu $a1, $a1, %lo(D_809CA8A0) ## $a1 = 809CA8A0 -/* 01704 809CA4C4 2484A890 */ addiu $a0, $a0, %lo(D_809CA890) ## $a0 = 809CA890 -/* 01708 809CA4C8 2406060A */ addiu $a2, $zero, 0x060A ## $a2 = 0000060A -/* 0170C 809CA4CC 0C0007FC */ jal __assert - -/* 01710 809CA4D0 AFA20018 */ sw $v0, 0x0018($sp) -/* 01714 809CA4D4 8FA30018 */ lw $v1, 0x0018($sp) -.L809CA4D8: -/* 01718 809CA4D8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 0171C 809CA4DC 3C0EE200 */ lui $t6, 0xE200 ## $t6 = E2000000 -/* 01720 809CA4E0 3C0FC810 */ lui $t7, 0xC810 ## $t7 = C8100000 -/* 01724 809CA4E4 35EF49F8 */ ori $t7, $t7, 0x49F8 ## $t7 = C81049F8 -/* 01728 809CA4E8 35CE001C */ ori $t6, $t6, 0x001C ## $t6 = E200001C -/* 0172C 809CA4EC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01730 809CA4F0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01734 809CA4F4 3C18DF00 */ lui $t8, 0xDF00 ## $t8 = DF000000 -/* 01738 809CA4F8 AC780008 */ sw $t8, 0x0008($v1) ## 00000008 -/* 0173C 809CA4FC AC60000C */ sw $zero, 0x000C($v1) ## 0000000C -/* 01740 809CA500 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01744 809CA504 00602025 */ or $a0, $v1, $zero ## $a0 = 00000000 -/* 01748 809CA508 24630008 */ addiu $v1, $v1, 0x0008 ## $v1 = 00000008 -/* 0174C 809CA50C 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 01750 809CA510 03E00008 */ jr $ra -/* 01754 809CA514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s deleted file mode 100644 index 35290c8943..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s +++ /dev/null @@ -1,44 +0,0 @@ -.rdata -glabel D_809CA8B0 - .asciz "gfxp != NULL" - .balign 4 - -glabel D_809CA8C0 - .asciz "../z_en_box.c" - .balign 4 - -.text -glabel func_809CA518 -/* 01758 809CA518 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0175C 809CA51C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01760 809CA520 0C031A73 */ jal Graph_Alloc - -/* 01764 809CA524 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 01768 809CA528 14400009 */ bne $v0, $zero, .L809CA550 -/* 0176C 809CA52C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 01770 809CA530 3C04809D */ lui $a0, %hi(D_809CA8B0) ## $a0 = 809D0000 -/* 01774 809CA534 3C05809D */ lui $a1, %hi(D_809CA8C0) ## $a1 = 809D0000 -/* 01778 809CA538 24A5A8C0 */ addiu $a1, $a1, %lo(D_809CA8C0) ## $a1 = 809CA8C0 -/* 0177C 809CA53C 2484A8B0 */ addiu $a0, $a0, %lo(D_809CA8B0) ## $a0 = 809CA8B0 -/* 01780 809CA540 2406061C */ addiu $a2, $zero, 0x061C ## $a2 = 0000061C -/* 01784 809CA544 0C0007FC */ jal __assert - -/* 01788 809CA548 AFA20018 */ sw $v0, 0x0018($sp) -/* 0178C 809CA54C 8FA30018 */ lw $v1, 0x0018($sp) -.L809CA550: -/* 01790 809CA550 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 01794 809CA554 3C0EE200 */ lui $t6, 0xE200 ## $t6 = E2000000 -/* 01798 809CA558 3C0FC811 */ lui $t7, 0xC811 ## $t7 = C8110000 -/* 0179C 809CA55C 35EF2078 */ ori $t7, $t7, 0x2078 ## $t7 = C8112078 -/* 017A0 809CA560 35CE001C */ ori $t6, $t6, 0x001C ## $t6 = E200001C -/* 017A4 809CA564 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 017A8 809CA568 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 017AC 809CA56C 3C18DF00 */ lui $t8, 0xDF00 ## $t8 = DF000000 -/* 017B0 809CA570 AC780008 */ sw $t8, 0x0008($v1) ## 00000008 -/* 017B4 809CA574 AC60000C */ sw $zero, 0x000C($v1) ## 0000000C -/* 017B8 809CA578 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017BC 809CA57C 00602025 */ or $a0, $v1, $zero ## $a0 = 00000000 -/* 017C0 809CA580 24630008 */ addiu $v1, $v1, 0x0008 ## $v1 = 00000008 -/* 017C4 809CA584 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 017C8 809CA588 03E00008 */ jr $ra -/* 017CC 809CA58C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/data/overlays/actors/z_en_box.bss.s b/data/overlays/actors/z_en_box.bss.s deleted file mode 100644 index 512b90734b..0000000000 --- a/data/overlays/actors/z_en_box.bss.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_809CAB00 - .space 0x10 diff --git a/data/overlays/actors/z_en_box.data.s b/data/overlays/actors/z_en_box.data.s deleted file mode 100644 index 484c5815f0..0000000000 --- a/data/overlays/actors/z_en_box.data.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Box_InitVars - .word 0x000A0B00, 0x00000000, 0x000E0000, 0x000001FC -.word EnBox_Init -.word EnBox_Destroy -.word EnBox_Update -.word EnBox_Draw -glabel D_809CA800 - .word 0x0600024C, 0x06000128, 0x0600043C, 0x0600043C -glabel D_809CA810 - .word 0x001F0000 -glabel D_809CA814 - .word 0x00000000, 0x3F800000, 0x00000000 -glabel D_809CA820 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_box.reloc.s b/data/overlays/actors/z_en_box.reloc.s deleted file mode 100644 index f339529c8f..0000000000 --- a/data/overlays/actors/z_en_box.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809CA920 - .incbin "baserom/ovl_En_Box", 0x1B60, 0x000001E0 diff --git a/include/functions.h b/include/functions.h index 87344620e5..76527546db 100644 --- a/include/functions.h +++ b/include/functions.h @@ -624,6 +624,7 @@ s32 func_8003E30C(CollisionContext* colCtx, Vec3f* center, f32 radius); // ? func_8003E9A0(?); void func_8003EBF8(GlobalContext* globalCtx, DynaCollisionContext* dynaColCtx, UNK_TYPE dynaPolyId); void func_8003EC50(GlobalContext* globalCtx, DynaCollisionContext* dynaColCtx, UNK_TYPE dynaPolyId); +void func_8003ECA8(GlobalContext* globalCtx, DynaCollisionContext* dynaColCtx, UNK_TYPE dynaPolyId); u32 DynaPolyInfo_RegisterActor(GlobalContext* globalCtx, DynaCollisionContext* dynaColCtx, Actor* actor, UNK_TYPE arg3); DynaPolyActor* DynaPolyInfo_GetActor(CollisionContext* colCtx, UNK_TYPE dynaPolyId); void DynaPolyInfo_Free(GlobalContext* globalCtx, DynaCollisionContext* dynaColCtx, UNK_TYPE dynaPolyId); @@ -1114,8 +1115,9 @@ Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b); // ? func_80080024(?); s16 func_800800F8(GlobalContext* globalCtx, s16 arg1, s16 arg2, Actor* actor, s16 arg4); void func_800803F0(GlobalContext* globalCtx, s16 camId); -// ? func_80080480(?); +UNK_RET func_80080480(GlobalContext* globalCtx, Actor* actor); UNK_TYPE func_800806BC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE); +UNK_TYPE func_80080728(GlobalContext* globalCtx, u8 actorType); void func_80080788(UNK_TYPE, UNK_TYPE); void Map_SavePlayerInitialInfo(GlobalContext* globalCtx); void Map_SetFloorPalettesData(GlobalContext* globalCtx, s16 floor); @@ -1358,8 +1360,8 @@ void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, Skeleton s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime); void SkelAnime_ChangeAnimImpl(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 frame, f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); -void SkelAnime_ChangeAnim(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 unk0, - f32 frameCount, u8 unk1, f32 transitionRate); +void SkelAnime_ChangeAnim(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 mode, f32 transitionRate); void SkelAnime_ChangeAnimDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationseg); void SkelAnime_ChangeAnimTransitionStop(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); void SkelAnime_ChangeAnimPlaybackStop(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); diff --git a/spec b/spec index 1ed41c6abb..8b2ceb1492 100644 --- a/spec +++ b/spec @@ -2038,9 +2038,7 @@ endseg beginseg name "ovl_En_Box" include "build/src/overlays/actors/ovl_En_Box/z_en_box.o" - include "build/data/overlays/actors/z_en_box.data.o" - include "build/data/overlays/actors/z_en_box.bss.o" - include "build/data/overlays/actors/z_en_box.reloc.o" + include "build/src/overlays/actors/ovl_En_Box/ovl_En_Box_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 2829f83fe0..c18292c2c7 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -4,14 +4,64 @@ #define THIS ((EnBox*)thisx) +// movement flags + +/* +set on init unless treasure flag is set +if clear, chest moves (Actor_MoveForward) (falls, likely) +ends up cleared from SWITCH_FLAG_FALL types when switch flag is set +*/ +#define ENBOX_MOVE_IMMOBILE (1 << 0) +/* +set in the logic for SWITCH_FLAG_FALL types +otherwise unused +*/ +#define ENBOX_MOVE_UNUSED (1 << 1) +/* +set with 50% chance on init for SWITCH_FLAG_FALL types +only used for SWITCH_FLAG_FALL types +ends up "blinking" (set/clear every frame) once switch flag is set, +if some collision-related condition (?) is met +only used for signum of z rotation +*/ +#define ENBOX_MOVE_FALL_ANGLE_SIDE (1 << 2) +/* +when set, gets cleared next EnBox_Update call and clip to the floor +*/ +#define ENBOX_MOVE_STICK_TO_GROUND (1 << 4) + +typedef enum { + ENBOX_STATE_0, // waiting for player near / player available / player ? (IDLE) + ENBOX_STATE_1, // used only temporarily, maybe "player is ready" ? + ENBOX_STATE_2 // waiting for something message context-related +} EnBoxStateUnk1FB; + void EnBox_Init(Actor* thisx, GlobalContext* globalCtx); void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnBox_Update(Actor* thisx, GlobalContext* globalCtx); void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnBox_FallOnSwitchFlag(EnBox*, GlobalContext*); +void func_809C9700(EnBox*, GlobalContext*); +void EnBox_AppearOnSwitchFlag(EnBox*, GlobalContext*); +void EnBox_AppearOnRoomClear(EnBox*, GlobalContext*); +void EnBox_AppearInit(EnBox*, GlobalContext*); +void EnBox_AppearAnimation(EnBox*, GlobalContext*); +void EnBox_WaitOpen(EnBox*, GlobalContext*); +void EnBox_Open(EnBox*, GlobalContext*); + +extern AnimationHeader D_06000128; +extern AnimationHeader D_0600024C; +extern AnimationHeader D_0600043C; +extern Gfx D_060006F0[]; // regular chest base +extern Gfx D_06000AE8[]; // boss key chest base +extern Gfx D_060010C0[]; // regular chest top +extern Gfx D_06001678[]; // boss key chest top +extern SkeletonHeader D_060047D8; +extern UNK_TYPE D_06005FC8; + const ActorInit En_Box_InitVars = { - Chest, + ACTOR_EN_BOX, ACTORTYPE_CHEST, FLAGS, OBJECT_BOX, @@ -21,47 +71,594 @@ const ActorInit En_Box_InitVars = { (ActorFunc)EnBox_Update, (ActorFunc)EnBox_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C8DC8.s") +static AnimationHeader* D_809CA800[4] = { &D_0600024C, &D_06000128, &D_0600043C, &D_0600043C }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_U8(unk_1F, 0, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Destroy.s") +static s32 sUnused; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C92F4.s") +void EnBox_SetupAction(EnBox* this, EnBoxActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C93F8.s") +void EnBox_ClipToGround(EnBox* this, GlobalContext* globalCtx) { + f32 newY; + CollisionPoly* a1; + void* a2; + Vec3f pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C94AC.s") + pos = this->dyna.actor.posRot.pos; + pos.y += 1.0f; + newY = func_8003C9A4(&globalCtx->colCtx, &a1, &a2, &this->dyna.actor, &pos); + if (newY != -32000.0f) { + this->dyna.actor.posRot.pos.y = newY; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9630.s") +void EnBox_Init(Actor* thisx, GlobalContext* globalCtx) { + GlobalContext* globalCtx2 = globalCtx; + EnBox* this = THIS; + AnimationHeader* animHeader; + s32 dynaUnk; + f32 animFrameStart; + f32 animFrameCount; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9700.s") + animFrameStart = 0.0f; + animHeader = D_809CA800[((void)0, gSaveContext.linkAge)]; + dynaUnk = 0; + animFrameCount = SkelAnime_GetFrameCount(&animHeader->genericHeader); + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C988C.s") + DynaPolyInfo_SetActorMove(&this->dyna, 0); + DynaPolyInfo_Alloc(&D_06005FC8, &dynaUnk); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx2, &globalCtx2->colCtx.dyna, &this->dyna.actor, dynaUnk); + func_8003ECA8(globalCtx2, &globalCtx2->colCtx.dyna, this->dyna.dynaPolyId); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s") + this->movementFlags = 0; + this->type = thisx->params >> 12 & 0xF; + this->iceSmokeTimer = 0; + this->unk_1FB = ENBOX_STATE_0; + this->dyna.actor.gravity = -5.5f; + this->switchFlag = this->dyna.actor.posRot.rot.z; + this->dyna.actor.minVelocityY = -50.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C99C4.s") + if (globalCtx2) {} // helps the compiler store globalCtx2 into s1 -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9A7C.s") + if (Flags_GetTreasure(globalCtx2, this->dyna.actor.params & 0x1F)) { + this->alpha = 255; + this->iceSmokeTimer = 100; + EnBox_SetupAction(this, EnBox_Open); + this->movementFlags |= ENBOX_MOVE_STICK_TO_GROUND; + animFrameStart = animFrameCount; + } else if ((this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_BIG || this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL) && + !Flags_GetSwitch(globalCtx2, this->switchFlag)) { + func_8003EBF8(globalCtx2, &globalCtx2->colCtx.dyna, this->dyna.dynaPolyId); + if (Math_Rand_ZeroOne() < 0.5f) { + this->movementFlags |= ENBOX_MOVE_FALL_ANGLE_SIDE; + } + this->unk_1A8 = -12; + EnBox_SetupAction(this, EnBox_FallOnSwitchFlag); + this->alpha = 0; + this->movementFlags |= ENBOX_MOVE_IMMOBILE; + this->dyna.actor.flags |= 0x10; + } else if ((this->type == ENBOX_TYPE_ROOM_CLEAR_BIG || this->type == ENBOX_TYPE_ROOM_CLEAR_SMALL) && + !Flags_GetClear(globalCtx2, this->dyna.actor.room)) { + EnBox_SetupAction(this, EnBox_AppearOnRoomClear); + func_8003EBF8(globalCtx2, &globalCtx2->colCtx.dyna, this->dyna.dynaPolyId); + this->movementFlags |= ENBOX_MOVE_IMMOBILE; + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y - 50.0f; + this->alpha = 0; + this->dyna.actor.flags |= 0x10; + } else if (this->type == ENBOX_TYPE_9 || this->type == ENBOX_TYPE_10) { + EnBox_SetupAction(this, func_809C9700); + this->dyna.actor.flags |= 0x2000000; + func_8003EBF8(globalCtx2, &globalCtx2->colCtx.dyna, this->dyna.dynaPolyId); + this->movementFlags |= ENBOX_MOVE_IMMOBILE; + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y - 50.0f; + this->alpha = 0; + this->dyna.actor.flags |= 0x10; + } else if (this->type == ENBOX_TYPE_SWITCH_FLAG_BIG && !Flags_GetSwitch(globalCtx2, this->switchFlag)) { + EnBox_SetupAction(this, EnBox_AppearOnSwitchFlag); + func_8003EBF8(globalCtx2, &globalCtx2->colCtx.dyna, this->dyna.dynaPolyId); + this->movementFlags |= ENBOX_MOVE_IMMOBILE; + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y - 50.0f; + this->alpha = 0; + this->dyna.actor.flags |= 0x10; + } else { + if (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6) { + this->dyna.actor.flags |= 0x80; + } + EnBox_SetupAction(this, EnBox_WaitOpen); + this->movementFlags |= ENBOX_MOVE_IMMOBILE; + this->movementFlags |= ENBOX_MOVE_STICK_TO_GROUND; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s") + this->dyna.actor.posRot.rot.y += 0x8000; + this->dyna.actor.initPosRot.rot.z = this->dyna.actor.posRot.rot.z = this->dyna.actor.shape.rot.z = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9D70.s") + SkelAnime_Init(globalCtx2, &this->skelanime, &D_060047D8, animHeader, this->limbDrawTable, + this->transitionDrawTable, 5); + SkelAnime_ChangeAnim(&this->skelanime, animHeader, 1.5f, animFrameStart, animFrameCount, 2, 0.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s") + switch (this->type) { + case ENBOX_TYPE_SMALL: + case ENBOX_TYPE_6: + case ENBOX_TYPE_ROOM_CLEAR_SMALL: + case ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL: + Actor_SetScale(&this->dyna.actor, 0.005f); + Actor_SetHeight(&this->dyna.actor, 20.0f); + break; + default: + Actor_SetScale(&this->dyna.actor, 0.01f); + Actor_SetHeight(&this->dyna.actor, 40.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Update.s") +void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnBox* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA2D8.s") + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA448.s") +void EnBox_RandomDustKinematic(EnBox* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { + f32 randomRadius = Math_Rand_ZeroOne() * 25.0f; + s16 randomAngle = Math_Rand_ZeroOne() * 0x10000; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA4A0.s") + *pos = this->dyna.actor.posRot.pos; + pos->x += Math_Sins(randomAngle) * randomRadius; + pos->z += Math_Coss(randomAngle) * randomRadius; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/func_809CA518.s") + velocity->y = 1.0f; + velocity->x = Math_Sins(randomAngle); + velocity->z = Math_Coss(randomAngle); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s") + accel->x = 0.0f; + accel->y = 0.0f; + accel->z = 0.0f; +} + +/** + * Spawns dust randomly around the chest when the chest hits the ground after falling (FALL types) + */ +void EnBox_SpawnDust(EnBox* this, GlobalContext* globalCtx) { + s32 i; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + + for (i = 0; i < 20; i++) { + EnBox_RandomDustKinematic(this, &pos, &velocity, &accel); + func_8002873C(globalCtx, &pos, &velocity, &accel, 100, 30, 15); + } +} + +/** + * Used while the chest is falling (FALL types) + */ +void EnBox_Fall(EnBox* this, GlobalContext* globalCtx) { + f32 yDiff; + + this->alpha = 255; + this->movementFlags &= ~ENBOX_MOVE_IMMOBILE; + if (this->dyna.actor.bgCheckFlags & 1) { + this->movementFlags |= ENBOX_MOVE_UNUSED; + if (this->movementFlags & ENBOX_MOVE_FALL_ANGLE_SIDE) { + this->movementFlags &= ~ENBOX_MOVE_FALL_ANGLE_SIDE; + } else { + this->movementFlags |= ENBOX_MOVE_FALL_ANGLE_SIDE; + } + if (this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_BIG) { + this->dyna.actor.velocity.y = -this->dyna.actor.velocity.y * 0.55f; + } else { + this->dyna.actor.velocity.y = -this->dyna.actor.velocity.y * 0.65f; + } + if (this->dyna.actor.velocity.y < 5.5f) { + this->dyna.actor.shape.rot.z = 0; + this->dyna.actor.posRot.pos.y = this->dyna.actor.groundY; + EnBox_SetupAction(this, EnBox_WaitOpen); + func_800803F0(globalCtx, this->unk_1AC); + } + Audio_PlaySoundGeneral(NA_SE_EV_COFFIN_CAP_BOUND, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + EnBox_SpawnDust(this, globalCtx); + } + yDiff = this->dyna.actor.posRot.pos.y - this->dyna.actor.groundY; + if (this->movementFlags & ENBOX_MOVE_FALL_ANGLE_SIDE) { + this->dyna.actor.shape.rot.z = yDiff * 50.0f; + } else { + this->dyna.actor.shape.rot.z = -yDiff * 50.0f; + } +} + +void EnBox_FallOnSwitchFlag(EnBox* this, GlobalContext* globalCtx) { + s32 treasureFlag = this->dyna.actor.params & 0x1F; + + if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { + func_8002F5F0(&this->dyna.actor, globalCtx); + } + + if (this->unk_1A8 >= 0) { + EnBox_SetupAction(this, EnBox_Fall); + this->unk_1AC = func_800800F8(globalCtx, 4500, 9999, &this->dyna.actor, 0); + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } else if (this->unk_1A8 >= -11) { + this->unk_1A8++; + } else if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->unk_1A8++; + } +} + +// used for types 9, 10 +void func_809C9700(EnBox* this, GlobalContext* globalCtx) { + s32 treasureFlag = this->dyna.actor.params & 0x1F; + Player* player = PLAYER; + + if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { + func_8002F5F0(&this->dyna.actor, globalCtx); + } + + if (Math3D_Vec3fDistSq(&this->dyna.actor.posRot.pos, &player->actor.posRot.pos) > 22500.0f) { + this->unk_1FB = ENBOX_STATE_0; + } else { + if (this->unk_1FB == ENBOX_STATE_0) { + if (!(player->stateFlags2 & 0x1000000)) { + player->stateFlags2 |= 0x800000; + return; + } + this->unk_1FB = ENBOX_STATE_1; + } + + if (this->unk_1FB == ENBOX_STATE_1) { + func_8010BD58(globalCtx, 1); + this->unk_1FB = ENBOX_STATE_2; + } else if (this->unk_1FB == ENBOX_STATE_2 && globalCtx->msgCtx.unk_E3EE == 4) { + if ((globalCtx->msgCtx.unk_E3EC == 8 && this->type == ENBOX_TYPE_9) || + (globalCtx->msgCtx.unk_E3EC == 9 && this->type == ENBOX_TYPE_10)) { + this->dyna.actor.flags &= ~0x2000000; + EnBox_SetupAction(this, EnBox_AppearInit); + func_80080480(globalCtx, &this->dyna.actor); + this->unk_1A8 = 0; + this->unk_1FB = ENBOX_STATE_0; + } else { + this->unk_1FB = ENBOX_STATE_0; + } + } + } +} + +void EnBox_AppearOnSwitchFlag(EnBox* this, GlobalContext* globalCtx) { + s32 treasureFlag = this->dyna.actor.params & 0x1F; + + if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { + func_8002F5F0(&this->dyna.actor, globalCtx); + } + + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + func_80080480(globalCtx, &this->dyna.actor); + EnBox_SetupAction(this, EnBox_AppearInit); + this->unk_1A8 = -30; + } +} + +void EnBox_AppearOnRoomClear(EnBox* this, GlobalContext* globalCtx) { + s32 treasureFlag = this->dyna.actor.params & 0x1F; + + if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { + func_8002F5F0(&this->dyna.actor, globalCtx); + } + + if (Flags_GetTempClear(globalCtx, this->dyna.actor.room) && !Player_InCsMode(globalCtx)) { + Flags_SetClear(globalCtx, this->dyna.actor.room); + EnBox_SetupAction(this, EnBox_AppearInit); + func_80080480(globalCtx, &this->dyna.actor); + if (func_80080728(globalCtx, this->dyna.actor.type)) { + this->unk_1A8 = 0; + } else { + this->unk_1A8 = -30; + } + } +} + +/** + * The chest is ready to appear, possibly waiting for camera/cutscene-related stuff to happen + */ +void EnBox_AppearInit(EnBox* this, GlobalContext* globalCtx) { + if (func_8005B198() == this->dyna.actor.type || this->unk_1A8 != 0) { + EnBox_SetupAction(this, EnBox_AppearAnimation); + this->unk_1A8 = 0; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_KANKYO, this->dyna.actor.initPosRot.pos.x, + this->dyna.actor.initPosRot.pos.y, this->dyna.actor.initPosRot.pos.z, 0, 0, 0, 0x0011); + Audio_PlaySoundGeneral(NA_SE_EV_TRE_BOX_APPEAR, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } +} + +void EnBox_AppearAnimation(EnBox* this, GlobalContext* globalCtx) { + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + + if (this->unk_1A8 < 0) { + this->unk_1A8++; + } else if (this->unk_1A8 < 40) { + this->unk_1A8++; + this->dyna.actor.posRot.pos.y += 1.25f; + } else if (this->unk_1A8 < 60) { + this->alpha += 12; + this->unk_1A8++; + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y; + } else { + EnBox_SetupAction(this, EnBox_WaitOpen); + } +} + +/** + * Chest is ready to be open + */ +void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx) { + f32 frameCount; + AnimationHeader* anim; + s32 linkAge; + s32 pad; + Vec3f sp4C; + Player* player; + + this->alpha = 255; + this->movementFlags |= ENBOX_MOVE_IMMOBILE; + if (this->unk_1F4 != 0) { // unk_1F4 is modified by player code + linkAge = gSaveContext.linkAge; + anim = D_809CA800[(this->unk_1F4 < 0 ? 2 : 0) + linkAge]; + frameCount = SkelAnime_GetFrameCount(&anim->genericHeader); + SkelAnime_ChangeAnim(&this->skelanime, anim, 1.5f, 0, frameCount, 2, 0.0f); + EnBox_SetupAction(this, EnBox_Open); + if (this->unk_1F4 > 0) { + switch (this->type) { + case ENBOX_TYPE_SMALL: + case ENBOX_TYPE_6: + case ENBOX_TYPE_ROOM_CLEAR_SMALL: + case ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL: + break; + default: + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_DEMO_TRE_LGT, + this->dyna.actor.posRot.pos.x, this->dyna.actor.posRot.pos.y, + this->dyna.actor.posRot.pos.z, this->dyna.actor.shape.rot.x, + this->dyna.actor.shape.rot.y, this->dyna.actor.shape.rot.z, 0xFFFF); + func_800F5C64(0x92B); + } + } + osSyncPrintf("Actor_Environment_Tbox_On() %d\n", this->dyna.actor.params & 0x1F); + Flags_SetTreasure(globalCtx, this->dyna.actor.params & 0x1F); + } else { + player = PLAYER; + func_8002DBD0(&this->dyna.actor, &sp4C, &player->actor.posRot.pos); + if (sp4C.z > -50.0f && sp4C.z < 0.0f && fabsf(sp4C.y) < 10.0f && fabsf(sp4C.x) < 20.0f && + func_8002DFC8(&this->dyna.actor, 0x3000, globalCtx)) { + func_8002F554(&this->dyna.actor, globalCtx, 0 - (this->dyna.actor.params >> 5 & 0x7F)); + } + if (Flags_GetTreasure(globalCtx, this->dyna.actor.params & 0x1F)) { + EnBox_SetupAction(this, EnBox_Open); + } + } +} + +/** + * Plays an animation to its end, playing sounds at key points + */ +void EnBox_Open(EnBox* this, GlobalContext* globalCtx) { + u16 sfxId; + + this->dyna.actor.flags &= ~0x80; + + if (SkelAnime_FrameUpdateMatrix(&this->skelanime)) { + if (this->unk_1F4 > 0) { + if (this->unk_1F4 < 120) { + this->unk_1F4++; + } else { + Math_ApproxF(&this->unk_1B0, 0.0f, 0.05f); + } + } else { + if (this->unk_1F4 > -120) { + this->unk_1F4--; + } else { + Math_ApproxF(&this->unk_1B0, 0.0f, 0.05f); + } + } + } else { + sfxId = 0; + + if (func_800A56C8(&this->skelanime, 30.0f)) { + sfxId = NA_SE_EV_TBOX_UNLOCK; + } else if (func_800A56C8(&this->skelanime, 90.0f)) { + sfxId = NA_SE_EV_TBOX_OPEN; + } + + if (sfxId != 0) { + Audio_PlaySoundGeneral(sfxId, &this->dyna.actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + + if (this->skelanime.limbDrawTbl[3].z > 0) { + this->unk_1B0 = (0x7D00 - this->skelanime.limbDrawTbl[3].z) * 0.00006f; + if (this->unk_1B0 < 0.0f) { + this->unk_1B0 = 0.0f; + } else if (this->unk_1B0 > 1.0f) { + this->unk_1B0 = 1.0f; + } + } + } +} + +void EnBox_SpawnIceSmoke(EnBox* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f vel = { 0.0f, 1.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.0f, 0.0f }; + f32 f0; + + this->iceSmokeTimer++; + func_8002F974(&this->dyna.actor, NA_SE_EN_MIMICK_BREATH - SFX_FLAG); + if (Math_Rand_ZeroOne() < 0.3f) { + f0 = 2.0f * Math_Rand_ZeroOne() - 1.0f; + pos = this->dyna.actor.posRot.pos; + if (this->type == ENBOX_TYPE_SMALL || this->type == ENBOX_TYPE_6 || this->type == ENBOX_TYPE_ROOM_CLEAR_SMALL || + this->type == ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL) { + pos.x += f0 * 10.0f * Math_Sins(this->dyna.actor.posRot.rot.y + 0x4000); + pos.z += f0 * 10.0f * Math_Coss(this->dyna.actor.posRot.rot.y + 0x4000); + f0 = 2.0f * Math_Rand_ZeroOne() - 1.0f; + vel.x = f0 * 0.8f * Math_Sins(this->dyna.actor.posRot.rot.y); + vel.y = 1.8f; + vel.z = f0 * 0.8f * Math_Coss(this->dyna.actor.posRot.rot.y); + } else { + pos.x += f0 * 20.0f * Math_Sins(this->dyna.actor.posRot.rot.y + 0x4000); + pos.z += f0 * 20.0f * Math_Coss(this->dyna.actor.posRot.rot.y + 0x4000); + f0 = 2.0f * Math_Rand_ZeroOne() - 1.0f; + vel.x = f0 * 1.6f * Math_Sins(this->dyna.actor.posRot.rot.y); + vel.y = 1.8f; + vel.z = f0 * 1.6f * Math_Coss(this->dyna.actor.posRot.rot.y); + } + EffectSsIceSmoke_Spawn(globalCtx, &pos, &vel, &accel, 150); + } +} + +void EnBox_Update(Actor* thisx, GlobalContext* globalCtx) { + EnBox* this = THIS; + + if (this->movementFlags & ENBOX_MOVE_STICK_TO_GROUND) { + this->movementFlags &= ~ENBOX_MOVE_STICK_TO_GROUND; + EnBox_ClipToGround(this, globalCtx); + } + + this->actionFunc(this, globalCtx); + + if (!(this->movementFlags & ENBOX_MOVE_IMMOBILE)) { + Actor_MoveForward(&this->dyna.actor); + func_8002E4B4(globalCtx, &this->dyna.actor, 0.0f, 0.0f, 0.0f, 0x1C); + } + + switch (this->type) { + case ENBOX_TYPE_SMALL: + case ENBOX_TYPE_6: + case ENBOX_TYPE_ROOM_CLEAR_SMALL: + case ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL: + Actor_SetHeight(&this->dyna.actor, 20.0f); + break; + default: + Actor_SetHeight(&this->dyna.actor, 40.0f); + } + + if ((this->dyna.actor.params >> 5 & 0x7F) == 0x7C && this->actionFunc == EnBox_Open && + this->skelanime.animCurrentFrame > 45 && this->iceSmokeTimer < 100) { + EnBox_SpawnIceSmoke(this, globalCtx); + } +} + +void EnBox_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) { + EnBox* this = THIS; + s32 pad; + + if (limbIndex == 1) { + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_box.c", 1492), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + if (this->type != ENBOX_TYPE_DECORATED_BIG) { + gSPDisplayList((*gfx)++, D_060006F0); + } else { + gSPDisplayList((*gfx)++, D_06000AE8); + } + } else if (limbIndex == 3) { + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_box.c", 1502), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + if (this->type != ENBOX_TYPE_DECORATED_BIG) { + gSPDisplayList((*gfx)++, D_060010C0); + } else { + gSPDisplayList((*gfx)++, D_06001678); + } + } +} + +Gfx* EnBox_EmptyDList(GraphicsContext* gfxCtx) { + Gfx* dListHead; + Gfx* dList; + + dList = Graph_Alloc(gfxCtx, sizeof(Gfx)); + if (dList == NULL) { + __assert("gfxp != NULL", "../z_en_box.c", 1528); + } + + dListHead = dList; + gSPEndDisplayList(dListHead++); + + return dList; +} + +// set render mode with a focus on transparency +Gfx* func_809CA4A0(GraphicsContext* gfxCtx) { + Gfx* dList; + Gfx* dListHead; + + dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); + if (dListHead == NULL) { + __assert("gfxp != NULL", "../z_en_box.c", 1546); + } + + dList = dListHead; + gDPSetRenderMode(dListHead++, + AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), + AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gSPEndDisplayList(dListHead++); + + return dList; +} + +Gfx* func_809CA518(GraphicsContext* gfxCtx) { + Gfx* dList; + Gfx* dListHead; + + dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); + if (dListHead == NULL) { + __assert("gfxp != NULL", "../z_en_box.c", 1564); + } + + dList = dListHead; + gDPSetRenderMode(dListHead++, + AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | + GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), + G_RM_AA_ZB_OPA_SURF2); + gSPEndDisplayList(dListHead++); + + return dList; +} + +void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnBox* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_box.c", 1581); + + /* + this->dyna.actor.flags & 0x80 is set by Init (if type is 4 or 6) + and cleared by Open + */ + if ((this->alpha == 255 && !(this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6)) || + ((this->dyna.actor.flags & 0x80) != 0x80 && (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6))) { + gDPPipeSync(oGfxCtx->polyOpa.p++); + gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, EnBox_EmptyDList(globalCtx->state.gfxCtx)); + func_80093D18(globalCtx->state.gfxCtx); + oGfxCtx->polyOpa.p = SkelAnime_Draw2(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, + EnBox_PostLimbDraw, &this->dyna.actor, oGfxCtx->polyOpa.p); + } else if (this->alpha != 0) { + gDPPipeSync(oGfxCtx->polyXlu.p++); + func_80093D84(globalCtx->state.gfxCtx); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); + if (this->type == ENBOX_TYPE_4 || this->type == ENBOX_TYPE_6) { + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, func_809CA518(globalCtx->state.gfxCtx)); + } else { + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, func_809CA4A0(globalCtx->state.gfxCtx)); + } + oGfxCtx->polyXlu.p = SkelAnime_Draw2(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, + EnBox_PostLimbDraw, &this->dyna.actor, oGfxCtx->polyXlu.p); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_box.c", 1639); +} diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index 8171438ae2..92da08385c 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -4,13 +4,47 @@ #include "ultra64.h" #include "global.h" +#define ENBOX_TREASURE_FLAG_UNK_MIN 20 +#define ENBOX_TREASURE_FLAG_UNK_MAX 32 + struct EnBox; +typedef void (*EnBoxActionFunc)(struct EnBox*, GlobalContext*); + +typedef enum { + /* + only values 1-11 are used explicitly, other values (like 0) default to another separate behavior + */ + /* 0 */ ENBOX_TYPE_BIG_DEFAULT, + /* 1 */ ENBOX_TYPE_ROOM_CLEAR_BIG, // appear on room clear, store temp clear as permanent clear + /* 2 */ ENBOX_TYPE_DECORATED_BIG, // boss key chest, different look, same as ENBOX_TYPE_BIG_DEFAULT otherwise + /* 3 */ ENBOX_TYPE_SWITCH_FLAG_FALL_BIG, // falling, appear on switch flag set + /* 4 */ ENBOX_TYPE_4, // big, drawn differently + /* 5 */ ENBOX_TYPE_SMALL, // same as ENBOX_TYPE_BIG_DEFAULT but small + /* 6 */ ENBOX_TYPE_6, // small, drawn differently + /* 7 */ ENBOX_TYPE_ROOM_CLEAR_SMALL, // use room clear, store temp clear as perm clear + /* 8 */ ENBOX_TYPE_SWITCH_FLAG_FALL_SMALL, // falling, appear on switch flag set + /* 9 */ ENBOX_TYPE_9, // big, has something more to do with player and message context? + /* 10 */ ENBOX_TYPE_10, // like 9 + /* 11 */ ENBOX_TYPE_SWITCH_FLAG_BIG // big, appear on switch flag set +} EnBoxType; + typedef struct EnBox { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA8]; - /* 0x01F4 */ s16 unk_1F4; - /* 0x01F6 */ char unk_1F6[0x06]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ SkelAnime skelanime; + /* 0x01A8 */ s32 unk_1A8; // related to animation delays for types 3 and 8 + /* 0x01AC */ s32 unk_1AC; + /* 0x01B0 */ f32 unk_1B0; // 0-1, rotation-related, apparently unused (in z_en_box.c at least) + /* 0x01B4 */ EnBoxActionFunc actionFunc; + /* 0x01B8 */ Vec3s limbDrawTable[5]; + /* 0x01D6 */ Vec3s transitionDrawTable[5]; + /* 0x01F4 */ s16 unk_1F4; // probably a frame count? set by player code + /* 0x01F6 */ u8 movementFlags; + /* 0x01F7 */ u8 alpha; + /* 0x01F8 */ u8 switchFlag; + /* 0x01F9 */ u8 type; + /* 0x01FA */ u8 iceSmokeTimer; + /* 0x01FB */ u8 unk_1FB; } EnBox; // size = 0x01FC extern const ActorInit En_Box_InitVars; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 049eacbed3..03931dd03b 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -5977,10 +5977,10 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { this->stateFlags1 |= 0x20000C00; func_8083AE40(this, giEntry->objectId); this->actor.posRot.pos.x = - chest->actor.posRot.pos.x - (Math_Sins(chest->actor.shape.rot.y) * 29.434299469f); + chest->dyna.actor.posRot.pos.x - (Math_Sins(chest->dyna.actor.shape.rot.y) * 29.434299469f); this->actor.posRot.pos.z = - chest->actor.posRot.pos.z - (Math_Coss(chest->actor.shape.rot.y) * 29.434299469f); - this->currentYaw = this->actor.shape.rot.y = chest->actor.shape.rot.y; + chest->dyna.actor.posRot.pos.z - (Math_Coss(chest->dyna.actor.shape.rot.y) * 29.434299469f); + this->currentYaw = this->actor.shape.rot.y = chest->dyna.actor.shape.rot.y; func_80832224(this); if ((giEntry->itemId != ITEM_NONE) && (giEntry->gi >= 0) && diff --git a/undefined_syms.txt b/undefined_syms.txt index 0389ff73b1..b273a2b726 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1007,6 +1007,17 @@ D_06000340 = 0x06000340; D_06000408 = 0x06000408; D_06000530 = 0x06000530; +// z_en_box +D_06000128 = 0x06000128; +D_0600024C = 0x0600024C; +D_0600043C = 0x0600043C; +D_060006F0 = 0x060006F0; +D_06000AE8 = 0x06000AE8; +D_060010C0 = 0x060010C0; +D_06001678 = 0x06001678; +D_060047D8 = 0x060047D8; +D_06005FC8 = 0x06005FC8; + // z_eff_ss_dust D_04010050 = 0x04010050;