diff --git a/assets/assets.json b/assets/assets.json index cdcbe84a..9be3efb1 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -42076,16 +42076,6 @@ "size": 35, "type": "animation" }, - { - "path": "object1D/gUnk_081208A8.bin", - "start": 1181864, - "size": 8 - }, - { - "path": "object1D/gUnk_081208A8_1.bin", - "start": 1181876, - "size": 4 - }, { "path": "animations/gSpriteAnimations_Object1E_2.bin", "start": 1181896, diff --git a/data/const/object/object1D.s b/data/const/object/object1D.s deleted file mode 100644 index c4534746..00000000 --- a/data/const/object/object1D.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_081208A0:: @ 081208A0 - .4byte sub_080874F8 - .4byte nullsub_117 - -gUnk_081208A8:: @ 081208A8 - .incbin "object1D/gUnk_081208A8.bin" - .4byte gUnk_081208A8 - .incbin "object1D/gUnk_081208A8_1.bin" diff --git a/linker.ld b/linker.ld index 1c1241c1..4b41aeec 100644 --- a/linker.ld +++ b/linker.ld @@ -1362,7 +1362,7 @@ SECTIONS { src/object/rupee.o(.rodata); src/object/greatFairy.o(.rodata); data/animations/npc/greatFairy.o(.rodata); - data/const/object/object1D.o(.rodata); + src/object/object1D.o(.rodata); src/object/object1E.o(.rodata); data/animations/object/object1E.o(.rodata); src/object/object1F.o(.rodata); diff --git a/src/object/object1D.c b/src/object/object1D.c index f1e13a00..7e6db44b 100644 --- a/src/object/object1D.c +++ b/src/object/object1D.c @@ -1,9 +1,14 @@ #include "entity.h" -extern void (*gUnk_081208A0[])(Entity*); +void sub_080874F8(Entity*); +void nullsub_117(Entity*); void Object1D(Entity* this) { - gUnk_081208A0[this->action](this); + static void (*const actionFuncs[])(Entity*) = { + sub_080874F8, + nullsub_117, + }; + actionFuncs[this->action](this); } void sub_080874F8(Entity* this) { @@ -12,3 +17,14 @@ void sub_080874F8(Entity* this) { void nullsub_117(Entity* this) { } + +static const s16 unused1[] = { + -1, + 0x8000, + 1, + 0, +}; +static const s16* const unusedptr[] = { + unused1, +}; +static const u32 unused2 = 0;