decompile macroMushroomStalks

This commit is contained in:
Tal Hayon 2022-02-28 00:54:42 +02:00
parent 675b5e314c
commit 4bf9c9b04d
4 changed files with 14 additions and 31 deletions

View File

@ -1,20 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start MacroMushromStalks
MacroMushromStalks: @ 0x0808C91C
push {lr}
ldr r2, _0808C930 @ =gUnk_08121668
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_0808C930: .4byte gUnk_08121668

View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121668:: @ 08121668
.4byte sub_0808C964
.4byte sub_0808CA10

View File

@ -701,7 +701,7 @@ SECTIONS {
src/object/jarPortal.o(.text);
src/object/bossDoor.o(.text);
asm/object/object3A.o(.text);
asm/object/macroMushroomStalks.o(.text);
src/object/macroMushroomStalks.o(.text);
asm/object/object75.o(.text); /* 75 and 76 are mislocated in object table */
asm/object/object76.o(.text);
asm/object/code_0808C964.o(.text);
@ -1437,7 +1437,7 @@ SECTIONS {
src/object/bossDoor.o(.rodata);
data/animations/object/bossDoor.o(.rodata);
data/const/object/object3A.o(.rodata);
data/const/object/macroMushroomStalks.o(.rodata);
src/object/macroMushroomStalks.o(.rodata);
data/const/object/object75.o(.rodata);
data/const/object/object76.o(.rodata);
data/const/object/macroPlayer.o(.rodata);

View File

@ -0,0 +1,12 @@
#include "entity.h"
void sub_0808C964(Entity*);
void sub_0808CA10(Entity*);
void MacroMushromStalks(Entity* this) {
static void (*const actionFuncs[])(Entity*) = {
sub_0808C964,
sub_0808CA10,
};
actionFuncs[this->action](this);
}