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 playerItemFireRodProjectile

This commit is contained in:
Tal Hayon 2022-04-21 09:18:38 +03:00
parent 26b9110180
commit 1ac2d10b8d
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -44064,11 +44064,6 @@
"start": 1208936,
"size": 8
},
{
"path": "playerItemFireRodProjectile/gUnk_08127278.bin",
"start": 1208952,
"size": 8
},
{
"offsets": {
"DEMO_USA": 2640

13
data/const/playerItem/playerItemFireRodProjectile.s
View File

@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08127270:: @ 08127270
.4byte sub_080A3084
.4byte sub_080A310C
gUnk_08127278:: @ 08127278
.incbin "playerItemFireRodProjectile/gUnk_08127278.bin"

2
linker.ld
View File

@ -1567,7 +1567,7 @@ SECTIONS {
src/playerItemDefinitions.o(.rodata);
data/data_08125104.o(.rodata);
data/const/playerItem/playerItemShield.o(.rodata);
data/const/playerItem/playerItemFireRodProjectile.o(.rodata);
src/playerItem/playerItemFireRodProjectile.o(.rodata);
#ifdef DEMO_USA
src/demo.o(.rodata);
#endif

13
src/playerItem/playerItemFireRodProjectile.c
View File

@ -15,22 +15,25 @@ typedef struct {
extern u8 gUnk_08003E44;
extern void (*const gUnk_08127270[])(FireRodProjectileEntity*);
extern Hitbox gUnk_08127278;
void sub_080A3084(FireRodProjectileEntity*);
void sub_080A310C(FireRodProjectileEntity*);
void PlayerItemFireRodProjectile(Entity* this) {
gUnk_08127270[this->action]((FireRodProjectileEntity*)this);
static void (*const actionFuncs[])(FireRodProjectileEntity*) = {
sub_080A3084,
sub_080A310C,
};
actionFuncs[this->action]((FireRodProjectileEntity*)this);
}
void sub_080A3084(FireRodProjectileEntity* this) {
static const Hitbox gUnk_08127278 = { 0, 0, { 4, 2, 2, 4 }, 6, 6 };
super->spriteSettings.draw = 1;
super->action = 0x01;
CopyPosition(super->parent, super);
if (super->type == 0) {
super->collisionFlags = gPlayerEntity.collisionFlags + 1;
super->hitbox = &gUnk_08127278;
super->hitbox = (Hitbox*)&gUnk_08127278;
super->speed = 0x400;
if (super->collisionLayer == 0x02) {
super->type2 = 0x01;