mirror of https://github.com/zeldaret/tmc.git
Put const data in farmers
This commit is contained in:
parent
8ac004a94f
commit
e3e6498cc2
|
|
@ -39078,16 +39078,6 @@
|
|||
"size": 5,
|
||||
"type": "animation"
|
||||
},
|
||||
{
|
||||
"path": "farmers/gUnk_08113140.bin",
|
||||
"start": 1126720,
|
||||
"size": 24
|
||||
},
|
||||
{
|
||||
"path": "farmers/gUnk_08113158.bin",
|
||||
"start": 1126744,
|
||||
"size": 16
|
||||
},
|
||||
{
|
||||
"path": "animations/gSpriteAnimations_Carlov_0_0.bin",
|
||||
"start": 1127000,
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_08113140:: @ 08113140
|
||||
.incbin "farmers/gUnk_08113140.bin"
|
||||
|
||||
gUnk_08113158:: @ 08113158
|
||||
.incbin "farmers/gUnk_08113158.bin"
|
||||
|
|
@ -1260,7 +1260,7 @@ SECTIONS {
|
|||
data/animations/npc/moblinLady.o(.rodata);
|
||||
src/npc/librarians.o(.rodata);
|
||||
data/animations/npc/librarians.o(.rodata);
|
||||
data/const/npc/farmers.o(.rodata);
|
||||
src/npc/farmers.o(.rodata);
|
||||
data/animations/npc/farmers.o(.rodata);
|
||||
data/animations/npc/carlov.o(.rodata);
|
||||
data/const/npc/dampe.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
#include "functions.h"
|
||||
#include "npc.h"
|
||||
|
||||
extern Dialog gUnk_08113158[];
|
||||
static const SpriteLoadData gUnk_08113140[] = {
|
||||
{ 0xf7, 0x48, 0x4 }, { 0x40f7, 0x48, 0x4 }, { 0, 0, 0 }, { 0xf8, 0x49, 0x4 }, { 0x40f8, 0x49, 0x4 }, { 0, 0, 0 },
|
||||
};
|
||||
|
||||
extern SpriteLoadData gUnk_08113140[];
|
||||
void sub_0806BC58(Entity* this);
|
||||
|
||||
void Farmers(Entity* this) {
|
||||
|
|
@ -63,6 +64,10 @@ void sub_0806BCD4(Entity* this) {
|
|||
}
|
||||
|
||||
void sub_0806BCE8(Entity* this) {
|
||||
static const Dialog gUnk_08113158[] = {
|
||||
{ 0x29, 3, 4, 1, { 0x1a07, 0x1a02 } },
|
||||
{ 0x29, 3, 4, 1, { 0x1a11, 0x1a0d } },
|
||||
};
|
||||
ShowNPCDialogue(this, &gUnk_08113158[this->type]);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue