From cb941add76761cdf4fa25c9aa66587bdeaa3653c Mon Sep 17 00:00:00 2001 From: angie Date: Mon, 25 Jan 2021 00:20:37 -0300 Subject: [PATCH] DemoGj_Init Signed-off-by: angie --- .../overlays/actors/ovl_Demo_Gj/DemoGj_Init.s | 115 ------------------ src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 56 +++++---- 2 files changed, 29 insertions(+), 142 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s deleted file mode 100644 index 642ab7952a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s +++ /dev/null @@ -1,115 +0,0 @@ -.rdata -glabel D_8097C120 - .asciz "\x1b[31mDemo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.late_rodata -glabel jtbl_8097C234 -.word L8097BC98 -.word L8097BD48 -.word L8097BD48 -.word L8097BD48 -.word L8097BCA8 -.word L8097BCB8 -.word L8097BCC8 -.word L8097BCD8 -.word L8097BCE8 -.word L8097BCF8 -.word L8097BD08 -.word L8097BD48 -.word L8097BD18 -.word L8097BD28 -.word L8097BD48 -.word L8097BD48 -.word L8097BD48 -.word L8097BD48 -.word L8097BD38 - -.text -glabel DemoGj_Init -/* 03328 8097BC58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0332C 8097BC5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03330 8097BC60 AFA5001C */ sw $a1, 0x001C($sp) -/* 03334 8097BC64 0C25E254 */ jal func_80978950 -/* 03338 8097BC68 AFA40018 */ sw $a0, 0x0018($sp) -/* 0333C 8097BC6C 244EFFFC */ addiu $t6, $v0, 0xFFFC ## $t6 = FFFFFFFC -/* 03340 8097BC70 2DC10013 */ sltiu $at, $t6, 0x0013 -/* 03344 8097BC74 8FA5001C */ lw $a1, 0x001C($sp) -/* 03348 8097BC78 10200033 */ beq $at, $zero, .L8097BD48 -/* 0334C 8097BC7C 8FA60018 */ lw $a2, 0x0018($sp) -/* 03350 8097BC80 000E7080 */ sll $t6, $t6, 2 -/* 03354 8097BC84 3C018098 */ lui $at, %hi(jtbl_8097C234) ## $at = 80980000 -/* 03358 8097BC88 002E0821 */ addu $at, $at, $t6 -/* 0335C 8097BC8C 8C2EC234 */ lw $t6, %lo(jtbl_8097C234)($at) -/* 03360 8097BC90 01C00008 */ jr $t6 -/* 03364 8097BC94 00000000 */ nop -glabel L8097BC98 -/* 03368 8097BC98 0C25EB70 */ jal func_8097ADC0 -/* 0336C 8097BC9C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03370 8097BCA0 10000030 */ beq $zero, $zero, .L8097BD64 -/* 03374 8097BCA4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BCA8 -/* 03378 8097BCA8 0C25E7F4 */ jal func_80979FD0 -/* 0337C 8097BCAC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03380 8097BCB0 1000002C */ beq $zero, $zero, .L8097BD64 -/* 03384 8097BCB4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BCB8 -/* 03388 8097BCB8 0C25E882 */ jal func_8097A208 -/* 0338C 8097BCBC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03390 8097BCC0 10000028 */ beq $zero, $zero, .L8097BD64 -/* 03394 8097BCC4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BCC8 -/* 03398 8097BCC8 0C25E911 */ jal func_8097A444 -/* 0339C 8097BCCC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 033A0 8097BCD0 10000024 */ beq $zero, $zero, .L8097BD64 -/* 033A4 8097BCD4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BCD8 -/* 033A8 8097BCD8 0C25E985 */ jal func_8097A614 -/* 033AC 8097BCDC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 033B0 8097BCE0 10000020 */ beq $zero, $zero, .L8097BD64 -/* 033B4 8097BCE4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BCE8 -/* 033B8 8097BCE8 0C25E9F9 */ jal func_8097A7E4 -/* 033BC 8097BCEC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 033C0 8097BCF0 1000001C */ beq $zero, $zero, .L8097BD64 -/* 033C4 8097BCF4 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BCF8 -/* 033C8 8097BCF8 0C25EA6D */ jal func_8097A9B4 -/* 033CC 8097BCFC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 033D0 8097BD00 10000018 */ beq $zero, $zero, .L8097BD64 -/* 033D4 8097BD04 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BD08 -/* 033D8 8097BD08 0C25EAE1 */ jal func_8097AB84 -/* 033DC 8097BD0C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 033E0 8097BD10 10000014 */ beq $zero, $zero, .L8097BD64 -/* 033E4 8097BD14 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BD18 -/* 033E8 8097BD18 0C25EB97 */ jal func_8097AE5C -/* 033EC 8097BD1C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 033F0 8097BD20 10000010 */ beq $zero, $zero, .L8097BD64 -/* 033F4 8097BD24 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BD28 -/* 033F8 8097BD28 0C25ECF1 */ jal func_8097B3C4 -/* 033FC 8097BD2C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03400 8097BD30 1000000C */ beq $zero, $zero, .L8097BD64 -/* 03404 8097BD34 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BD38 -/* 03408 8097BD38 0C25EE3A */ jal func_8097B8E8 -/* 0340C 8097BD3C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03410 8097BD40 10000008 */ beq $zero, $zero, .L8097BD64 -/* 03414 8097BD44 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8097BD48 -.L8097BD48: -/* 03418 8097BD48 3C048098 */ lui $a0, %hi(D_8097C120) ## $a0 = 80980000 -/* 0341C 8097BD4C 2484C120 */ addiu $a0, $a0, %lo(D_8097C120) ## $a0 = 8097C120 -/* 03420 8097BD50 0C00084C */ jal osSyncPrintf - -/* 03424 8097BD54 AFA60018 */ sw $a2, 0x0018($sp) -/* 03428 8097BD58 0C00B55C */ jal Actor_Kill - -/* 0342C 8097BD5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03430 8097BD60 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097BD64: -/* 03434 8097BD64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03438 8097BD68 03E00008 */ jr $ra -/* 0343C 8097BD6C 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 bfb91695f6..f310e0b142 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -769,6 +769,7 @@ void func_8097A990(DemoGj *this, GlobalContext *globalCtx) { func_8097911C(this, globalCtx, &D_06002E80); } +void func_8097A9B4(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s") void func_8097A9E4(DemoGj *this, GlobalContext *globalCtx); @@ -796,6 +797,7 @@ void func_8097AB60(DemoGj *this, GlobalContext *globalCtx) { func_8097911C(this, globalCtx, &D_06003190); } +void func_8097AB84(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s") void func_8097ABB4(DemoGj *this, GlobalContext *globalCtx); @@ -825,6 +827,7 @@ void func_8097AD9C(DemoGj *this, GlobalContext *globalCtx) { func_8097911C(this, globalCtx, &D_06003710); } +void func_8097ADC0(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s") void func_8097ADF0(DemoGj *this, GlobalContext *globalCtx) { @@ -838,8 +841,10 @@ void func_8097AE38(DemoGj *this, GlobalContext *globalCtx) { func_80979030(this, globalCtx, &D_06000DC0); } +void func_8097AE5C(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s") +void func_8097AEDC(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEDC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AEE8.s") @@ -848,6 +853,7 @@ void func_8097AE38(DemoGj *this, GlobalContext *globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B0EC.s") +void func_8097B128(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s") @@ -869,6 +875,7 @@ void func_8097B3A0(DemoGj *this, GlobalContext *globalCtx) { func_80979030(this, globalCtx, &D_06001D20); } +void func_8097B3C4(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B444.s") @@ -900,6 +907,7 @@ void func_8097B8C4(DemoGj *this, GlobalContext *globalCtx) { func_80979030(this, globalCtx, &D_06002160); } +void func_8097B8E8(DemoGj *this, GlobalContext *globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B930.s") @@ -938,58 +946,52 @@ void DemoGj_Update(Actor* thisx, GlobalContext* globalCtx) { temp_v1(this, globalCtx); } -#ifdef NON_MATCHING -/*void DemoGj_Init(Actor* thisx, GlobalContext *globalCtx) { - DemoGj *this = THIS - DemoGj *temp_a2; +void DemoGj_Init(Actor *thisx, GlobalContext *globalCtx) { u32 temp_t6; + DemoGj *this = THIS; - temp_t6 = func_80978950() - 4; - temp_a2 = this; - if (temp_t6 < 0x13U) { - goto **(&jtbl_8097C234 + (temp_t6 * 4)); + temp_t6 = func_80978950(this) - 4; + switch (temp_t6) { case 0: - func_8097ADC0(temp_a2, globalCtx, temp_a2); + func_8097ADC0(this, globalCtx); return; case 4: - func_80979FD0(temp_a2, globalCtx, temp_a2); + func_80979FD0(this, globalCtx); return; case 5: - func_8097A208(temp_a2, globalCtx, temp_a2); + func_8097A208(this, globalCtx); return; case 6: - func_8097A444(temp_a2, globalCtx, temp_a2); + func_8097A444(this, globalCtx); return; case 7: - func_8097A614(temp_a2, globalCtx, temp_a2); + func_8097A614(this, globalCtx); return; case 8: - func_8097A7E4(temp_a2, globalCtx, temp_a2); + func_8097A7E4(this, globalCtx); return; case 9: - func_8097A9B4(temp_a2, globalCtx, temp_a2); + func_8097A9B4(this, globalCtx); return; case 10: - func_8097AB84(temp_a2, globalCtx, temp_a2); + func_8097AB84(this, globalCtx); return; case 12: - func_8097AE5C(temp_a2, globalCtx, temp_a2); + func_8097AE5C(this, globalCtx); return; case 13: - func_8097B3C4(temp_a2, globalCtx, temp_a2); + func_8097B3C4(this, globalCtx); return; case 18: - func_8097B8E8(temp_a2, globalCtx, temp_a2); + func_8097B8E8(this, globalCtx); return; + + default: + // Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!! + osSyncPrintf("\x1b[31mDemo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m", globalCtx, this); + Actor_Kill(&this->dyna.actor); } -default: - this = temp_a2; - osSyncPrintf((const char *) "\x1b[31mDemo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m", globalCtx, temp_a2); - Actor_Kill((Actor *) this); -}*/ -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s") -#endif +} void func_8097BD70(DemoGj *this, GlobalContext *globalCtx) { }