mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-10 04:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

sort out most of functions.h

Browse Source
This commit is contained in:
theo3
2022-03-30 00:52:53 -07:00
parent 65b80571b2
commit a633efd88c
81 changed files with 400 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/bird.c
+6 -4
View File
@@ -4,6 +4,7 @@
#include "item.h"
#include "message.h"
#include "game.h"
#include "collision.h"
extern u16 script_EzloTalkOcarina[];
@@ -211,10 +212,11 @@ void Bird_Type8(Entity* this) {
this->speed = 0x300;
}
if ((gPlayerEntity.flags & ENT_COLLIDE) && (gMessage.doTextBox & 0x7f) == 0 && gPlayerEntity.action != PLAYER_SLEEP &&
gPlayerEntity.action != PLAYER_BOUNCE && gPlayerEntity.action != PLAYER_MINISH && gPlayerState.framestate != PL_STATE_CLIMB &&
gPlayerState.framestate != PL_STATE_JUMP && gPlayerState.framestate != PL_STATE_PARACHUTE && PlayerCanBeMoved() &&
(EntityInRectRadius(this, &gPlayerEntity, 0xe, 0xe))) {
if ((gPlayerEntity.flags & ENT_COLLIDE) && (gMessage.doTextBox & 0x7f) == 0 &&
gPlayerEntity.action != PLAYER_SLEEP && gPlayerEntity.action != PLAYER_BOUNCE &&
gPlayerEntity.action != PLAYER_MINISH && gPlayerState.framestate != PL_STATE_CLIMB &&
gPlayerState.framestate != PL_STATE_JUMP && gPlayerState.framestate != PL_STATE_PARACHUTE &&
PlayerCanBeMoved() && (EntityInRectRadius(this, &gPlayerEntity, 0xe, 0xe))) {
s32 z = gPlayerEntity.z.HALF.HI - this->z.HALF.HI - 8;
if ((u16)z < 0x20 && gPlayerEntity.health != 0) {
pEVar5 = CreateObject(0x95, 10, 0);
src/object/book.c
+1
View File
@@ -3,6 +3,7 @@
#include "message.h"
#include "item.h"
#include "npc.h"
#include "collision.h"
extern void (*const BookActionFuncs[])(Entity*);
extern s8 const gUnk_08123D94[];
src/object/fairy.c
+1
View File
@@ -11,6 +11,7 @@
#include "functions.h"
#include "item.h"
#include "hitbox.h"
#include "collision.h"
typedef struct {
/*0x00*/ Entity base;
src/object/fan.c
+1
View File
@@ -6,6 +6,7 @@
#include "functions.h"
#include "sound.h"
#include "object.h"
#include "collision.h"
typedef struct {
Entity base;
src/object/fourElements.c
+1
View File
@@ -12,6 +12,7 @@
#include "hitbox.h"
#include "screen.h"
#include "message.h"
#include "collision.h"
typedef struct {
/*0x00*/ Entity base;
src/object/heartContainer.c
+1
View File
@@ -3,6 +3,7 @@
#include "flags.h"
#include "functions.h"
#include "item.h"
#include "collision.h"
static void sub_0808E6A0(Entity*);
static void sub_0808E6E4(Entity*);
src/object/itemOnGround.c
+1
View File
@@ -8,6 +8,7 @@
#include "itemMetaData.h"
#include "functions.h"
#include "hitbox.h"
#include "collision.h"
void sub_08081150(Entity*);
u8 sub_0808147C(u32);
src/object/lightableSwitch.c
+8 -3
View File
@@ -6,11 +6,16 @@
#include "flags.h"
#include "functions.h"
#include "hitbox.h"
#include "object.h"
extern void (*const gUnk_081243B4[])(Entity*);
extern void (*const gUnk_081243BC[])(Entity*);
extern void (*const gUnk_081243C4[])(Entity*);
static void sub_0809EB30(Entity* this);
static void sub_0809EAD8(Entity* this);
static void sub_0809EABC(Entity* this);
void LightableSwitch(Entity* this) {
gUnk_081243B4[this->type](this);
sub_0809EB30(this);
@@ -47,7 +52,7 @@ void sub_0809EA80(Entity* this) {
sub_0809EABC(this);
}
void sub_0809EABC(Entity* this) {
static void sub_0809EABC(Entity* this) {
bool32 anySet = 0;
if (CheckFlags(this->field_0x86.HWORD)) {
@@ -58,7 +63,7 @@ void sub_0809EABC(Entity* this) {
}
}
void sub_0809EAD8(Entity* this) {
static void sub_0809EAD8(Entity* this) {
u8 bVar1;
Entity* pEVar2;
@@ -72,7 +77,7 @@ void sub_0809EAD8(Entity* this) {
}
}
void sub_0809EB30(Entity* this) {
static void sub_0809EB30(Entity* this) {
u16 uVar1;
u16* puVar2;
src/object/macroShoes.c
-1
View File
@@ -1,7 +1,6 @@
#include "entity.h"
#include "asm.h"
void sub_0800445C(Entity*);
void MacroShoes_Init(Entity*);
void MacroShoes_Idle(Entity*);
src/object/object30.c
+1
View File
@@ -10,6 +10,7 @@
#include "object.h"
#include "functions.h"
#include "item.h"
#include "collision.h"
typedef struct {
/*0x00*/ Entity base;
src/object/object96.c
+1
View File
@@ -7,6 +7,7 @@
#include "item.h"
#include "flags.h"
#include "effects.h"
#include "collision.h"
typedef struct _struct_gUnk_08123FB0 {
void (*const funcEnt)(Entity*);
src/object/object98.c
+1
View File
@@ -3,6 +3,7 @@
#include "projectile.h"
#include "room.h"
#include "functions.h"
#include "object.h"
typedef struct {
Entity base;
src/object/objectA8.c
+1
View File
@@ -11,6 +11,7 @@
#include "functions.h"
#include "item.h"
#include "hitbox.h"
#include "collision.h"
typedef struct {
/*0x00*/ Entity base;
src/object/objectB2.c
+1
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "collision.h"
extern u8 gUnk_02027EB4[];
extern u8 gUnk_0200D654[];
src/object/pressurePlate.c
+1
View File
@@ -2,6 +2,7 @@
#include "object.h"
#include "functions.h"
#include "hitbox.h"
#include "collision.h"
typedef struct {
Entity base;
src/object/treeHidingPortal.c
+8 -3
View File
@@ -6,6 +6,7 @@
#include "room.h"
#include "functions.h"
#include "effects.h"
#include "object.h"
extern const s16 gUnk_080B4468[];
@@ -14,6 +15,10 @@ void sub_0809E86C(Entity* this);
void sub_0809E8BC(Entity* this);
void sub_0809E8EC(Entity* this);
static void sub_0809E96C(Entity* this);
static u32 sub_0809E9A0(void);
static void sub_0809E918(Entity* this);
void TreeHidingPortal(Entity* this) {
static void (*const actionFuncs[])(Entity*) = {
sub_0809E83C,
@@ -69,7 +74,7 @@ void sub_0809E8EC(Entity* this) {
}
}
void sub_0809E918(Entity* this) {
static void sub_0809E918(Entity* this) {
static const s16 gUnk_08124364[] = {
0, -4, 8, -4, 16, -4, 22, -4, -8, -4, -16, -4, -22, -4, 0, -12, 0, 4, 8, -12,
8, 4, -8, -12, -8, 4, 8, -16, -8, -16, 12, -16, -12, -16, 16, -14, -16, -14, -1000, 0,
@@ -88,11 +93,11 @@ void sub_0809E918(Entity* this) {
}
}
void sub_0809E96C(Entity* this) {
static void sub_0809E96C(Entity* this) {
CreateMinishEntrance(COORD_TO_TILE_OFFSET(this, 0x20, 0x8));
}
u32 sub_0809E9A0(void) {
static u32 sub_0809E9A0(void) {
u32 rv;
const s16* ptr;
src/object/windTribeTeleporter.c
+1
View File
@@ -10,6 +10,7 @@
#include "object.h"
#include "functions.h"
#include "hitbox.h"
#include "collision.h"
typedef struct {
/*0x00*/ Entity base;