From 47f377eb4a99a83a42e6c908efc3a9b87c508bde Mon Sep 17 00:00:00 2001 From: Rainchus Date: Sat, 15 Aug 2020 02:01:33 -0500 Subject: [PATCH] ebd0 matched functions --- .../code_ebd0_len_6a0/func_80033B54.s | 18 ----------------- .../code_ebd0_len_6a0/func_80033B88.s | 18 ----------------- .../code_ebd0_len_6a0/func_80033E64.s | 8 -------- src/code_ebd0_len_6a0.c | 20 ++++++++++++++++--- 4 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s delete mode 100644 asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s delete mode 100644 asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s deleted file mode 100644 index ed282abd3e..0000000000 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80033B54 -/* 00EF54 80033B54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00EF58 80033B58 AFBF0010 */ sw $ra, 0x10($sp) -/* 00EF5C 80033B5C 0C00F96C */ jal func_8003E5B0 -/* 00EF60 80033B60 00000000 */ nop -/* 00EF64 80033B64 3C02800A */ lui $v0, 0x800a -/* 00EF68 80033B68 80420900 */ lb $v0, 0x900($v0) -/* 00EF6C 80033B6C 04410003 */ bgez $v0, .L80033B7C -/* 00EF70 80033B70 00000000 */ nop -/* 00EF74 80033B74 0C08FA9F */ jal draw_main_battle_ui -/* 00EF78 80033B78 00000000 */ nop -.L80033B7C: -/* 00EF7C 80033B7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 00EF80 80033B80 03E00008 */ jr $ra -/* 00EF84 80033B84 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s deleted file mode 100644 index 1e7b4ef223..0000000000 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80033B88 -/* 00EF88 80033B88 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00EF8C 80033B8C 3C02800A */ lui $v0, 0x800a -/* 00EF90 80033B90 2442A650 */ addiu $v0, $v0, -0x59b0 -/* 00EF94 80033B94 AFBF0010 */ sw $ra, 0x10($sp) -/* 00EF98 80033B98 8C430000 */ lw $v1, ($v0) -/* 00EF9C 80033B9C 34630008 */ ori $v1, $v1, 8 -/* 00EFA0 80033BA0 0C018028 */ jal nuContRmbForceStop -/* 00EFA4 80033BA4 AC430000 */ sw $v1, ($v0) -/* 00EFA8 80033BA8 8FBF0010 */ lw $ra, 0x10($sp) -/* 00EFAC 80033BAC 24020005 */ addiu $v0, $zero, 5 -/* 00EFB0 80033BB0 3C01800A */ lui $at, 0x800a -/* 00EFB4 80033BB4 A0220900 */ sb $v0, 0x900($at) -/* 00EFB8 80033BB8 03E00008 */ jr $ra -/* 00EFBC 80033BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s deleted file mode 100644 index 486722bfbb..0000000000 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80033E64 -/* 00F264 80033E64 03E00008 */ jr $ra -/* 00F268 80033E68 00000000 */ nop - -/* 00F26C 80033E6C 00000000 */ nop diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index 2de74dc149..1fbe7818f8 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -53,7 +53,21 @@ void start_battle_countdown(void) { } INCLUDE_ASM(code_ebd0_len_6a0, step_battle); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033B54); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033B88); + +void func_80033B54(void) { + func_8003E5B0(); + if (D_800A0900 < 0) { + draw_main_battle_ui(); + } +} + +void func_80033B88(void) { + D_8009A650[0] |= 0x08; + nuContRmbForceStop(); + D_800A0900 = 5; +} + INCLUDE_ASM(code_ebd0_len_6a0, func_80033BC0); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033E64); + +void func_80033E64(void) { +} \ No newline at end of file