summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-04-16 00:54:59 +0300
committerTal Hayon <talhayon1@gmail.com>2022-04-16 00:54:59 +0300
commit42db284296dbfef0aa9121b0c4425ed414f46799 (patch)
treee6c01ef812236300b8e9dbd6df15b15f624ac76f /src
parent02f5e4cc5f8808c4aed3ec2bade32699ad5b2cbd (diff)
Put const data in librari
Diffstat (limited to 'src')
-rw-r--r--src/npc/librari.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/npc/librari.c b/src/npc/librari.c
index 98ef6450..fc7be731 100644
--- a/src/npc/librari.c
+++ b/src/npc/librari.c
@@ -3,8 +3,6 @@
#include "npc.h"
#include "item.h"
-extern u16 gUnk_08112D48[];
-
void Librari(Entity* this) {
switch (this->action) {
case 0:
@@ -35,6 +33,12 @@ void Librari(Entity* this) {
}
void sub_0806B260(Entity* this, ScriptExecutionContext* context) {
+ static const u16 messageIndices[] = {
+ 0x4a19,
+ 0x4a1a,
+ 0x4a22,
+ 0x4a27,
+ };
u32 index;
context->condition = 0;
@@ -51,12 +55,13 @@ void sub_0806B260(Entity* this, ScriptExecutionContext* context) {
} else {
index = 3;
}
- MessageNoOverlap(gUnk_08112D48[index], this);
+ MessageNoOverlap(messageIndices[index], this);
}
-extern u16 gUnk_08112D50[];
-
void sub_0806B2B4(Entity* this) {
+ static const u16 messageIndices[] = {
+ 0xdad, 0xdae, 0xdaf, 0xdb0, 0xdb1,
+ };
u32 index;
if (CheckLocalFlag(0xb3)) {
@@ -78,7 +83,7 @@ void sub_0806B2B4(Entity* this) {
} else {
index = 0;
}
- MessageNoOverlap(gUnk_08112D50[index], this);
+ MessageNoOverlap(messageIndices[index], this);
}
void Librari_Fusion(Entity* this) {