summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-04-16 11:13:50 +0300
committerTal Hayon <talhayon1@gmail.com>2022-04-16 11:13:50 +0300
commit6d04f20dca7b4d658131d7164dd405b56c8b03bb (patch)
treeba4c4ca49f074df237a5405eb6523039cbf04c74 /src
parente3e6498cc233f30248ee7e0b2ffbd002e5e7f6cb (diff)
Put const data in dampe
Diffstat (limited to 'src')
-rw-r--r--src/npc/dampe.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index cd6ee87c..a058d42d 100644
--- a/src/npc/dampe.c
+++ b/src/npc/dampe.c
@@ -7,9 +7,6 @@
#include "npc.h"
#include "item.h"
-extern u16 gUnk_08113344[];
-extern u16 gUnk_0811334A[];
-
void Dampe(Entity* this) {
switch (this->action) {
case 0:
@@ -52,6 +49,11 @@ void Dampe_Fusion(Entity* this) {
}
void sub_0806BE84(Entity* this, ScriptExecutionContext* context) {
+ static const u16 messageIndices[] = {
+ 0x2801,
+ 0x2808,
+ 0x2804,
+ };
u32 msgIndex;
context->condition = 0;
@@ -65,10 +67,15 @@ void sub_0806BE84(Entity* this, ScriptExecutionContext* context) {
if (GetInventoryValue(ITEM_QST_GRAVEYARD_KEY) >= 2) {
msgIndex = 2;
}
- MessageNoOverlap(gUnk_08113344[msgIndex], this);
+ MessageNoOverlap(messageIndices[msgIndex], this);
}
void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
+ static const u16 messageIndices[] = {
+ 0x2802,
+ 0x2803,
+ 0x2804,
+ };
u32 hasGraveyardKey;
u32 msgIndex;
@@ -82,7 +89,7 @@ void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
msgIndex = 2;
}
- MessageNoOverlap(gUnk_0811334A[msgIndex], this);
+ MessageNoOverlap(messageIndices[msgIndex], this);
}
void sub_0806BEFC(void) {