diff --git a/data/const/npc/milkCart.s b/data/const/npc/milkCart.s deleted file mode 100644 index 3286faf9..00000000 --- a/data/const/npc/milkCart.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gMilkCartBehaviors:: @ 08110118 - .4byte sub_08065B6C - .4byte sub_08065B9C diff --git a/linker.ld b/linker.ld index 8e6e384e..d5391ac3 100644 --- a/linker.ld +++ b/linker.ld @@ -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); diff --git a/src/npc/milkCart.c b/src/npc/milkCart.c index 1493d385..5736b5b6 100644 --- a/src/npc/milkCart.c +++ b/src/npc/milkCart.c @@ -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); }