diff --git a/assets/assets.json b/assets/assets.json index b7774db7..65796d16 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -43653,11 +43653,6 @@ "size": 18, "type": "animation" }, - { - "path": "bigVortex/gUnk_08123690.bin", - "start": 1193616, - "size": 8 - }, { "path": "animations/gSpriteAnimations_BigPushableLever_0.bin", "start": 1193724, diff --git a/data/const/object/bigVortex.s b/data/const/object/bigVortex.s deleted file mode 100644 index 550003a2..00000000 --- a/data/const/object/bigVortex.s +++ /dev/null @@ -1,16 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0812367C:: @ 0812367C - .4byte sub_08098D1C - .4byte sub_08098D6C - .4byte sub_08098D9C - .4byte sub_08098DC4 - .4byte sub_08098E34 - -gUnk_08123690:: @ 08123690 - .incbin "bigVortex/gUnk_08123690.bin" - diff --git a/linker.ld b/linker.ld index 862bd35c..1c8463d3 100644 --- a/linker.ld +++ b/linker.ld @@ -1487,7 +1487,7 @@ SECTIONS { data/animations/object/picoBloom.o(.rodata); src/object/board.o(.rodata); src/object/object81.o(.rodata); - data/const/object/bigVortex.o(.rodata); + src/object/bigVortex.o(.rodata); data/animations/object/bigVortex.o(.rodata); src/object/bigPushableLever.o(.rodata); data/animations/object/bigPushableLever.o(.rodata); diff --git a/src/object/bigVortex.c b/src/object/bigVortex.c index 2aa0f349..6b7ef06d 100644 --- a/src/object/bigVortex.c +++ b/src/object/bigVortex.c @@ -4,14 +4,18 @@ #include "object.h" #include "functions.h" -extern void sub_08098E3C(Entity*); -extern void sub_08098E88(Entity*); - -extern void (*const gUnk_0812367C[])(Entity*); - -extern u16 gUnk_08123690[]; +void sub_08098E3C(Entity*); +void sub_08098E88(Entity*); +void sub_08098D1C(Entity*); +void sub_08098D6C(Entity*); +void sub_08098D9C(Entity*); +void sub_08098DC4(Entity*); +void sub_08098E34(Entity*); void BigVortex(Entity* this) { + static void (*const gUnk_0812367C[])(Entity*) = { + sub_08098D1C, sub_08098D6C, sub_08098D9C, sub_08098DC4, sub_08098E34, + }; if (this->type == 0) { gUnk_0812367C[this->action](this); } else { @@ -83,7 +87,13 @@ void sub_08098E34(Entity* this) { } void sub_08098E3C(Entity* this) { - u16* temp; + static const u16 gUnk_08123690[] = { + 0x1c0, + 0x160, + 0x300, + 0x200, + }; + const u16* temp; if (this->action == 0) { this->action = 1;