diff --git a/assets/assets.json b/assets/assets.json index ce16dc72..1f006ed0 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -35976,31 +35976,6 @@ "size": 62, "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", "start": 1100540, @@ -36025,11 +36000,6 @@ "size": 5, "type": "animation" }, - { - "path": "brocco/gUnk_0810CAAC.bin", - "start": 1100460, - "size": 80 - }, { "path": "animations/gSpriteAnimations_SittingPerson_0.bin", "start": 1101216, diff --git a/data/const/npc/brocco.s b/data/const/npc/brocco.s deleted file mode 100644 index 29bd4732..00000000 --- a/data/const/npc/brocco.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0810CAAC:: @ 0810CAAC - .incbin "brocco/gUnk_0810CAAC.bin" diff --git a/linker.ld b/linker.ld index 1c2aed32..464fb4b7 100644 --- a/linker.ld +++ b/linker.ld @@ -1180,7 +1180,6 @@ SECTIONS { src/npc/beedle.o(.rodata); data/animations/npc/beedle.o(.rodata); src/npc/brocco.o(.rodata); - data/const/npc/brocco.o(.rodata); data/animations/npc/brocco.o(.rodata); data/const/npc/sittingPerson.o(.rodata); data/animations/npc/sittingPerson.o(.rodata); diff --git a/src/npc/brocco.c b/src/npc/brocco.c index 680688f2..78e05325 100644 --- a/src/npc/brocco.c +++ b/src/npc/brocco.c @@ -9,8 +9,6 @@ void sub_0806355C(Entity*); void sub_08063584(Entity*); void sub_08063608(Entity*); -extern Dialog gUnk_0810CAAC[]; - void Brocco(Entity* this) { if ((this->flags & ENT_SCRIPTED) != 0) { sub_0806362C(this); @@ -100,6 +98,13 @@ void sub_0806362C(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]); }