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

Merge branch 'master' into ply

Browse Source
This commit is contained in:
notyourav
2021-03-17 20:23:01 -07:00
committed by GitHub
parent a39686c24c 2d1b0da52e
commit 8b81269271
250 changed files with 580 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/archway.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "entity.h"
#include "sprite.h"
#include "functions.h"
#include "game.h"
void Archway(Entity* this) {
if (this->action == 0) {
src/object/backgroundCloud.c
+1
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "entity.h"
#include "random.h"
#include "functions.h"
extern void (*const gUnk_08121EA4[])(Entity*);
src/object/bell.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "entity.h"
#include "global.h"
#include "entity.h"
extern void (*gUnk_08123384[])(Entity*);
src/object/bird.c
+2 -1
View File
@@ -1,8 +1,9 @@
#include "global.h"
#include "entity.h"
#include "flags.h"
#include "functions.h"
#include "save.h"
#include "random.h"
#include "functions.h"
extern void (*const gUnk_08123EC0[])(Entity*);
extern void (*const gUnk_08123EEC[])(Entity*);
src/object/button.c
+1 -6
View File
@@ -105,7 +105,6 @@ void sub_08081C98(Entity* this) {
}
Entity* sub_08081D74(Entity*);
void sub_0807B7D8(u32, u32, u32);
u32 sub_080001DA(u32, u32);
u32 sub_08081CB0(Entity* this) {
@@ -142,8 +141,7 @@ u32 sub_08081D28(Entity* this) {
}
extern u32 sub_080002E0(u32, u32);
extern Entity* gUnk_03004040[];
extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
extern Entity* gUnk_03004040[3];
u32 sub_08081E0C(Entity*);
Entity* sub_08081D74(Entity* this) {
@@ -171,8 +169,6 @@ Entity* sub_08081D74(Entity* this) {
return ent;
}
extern u32 sub_08079F8C();
u32 sub_08081E0C(Entity* this) {
Entity* tmp = &gPlayerEntity;
if (tmp->height.HALF.HI != 0 || !sub_08079F8C()) {
@@ -273,7 +269,6 @@ u32 sub_08081F7C(Entity* this, u32 r7) {
return 1;
}
extern Entity* gUnk_03004040[3];
extern void sub_080044AE(Entity*, u32, u32);
void sub_08081FF8(Entity* this) {
src/object/chestSpawner.c
-1
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "entity.h"
#include "flags.h"
extern void sub_080842D8(Entity*);
extern void sub_08078828(Entity*);
src/object/cloud.c
+2 -14
View File
@@ -3,29 +3,17 @@
#include "room.h"
#include "player.h"
#include "flags.h"
#include "random.h"
#include "functions.h"
#include "structures.h"
extern void sub_0809F7BC(Entity*);
extern void SoundReq(u32);
extern void sub_0809F814(u32);
extern void sub_0809F7F4(Entity*);
extern void LoadRoomEntityList();
extern void DeleteThisEntity();
extern u32 CheckRoomFlag(u32);
extern void sub_08078A90(u32);
extern void sub_08078B48(void);
extern void sub_0806F69C(Entity*);
extern void (*gUnk_08124798[])(Entity*);
extern void (*gUnk_081247A0[])(Entity*);
extern void (*gUnk_081247AC[])(Entity*);
extern Entity* CreateObject(u32, u32, u32);
extern void PositionEntityOnTop(Entity*, Entity*);
extern void sub_0807BB68(u32*, u32, u32);
extern void* gUnk_080DD750;
extern Entity gPlayerEntity;
extern PlayerState gPlayerState;
extern u8 gUnk_081247C0[];
extern u16 gUnk_081247C8[];
extern u32 gUnk_081247D0;
@@ -72,7 +60,7 @@ void sub_0809F5B0(Entity* this) {
if (--this->actionDelay == 0) {
SoundReq(115);
SetGlobalFlag(KUMOTATSUMAKI);
LoadRoomEntityList(&gUnk_080DD750);
LoadRoomEntityList((EntityData*)&gUnk_080DD750);
DeleteThisEntity();
}
}
src/object/fileScreenObjects.c
+3 -5
View File
@@ -1,18 +1,17 @@
#include "global.h"
#include "entity.h"
#include "flags.h"
#include "functions.h"
#include "main.h"
#include "menu.h"
#include "npc.h"
#include "position.h"
#include "structures.h"
#include "fileScreen.h"
#include "readKeyInput.h"
#include "structures.h"
#include "functions.h"
extern int sub_0807A094(int);
extern void LoadPalettes(const u8*, int, int);
extern u32 sub_080041EC(int, int);
extern u32 sub_080045DA(int, int);
static bool32 sub_0808E950(void);
static void sub_0808EABC(Entity*);
@@ -39,7 +38,6 @@ typedef struct {
extern void (*const gUnk_08121C64[])(Entity*);
extern void (*const gUnk_08121CCC[])(Entity*);
extern const int gUnk_08133368[];
extern const u8 gGlobalGfxAndPalettes[];
extern const struct_08121CD4 gUnk_08121CD4[][4];
extern const u8 gUnk_08121D10[];
extern const u8 gUnk_08121D38[][8];
src/object/floatingBlock.c
-1
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
void FloatingBlock(Entity* this) {
if (this->action == 0) {
src/object/giantLeaf.c
+1 -2
View File
@@ -1,11 +1,10 @@
#include "global.h"
#include "entity.h"
#include "room.h"
#include "functions.h"
void SetTile(u32 tileIndex, s32 tilePosition, s32 layerIndex);
void sub_0808D618(Entity* ent);
extern RoomControls gRoomControls;
extern s16 gUnk_08121750[];
extern s16 gUnk_0812176A[];
src/object/greatFairy.c
+4 -2
View File
@@ -2,11 +2,13 @@
#include "entity.h"
#include "room.h"
#include "screen.h"
#include "structures.h"
#include "greatFairy.h"
#include "functions.h"
#include "flags.h"
#include "save.h"
#include "random.h"
#include "script.h"
#include "structures.h"
#include "functions.h"
enum {
BEHAVIORS,
src/object/heartContainer.c
-3
View File
@@ -3,9 +3,6 @@
#include "flags.h"
#include "functions.h"
extern void DeleteThisEntity();
extern void sub_08080CB4(Entity*);
extern u32 sub_08017850(Entity*);
static void sub_0808E6A0(Entity*);
static void sub_0808E6E4(Entity*);
static void sub_0808E714(Entity*);
src/object/jailBars.c
+1 -1
View File
@@ -2,9 +2,9 @@
#include "entity.h"
#include "flags.h"
#include "room.h"
#include "functions.h"
extern void sub_080A0960(Entity*, u32);
extern void SoundReq(u32);
extern void sub_0801AF18(u8*, u32, u32);
extern void (*const gUnk_08124950[])(Entity*);
src/object/lightableSwitch.c
-3
View File
@@ -7,10 +7,7 @@
extern void sub_0809EB30(Entity*);
extern void sub_0809EAD8(Entity*);
extern void sub_0809EABC(Entity*);
extern void EnqueueSFX(u32);
extern void sub_080A2CC0(Entity*, Entity**, u16*);
extern void SetTile(u32, u32, u32);
extern void sub_0806F69C(Entity*);
extern void (*const gUnk_081243B4[])(Entity*);
extern void (*const gUnk_081243BC[])(Entity*);
src/object/lilypadSmall.c
+2 -1
View File
@@ -1,7 +1,8 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "player.h"
#include "random.h"
#include "functions.h"
extern void sub_080A2CC0(Entity*, Entity**, u16*);
src/object/mask.c
+7 -16
View File
@@ -2,26 +2,17 @@
#include "entity.h"
#include "room.h"
#include "random.h"
extern Entity gPlayerEntity;
extern u16 gScreenTransition[];
#include "structures.h"
#include "player.h"
#include "flags.h"
#include "functions.h"
extern void (*MaskActionFuncs[])(Entity*);
extern void DeleteThisEntity();
extern bool32 CheckFlags(u16);
extern void SetFlag(u16);
extern void ClearFlag(u16);
extern void SetTile(u32, u16, u32);
extern void sub_08000148(u16, u16, u32);
extern s16 sub_080001DA(u16, u32);
extern u16 sub_080002E0(u16, u32);
extern void EnqueueSFX(u32);
extern void sub_080044EC(Entity*, u16);
extern void sub_0805457C(Entity*, s32);
void Mask(Entity* this) {
@@ -35,7 +26,7 @@ void sub_080929A4(Entity* this) {
switch (this->type2 & 0xC0) {
case 0x40:
field_0x0a = gScreenTransition[0x5];
field_0x0a = gScreenTransition.field_0xa;
switch (field_0x0a) {
case 0x44D ... 0x44F:
@@ -69,7 +60,7 @@ void sub_080929A4(Entity* this) {
this->field_0x7a.HWORD = sub_080002E0(this->field_0x7c.HALF.HI, 1);
SetTile(0x4022, this->field_0x7c.HALF.HI, 1);
SetTile(0x4022, this->field_0x7c.HALF_U.HI, 1);
}
// Probably related to knocking it down
@@ -94,7 +85,7 @@ void sub_08092A94(Entity* this) {
}
// Presumably, make the mask fall
SetTile((u16)this->field_0x7c.HALF.LO, this->field_0x7c.HALF.HI, 1);
SetTile(this->field_0x7c.HALF_U.LO, this->field_0x7c.HALF_U.HI, 1);
sub_08000148(this->field_0x7a.HWORD, this->field_0x7c.HALF.HI, 1);
src/object/metalDoor.c
+1 -4
View File
@@ -2,15 +2,12 @@
#include "entity.h"
#include "room.h"
#include "flags.h"
#include "functions.h"
extern u32 sub_08083734(Entity*, u32);
extern void sub_080A080C(Entity*);
extern void sub_0806F69C(Entity*);
extern void EnqueueSFX(u32);
extern void sub_080A0870(Entity*);
extern void SoundReq(u32);
extern u32 sub_080001DA(u32, u32);
extern void SetTile(u32, u32, u32);
extern void (*const gUnk_0812493C[])(Entity*);
src/object/minecart.c
-1
View File
@@ -7,7 +7,6 @@ extern u32 sub_08091DDC(Entity*);
extern u32 sub_080002B4(Entity*, u32, u32);
extern u32 sub_08007DD6(u32, u32);
extern void sub_08017744(Entity*);
extern u32 sub_080002B8(Entity*);
extern void sub_08091C0C(Entity*);
typedef struct {
src/object/minishSizedArchway.c
+1 -2
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "entity.h"
#include "sprite.h"
#include "functions.h"
#include "game.h"
void MinishSizedArchway(Entity* this) {
if (this->action == 0) {
src/object/minishSizedEntrance.c
+2 -4
View File
@@ -1,9 +1,7 @@
#include "global.h"
#include "entity.h"
extern bool32 CheckIsDungeon();
extern void sub_080AE068(Entity*);
extern void LoadFixedGFX(Entity*, u32);
#include "game.h"
#include "functions.h"
extern void (*const gUnk_08122254[])(Entity*);
src/object/object1A.c
+1
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "entity.h"
#include "random.h"
#include "functions.h"
extern void sub_08086A6C();
src/object/object1C.c
-1
View File
@@ -2,7 +2,6 @@
#include "entity.h"
extern u32 CheckRectOnScreen(s16, s16, u32, u32);
extern void DeleteThisEntity();
void Object1C(Entity* this) {
s32 iVar1;
src/object/object1D.c
-2
View File
@@ -1,8 +1,6 @@
#include "global.h"
#include "entity.h"
void DeleteThisEntity();
extern void (*gUnk_081208A0[])(Entity*);
void Object1D(Entity* this) {
src/object/object49.c
-1
View File
@@ -11,7 +11,6 @@ static void sub_0808F244(Entity*);
extern void sub_0806FCF4(Entity*, u32, u32, u32);
extern void sub_0808F5EC(Entity*);
extern bool32 sub_0806F3E4(Entity*);
extern void (*const gUnk_08121E5C[])(Entity*);
extern void (*const gUnk_08121E88[])(Entity*);
src/object/object7E.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "position.h"
void Object7E(Entity* this) {
src/object/object86.c
+2 -1
View File
@@ -1,9 +1,10 @@
#include "global.h"
#include "entity.h"
#include "position.h"
#include "player.h"
#include "flags.h"
#include "functions.h"
extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
void sub_08099ECC(Entity*);
extern void sub_0805E4E0(Entity*, u32);
extern void sub_0805B390(u32);
src/object/object9E.c
+2 -2
View File
@@ -1,11 +1,11 @@
#include "global.h"
#include "entity.h"
#include "position.h"
#include "room.h"
#include "functions.h"
extern Hitbox gUnk_080FD168;
extern void SetTile(u32, u32, u32);
void Object9E(Entity* this) {
Entity* ent;
u32 tilePos;
src/object/objectA.c
+1
View File
@@ -2,6 +2,7 @@
#include "entity.h"
#include "room.h"
#include "flags.h"
#include "createObject.h"
#include "functions.h"
extern Hitbox gUnk_080FD170;
src/object/objectA2.c
+1
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "object.h"
#include "menu.h"
#include "random.h"
#include "structures.h"
#include "functions.h"
src/object/objectA8.c
+2 -6
View File
@@ -1,14 +1,10 @@
#include "global.h"
#include "entity.h"
extern Entity* CreateItemEntity(u32, u32, u32);
extern void DeleteThisEntity();
extern void sub_08080CB4(Entity*);
#include "player.h"
#include "functions.h"
extern void (*gUnk_08124824[])(Entity*);
extern Entity gPlayerEntity;
void ObjectA8(Entity* this) {
if ((this->bitfield & 0x80) != 0) {
switch (this->bitfield & 0x7f) {
src/object/objectAF.c
+1
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "entity.h"
#include "position.h"
extern void sub_080A0640(Entity*);
src/object/objectB2.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
extern void sub_0806F69C(Entity*);
extern u32 sub_080AE4CC(Entity*, u32, u32, u32);
extern void* gUnk_02027EB4;
src/object/pinwheel.c
+2 -3
View File
@@ -1,10 +1,9 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "flags.h"
#include "createObject.h"
extern u32 ReadBit(u32*, u32);
extern void DeleteThisEntity();
extern u32 CheckLocalFlag(u32);
extern u32 gUnk_020342F8;
extern u16 gUnk_08125050[];
src/object/pot.c
-2
View File
@@ -16,10 +16,8 @@ extern void (*const gUnk_0811F0C4[])(Entity*);
extern Hitbox gUnk_080FD338; // TODO: should be const
extern Hitbox gUnk_080FD340; // TODO: should be const
extern u32 sub_08016A30(Entity*);
extern u32 sub_080001DA(u32, u32);
extern void sub_08078930(Entity*);
extern u32 sub_080002B8(Entity*);
extern void sub_08016A6C(Entity*);
void Pot(Entity* this) {
src/object/railtrack.c
+1 -2
View File
@@ -2,13 +2,12 @@
#include "entity.h"
#include "room.h"
#include "flags.h"
#include "functions.h"
extern u32* GetLayerByIndex(u32);
extern void sub_08085394(Entity*);
extern void sub_0808543C(Entity*);
extern void EnqueueSFX(u32);
extern u32 sub_080854A8(Entity*);
extern void SetTile(u32, u32, u32);
extern void (*const gUnk_081205D0[])(Entity*);
src/object/smoke.c
+1 -2
View File
@@ -1,9 +1,8 @@
#include "global.h"
#include "entity.h"
#include "random.h"
#include "functions.h"
extern void sub_0806F69C(Entity*);
extern void (*const gUnk_08121060[])(Entity*);
extern void (*const gUnk_08121070[])(Entity*);
src/object/thoughtBubble.c
+1 -5
View File
@@ -1,10 +1,6 @@
#include "global.h"
#include "entity.h"
extern void InitializeAnimation(Entity*, u32);
extern void SoundReq(u32);
extern void DeleteThisEntity();
extern void GetNextFrame(Entity*);
#include "functions.h"
extern void (*const ThoughtBubble_Behaviors[])(Entity*);
src/object/treeHidingPortal.c
+3 -5
View File
@@ -3,19 +3,17 @@
#include "flags.h"
#include "player.h"
#include "room.h"
#include "structures.h"
#include "functions.h"
extern void sub_0809E96C(Entity*);
extern u32 sub_0800419C(Entity*, Entity*, u32, u32);
extern void CreateSparkle(Entity*);
extern u32 sub_0809E9A0(void);
extern void sub_08078A90(u32);
extern void sub_0809E918(Entity*);
extern void SoundReq(u32);
extern void CreateMinishEntrance(u32 tile);
extern void (*const gUnk_08124354[])(Entity*);
extern u32 gScreenTransition;
extern s16 gUnk_08124364[];
void TreeHidingPortal(Entity* this) {
@@ -36,7 +34,7 @@ void sub_0809E86C(Entity* this) {
if (sub_0800419C(this, &gPlayerEntity, 0x30, 0x30)) {
if (CheckGlobalFlag(EZERO_1ST)) {
if (((gScreenTransition & 3) == 0)) {
if (((gScreenTransition.frameCount & 3) == 0)) {
CreateSparkle(this);
}
}
src/object/well.c
+1 -5
View File
@@ -2,11 +2,7 @@
#include "entity.h"
#include "room.h"
#include "player.h"
void SetTile(u32 tileIndex, s32 tilePosition, s32 layerIndex);
s32 GetTileType(s32 tilePosition, s32 layerIndex);
void sub_08078B48();
void DeleteThisEntity();
#include "functions.h"
extern void (*gUnk_08124C08[])(Entity*);
src/object/windTribeFlag.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "random.h"
void WindTribeFlag(Entity* this) {
if (this->action == 0) {
src/object/windcrest.c
-2
View File
@@ -4,8 +4,6 @@
#include "script.h"
extern void sub_08078850(Entity*, u32, u32, u8*);
extern void SoundReq(u32);
extern Entity* CreateFx(Entity*, u32, u32);
extern u8 gUnk_08125010;