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 playerItemBow

This commit is contained in:
Tal Hayon 2022-04-13 19:48:14 +03:00
parent 8eaddf08c2
commit 875fd3e024
5 changed files with 36 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
assets/assets.json
View File

@ -3591,36 +3591,6 @@
"start": 736808,
"size": 8
},
{
"path": "playerItemBow/gUnk_080B3E40.bin",
"start": 736832,
"size": 8
},
{
"path": "playerItemBow/gUnk_080B3E40_1.bin",
"start": 736844,
"size": 8
},
{
"path": "playerItemBow/gUnk_080B3E40_2.bin",
"start": 736856,
"size": 8
},
{
"path": "playerItemBow/gUnk_080B3E40_3.bin",
"start": 736868,
"size": 8
},
{
"path": "data_080B3E70/gUnk_080B3E70.bin",
"start": 736880,
"size": 8
},
{
"path": "data_080B3E70/gUnk_080B3E78.bin",
"start": 736888,
"size": 8
},
{
"path": "data_080B3E70/gUnk_080B3E80.bin",
"start": 736896,

21
data/const/playerItem/playerItemBow.s
View File

@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080B3E30:: @ 080B3E30
.4byte sub_08018FE4
.4byte sub_0801917C
.4byte sub_08019410
.4byte sub_08019444
gUnk_080B3E40:: @ 080B3E40
.incbin "playerItemBow/gUnk_080B3E40.bin"
.4byte gUnk_080B3E78
.incbin "playerItemBow/gUnk_080B3E40_1.bin"
.4byte gUnk_080B3E70
.incbin "playerItemBow/gUnk_080B3E40_2.bin"
.4byte gUnk_080B3E78
.incbin "playerItemBow/gUnk_080B3E40_3.bin"
.4byte gUnk_080B3E70

6
data/data_080B3E70.s
View File

@ -4,11 +4,5 @@
.section .rodata
.align 2
gUnk_080B3E70:: @ 080B3E70
.incbin "data_080B3E70/gUnk_080B3E70.bin"
gUnk_080B3E78:: @ 080B3E78
.incbin "data_080B3E70/gUnk_080B3E78.bin"
gUnk_080B3E80:: @ 080B3E80
.incbin "data_080B3E70/gUnk_080B3E80.bin"

2
linker.ld
View File

@ -893,7 +893,7 @@ SECTIONS {
src/collision.o(.rodata);
data/data_080B3740.o(.rodata);
data/const/playerItem/playerItemGustBig.o(.rodata);
data/const/playerItem/playerItemBow.o(.rodata);
src/playerItem/playerItemBow.o(.rodata);
data/data_080B3E70.o(.rodata);
src/playerItem/playerItemSwordBeam.o(.rodata);
data/data_080B4410.o(.rodata);

53
src/playerItem/playerItemBow.c
View File

@ -9,8 +9,6 @@
#include "sound.h"
#include "save.h"
extern void (*const gUnk_080B3E30[])(Entity*);
typedef struct {
Entity base;
u8 unk_68;
@ -30,13 +28,9 @@ typedef struct {
s8 unk_5;
u8 animIndex;
u8 unk_7;
Hitbox* hitbox;
const Hitbox* hitbox;
} struct_080B3E40;
extern const struct_080B3E40 gUnk_080B3E40[];
void sub_0801917C(PlayerItemBowEntity*);
extern u8 gUnk_08003E44;
extern Entity* sub_08008782(Entity*, u32, s32, s32);
@ -44,11 +38,34 @@ extern void sub_08017744(Entity*);
extern void ModArrows(s32);
void sub_08019468(PlayerItemBowEntity*);
void sub_08018FE4(PlayerItemBowEntity*);
void sub_0801917C(PlayerItemBowEntity*);
void sub_08019410(PlayerItemBowEntity*);
void sub_08019444(PlayerItemBowEntity*);
void PlayerItemBow(Entity* this) {
gUnk_080B3E30[(this->action)](this);
static void (*const gUnk_080B3E30[])(PlayerItemBowEntity*) = {
sub_08018FE4,
sub_0801917C,
sub_08019410,
sub_08019444,
};
gUnk_080B3E30[this->action]((PlayerItemBowEntity*)this);
}
static const Hitbox gUnk_080B3E70;
static const Hitbox gUnk_080B3E78;
static const struct_080B3E40 gUnk_080B3E40[] = {
{ -3, -12, 0, 0, 0, -5, 2, 0, &gUnk_080B3E78 },
{ 8, -4, 1, 0, 5, 0, 1, 0, &gUnk_080B3E70 },
{ 0, 1, 0, 1, 0, 5, 2, 0, &gUnk_080B3E78 },
{ -8, -4, 0, 0, -5, 0, 1, 0, &gUnk_080B3E70 },
};
static const Hitbox gUnk_080B3E70 = { 0, 0, { 4, 0, 0, 0 }, 6, 4 };
static const Hitbox gUnk_080B3E78 = { 0, 0, { 0, 0, 0, 4 }, 4, 6 };
void sub_08018FE4(PlayerItemBowEntity* this) {
Entity* object;
const struct_080B3E40* ptr;
@ -81,7 +98,7 @@ void sub_08018FE4(PlayerItemBowEntity* this) {
super->animIndex = ptr->animIndex;
this->unk_6c = ptr->unk_4;
this->unk_70 = ptr->unk_5;
super->hitbox = ptr->hitbox;
super->hitbox = (Hitbox*)ptr->hitbox;
sub_0801766C(super);
if (super->hurtType == 0x0e) {
super->animIndex += 6;
@ -221,21 +238,21 @@ void sub_0801917C(PlayerItemBowEntity* this) {
}
}
void sub_08019410(Entity* this) {
if (this->timer < 0xf) {
InitializeAnimation(this, this->animIndex);
void sub_08019410(PlayerItemBowEntity* this) {
if (super->timer < 0xf) {
InitializeAnimation(super, super->animIndex);
} else {
GetNextFrame(this);
GetNextFrame(super);
}
if (this->timer-- == 0) {
if (super->timer-- == 0) {
DeleteThisEntity();
}
}
void sub_08019444(Entity* this) {
GetNextFrame(this);
LinearMoveUpdate(this);
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
void sub_08019444(PlayerItemBowEntity* this) {
GetNextFrame(super);
LinearMoveUpdate(super);
if (GravityUpdate(super, Q_8_8(32.0)) == 0) {
DeleteThisEntity();
}
}