mirror of https://github.com/zeldaret/tmc.git
Put const data into wheaton
This commit is contained in:
parent
9f323b8fc3
commit
d7fbc73414
|
@ -35826,11 +35826,6 @@
|
|||
"size": 17,
|
||||
"type": "animation"
|
||||
},
|
||||
{
|
||||
"path": "wheaton/gUnk_0810C3C0.bin",
|
||||
"start": 1098688,
|
||||
"size": 8
|
||||
},
|
||||
{
|
||||
"path": "animations/gSpriteAnimations_Pita_0.bin",
|
||||
"start": 1098821,
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_0810C3C0:: @ 0810C3C0
|
||||
.incbin "wheaton/gUnk_0810C3C0.bin"
|
|
@ -1169,7 +1169,7 @@ SECTIONS {
|
|||
data/animations/npc/stamp.o(.rodata);
|
||||
src/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/const/npc/pita.o(.rodata);
|
||||
data/animations/npc/pita.o(.rodata);
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
#include "npc.h"
|
||||
|
||||
extern Hitbox gUnk_0810C3C0;
|
||||
|
||||
void Wheaton(Entity* this) {
|
||||
static const Hitbox gUnk_0810C3C0 = { 0, 4, { 0, 0, 0, 0 }, 6, 12 };
|
||||
if (this->action == 0) {
|
||||
this->action++;
|
||||
|
||||
SetDefaultPriority(this, PRIO_MESSAGE);
|
||||
SortEntityAbove(this, this);
|
||||
this->hitbox = &gUnk_0810C3C0;
|
||||
this->hitbox = (Hitbox*)&gUnk_0810C3C0;
|
||||
this->spriteOffsetY = 0xfe;
|
||||
sub_0807DD64(this);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue