mirror of https://github.com/zeldaret/tmc.git
Put const data in pina
This commit is contained in:
parent
3f0a05f2e8
commit
2c473c443c
|
|
@ -36164,11 +36164,6 @@
|
|||
"size": 7,
|
||||
"type": "animation"
|
||||
},
|
||||
{
|
||||
"path": "pina/gUnk_0810CE04.bin",
|
||||
"start": 1101316,
|
||||
"size": 80
|
||||
},
|
||||
{
|
||||
"path": "guard/gUnk_0810F560.bin",
|
||||
"start": 1111392,
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_0810CE04:: @ 0810CE04
|
||||
.incbin "pina/gUnk_0810CE04.bin"
|
||||
|
||||
|
|
@ -1184,7 +1184,6 @@ SECTIONS {
|
|||
data/const/npc/sittingPerson.o(.rodata);
|
||||
data/animations/npc/sittingPerson.o(.rodata);
|
||||
src/npc/pina.o(.rodata);
|
||||
data/const/npc/pina.o(.rodata);
|
||||
data/animations/npc/pina.o(.rodata);
|
||||
data/const/npc/guard.o(.rodata);
|
||||
src/npc/guardWithSpear.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ void sub_08063A98(Entity* this);
|
|||
void sub_08063AC0(Entity* this);
|
||||
void sub_08063B44(Entity* this);
|
||||
|
||||
extern Dialog gUnk_0810CE04[];
|
||||
|
||||
void Pina(Entity* this) {
|
||||
if ((this->flags & ENT_SCRIPTED) != 0) {
|
||||
sub_08063B68(this);
|
||||
|
|
@ -137,6 +135,12 @@ void sub_08063C74(void) {
|
|||
}
|
||||
|
||||
void sub_08063C90(Entity* this) {
|
||||
static const Dialog gUnk_0810CE04[] = {
|
||||
{ 6, 0, 3, 1, { 0x3422, 0x3421 } }, { 6, 0, 3, 1, { 0x3422, 0x3421 } }, { 6, 0, 3, 1, { 0x3422, 0x3421 } },
|
||||
{ 6, 0, 3, 1, { 0x3422, 0x3421 } }, { 6, 0, 3, 1, { 0x351d, 0x351c } }, { 6, 0, 3, 1, { 0x361c, 0x361b } },
|
||||
{ 6, 0, 3, 1, { 0x371d, 0x371c } }, { 6, 0, 3, 1, { 0x381d, 0x381c } }, { 6, 0, 3, 1, { 0x3917, 0x3916 } },
|
||||
{ 6, 0, 3, 1, { 0x3917, 0x3916 } },
|
||||
};
|
||||
ShowNPCDialogue(this, &gUnk_0810CE04[gSave.global_progress]);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue