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

Put const data into brocco

This commit is contained in:
Tal Hayon 2022-04-14 20:27:32 +03:00
parent 4820349daf
commit 3f0a05f2e8
4 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
assets/assets.json
View File

@ -35976,31 +35976,6 @@
"size": 62, "size": 62,
"type": "animation" "type": "animation"
}, },
{
"path": "beedle/gUnk_0810C88C.bin",
"start": 1099916,
"size": 8
},
{
"path": "beedle/gUnk_0810C894.bin",
"start": 1099924,
"size": 8
},
{
"path": "beedle/gUnk_0810C89C.bin",
"start": 1099932,
"size": 56
},
{
"path": "beedle/gUnk_0810C8D4.bin",
"start": 1099988,
"size": 12
},
{
"path": "beedle/gUnk_0810C8F0.bin",
"start": 1100016,
"size": 120
},
{ {
"path": "animations/gSpriteAnimations_Brocco_0.bin", "path": "animations/gSpriteAnimations_Brocco_0.bin",
"start": 1100540, "start": 1100540,
@ -36025,11 +36000,6 @@
"size": 5, "size": 5,
"type": "animation" "type": "animation"
}, },
{
"path": "brocco/gUnk_0810CAAC.bin",
"start": 1100460,
"size": 80
},
{ {
"path": "animations/gSpriteAnimations_SittingPerson_0.bin", "path": "animations/gSpriteAnimations_SittingPerson_0.bin",
"start": 1101216, "start": 1101216,

8
data/const/npc/brocco.s
View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810CAAC:: @ 0810CAAC
.incbin "brocco/gUnk_0810CAAC.bin"

1
linker.ld
View File

@ -1180,7 +1180,6 @@ SECTIONS {
src/npc/beedle.o(.rodata); src/npc/beedle.o(.rodata);
data/animations/npc/beedle.o(.rodata); data/animations/npc/beedle.o(.rodata);
src/npc/brocco.o(.rodata); src/npc/brocco.o(.rodata);
data/const/npc/brocco.o(.rodata);
data/animations/npc/brocco.o(.rodata); data/animations/npc/brocco.o(.rodata);
data/const/npc/sittingPerson.o(.rodata); data/const/npc/sittingPerson.o(.rodata);
data/animations/npc/sittingPerson.o(.rodata); data/animations/npc/sittingPerson.o(.rodata);

9
src/npc/brocco.c
View File

@ -9,8 +9,6 @@ void sub_0806355C(Entity*);
void sub_08063584(Entity*); void sub_08063584(Entity*);
void sub_08063608(Entity*); void sub_08063608(Entity*);
extern Dialog gUnk_0810CAAC[];
void Brocco(Entity* this) { void Brocco(Entity* this) {
if ((this->flags & ENT_SCRIPTED) != 0) { if ((this->flags & ENT_SCRIPTED) != 0) {
sub_0806362C(this); sub_0806362C(this);
@ -100,6 +98,13 @@ void sub_0806362C(Entity* this) {
} }
void sub_080636D8(Entity* this) { void sub_080636D8(Entity* this) {
static const Dialog gUnk_0810CAAC[] = {
{ 0, 0, 1, 1, { 0, 0x2510 } }, { 0, 0, 1, 1, { 0, 0x2510 } }, { 5, 0, 3, 1, { 0x3424, 0x3423 } },
{ 5, 0, 3, 1, { 0x3424, 0x3423 } }, { 5, 0, 3, 1, { 0x351f, 0x351e } }, { 5, 0, 3, 1, { 0x361e, 0x361d } },
{ 5, 0, 3, 1, { 0x371f, 0x371e } }, { 5, 0, 3, 1, { 0x381f, 0x381e } }, { 5, 0, 3, 1, { 0x3919, 0x3918 } },
{ 5, 0, 3, 1, { 0x3919, 0x3918 } },
};
ShowNPCDialogue(this, &gUnk_0810CAAC[gSave.global_progress]); ShowNPCDialogue(this, &gUnk_0810CAAC[gSave.global_progress]);
} }