mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-16 21:18:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Put const data into marcy

Browse Source
This commit is contained in:
Tal Hayon
2022-04-13 23:02:57 +03:00
parent 57cb7af7c4
commit 9f323b8fc3
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/marcy.c
+2 -3
View File
@@ -4,8 +4,6 @@
#include "message.h"
#include "item.h"
extern u16 gUnk_0810C34C[];
void Marcy(Entity* this) {
if (this->action == 0) {
this->action += 1;
@@ -16,6 +14,7 @@ void Marcy(Entity* this) {
}
void sub_08062D18(Entity* this, ScriptExecutionContext* context) {
static const u16 msgIndices[] = { 0x4004, 0x400b, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0 };
u8 tmp = 0;
if ((GetInventoryValue(ITEM_SKILL_PERIL_BEAM) != 0) && (CheckLocalFlag(0x26) == 0)) {
tmp = 7;
@@ -50,7 +49,7 @@ void sub_08062D18(Entity* this, ScriptExecutionContext* context) {
tmp = 3;
}
MessageNoOverlap(gUnk_0810C34C[tmp], this);
MessageNoOverlap(msgIndices[tmp], this);
if (tmp == 0) {
context->condition = TRUE;
} else {