falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put const data in dampe

This commit is contained in:
Tal Hayon 2022-04-16 11:13:50 +03:00
parent e3e6498cc2
commit 6d04f20dca
4 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/assets.json
View File

@ -39126,16 +39126,6 @@
"size": 9,
"type": "animation"
},
{
"path": "dampe/gUnk_08113344.bin",
"start": 1127236,
"size": 6
},
{
"path": "dampe/gUnk_0811334A.bin",
"start": 1127242,
"size": 6
},
{
"path": "animations/gSpriteAnimations_DrLeft_0.bin",
"start": 1127352,

11
data/const/npc/dampe.s
View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08113344:: @ 08113344
.incbin "dampe/gUnk_08113344.bin"
gUnk_0811334A:: @ 0811334A
.incbin "dampe/gUnk_0811334A.bin"

2
linker.ld
View File

@ -1263,7 +1263,7 @@ SECTIONS {
src/npc/farmers.o(.rodata);
data/animations/npc/farmers.o(.rodata);
data/animations/npc/carlov.o(.rodata);
data/const/npc/dampe.o(.rodata);
src/npc/dampe.o(.rodata);
data/animations/npc/dampe.o(.rodata);
data/const/npc/drLeft.o(.rodata);
data/animations/npc/drLeft.o(.rodata);

17
src/npc/dampe.c
View File

@ -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) {