From 5cf678e6a38d1252a3271425e555ee336e89799f Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 24 Jan 2021 23:04:38 -0300 Subject: [PATCH] Add functions of the array used by the update function Signed-off-by: angie --- .../actors/ovl_Demo_Gj/func_8097A190.s | 13 --- .../actors/ovl_Demo_Gj/func_8097A1E4.s | 10 --- .../actors/ovl_Demo_Gj/func_8097A208.s | 13 --- .../actors/ovl_Demo_Gj/func_8097A90C.s | 13 --- .../actors/ovl_Demo_Gj/func_8097A93C.s | 13 --- .../actors/ovl_Demo_Gj/func_8097AADC.s | 13 --- .../actors/ovl_Demo_Gj/func_8097AB0C.s | 13 --- .../actors/ovl_Demo_Gj/func_8097AD18.s | 13 --- .../actors/ovl_Demo_Gj/func_8097AD48.s | 13 --- .../actors/ovl_Demo_Gj/func_8097ADF0.s | 19 ---- .../actors/ovl_Demo_Gj/func_8097B340.s | 13 --- .../actors/ovl_Demo_Gj/func_8097B370.s | 13 --- .../actors/ovl_Demo_Gj/func_8097B864.s | 13 --- .../actors/ovl_Demo_Gj/func_8097B894.s | 13 --- .../actors/ovl_Demo_Gj/func_8097BB78.s | 13 --- .../actors/ovl_Demo_Gj/func_8097BBA8.s | 13 --- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 89 ++++++++++++++----- 17 files changed, 65 insertions(+), 235 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s deleted file mode 100644 index cd7a93bdf8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097A190 -/* 01860 8097A190 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01864 8097A194 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01868 8097A198 AFA40018 */ sw $a0, 0x0018($sp) -/* 0186C 8097A19C 0C25E800 */ jal func_8097A000 -/* 01870 8097A1A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01874 8097A1A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01878 8097A1A8 0C25E84C */ jal func_8097A130 -/* 0187C 8097A1AC 8FA5001C */ lw $a1, 0x001C($sp) -/* 01880 8097A1B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01884 8097A1B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01888 8097A1B8 03E00008 */ jr $ra -/* 0188C 8097A1BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s deleted file mode 100644 index 6f273f546f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8097A1E4 -/* 018B4 8097A1E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018B8 8097A1E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018BC 8097A1EC 3C060600 */ lui $a2, %hi(D_06001D20) ## $a2 = 06000000 -/* 018C0 8097A1F0 0C25E447 */ jal func_8097911C -/* 018C4 8097A1F4 24C61D20 */ addiu $a2, $a2, %lo(D_06001D20) ## $a2 = 06001D20 -/* 018C8 8097A1F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018CC 8097A1FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018D0 8097A200 03E00008 */ jr $ra -/* 018D4 8097A204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s deleted file mode 100644 index b60071851c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097A208 -/* 018D8 8097A208 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 018DC 8097A20C 3C0E0600 */ lui $t6, %hi(D_06002448) ## $t6 = 06000000 -/* 018E0 8097A210 AFBF001C */ sw $ra, 0x001C($sp) -/* 018E4 8097A214 25CE2448 */ addiu $t6, $t6, %lo(D_06002448) ## $t6 = 06002448 -/* 018E8 8097A218 AFAE0010 */ sw $t6, 0x0010($sp) -/* 018EC 8097A21C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 018F0 8097A220 0C25E3F3 */ jal func_80978FCC -/* 018F4 8097A224 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 018F8 8097A228 8FBF001C */ lw $ra, 0x001C($sp) -/* 018FC 8097A22C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01900 8097A230 03E00008 */ jr $ra -/* 01904 8097A234 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s deleted file mode 100644 index ed4594fe3f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097A90C -/* 01FDC 8097A90C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01FE0 8097A910 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01FE4 8097A914 AFA40018 */ sw $a0, 0x0018($sp) -/* 01FE8 8097A918 0C25E3B9 */ jal func_80978EE4 -/* 01FEC 8097A91C AFA5001C */ sw $a1, 0x001C($sp) -/* 01FF0 8097A920 8FA40018 */ lw $a0, 0x0018($sp) -/* 01FF4 8097A924 0C25EA24 */ jal func_8097A890 -/* 01FF8 8097A928 8FA5001C */ lw $a1, 0x001C($sp) -/* 01FFC 8097A92C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02000 8097A930 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02004 8097A934 03E00008 */ jr $ra -/* 02008 8097A938 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s deleted file mode 100644 index e083b48767..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097A93C -/* 0200C 8097A93C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02010 8097A940 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02014 8097A944 AFA40018 */ sw $a0, 0x0018($sp) -/* 02018 8097A948 0C25EA05 */ jal func_8097A814 -/* 0201C 8097A94C AFA5001C */ sw $a1, 0x001C($sp) -/* 02020 8097A950 8FA40018 */ lw $a0, 0x0018($sp) -/* 02024 8097A954 0C25EA37 */ jal func_8097A8DC -/* 02028 8097A958 8FA5001C */ lw $a1, 0x001C($sp) -/* 0202C 8097A95C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02030 8097A960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02034 8097A964 03E00008 */ jr $ra -/* 02038 8097A968 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s deleted file mode 100644 index 5a2495bfda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097AADC -/* 021AC 8097AADC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021B0 8097AAE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 021B4 8097AAE4 AFA40018 */ sw $a0, 0x0018($sp) -/* 021B8 8097AAE8 0C25E3B9 */ jal func_80978EE4 -/* 021BC 8097AAEC AFA5001C */ sw $a1, 0x001C($sp) -/* 021C0 8097AAF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 021C4 8097AAF4 0C25EA98 */ jal func_8097AA60 -/* 021C8 8097AAF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 021CC 8097AAFC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 021D0 8097AB00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 021D4 8097AB04 03E00008 */ jr $ra -/* 021D8 8097AB08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s deleted file mode 100644 index 3eae982ee4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097AB0C -/* 021DC 8097AB0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021E0 8097AB10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 021E4 8097AB14 AFA40018 */ sw $a0, 0x0018($sp) -/* 021E8 8097AB18 0C25EA79 */ jal func_8097A9E4 -/* 021EC 8097AB1C AFA5001C */ sw $a1, 0x001C($sp) -/* 021F0 8097AB20 8FA40018 */ lw $a0, 0x0018($sp) -/* 021F4 8097AB24 0C25EAAB */ jal func_8097AAAC -/* 021F8 8097AB28 8FA5001C */ lw $a1, 0x001C($sp) -/* 021FC 8097AB2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02200 8097AB30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02204 8097AB34 03E00008 */ jr $ra -/* 02208 8097AB38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s deleted file mode 100644 index a94f2b2b14..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097AD18 -/* 023E8 8097AD18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 023EC 8097AD1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 023F0 8097AD20 AFA40018 */ sw $a0, 0x0018($sp) -/* 023F4 8097AD24 0C25E3B9 */ jal func_80978EE4 -/* 023F8 8097AD28 AFA5001C */ sw $a1, 0x001C($sp) -/* 023FC 8097AD2C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02400 8097AD30 0C25EB27 */ jal func_8097AC9C -/* 02404 8097AD34 8FA5001C */ lw $a1, 0x001C($sp) -/* 02408 8097AD38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0240C 8097AD3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02410 8097AD40 03E00008 */ jr $ra -/* 02414 8097AD44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s deleted file mode 100644 index 14fe2f7755..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097AD48 -/* 02418 8097AD48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0241C 8097AD4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02420 8097AD50 AFA40018 */ sw $a0, 0x0018($sp) -/* 02424 8097AD54 0C25EAED */ jal func_8097ABB4 -/* 02428 8097AD58 AFA5001C */ sw $a1, 0x001C($sp) -/* 0242C 8097AD5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02430 8097AD60 0C25EB3A */ jal func_8097ACE8 -/* 02434 8097AD64 8FA5001C */ lw $a1, 0x001C($sp) -/* 02438 8097AD68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0243C 8097AD6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02440 8097AD70 03E00008 */ jr $ra -/* 02444 8097AD74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s deleted file mode 100644 index 2d9116f702..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8097ADF0 -/* 024C0 8097ADF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 024C4 8097ADF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 024C8 8097ADF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 024CC 8097ADFC 0C25E3B9 */ jal func_80978EE4 -/* 024D0 8097AE00 AFA5001C */ sw $a1, 0x001C($sp) -/* 024D4 8097AE04 8FA40018 */ lw $a0, 0x0018($sp) -/* 024D8 8097AE08 0C25E81F */ jal func_8097A07C -/* 024DC 8097AE0C 8FA5001C */ lw $a1, 0x001C($sp) -/* 024E0 8097AE10 8FA40018 */ lw $a0, 0x0018($sp) -/* 024E4 8097AE14 0C25E8AD */ jal func_8097A2B4 -/* 024E8 8097AE18 8FA5001C */ lw $a1, 0x001C($sp) -/* 024EC 8097AE1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 024F0 8097AE20 0C25EB0C */ jal func_8097AC30 -/* 024F4 8097AE24 8FA5001C */ lw $a1, 0x001C($sp) -/* 024F8 8097AE28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 024FC 8097AE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02500 8097AE30 03E00008 */ jr $ra -/* 02504 8097AE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s deleted file mode 100644 index cde1a84c95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097B340 -/* 02A10 8097B340 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A14 8097B344 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A18 8097B348 AFA40018 */ sw $a0, 0x0018($sp) -/* 02A1C 8097B34C 0C25E3B9 */ jal func_80978EE4 -/* 02A20 8097B350 AFA5001C */ sw $a1, 0x001C($sp) -/* 02A24 8097B354 8FA40018 */ lw $a0, 0x0018($sp) -/* 02A28 8097B358 0C25EC4A */ jal func_8097B128 -/* 02A2C 8097B35C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02A30 8097B360 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A34 8097B364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A38 8097B368 03E00008 */ jr $ra -/* 02A3C 8097B36C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s deleted file mode 100644 index 296f6fb2ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097B370 -/* 02A40 8097B370 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A44 8097B374 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A48 8097B378 AFA40018 */ sw $a0, 0x0018($sp) -/* 02A4C 8097B37C 0C25EC8B */ jal func_8097B22C -/* 02A50 8097B380 AFA5001C */ sw $a1, 0x001C($sp) -/* 02A54 8097B384 8FA40018 */ lw $a0, 0x0018($sp) -/* 02A58 8097B388 0C25EBB7 */ jal func_8097AEDC -/* 02A5C 8097B38C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02A60 8097B390 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A64 8097B394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A68 8097B398 03E00008 */ jr $ra -/* 02A6C 8097B39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s deleted file mode 100644 index a782d64a89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097B864 -/* 02F34 8097B864 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F38 8097B868 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F3C 8097B86C AFA40018 */ sw $a0, 0x0018($sp) -/* 02F40 8097B870 0C25E3B9 */ jal func_80978EE4 -/* 02F44 8097B874 AFA5001C */ sw $a1, 0x001C($sp) -/* 02F48 8097B878 8FA40018 */ lw $a0, 0x0018($sp) -/* 02F4C 8097B87C 0C25EDB1 */ jal func_8097B6C4 -/* 02F50 8097B880 8FA5001C */ lw $a1, 0x001C($sp) -/* 02F54 8097B884 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F58 8097B888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F5C 8097B88C 03E00008 */ jr $ra -/* 02F60 8097B890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s deleted file mode 100644 index 22439862bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097B894 -/* 02F64 8097B894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F68 8097B898 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F6C 8097B89C AFA40018 */ sw $a0, 0x0018($sp) -/* 02F70 8097B8A0 0C25EDD4 */ jal func_8097B750 -/* 02F74 8097B8A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02F78 8097B8A8 8FA40018 */ lw $a0, 0x0018($sp) -/* 02F7C 8097B8AC 0C25ED11 */ jal func_8097B444 -/* 02F80 8097B8B0 8FA5001C */ lw $a1, 0x001C($sp) -/* 02F84 8097B8B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F88 8097B8B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F8C 8097B8BC 03E00008 */ jr $ra -/* 02F90 8097B8C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s deleted file mode 100644 index dd720a039f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097BB78 -/* 03248 8097BB78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0324C 8097BB7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03250 8097BB80 AFA40018 */ sw $a0, 0x0018($sp) -/* 03254 8097BB84 0C25E3B9 */ jal func_80978EE4 -/* 03258 8097BB88 AFA5001C */ sw $a1, 0x001C($sp) -/* 0325C 8097BB8C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03260 8097BB90 0C25EE6F */ jal func_8097B9BC -/* 03264 8097BB94 8FA5001C */ lw $a1, 0x001C($sp) -/* 03268 8097BB98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0326C 8097BB9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03270 8097BBA0 03E00008 */ jr $ra -/* 03274 8097BBA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s deleted file mode 100644 index 5a307540b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8097BBA8 -/* 03278 8097BBA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0327C 8097BBAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03280 8097BBB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 03284 8097BBB4 0C25EE92 */ jal func_8097BA48 -/* 03288 8097BBB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0328C 8097BBBC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03290 8097BBC0 0C25EE4C */ jal func_8097B930 -/* 03294 8097BBC4 8FA5001C */ lw $a1, 0x001C($sp) -/* 03298 8097BBC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0329C 8097BBCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 032A0 8097BBD0 03E00008 */ jr $ra -/* 032A4 8097BBD4 00000000 */ nop diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index e523801ed6..c9f27327dd 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -483,13 +483,10 @@ void func_8097A160(DemoGj* this, GlobalContext* globalCtx) { func_8097A0E4(this, globalCtx); } -/* -void func_8097A190(DemoGj* this, s32 arg1) { - func_8097A000(this, arg1); - func_8097A130(this, arg1); +void func_8097A190(DemoGj* this, GlobalContext* globalCtx) { + func_8097A000(this, globalCtx); + func_8097A130(this, globalCtx); } -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A190.s") void func_8097A1C0(DemoGj* this, GlobalContext* globalCtx) { func_80979030(this, globalCtx, &D_06001D20); @@ -498,12 +495,10 @@ void func_8097A1C0(DemoGj* this, GlobalContext* globalCtx) { void func_8097A1E4(DemoGj* this, GlobalContext* globalCtx) { func_8097911C(this, globalCtx, &D_06001D20); } -//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A1E4.s") void func_8097A208(DemoGj* this, GlobalContext* globalCtx) { func_80978FCC(this, globalCtx, 2, 3, &D_06002448); } -//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A208.s") void func_8097A238(DemoGj* this, GlobalContext* globalCtx); #ifdef NON_MATCHING @@ -692,14 +687,14 @@ void func_8097A7E4(DemoGj* this, GlobalContext* globalCtx) { func_80978FCC(this, globalCtx, 5, 6, &D_06002FE4); } -void func_8097A814(DemoGj* this, s32 arg1); +void func_8097A814(DemoGj* this, GlobalContext* globalCtx); #ifdef NON_MATCHING -void func_8097A814(DemoGj* this, s32 arg1) { +void func_8097A814(DemoGj* this, GlobalContext* globalCtx) { Actor_MoveForward(&this->dyna.actor); this->unk_16C.x = (s16) (this->unk_16C.x + gGameInfo->data[2662]); this->unk_16C.y = (s16) (this->unk_16C.y+ (gGameInfo->data[2663] + 0x3E8)); this->unk_16C.z = (s16) (this->unk_16C.z + (gGameInfo->data[2664] + 0xBB8)); - func_8097923C(this, arg1); + func_8097923C(this, globalCtx); } #else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s") @@ -709,9 +704,15 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A8DC.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A90C.s") +void func_8097A90C(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097A890(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A93C.s") +void func_8097A93C(DemoGj *this, GlobalContext *globalCtx) { + func_8097A814(this, globalCtx); + func_8097A8DC(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s") @@ -719,15 +720,22 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s") +void func_8097A9E4(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AAAC.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AADC.s") +void func_8097AADC(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097AA60(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB0C.s") +void func_8097AB0C(DemoGj *this, GlobalContext *globalCtx) { + func_8097A9E4(this, globalCtx); + func_8097AAAC(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s") @@ -735,6 +743,7 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s") +void func_8097ABB4(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s") @@ -743,9 +752,15 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ACE8.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD18.s") +void func_8097AD18(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097AC9C(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD48.s") +void func_8097AD48(DemoGj *this, GlobalContext *globalCtx) { + func_8097ABB4(this, globalCtx); + func_8097ACE8(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s") @@ -753,7 +768,12 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADF0.s") +void func_8097ADF0(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097A07C(this, globalCtx); + func_8097A2B4(this, globalCtx); + func_8097AC30(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s") @@ -771,11 +791,18 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s") +void func_8097B22C(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B340.s") +void func_8097B340(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097B128(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B370.s") +void func_8097B370(DemoGj *this, GlobalContext *globalCtx) { + func_8097B22C(this, globalCtx); + func_8097AEDC(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s") @@ -793,11 +820,18 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s") +void func_8097B750(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B864.s") +void func_8097B864(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097B6C4(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B894.s") +void func_8097B894(DemoGj *this, GlobalContext *globalCtx) { + func_8097B750(this, globalCtx); + func_8097B444(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s") @@ -809,11 +843,18 @@ void func_8097A814(DemoGj* this, s32 arg1) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s") +void func_8097BA48(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BA48.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BB78.s") +void func_8097BB78(DemoGj *this, GlobalContext *globalCtx) { + func_80978EE4(this, globalCtx); + func_8097B9BC(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBA8.s") +void func_8097BBA8(DemoGj *this, GlobalContext *globalCtx) { + func_8097BA48(this, globalCtx); + func_8097B930(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s")