diff --git a/assets/assets.json b/assets/assets.json index 118e1fa1..b7774db7 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -43552,11 +43552,6 @@ "size": 4, "type": "animation" }, - { - "path": "lilypadSmall/gUnk_08123318.bin", - "start": 1192728, - "size": 16 - }, { "path": "animations/gSpriteAnimations_Bell_0.bin", "start": 1192844, diff --git a/data/const/object/lilypadSmall.s b/data/const/object/lilypadSmall.s deleted file mode 100644 index 3580eecf..00000000 --- a/data/const/object/lilypadSmall.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08123318:: @ 08123318 - .incbin "lilypadSmall/gUnk_08123318.bin" - diff --git a/linker.ld b/linker.ld index 40b322d5..b05744f4 100644 --- a/linker.ld +++ b/linker.ld @@ -1471,7 +1471,7 @@ SECTIONS { src/object/object70.o(.rodata); src/object/pushableGrave.o(.rodata); src/object/stoneTablet.o(.rodata); - data/const/object/lilypadSmall.o(.rodata); + src/object/lilypadSmall.o(.rodata); src/object/object74.o(.rodata); data/const/object/bell.o(.rodata); data/animations/object/bell.o(.rodata); diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c index 6cbd40e4..0a14f7f2 100644 --- a/src/object/lilypadSmall.c +++ b/src/object/lilypadSmall.c @@ -1,8 +1,6 @@ #include "object.h" #include "functions.h" -extern u16 gUnk_08123318[]; - static void sub_08097B24(Entity* this); static bool32 CheckMovePlayer(Entity* this); @@ -47,9 +45,12 @@ static bool32 CheckMovePlayer(Entity* this) { } static void sub_08097B24(Entity* this) { + static const u16 gUnk_08123318[] = { + 0x100, 0x101, 0x102, 0x101, 0x100, 0xff, 0xfe, 0xff, + }; u32 temp; u32 temp2; - u16* temp3; + const u16* temp3; if (--this->timer == 0) { this->timer = 90;