diff --git a/assets/assets.json b/assets/assets.json index b72b0d71..a386f274 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -39030,11 +39030,6 @@ "size": 17, "type": "animation" }, - { - "path": "librarians/gUnk_08113078.bin", - "start": 1126520, - "size": 6 - }, { "path": "animations/gSpriteAnimations_Farmers_0_0.bin", "start": 1126760, diff --git a/data/const/npc/librarians.s b/data/const/npc/librarians.s deleted file mode 100644 index 5d8a519d..00000000 --- a/data/const/npc/librarians.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08113078:: @ 08113078 - .incbin "librarians/gUnk_08113078.bin" - diff --git a/linker.ld b/linker.ld index a1f97104..51923adf 100644 --- a/linker.ld +++ b/linker.ld @@ -1258,7 +1258,7 @@ SECTIONS { src/npc/vaatiReborn.o(.rodata); data/animations/npc/vaatiReborn.o(.rodata); data/animations/npc/moblinLady.o(.rodata); - data/const/npc/librarians.o(.rodata); + src/npc/librarians.o(.rodata); data/animations/npc/librarians.o(.rodata); data/const/npc/farmers.o(.rodata); data/animations/npc/farmers.o(.rodata); diff --git a/src/npc/librarians.c b/src/npc/librarians.c index c2e3ddc9..90b8631a 100644 --- a/src/npc/librarians.c +++ b/src/npc/librarians.c @@ -6,8 +6,6 @@ #include "sound.h" #include "item.h" -extern u16 gUnk_08113078[]; - extern void sub_08095BE0(Entity*, u32); extern const u8 gUnk_08114F30[]; @@ -106,6 +104,11 @@ void sub_0806BB7C(Entity* this, ScriptExecutionContext* context) { } void sub_0806BBB0(Entity* this) { + static const u16 messageIndices[] = { + 0x490f, + 0x4910, + 0x4912, + }; u32 tmp; if (GetInventoryValue(ITEM_FLIPPERS) == 0) { @@ -117,5 +120,5 @@ void sub_0806BBB0(Entity* this) { } else { tmp = 2; } - MessageNoOverlap(gUnk_08113078[tmp], this); + MessageNoOverlap(messageIndices[tmp], this); }