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

func renaming

Browse Source
This commit is contained in:
theo3
2020-08-20 02:21:23 -07:00
parent 6570eea1f2
commit 4f2f69ceb4
24 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loadRoom.c
+6 -6
View File
@@ -8,7 +8,7 @@ extern void sub_0804B058(EntityData* dat);
extern void LoadRoomTileEntities(EntityData* dat);
extern void sub_0801AC98();
extern u32 sub_08049D1C(u32);
extern Entity* CreateEntity(EntityData*);
extern Entity* LoadRoomEntity(EntityData*);
extern void* GetRoomProperty(u32, u32, u32);
extern u32 gUnk_02017654;
@@ -32,22 +32,22 @@ void sub_0804B058(EntityData* dat) {
Entity* ent;
u32 uVar2;
if ((dat != NULL) && (dat->entityType != 0xff)) {
if ((dat != NULL) && *(u8*)dat != 0xff) {
uVar2 = 0;
do {
if ((uVar2 < 0x20) && ((dat->entityType & 0xf) == 3)) {
if ((uVar2 < 0x20) && ((dat->type) == 3)) {
if (sub_08049D1C(uVar2) != 0) {
ent = CreateEntity(dat);
ent = LoadRoomEntity(dat);
if ((ent != NULL) && ((ent->entityType).type == 3)) {
ent->field_0x6c.HALF.LO = uVar2 | 0x80;
}
}
} else {
CreateEntity(dat);
LoadRoomEntity(dat);
}
uVar2++;
dat++;
} while (dat->entityType != 0xff);
} while (*(u8*)dat!= 0xff);
}
}