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 lilypadSmall

This commit is contained in:
Tal Hayon 2022-04-18 00:35:29 +03:00
parent 551c36849c
commit b085c7c401
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -43552,11 +43552,6 @@
"size": 4, "size": 4,
"type": "animation" "type": "animation"
}, },
{
"path": "lilypadSmall/gUnk_08123318.bin",
"start": 1192728,
"size": 16
},
{ {
"path": "animations/gSpriteAnimations_Bell_0.bin", "path": "animations/gSpriteAnimations_Bell_0.bin",
"start": 1192844, "start": 1192844,

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

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123318:: @ 08123318
.incbin "lilypadSmall/gUnk_08123318.bin"

2
linker.ld
View File

@ -1471,7 +1471,7 @@ SECTIONS {
src/object/object70.o(.rodata); src/object/object70.o(.rodata);
src/object/pushableGrave.o(.rodata); src/object/pushableGrave.o(.rodata);
src/object/stoneTablet.o(.rodata); src/object/stoneTablet.o(.rodata);
data/const/object/lilypadSmall.o(.rodata); src/object/lilypadSmall.o(.rodata);
src/object/object74.o(.rodata); src/object/object74.o(.rodata);
data/const/object/bell.o(.rodata); data/const/object/bell.o(.rodata);
data/animations/object/bell.o(.rodata); data/animations/object/bell.o(.rodata);

7
src/object/lilypadSmall.c
View File

@ -1,8 +1,6 @@
#include "object.h" #include "object.h"
#include "functions.h" #include "functions.h"
extern u16 gUnk_08123318[];
static void sub_08097B24(Entity* this); static void sub_08097B24(Entity* this);
static bool32 CheckMovePlayer(Entity* this); static bool32 CheckMovePlayer(Entity* this);
@ -47,9 +45,12 @@ static bool32 CheckMovePlayer(Entity* this) {
} }
static void sub_08097B24(Entity* this) { static void sub_08097B24(Entity* this) {
static const u16 gUnk_08123318[] = {
0x100, 0x101, 0x102, 0x101, 0x100, 0xff, 0xfe, 0xff,
};
u32 temp; u32 temp;
u32 temp2; u32 temp2;
u16* temp3; const u16* temp3;
if (--this->timer == 0) { if (--this->timer == 0) {
this->timer = 90; this->timer = 90;