mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-10 23:22:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into takkuri

Browse Source
This commit is contained in:
Tal Hayon
2022-01-11 12:58:21 +02:00
parent c3bada6cd0 688508b1af
commit d852efec29
43 changed files with 2513 additions and 5357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/enemy.h
+5 -5
View File
@@ -223,14 +223,14 @@ void FireballGuy(Entity*);
void MiniFireballGuy(Entity*);
void VaatiTransfiguredEye(Entity*);
void BusinessScrubPrologue(Entity*);
void GyorgFemale(Entity*);
void GyorgMale(Entity*);
void GyorgFemale();
void GyorgMale();
void Curtain(Entity*);
void VaatiWrathEye(Entity*);
void GyorgChild(Entity*);
void GyorgFemaleEye(Entity*);
void GyorgChild();
void GyorgFemaleEye();
void Enemy62(Entity*);
void GyorgFemaleMouth(Entity*);
void GyorgFemaleMouth();
void Enemy64(Entity*);
void TreeItem(Entity*);
void Enemy66(Entity*);
include/enemy/gyorg.h
+93
View File
@@ -0,0 +1,93 @@
#ifndef ENEMY_GYORG_H
#define ENEMY_GYORG_H
#include "enemy.h"
typedef struct {
Entity base;
u8 unk_68[0x8];
u16 unk_70;
u8 unk_72[0x6];
u8 unk_78;
u8 unk_79;
u16 unk_7a;
u8 unk_7c;
u8 unk_7d;
u8 unk_7e[1];
u8 unk_7f;
u8 unk_80;
u8 unk_81[1];
u8 unk_82;
u8 unk_83[5];
} GyorgFemaleEntity;
typedef struct {
Entity base;
u8 unk_68[0x20];
} GyorgFemaleEyeEntity;
typedef struct {
Entity base;
u8 filler[0x20];
} GyorgFemaleMouthEntity;
typedef struct {
Entity base;
u8 unk_68[0x8];
u16 unk_70;
u16 unk_72;
u16 unk_74;
u16 unk_76;
u16 unk_78;
u16 unk_7a;
u8 unk_7c;
u8 unk_7d;
u16 unk_7e;
u16 unk_80;
u16 unk_82;
u16 unk_84;
u16 unk_86;
} GyorgMaleEntity;
typedef struct {
Entity base;
u8 unk_68[0xC];
u16 unk_74;
u16 unk_76;
u16 unk_78;
u8 unk_7a;
u8 unk_7b;
u8 unk_7c[0xC];
} GyorgChildEntity;
typedef struct {
Entity base;
u8 unk_68[4];
u16 unk_6c;
u16 unk_6e;
u16 unk_70;
u16 unk_72;
u8 unk_74;
u8 unk_75;
u16 unk_76;
u16 unk_78;
u8 unk_7a;
u8 unk_7b;
u16 unk_7c;
u8 unk_7e[0xa];
} GyorgBossObjectEntity;
typedef struct {
GyorgBossObjectEntity* boss;
GyorgFemaleEntity* female;
GyorgMaleEntity* male1;
GyorgMaleEntity* male2;
GyorgFemaleMouthEntity* unk_10;
GenericEntity* unk_14;
void* unk_18[0x8];
u16 unk_38;
u16 unk_3a;
u8 unk_3c;
} GyorgHeap;
#endif
include/entity.h
+19 -1
View File
@@ -195,7 +195,7 @@ typedef struct Entity_ {
/*0x60*/ u16 spriteVramOffset;
/*0x62*/ u8 spriteOffsetX;
/*0x63*/ s8 spriteOffsetY;
/*0x64*/ u32* myHeap; /**< Heap data allocated with #zMalloc. */
/*0x64*/ void* myHeap; /**< Heap data allocated with #zMalloc. */
#ifndef NENT_DEPRECATED
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
@@ -214,6 +214,24 @@ typedef struct Entity_ {
#endif
} Entity;
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ union SplitHWord field_0x6c;
/*0x6e*/ union SplitHWord field_0x6e;
/*0x70*/ union SplitWord field_0x70;
/*0x74*/ union SplitHWord field_0x74;
/*0x76*/ union SplitHWord field_0x76;
/*0x78*/ union SplitHWord field_0x78;
/*0x7a*/ union SplitHWord field_0x7a;
/*0x7c*/ union SplitWord field_0x7c;
/*0x80*/ union SplitHWord field_0x80;
/*0x82*/ union SplitHWord field_0x82;
/*0x84*/ union SplitHWord cutsceneBeh;
/*0x86*/ union SplitHWord field_0x86;
} GenericEntity;
/**
* Entity linked list structure.
*/
include/functions.h
+2 -3
View File
@@ -26,7 +26,7 @@ extern void sub_0806D02C(Entity*);
extern void sub_0806FD3C(Entity*);
extern void sub_0805ED14(u32*);
extern void sub_080A7C18(u32, u32, u32);
extern void sub_0804AA30(Entity*, EntityActionArray);
extern void sub_0804AA30(Entity*, void (*const[])());
extern void sub_0804A720(Entity*);
extern u32 sub_080AEFE0(Entity*);
extern u32 sub_08049FA0(Entity*);
@@ -49,7 +49,7 @@ extern void sub_080575C8(u32);
extern void sub_08057688(void);
extern void sub_080580B0(u32);
extern void sub_080751E8(u32, u32, void*);
extern void sub_0808091C(ScreenTransitionData*, u32);
extern void sub_0808091C(const ScreenTransitionData*, u32);
extern void sub_0805BC4C(void);
extern void sub_0807BB68(u32*, u32, u32);
extern void sub_08054570(void);
@@ -96,7 +96,6 @@ extern u32 sub_0805F8F8(u32);
extern u32 sub_0805F7A0(u32);
extern u32* sub_0805F25C(u32);
u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern void sub_080A1D70(Entity*, u32);
extern void sub_0806F62C(Entity*, u32, u32);
extern void sub_080A1ED0(u32, u32, u32);
extern u32 sub_0806F5B0(u32);
include/room.h
+1 -1
View File
@@ -215,6 +215,6 @@ void LoadRoomEntityList(EntityData* listPtr);
void sub_0804B3C4(void*);
void sub_0804B0B0(u32 arg0, u32 arg1);
void DoExitTransition(ScreenTransitionData* data);
void DoExitTransition(const ScreenTransitionData* data);
#endif