Add const data into milkCart

This commit is contained in:
Tal Hayon 2022-04-14 23:06:29 +03:00
parent 85bf45cb20
commit dff1e3299a
3 changed files with 7 additions and 11 deletions

View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gMilkCartBehaviors:: @ 08110118
.4byte sub_08065B6C
.4byte sub_08065B9C

View File

@ -1205,7 +1205,7 @@ SECTIONS {
data/animations/npc/malon.o(.rodata);
src/npc/epona.o(.rodata);
data/animations/npc/epona.o(.rodata);
data/const/npc/milkCart.o(.rodata);
src/npc/milkCart.o(.rodata);
data/animations/npc/milkCart.o(.rodata);
data/const/npc/ghostBrothers.o(.rodata);
data/animations/npc/ghostBrothers.o(.rodata);

View File

@ -1,9 +1,14 @@
#include "entity.h"
#include "npc.h"
extern void (*gMilkCartBehaviors[2])(Entity*);
void sub_08065B6C(Entity*);
void sub_08065B9C(Entity*);
void MilkCart(Entity* ent) {
static void (*const gMilkCartBehaviors[2])(Entity*) = {
sub_08065B6C,
sub_08065B9C,
};
gMilkCartBehaviors[ent->action](ent);
sub_0806ED78(ent);
}