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

Review Fixes

This commit is contained in:
Tal Hayon 2021-12-31 01:06:02 +02:00
parent a139e43d93
commit 68973c163b
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/enemy.h
View File

@ -12,7 +12,7 @@
#include "entity.h"
extern u32 GetNextFunction(Entity*);
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void EnemyFunctionHandler(Entity*, EntityActionArray);
extern void sub_08001324(Entity*);
extern Entity* sub_0804A9FC(Entity*, u32);

4
include/entity.h
View File

@ -149,6 +149,10 @@ typedef struct Entity_ {
#endif
} Entity;
typedef void(EntityAction)(Entity*);
typedef void(*EntityActionPtr)(Entity*);
typedef void(*const* EntityActionArray)(Entity*);
typedef struct LinkedList {
Entity* last;
Entity* first;

2
include/functions.h
View File

@ -48,7 +48,7 @@ extern void ChangeObjPalette(Entity*, u32);
extern void sub_0806FD3C(Entity*);
extern void sub_0805ED14(u32*);
extern void sub_080A7C18(u32, u32, u32);
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
extern void sub_0804AA30(Entity*, EntityActionArray);
extern void sub_0804A720(Entity*);
extern u32 sub_080AEFE0(Entity*);
extern u32 sub_08049FA0(Entity*);

12
src/enemy/bowMoblin.c
View File

@ -30,8 +30,8 @@ extern Entity* sub_08049DF4(u32);
extern u32 sub_0806FC80(Entity*, Entity*, s32);
void sub_0803C664(BowMoblinEntity*);
extern void (*const gUnk_080CFF78[])(Entity*);
extern void (*const gUnk_080CFF90[])(Entity*);
extern void (*const gUnk_080CFF78[])(BowMoblinEntity*);
extern void (*const gUnk_080CFF90[])(BowMoblinEntity*);
extern const s8 gUnk_080CFFC4[8];
extern const s8 gUnk_080CFFA4[8];
@ -39,12 +39,12 @@ extern const s8 gUnk_080CFFAC[16];
extern const u16 gUnk_080CFFBC[4];
void BowMoblin(Entity* this) {
EnemyFunctionHandler(this, gUnk_080CFF78);
EnemyFunctionHandler(this, (EntityActionArray)gUnk_080CFF78);
SetChildOffset(this, 0, 1, -0x18);
}
void sub_0803C180(BowMoblinEntity* this) {
gUnk_080CFF90[super->action](super);
gUnk_080CFF90[super->action](this);
}
void sub_0803C198(BowMoblinEntity* this) {
@ -53,7 +53,7 @@ void sub_0803C198(BowMoblinEntity* this) {
if (super->field_0x43 != 0) {
sub_0804A9FC(super, 0x1c);
}
sub_0804AA30(super, gUnk_080CFF78);
sub_0804AA30(super, (EntityActionArray)gUnk_080CFF78);
if ((super->bitfield & 0x80) != 0) {
sub_0803C5F0(this);
pEVar1 = super->child;
@ -371,7 +371,7 @@ u32 sub_0803C6F8(BowMoblinEntity* this) {
}
void sub_0803C714(BowMoblinEntity* this) {
Entity* child = super->child; // Unused
Entity* child = super->child;
const s8* tmp;
u32 offsetX;
u32 offsetY;

2
src/player.c
View File

@ -31,8 +31,6 @@
#define DEFAULT_ANIM 0x100
typedef void(EntityAction)(Entity*);
static EntityAction PlayerInit;
static EntityAction PlayerNormal;
// static EntityAction PlayerInit;