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

Put const data in windcrest

This commit is contained in:
Tal Hayon 2022-04-19 22:03:51 +03:00
parent 7239c05a1a
commit d3a9d40206
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -43822,11 +43822,6 @@
"size": 83,
"type": "animation"
},
{
"path": "windcrest/gUnk_08125010.bin",
"start": 1200144,
"size": 4
},
{
"path": "animations/gSpriteAnimations_Pinwheel_0.bin",
"start": 1200232,

9
data/const/object/windcrest.s
View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08125010:: @ 08125010
.incbin "windcrest/gUnk_08125010.bin"

2
linker.ld
View File

@ -1556,7 +1556,7 @@ SECTIONS {
src/object/windTribeTeleporter.o(.rodata);
src/object/cuccoMinigame.o(.rodata);
src/object/gyorgBossObject.o(.rodata);
data/const/object/windcrest.o(.rodata);
src/object/windcrest.o(.rodata);
src/object/objectBD.o(.rodata);
src/object/pinwheel.o(.rodata);
data/animations/object/pinwheel.o(.rodata);

5
src/object/windcrest.c
View File

@ -6,8 +6,6 @@
#include "effects.h"
#include "functions.h"
extern u8 gUnk_08125010;
void Windcrest(Entity* this) {
if (this->action == 0) {
this->action++;
@ -19,7 +17,8 @@ void Windcrest(Entity* this) {
}
void sub_080A2124(Entity* this) {
sub_08078850(this, 1, 0xe, &gUnk_08125010);
static const u8 gUnk_08125010[] = { 0, 0, 12, 12 };
sub_08078850(this, 1, 0xe, gUnk_08125010);
}
void Windcrest_Unlock(Entity* this) {