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

merge changes

Browse Source
This commit is contained in:
Henny022p
2021-03-28 13:26:33 +02:00
parent abfcc50245 167fe388b6
commit cb03157e65
787 changed files with 82999 additions and 62161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/houseDoorExterior.c
+2 -2
View File
@@ -23,7 +23,7 @@ typedef struct {
static void sub_080868EC(Entity* entity, unk_80868EC* arg1);
static bool32 sub_080867CC(u32);
static void sub_0808681C(Entity*);
void sub_0808681C(Entity*);
static u8 sub_08086954(Entity*);
extern u32 sub_080562CC(u32, u32, u32, u32);
@@ -91,7 +91,7 @@ void sub_080867E4(Entity* this) {
sub_0808681C(this);
}
static void sub_0808681C(Entity* this) {
void sub_0808681C(Entity* this) {
switch (this->action) {
case 0:
this->action = 1;
src/object/object49.c
+4 -4
View File
@@ -7,8 +7,8 @@
#include "structures.h"
static void sub_0808F2B0(Entity*);
static void sub_0808F14C(Entity*);
static void sub_0808F244(Entity*);
void sub_0808F14C(Entity*);
void sub_0808F244(Entity*);
extern void sub_0806FCF4(Entity*, u32, u32, u32);
extern void sub_0808F5EC(Entity*);
@@ -55,7 +55,7 @@ void sub_0808F0D0(Entity* this) {
sub_0808F14C(this);
}
static void sub_0808F14C(Entity* this) {
void sub_0808F14C(Entity* this) {
sub_0808F2B0(this);
if (sub_08003FC4(this, 0x2000) == 0) {
this->action++;
@@ -101,7 +101,7 @@ void sub_0808F1F8(Entity* this) {
sub_0808F244(this);
}
static void sub_0808F244(Entity* this) {
void sub_0808F244(Entity* this) {
this->spriteSettings.b.draw = this->parent->spriteSettings.b.draw;
this->y.HALF.HI = this->parent->y.HALF.HI + 3;
src/object/pot.c
+4 -4
View File
@@ -5,9 +5,9 @@
#include "player.h"
#include "room.h"
static void sub_08082824(Entity*);
void sub_08082824(Entity*);
static void sub_08082850(Entity*, Entity*);
static void sub_08082608(Entity*);
void sub_08082608(Entity*);
extern void (*const gUnk_0811F090[])(Entity*);
extern void (*const gUnk_0811F0A8[])(Entity*);
@@ -162,7 +162,7 @@ void sub_080825F0(Entity* this) {
}
}
static void sub_08082608(Entity* this) {
void sub_08082608(Entity* this) {
this->action = 1;
this->subAction = 0;
}
@@ -248,7 +248,7 @@ void sub_08082818(Entity* this) {
sub_08082850(this, NULL);
}
static void sub_08082824(Entity* this) {
void sub_08082824(Entity* this) {
if (this->field_0x20 < 0) {
this->spriteSettings.b.flipY = 1;
}