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

Move const data into playerItemSpiralBeam

This commit is contained in:
Tal Hayon 2022-04-13 22:38:00 +03:00
parent a78e5f4ca9
commit ce25a10148
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -33905,11 +33905,6 @@
"start": 1088184,
"size": 16
},
{
"path": "playerItemSpiralBeam/gUnk_08109AD0.bin",
"start": 1088208,
"size": 8
},
{
"path": "animations/gSpriteAnimations_Gentari_0.bin",
"start": 1088216,

12
data/const/playerItem/playerItemSpiralBeam.s
View File

@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08109AC8:: @ 08109AC8
.4byte sub_0805FBE8
.4byte sub_0805FC74
gUnk_08109AD0:: @ 08109AD0
.incbin "playerItemSpiralBeam/gUnk_08109AD0.bin"

2
linker.ld
View File

@ -1149,7 +1149,7 @@ SECTIONS {
data/const/manager/manager38.o(.rodata);
data/const/manager/manager39.o(.rodata);
data/data_08108E6C.o(.rodata);
data/const/playerItem/playerItemSpiralBeam.o(.rodata);
src/playerItem/playerItemSpiralBeam.o(.rodata);
data/animations/npc/gentari.o(.rodata);
data/const/npc/festari.o(.rodata);
data/animations/npc/festari.o(.rodata);

12
src/playerItem/playerItemSpiralBeam.c
View File

@ -4,22 +4,26 @@
#include "effects.h"
#include "asm.h"
extern void (*const gUnk_08109AC8[])(Entity*);
extern Hitbox gUnk_08109AD0;
extern u8 gUnk_08003E44;
void sub_0805FBE8(Entity*);
void sub_0805FC74(Entity*);
void PlayerItemSpiralBeam(Entity* this) {
gUnk_08109AC8[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_0805FBE8,
sub_0805FC74,
};
actionFuncs[this->action](this);
}
void sub_0805FBE8(Entity* this) {
static const Hitbox gUnk_08109AD0 = { 0, 0, { 4, 0, 0, 0 }, 6, 6 };
CopyPosition(&gPlayerEntity, this);
this->action++;
this->spriteSettings.draw = TRUE;
this->collisionFlags = gPlayerEntity.collisionFlags + 1;
this->hitbox = &gUnk_08109AD0;
this->hitbox = (Hitbox*)&gUnk_08109AD0;
this->speed = 0x380;
this->animationState = this->animationState & 0x7f;
if (this->collisionLayer == 2) {