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 giantLeaf

This commit is contained in:
Tal Hayon 2022-04-17 20:40:55 +03:00
parent 809ad1331b
commit 1c6bc876b5
4 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/assets.json
View File

@ -42544,16 +42544,6 @@
"size": 4, "size": 4,
"type": "animation" "type": "animation"
}, },
{
"path": "giantLeaf/gUnk_08121750.bin",
"start": 1185616,
"size": 26
},
{
"path": "giantLeaf/gUnk_0812176A.bin",
"start": 1185642,
"size": 26
},
{ {
"path": "animations/gSpriteAnimations_Object43_0.bin", "path": "animations/gSpriteAnimations_Object43_0.bin",
"start": 1185760, "start": 1185760,

11
data/const/object/giantLeaf.s
View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121750:: @ 08121750
.incbin "giantLeaf/gUnk_08121750.bin"
gUnk_0812176A:: @ 0812176A
.incbin "giantLeaf/gUnk_0812176A.bin"

2
linker.ld
View File

@ -1411,7 +1411,7 @@ SECTIONS {
src/object/macroPlayer.o(.rodata); src/object/macroPlayer.o(.rodata);
src/object/object3D.o(.rodata); src/object/object3D.o(.rodata);
src/object/object3E.o(.rodata); src/object/object3E.o(.rodata);
data/const/object/giantLeaf.o(.rodata); src/object/giantLeaf.o(.rodata);
src/object/fairy.o(.rodata); src/object/fairy.o(.rodata);
src/object/object42.o(.rodata); src/object/object42.o(.rodata);
src/object/object43.o(.rodata); src/object/object43.o(.rodata);

11
src/object/giantLeaf.c
View File

@ -2,9 +2,6 @@
void sub_0808D618(Entity* ent); void sub_0808D618(Entity* ent);
extern s16 gUnk_08121750[];
extern s16 gUnk_0812176A[];
void GiantLeaf(Entity* ent) { void GiantLeaf(Entity* ent) {
if (ent->action == 0) { if (ent->action == 0) {
ent->action = 1; ent->action = 1;
@ -17,8 +14,14 @@ void GiantLeaf(Entity* ent) {
} }
void sub_0808D618(Entity* ent) { void sub_0808D618(Entity* ent) {
static const s16 gUnk_08121750[] = {
0x41, 0x40, 0x3f, 0x3e, 0x1, 0x0, -0x1, -0x2, -0x3e, -0x3f, -0x40, -0x41, -0x7e,
};
static const s16 gUnk_0812176A[] = {
0x3f, 0x40, 0x41, 0x42, -0x1, 0x0, 0x1, 0x2, -0x42, -0x41, -0x40, -0x3f, -0x82,
};
u32 tilePos; u32 tilePos;
s16* arr; const s16* arr;
u32 i; u32 i;
arr = (ent->type != 0) ? gUnk_0812176A : gUnk_08121750; arr = (ent->type != 0) ? gUnk_0812176A : gUnk_08121750;