mirror of https://github.com/zeldaret/tmc.git
Put const data into marcy
This commit is contained in:
parent
57cb7af7c4
commit
9f323b8fc3
|
|
@ -35802,11 +35802,6 @@
|
|||
"size": 14,
|
||||
"type": "animation"
|
||||
},
|
||||
{
|
||||
"path": "marcy/gUnk_0810C34C.bin",
|
||||
"start": 1098572,
|
||||
"size": 20
|
||||
},
|
||||
{
|
||||
"path": "animations/gSpriteAnimations_Wheaton_0.bin",
|
||||
"start": 1098696,
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_0810C34C:: @ 0810C34C
|
||||
.incbin "marcy/gUnk_0810C34C.bin"
|
||||
|
|
@ -1167,7 +1167,7 @@ SECTIONS {
|
|||
data/animations/npc/npc9.o(.rodata);
|
||||
src/npc/stamp.o(.rodata);
|
||||
data/animations/npc/stamp.o(.rodata);
|
||||
data/const/npc/marcy.o(.rodata);
|
||||
src/npc/marcy.o(.rodata);
|
||||
data/animations/npc/marcy.o(.rodata);
|
||||
data/const/npc/wheaton.o(.rodata);
|
||||
data/animations/npc/wheaton.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue