mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-07 11:21:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

big cleanup part 1

Browse Source
This commit is contained in:
Henny022p
2021-03-09 04:22:03 +01:00
parent cdb6f5a17e
commit d6c379cb3e
198 changed files with 398 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/acroBandits.c
-4
View File
@@ -4,7 +4,6 @@
extern u32 sub_080002D4(s32, s32, u32);
extern s32 sub_080012DC(Entity*);
extern u32 sub_080044EC(Entity*, u32);
extern u32 sub_08031E04(Entity*);
extern void sub_08031E48(Entity*, Entity*);
extern void sub_08032290(Entity*);
@@ -12,10 +11,7 @@ extern u32 sub_080322A4(Entity*);
void sub_080322E8(Entity*);
extern void sub_08032338(Entity*);
extern Entity* sub_08049DF4(u32);
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern u32 GetNextFunction(Entity*);
extern void SetChildOffset(Entity*, s32, s32, s32);
extern Entity* gUnk_020000B0;
extern u8 gEntCount;
src/enemy/beetle.c
+1 -1
View File
@@ -5,7 +5,7 @@
extern u32 PlayerInRange(Entity*, u32, u32);
u32 sub_08021D00();
void sub_08021D44(Entity* this, u32 param_2);
void sub_08021D44(Entity* this, u32 direction);
extern void (*const gUnk_080CB590[])(Entity*);
extern void (*const gUnk_080CB5A8[])(Entity*);
src/enemy/bladeTrap.c
+1 -2
View File
@@ -1,10 +1,9 @@
#include "global.h"
#include "entity.h"
#include "room.h"
#include "functions.h"
extern void sub_080A2CC0();
extern void sub_0806F69C();
extern void EnqueueSFX();
void BladeTrap(Entity* this) {
if (this->action == 0) {
src/enemy/bombPeahat.c
-3
View File
@@ -4,14 +4,11 @@
#include "player.h"
extern void sub_08078954(Entity*);
extern u32 sub_0800442E(Entity*);
extern void sub_08078930(Entity*);
extern s32 sub_080012DC(Entity*);
extern u32 GetNextFunction(Entity*);
extern void sub_0806F4E8(Entity*);
extern Entity* sub_08049DF4(u32);
extern void sub_08079BD8(Entity*);
extern u32 GetTileTypeByEntity(Entity*);
void sub_0802AD1C(Entity*, u32);
void sub_0802AD54(Entity*);
src/enemy/bowMoblin.c
+3 -5
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "entity.h"
#include "enemy.h"
#include "functions.h"
extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
extern void SetChildOffset(Entity*, u32, u32, u32);
extern void sub_0804A9FC(Entity*, u32);
extern void sub_0804AA30(Entity*, void (*const funcs[][])(Entity*));
extern void sub_0803C5F0(Entity*);
extern void (*const gUnk_080CFF78[])(Entity*);
@@ -25,7 +23,7 @@ void sub_0803C198(Entity* this) {
if (this->field_0x43 != 0) {
sub_0804A9FC(this, 0x1c);
}
sub_0804AA30(this, &gUnk_080CFF78);
sub_0804AA30(this, gUnk_080CFF78);
if ((this->bitfield & 0x80) != 0) {
sub_0803C5F0(this);
pEVar1 = this->attachedEntity;
src/enemy/chuchuBoss.c
-4
View File
@@ -2,8 +2,6 @@
#include "entity.h"
#include "functions.h"
extern void sub_08078B48(void);
void sub_08027870(Entity*);
extern void (*const gUnk_080CC19C[])(Entity*);
@@ -36,13 +34,11 @@ void sub_08025CBC(Entity* this) {
void sub_08025DC0(Entity*);
void sub_08025CD4(Entity*);
void sub_08001242(Entity*);
void sub_08025DD8(Entity*);
void sub_08026060(Entity*);
void sub_08026110(Entity*);
void sub_080272D4(Entity*);
void sub_0802720C(Entity*);
void sub_0802720C(Entity*);
void sub_08026090(Entity*);
void sub_0802626C(Entity*);
void sub_08026580(Entity*);
src/enemy/gyorgMale.c
-1
View File
@@ -26,7 +26,6 @@ const u8 gUnk_080D1C44[0xC];
const u16 gUnk_080D1C50[8];
const u16 gUnk_080D1C60[8];
void GyorgMale(Entity*);
void sub_08046898(Entity*); // action 0
void sub_08046910(Entity*); // action 1
void sub_08046930(Entity*); // action 1 previousActionFlag 0
src/enemy/keaton.c
+4 -4
View File
@@ -164,17 +164,17 @@ void sub_08032650(Entity* this) {
sub_0803269C(this, this->direction);
}
void sub_0803269C(Entity* this, u32 param_2) {
void sub_0803269C(Entity* this, u32 direction) {
u32 uVar1;
if (((param_2 - 3) & 7) < 3) {
uVar1 = DirectionToAnimationState(param_2);
if (((direction - 3) & 7) < 3) {
uVar1 = DirectionToAnimationState(direction);
if (((this->animationState - uVar1) & 3) > 1) {
this->animationState = uVar1;
InitAnimationForceUpdate(this, (this->animIndex & 0xFC) + uVar1);
}
} else {
uVar1 = DirectionToAnimationState(param_2);
uVar1 = DirectionToAnimationState(direction);
if (uVar1 != this->animationState) {
this->animationState = uVar1;
InitAnimationForceUpdate(this, (this->animIndex & 0xFC) + uVar1);
src/enemy/keese.c
-7
View File
@@ -5,16 +5,9 @@
#include "functions.h"
extern void sub_08001328(Entity*);
extern u32 sub_0806F520(Entity*);
extern void sub_0806F4E8(Entity*);
extern u32 sub_0806F3E4(Entity*);
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void Keese_StartFly(Entity*);
extern void sub_080AEFB4(Entity*);
extern void sub_08021F24(Entity*);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049EE4(Entity*);
extern void (*const gKeeseFunctions[])(Entity*);
extern void (*const gKeeseActions[])(Entity*);
src/enemy/lakitu.c
-47
View File
@@ -7,51 +7,6 @@
extern void (*const LakituActionFuncs[])(Entity*);
// Lakitu
extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*));
// sub_0803C784
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
// sub_0803C820
extern u32 sub_0806F520(Entity*);
// sub_0803C850
extern void sub_0806F4E8(Entity*);
// Lakitu_Initialize
extern void sub_0804A720(Entity*);
// Lakitu_Cloudless
extern u32 sub_08003FC4(Entity*, u32);
// sub_0803CA4C
extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
// sub_0803CAD0
extern u32 sub_080AEFE0(Entity*);
// Lakitu_SpawnLightning
void PositionRelative(Entity*, Entity*, s32, s32);
extern void EnqueueSFX(u32);
// sub_0803CC08
extern void DeleteEntity(Entity*);
// Part of function tables
extern void sub_08001324(Entity*);
extern void sub_0804A7D4(Entity*);
extern void sub_08001242(Entity*);
// Used in multiple functions
extern Entity* CreateFx(Entity*, u32, u32);
extern Entity* sub_0804A98C(Entity* positionEntity, u8 subtype,
u8 form); // Creates a projectile positioned at the given entity
extern void UpdateAnimationSingleFrame(Entity*);
extern void InitAnimationForceUpdate(Entity*, u32);
extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern u32 GetFacingDirection(Entity*, Entity*);
// Forward references to functions in lakitu.c
extern void sub_0803CAD0(Entity*);
extern void sub_0803CBAC(Entity*);
@@ -78,8 +33,6 @@ typedef struct {
s8 y;
} PACKED OffsetCoords;
// sub_0803CC08
extern void DeleteEntity(Entity*);
// Variables
extern void (*const gUnk_080D0110[])(Entity*);
src/enemy/lakituCloud.c
+1 -9
View File
@@ -1,25 +1,17 @@
#include "global.h"
#include "entity.h"
#include "player.h"
#include "functions.h"
extern u32 GetNextFunction(Entity*);
extern void sub_0804A7D4(Entity*);
extern void sub_08001242(Entity*);
extern void (*const gUnk_080D0418[6])(Entity*);
extern void (*const gUnk_080D0430[3])(Entity*);
extern void (*const gUnk_080D043C[3])(Entity*);
extern bool32 sub_0806F3E4(Entity*);
extern bool32 sub_0806F520(Entity*);
extern void sub_0800449C(Entity*, u32);
extern void sub_0803CE14(Entity*);
extern void sub_0803CE3C(Entity*);
extern Entity* GetCurrentRoomProperty(u8);
extern void sub_0806F4E8(Entity*);
extern void sub_0806F69C(Entity*);
extern void sub_08079D84(void);
extern void sub_080A2CC0(Entity*, Entity**, u16*);
src/enemy/leever.c
-6
View File
@@ -3,14 +3,8 @@
#include "enemy.h"
#include "functions.h"
extern void SetChildOffset(Entity*, s32, s32, s32);
extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
extern void sub_0804A7D4(Entity*);
extern Entity* CreateDeathFx(Entity*, u32, u32);
extern void sub_0804A720(Entity*);
extern u32 sub_080002D4(s32, s32, u32);
extern u32 sub_080002BC(s32, s32, u32);
extern u32 sub_08049FDC(Entity*, u32);
extern Entity* gUnk_020000B0;
extern s16 gSineTable[];
src/enemy/likeLike.c
-1
View File
@@ -5,7 +5,6 @@
#include "save.h"
extern bool32 sub_080544B4(u32);
extern void sub_0807CAA0(u32, u32);
void sub_0802810C(Entity*);
void sub_080281A0(Entity*);
src/enemy/miniFireballGuy.c
-4
View File
@@ -2,10 +2,6 @@
#include "entity.h"
#include "functions.h"
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void sub_08045678(Entity*);
extern void sub_08045678(Entity*);
extern void (*const gUnk_080D1868[])(Entity*);
src/enemy/miniSlime.c
-3
View File
@@ -6,11 +6,8 @@
void sub_08045374(Entity*);
extern u32 sub_0806FA04(u32, u32);
extern void sub_0804A720();
extern void sub_080452E4();
extern void sub_0804AA30();
extern void ReplaceMonitoredEntity(Entity*, Entity*);
extern void sub_0804A7D4(Entity*);
extern void (*const gUnk_080D17C0[])(Entity*);
extern void (*const gUnk_080D17D8[])(Entity*);
src/enemy/octorok.c
-8
View File
@@ -2,14 +2,6 @@
#include "entity.h"
#include "functions.h"
extern void EnemyFunctionHandler();
extern void SetChildOffset();
extern void sub_0804AA30();
extern void sub_0804A7D4();
extern u32 sub_0806F520();
extern void sub_0806F4E8();
extern void UpdateAnimationVariableFrames();
extern void sub_0804A720();
extern Entity* sub_08049DF4(u32);
void Octorok_Pause();
src/enemy/pesto.c
-2
View File
@@ -3,10 +3,8 @@
#include "functions.h"
extern u32 sub_080002E0(u16, u32);
extern u32 CheckIsDungeon(void);
extern void sub_0800449C(Entity*, u32);
extern u32 sub_08049F1C(Entity*, Entity*, u32);
extern void sub_0804AA30(Entity*, void (*const funcs[])(Entity*));
extern u32 PlayerInRange(Entity*, u32, u32);
extern void sub_080AEFB4(Entity*);
extern Entity* FindNextEntityOfSameSubtype(Entity* ent, int listIndex);
src/enemy/puffstool.c
-1
View File
@@ -8,7 +8,6 @@ extern u16 sub_080002A8(u32, u32, u32);
extern u16 sub_080002D4(u32, u32, u32);
extern void sub_0804AA1C(Entity*);
extern Entity* sub_08049DF4(u32);
extern void sub_0807B7D8(u32, u32, u32);
extern u8 gUnk_080B37A0[];
extern u8 gUnk_080B3E80[];
src/enemy/slime.c
-3
View File
@@ -16,10 +16,7 @@ typedef struct {
void sub_08044FF8(Entity*);
void sub_08045178(Entity*, Entity*, int, int);
extern void sub_0804A720(Entity*);
extern u32 sub_0806FA04(u32, u32);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049EE4(Entity*);
extern void sub_0804A4E4(Entity*, Entity*);
extern u32 sub_080002CC(Entity*, s32, s32);
src/enemy/smallPesto.c
+3 -12
View File
@@ -1,17 +1,10 @@
#include "global.h"
#include "entity.h"
#include "position.h"
#include "functions.h"
extern u32 GetNextFunction(Entity*);
extern u32 sub_0806F520(Entity*);
extern void sub_0806F4E8(Entity*);
extern u32 sub_0806F3E4();
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void sub_080317F8(Entity*);
extern u32 sub_08049FA0(Entity*);
extern u32 Random();
extern u32 sub_08049EE4(Entity*);
extern void sub_0806F69C(Entity*);
extern void (*gUnk_080CE530[])(Entity*);
extern void (*gUnk_080CE548[])(Entity*);
@@ -19,7 +12,6 @@ extern void (*gUnk_080CE554[])(Entity*);
void sub_080317B4(Entity*);
void sub_080317E0(Entity*);
void sub_080317F8(Entity*);
void sub_08031840(Entity*);
extern Hitbox gUnk_080CE560;
@@ -61,7 +53,7 @@ void sub_080316E8(Entity* this) {
}
void sub_080316F0(Entity* this) {
if (sub_0806F3E4()) {
if (sub_0806F3E4(this)) {
sub_0804A7D4(this);
}
}
@@ -101,7 +93,6 @@ void sub_08031770(Entity* this) {
this->attachedEntity = NULL;
}
}
return;
}
void sub_080317B4(Entity* this) {
src/enemy/spearMoblin.c
-1
View File
@@ -3,7 +3,6 @@
#include "functions.h"
extern bool32 sub_0806FC80(Entity*, Entity*, u32);
extern Entity* sub_080A7EE0(u32);
extern Entity* sub_08049DF4(u32);
void sub_08028604(Entity*);
src/enemy/tektite.c
-4
View File
@@ -62,8 +62,6 @@ void sub_0802F1F0(Entity* this) {
}
}
extern u8 gUnk_080CDEF8[];
void sub_0802F210(Entity* this) {
u32 temp;
u32 temp2;
@@ -106,8 +104,6 @@ void sub_0802F284(Entity* this) {
}
}
extern u8 gUnk_080CDEF8[];
void sub_0802F300(Entity* this) {
s32 temp;
u32 rand;
src/enemy/vaatiBall.c
-2
View File
@@ -136,8 +136,6 @@ void sub_080447E0(Entity* this) {
}
}
extern u32 sub_080045B4();
extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern void sub_08044DEC();
void sub_08044868(Entity* this) {
src/enemy/wallMaster2.c
-1
View File
@@ -3,7 +3,6 @@
#include "area.h"
extern void sub_08001328(Entity*);
extern u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern void DoExitTransition(u32*);
extern Entity* gUnk_020000B0;