mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-12 13:35:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc function renaming

Browse Source
This commit is contained in:
theo
2020-06-11 02:52:05 -07:00
parent ada93e7653
commit 6f91fbbdb9
174 changed files with 1153 additions and 1136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/greatFairy.c
+7 -7
View File
@@ -299,7 +299,7 @@ void sub_08086E64(Entity *ent)
sub_08004274(ent);
sub_080873D0(ent);
if ((gRoomVars.greatFairyState & 1) != 0) {
sub_0805E7BC(ent);
DeleteEntity(ent);
}
}
@@ -373,7 +373,7 @@ void sub_08086FA0(Entity *ent)
{
sub_08004274(ent);
if ((ent->frames.all & 128) != 0) {
sub_0805E7BC(ent);
DeleteEntity(ent);
}
}
@@ -395,7 +395,7 @@ void sub_08086FD8(Entity *ent)
void sub_08087000(Entity *ent)
{
if ((gRoomVars.greatFairyState & 2) != 0) {
sub_0805E7BC(ent);
DeleteEntity(ent);
}
else {
sub_08004274(ent);
@@ -432,7 +432,7 @@ void sub_0808706C(Entity *ent)
if (target != NULL) {
PositionRelative(ent,target,0,-524288);
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 2;
sub_0805E7BC(ent);
DeleteEntity(ent);
}
}
}
@@ -456,7 +456,7 @@ void sub_080870F4(Entity *ent)
{
sub_08004274(ent);
if ((ent->frames.all & 128) != 0) {
sub_0805E7BC(ent);
DeleteEntity(ent);
}
}
@@ -520,7 +520,7 @@ void sub_080871D0(Entity *ent)
bVar1 = ent->parameter3 -= 1;
if (bVar1 == 0) {
gRoomVars.greatFairyState = gRoomVars.greatFairyState | 8;
sub_0805E7BC(ent);
DeleteEntity(ent);
}
}
@@ -571,7 +571,7 @@ void sub_0808727C(Entity *ent)
bVar1 = ent->parameter3 -= 1;
if (bVar1 == 0) {
sub_0805E7BC(ent);
DeleteEntity(ent);
}
}
src/room.c
+1 -1
View File
@@ -30,7 +30,7 @@ void sub_08080930(void)
return;
}
u32 * sub_0808094C(u32 param_1)
u32 * GetLayerByIndex(u32 param_1)
{
src/slime.c
+14
View File
@@ -0,0 +1,14 @@
#include "global.h"
#include "entity.h"
extern void sub_0804A9AC();
extern void sub_0800129E();
extern void gUnk_080D16A4(void);
void Slime(Entity *ent)
{
sub_0800129E(ent, &gUnk_080D16A4);
sub_0804A9AC(ent,0,1,-12);
}
src/sub_0807B7D8.c
+2 -2
View File
@@ -2,7 +2,7 @@
extern void sub_08000152(u32);
extern void sub_0807B778(u32, u32);
extern void sub_0807B314(u32, u32, u32);
extern void SetTileType(u32, u32, u32);
void sub_0807B7D8(u32 param_1,u32 param_2,u32 param_3)
@@ -16,7 +16,7 @@ void sub_0807B7D8(u32 param_1,u32 param_2,u32 param_3)
sub_0807B778(param_2 + -64,param_3);
}
else {
sub_0807B314(param_1,param_2,param_3);
SetTileType(param_1,param_2,param_3);
}
return;
}
src/sub_0807B820.c
+10 -10
View File
@@ -1,18 +1,18 @@
#include "global.h"
extern void sub_0807B314(u32, u32, u32);
extern void SetTileType(u32, u32, u32);
void sub_0807B820(u32 param_1)
{
sub_0807B314(620,param_1 + -65,1);
sub_0807B314(627,param_1 + -65,2);
sub_0807B314(621,param_1 + -64,1);
sub_0807B314(628,param_1 + -64,2);
sub_0807B314(622,param_1 + -63,1);
sub_0807B314(629,param_1 + -63,2);
sub_0807B314(623,param_1 + -1,1);
sub_0807B314(624,param_1,1);
sub_0807B314(626,param_1 + 1,1);
SetTileType(620,param_1 + -65,1);
SetTileType(627,param_1 + -65,2);
SetTileType(621,param_1 + -64,1);
SetTileType(628,param_1 + -64,2);
SetTileType(622,param_1 + -63,1);
SetTileType(629,param_1 + -63,2);
SetTileType(623,param_1 + -1,1);
SetTileType(624,param_1,1);
SetTileType(626,param_1 + 1,1);
return;
}
src/sub_0807B8A8.c
+10 -10
View File
@@ -1,18 +1,18 @@
#include "global.h"
extern void sub_0807B314(u32, u32, u32);
extern void SetTileType(u32, u32, u32);
void sub_0807B8A8(u32 param_1)
{
sub_0807B314(636,param_1 + -65,1);
sub_0807B314(643,param_1 + -65,2);
sub_0807B314(637,param_1 + -64,1);
sub_0807B314(644,param_1 + -64,2);
sub_0807B314(638,param_1 + -63,1);
sub_0807B314(645,param_1 + -63,2);
sub_0807B314(639,param_1 + -1,1);
sub_0807B314(640,param_1,1);
sub_0807B314(642,param_1 + 1,1);
SetTileType(636,param_1 + -65,1);
SetTileType(643,param_1 + -65,2);
SetTileType(637,param_1 + -64,1);
SetTileType(644,param_1 + -64,2);
SetTileType(638,param_1 + -63,1);
SetTileType(645,param_1 + -63,2);
SetTileType(639,param_1 + -1,1);
SetTileType(640,param_1,1);
SetTileType(642,param_1 + 1,1);
return;
}
src/sub_0807B930.c
+10 -10
View File
@@ -1,19 +1,19 @@
#include "global.h"
extern void sub_0807B314(u32, u32, u32);
extern void SetTileType(u32, u32, u32);
void sub_0807B930(int param_1)
{
sub_0807B314(652,param_1 + -65,1);
sub_0807B314(659,param_1 + -65,2);
sub_0807B314(653,param_1 + -64,1);
sub_0807B314(660,param_1 + -64,2);
sub_0807B314(654,param_1 + -63,1);
sub_0807B314(661,param_1 + -63,2);
sub_0807B314(655,param_1 + -1,1);
sub_0807B314(656,param_1,1);
sub_0807B314(658,param_1 + 1,1);
SetTileType(652,param_1 + -65,1);
SetTileType(659,param_1 + -65,2);
SetTileType(653,param_1 + -64,1);
SetTileType(660,param_1 + -64,2);
SetTileType(654,param_1 + -63,1);
SetTileType(661,param_1 + -63,2);
SetTileType(655,param_1 + -1,1);
SetTileType(656,param_1,1);
SetTileType(658,param_1 + 1,1);
return;
}