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 wheaton

This commit is contained in:
Tal Hayon 2022-04-13 23:06:06 +03:00
parent 9f323b8fc3
commit d7fbc73414
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -35826,11 +35826,6 @@
"size": 17, "size": 17,
"type": "animation" "type": "animation"
}, },
{
"path": "wheaton/gUnk_0810C3C0.bin",
"start": 1098688,
"size": 8
},
{ {
"path": "animations/gSpriteAnimations_Pita_0.bin", "path": "animations/gSpriteAnimations_Pita_0.bin",
"start": 1098821, "start": 1098821,

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

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0810C3C0:: @ 0810C3C0
.incbin "wheaton/gUnk_0810C3C0.bin"

2
linker.ld
View File

@ -1169,7 +1169,7 @@ SECTIONS {
data/animations/npc/stamp.o(.rodata); data/animations/npc/stamp.o(.rodata);
src/npc/marcy.o(.rodata); src/npc/marcy.o(.rodata);
data/animations/npc/marcy.o(.rodata); data/animations/npc/marcy.o(.rodata);
data/const/npc/wheaton.o(.rodata); src/npc/wheaton.o(.rodata);
data/animations/npc/wheaton.o(.rodata); data/animations/npc/wheaton.o(.rodata);
data/const/npc/pita.o(.rodata); data/const/npc/pita.o(.rodata);
data/animations/npc/pita.o(.rodata); data/animations/npc/pita.o(.rodata);

5
src/npc/wheaton.c
View File

@ -1,14 +1,13 @@
#include "npc.h" #include "npc.h"
extern Hitbox gUnk_0810C3C0;
void Wheaton(Entity* this) { void Wheaton(Entity* this) {
static const Hitbox gUnk_0810C3C0 = { 0, 4, { 0, 0, 0, 0 }, 6, 12 };
if (this->action == 0) { if (this->action == 0) {
this->action++; this->action++;
SetDefaultPriority(this, PRIO_MESSAGE); SetDefaultPriority(this, PRIO_MESSAGE);
SortEntityAbove(this, this); SortEntityAbove(this, this);
this->hitbox = &gUnk_0810C3C0; this->hitbox = (Hitbox*)&gUnk_0810C3C0;
this->spriteOffsetY = 0xfe; this->spriteOffsetY = 0xfe;
sub_0807DD64(this); sub_0807DD64(this);
} }