Put const data in librarians

This commit is contained in:
Tal Hayon 2022-04-16 11:05:54 +03:00
parent 032b846489
commit 8ac004a94f
4 changed files with 7 additions and 18 deletions

View File

@ -39030,11 +39030,6 @@
"size": 17, "size": 17,
"type": "animation" "type": "animation"
}, },
{
"path": "librarians/gUnk_08113078.bin",
"start": 1126520,
"size": 6
},
{ {
"path": "animations/gSpriteAnimations_Farmers_0_0.bin", "path": "animations/gSpriteAnimations_Farmers_0_0.bin",
"start": 1126760, "start": 1126760,

View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08113078:: @ 08113078
.incbin "librarians/gUnk_08113078.bin"

View File

@ -1258,7 +1258,7 @@ SECTIONS {
src/npc/vaatiReborn.o(.rodata); src/npc/vaatiReborn.o(.rodata);
data/animations/npc/vaatiReborn.o(.rodata); data/animations/npc/vaatiReborn.o(.rodata);
data/animations/npc/moblinLady.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/animations/npc/librarians.o(.rodata);
data/const/npc/farmers.o(.rodata); data/const/npc/farmers.o(.rodata);
data/animations/npc/farmers.o(.rodata); data/animations/npc/farmers.o(.rodata);

View File

@ -6,8 +6,6 @@
#include "sound.h" #include "sound.h"
#include "item.h" #include "item.h"
extern u16 gUnk_08113078[];
extern void sub_08095BE0(Entity*, u32); extern void sub_08095BE0(Entity*, u32);
extern const u8 gUnk_08114F30[]; extern const u8 gUnk_08114F30[];
@ -106,6 +104,11 @@ void sub_0806BB7C(Entity* this, ScriptExecutionContext* context) {
} }
void sub_0806BBB0(Entity* this) { void sub_0806BBB0(Entity* this) {
static const u16 messageIndices[] = {
0x490f,
0x4910,
0x4912,
};
u32 tmp; u32 tmp;
if (GetInventoryValue(ITEM_FLIPPERS) == 0) { if (GetInventoryValue(ITEM_FLIPPERS) == 0) {
@ -117,5 +120,5 @@ void sub_0806BBB0(Entity* this) {
} else { } else {
tmp = 2; tmp = 2;
} }
MessageNoOverlap(gUnk_08113078[tmp], this); MessageNoOverlap(messageIndices[tmp], this);
} }