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

Merge branch 'upstream/master' into main

Browse Source
This commit is contained in:
theo3
2021-01-31 11:24:17 -08:00
parent ced13c2c8d 4120161dec
commit 82e6c864bd
22 changed files with 5896 additions and 6131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/houseDoorExterior.c
-1
View File
@@ -26,7 +26,6 @@ static u8 sub_08086954(Entity*);
extern u32 sub_080562CC(u32, u32, u32, u32);
extern void sub_08078AC0(u32, u32, u32);
extern void* GetCurrentRoomProperty(u8);
extern void (*const gUnk_081206B4[])(Entity*);
extern BoundingBox gUnk_081206AC; // TODO: should be const
src/object/lightableSwitch.c
-1
View File
@@ -9,7 +9,6 @@ extern void sub_0809EAD8(Entity*);
extern void sub_0809EABC(Entity*);
extern void EnqueueSFX(u32);
extern void sub_080A2CC0(Entity*, Entity**, u16*);
extern Entity* GetCurrentRoomProperty(u32);
extern void SetTile(u32, u32, u32);
extern void sub_0806F69C(Entity*);
src/object/lilypadSmall.c
-1
View File
@@ -3,7 +3,6 @@
#include "functions.h"
#include "player.h"
extern Entity* GetCurrentRoomProperty(u32);
extern void sub_080A2CC0(Entity*, Entity**, u16*);
extern u16 gUnk_08123318[];
src/object/object48.c
+1 -1
View File
@@ -323,7 +323,7 @@ void sub_0808EBB8(Entity* this) {
}
static Entity* sub_0808EC80(int form) {
Entity* entityA = &gUnk_03003DA0;
Entity* entityA = (Entity*) &gUnk_03003DA0;
Entity* entityB = entityA->next;
while (entityB != entityA) {
if ((entityB->entityType.type == 0x6 && entityB->entityType.subtype == 0x48) &&