From 18ab0498803d524d7e13d378364c71013e5edfd6 Mon Sep 17 00:00:00 2001 From: angie Date: Sun, 24 Jan 2021 21:54:53 -0300 Subject: [PATCH] add dummies to func_8097911C to match it Signed-off-by: angie --- .../actors/ovl_Demo_Gj/func_8097911C.s | 88 ------------------- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 9 +- 2 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s deleted file mode 100644 index 79f69a2222..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s +++ /dev/null @@ -1,88 +0,0 @@ -.rdata -glabel D_8097C020 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C030 - .asciz "../z_demo_gj.c" - .balign 4 - -glabel D_8097C040 - .asciz "../z_demo_gj.c" - .balign 4 - -.text -glabel func_8097911C -/* 007EC 8097911C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 007F0 80979120 AFBF001C */ sw $ra, 0x001C($sp) -/* 007F4 80979124 AFB00018 */ sw $s0, 0x0018($sp) -/* 007F8 80979128 AFA50064 */ sw $a1, 0x0064($sp) -/* 007FC 8097912C AFA60068 */ sw $a2, 0x0068($sp) -/* 00800 80979130 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 00804 80979134 A7AE0056 */ sh $t6, 0x0056($sp) -/* 00808 80979138 848F016E */ lh $t7, 0x016E($a0) ## 0000016E -/* 0080C 8097913C A7AF0054 */ sh $t7, 0x0054($sp) -/* 00810 80979140 84980170 */ lh $t8, 0x0170($a0) ## 00000170 -/* 00814 80979144 A7B80052 */ sh $t8, 0x0052($sp) -/* 00818 80979148 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 0081C 8097914C 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 00820 80979150 0C031A73 */ jal Graph_Alloc - -/* 00824 80979154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00828 80979158 3C068098 */ lui $a2, %hi(D_8097C020) ## $a2 = 80980000 -/* 0082C 8097915C AFA20048 */ sw $v0, 0x0048($sp) -/* 00830 80979160 24C6C020 */ addiu $a2, $a2, %lo(D_8097C020) ## $a2 = 8097C020 -/* 00834 80979164 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 -/* 00838 80979168 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0083C 8097916C 0C031AB1 */ jal Graph_OpenDisps -/* 00840 80979170 240704A3 */ addiu $a3, $zero, 0x04A3 ## $a3 = 000004A3 -/* 00844 80979174 0C034213 */ jal Matrix_Push -/* 00848 80979178 00000000 */ nop -/* 0084C 8097917C 87A40056 */ lh $a0, 0x0056($sp) -/* 00850 80979180 87A50054 */ lh $a1, 0x0054($sp) -/* 00854 80979184 87A60052 */ lh $a2, 0x0052($sp) -/* 00858 80979188 0C034421 */ jal Matrix_RotateRPY -/* 0085C 8097918C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00860 80979190 3C058098 */ lui $a1, %hi(D_8097C030) ## $a1 = 80980000 -/* 00864 80979194 24A5C030 */ addiu $a1, $a1, %lo(D_8097C030) ## $a1 = 8097C030 -/* 00868 80979198 8FA40048 */ lw $a0, 0x0048($sp) -/* 0086C 8097919C 0C034695 */ jal Matrix_ToMtx -/* 00870 809791A0 240604A9 */ addiu $a2, $zero, 0x04A9 ## $a2 = 000004A9 -/* 00874 809791A4 0C034221 */ jal Matrix_Pull -/* 00878 809791A8 00000000 */ nop -/* 0087C 809791AC 0C024F46 */ jal func_80093D18 -/* 00880 809791B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00884 809791B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00888 809791B8 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 0088C 809791BC 35290002 */ ori $t1, $t1, 0x0002 ## $t1 = DA380002 -/* 00890 809791C0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00894 809791C4 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 00898 809791C8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0089C 809791CC 8FAA0048 */ lw $t2, 0x0048($sp) -/* 008A0 809791D0 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 008A4 809791D4 3C0FD838 */ lui $t7, 0xD838 ## $t7 = D8380000 -/* 008A8 809791D8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 008AC 809791DC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 008B0 809791E0 35EF0002 */ ori $t7, $t7, 0x0002 ## $t7 = D8380002 -/* 008B4 809791E4 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 008B8 809791E8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 008BC 809791EC AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 008C0 809791F0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 008C4 809791F4 8FAD0068 */ lw $t5, 0x0068($sp) -/* 008C8 809791F8 3C068098 */ lui $a2, %hi(D_8097C040) ## $a2 = 80980000 -/* 008CC 809791FC 24C6C040 */ addiu $a2, $a2, %lo(D_8097C040) ## $a2 = 8097C040 -/* 008D0 80979200 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 008D4 80979204 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 008D8 80979208 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 -/* 008DC 8097920C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 008E0 80979210 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 008E4 80979214 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 008E8 80979218 240704B1 */ addiu $a3, $zero, 0x04B1 ## $a3 = 000004B1 -/* 008EC 8097921C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 008F0 80979220 0C031AD5 */ jal Graph_CloseDisps -/* 008F4 80979224 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008F8 80979228 8FBF001C */ lw $ra, 0x001C($sp) -/* 008FC 8097922C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00900 80979230 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00904 80979234 03E00008 */ jr $ra -/* 00908 80979238 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 64816dbde0..82cb86062e 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -293,15 +293,17 @@ void func_80979030(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) { } } -#ifdef NON_MATCHING void func_8097911C(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) { + void* dummy; GraphicsContext *gfxCtx; - Mtx* matrix; s16 sp56; s16 sp54; s16 sp52; + void* dummy2; + Mtx* matrix; + sp56 = this->unk_16C.x; sp54 = this->unk_16C.y; sp52 = this->unk_16C.z; @@ -325,9 +327,6 @@ void func_8097911C(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) { CLOSE_DISPS(gfxCtx, "../z_demo_gj.c", 1201); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s") -#endif void func_8097923C(DemoGj* this, UNK_TYPE arg1); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097923C.s")