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

gyorgMale.c: ok

This commit is contained in:
Ibot02 2020-11-23 17:17:20 +01:00
parent d2d35118bc
commit 140a473622
9 changed files with 1108 additions and 3473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3466
asm/gyorgMale.s
View File

File diff suppressed because it is too large Load Diff

7
include/functions.h
View File

@ -270,4 +270,11 @@ extern u32 sub_0800442E(Entity*);
extern void sub_08081404(Entity*, u32);
extern void sub_0807B7D8(u32, u32, u32);
extern void sub_08052D74(void*, void*, void*);
extern u32 sub_080045DA(s32, s32);
u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern Entity* sub_080A7EE0(u32);
extern void sub_080A1D70(Entity*, u32);
extern void sub_0806F62C(Entity*, u32, u32);
extern u32 sub_08079F8C(void);
extern void sub_080A1ED0(u32, u32, u32);
#endif

3
include/player.h
View File

@ -47,7 +47,8 @@ typedef struct {
/* */ u32 filler11b : 16;
/* */ } PACKED b;
/* */ } flags;
/*0x34*/ u8 field_0x34[4];
/*0x34*/ u8 field_0x34[2];
/*0x36*/ s16 field_0x36;
/*0x38*/ u8 field_0x38;
/*0x39*/ u8 field_0x39;
/*0x3a*/ u16 field_0x3a;

2
linker.ld
View File

@ -424,7 +424,7 @@ SECTIONS {
asm/enemy5A.o(.text);
asm/businessScrubPrologue.o(.text);
asm/gyorgFemale.o(.text);
asm/gyorgMale.o(.text);
src/enemy/gyorgMale.o(.text);
asm/curtain.o(.text);
asm/enemy5F.o(.text);
asm/gyorgChild.o(.text);

1098
src/enemy/gyorgMale.c Normal file
View File

File diff suppressed because it is too large Load Diff

1
src/enemy/keese.c
View File

@ -13,7 +13,6 @@ extern void sub_0804A720(Entity*);
extern void Keese_StartFly(Entity*);
extern void sub_080AEFB4(Entity*);
extern void sub_08021F24(Entity*);
extern u32 sub_0806FCB8(Entity*, s32, s32, u32);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049EE4(Entity*);

1
src/npc/townMinish.c
View File

@ -15,7 +15,6 @@ extern void sub_0806AEE4(Entity*);
extern void sub_0806AFE8(Entity*, s32*);
extern s32 sub_0806EDD8(Entity*, u32, u32);
extern u32 sub_0806F5B0(u32);
extern void sub_0806F62C(Entity*, s32, s32);
extern void sub_08078784(Entity*, u32);
extern void sub_08078850(Entity*, u32, u32, u32*);

1
src/npc/zelda.c
View File

@ -15,7 +15,6 @@ u32 GetAnimationState(Entity* ent);
void DeleteThisEntity(void);
extern Entity* GetEntityByType(u32, u32);
extern void sub_080686C4(Entity*, Entity*);
extern void sub_0806F62C(Entity*, u32, u32);
extern void PlaySFX(u32);
extern void SetTileType(u32, u32, u32);

2
src/object/objectA2.c
View File

@ -21,8 +21,6 @@ typedef struct {
const struct_08124708 gUnk_08124708[5] = { { 0, 0x2F }, { 1, 0x20 }, { 1, 0x16 }, { 2, 0x10 }, { 3, 0x01 } };
extern u32 sub_080045DA(s32, u32);
void ObjectA2(Entity* this) {
gUnk_081246F4[this->action](this);
GetNextFrame(this);