From 8237e29a164211eb2ec4cd161eb4183cc1947fee Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Thu, 9 Sep 2021 19:22:48 -0400 Subject: Defined more in-dungeon structs and enums (#53) * Defined DungeonEntity * Rename EntityType enums * Revert EntityType rename * Defined more in-dungeon structs and enums * Added more dungeon global structs/enums * Prefixed dungeonGlobalData with g * Fixed compile errors * Removed some CRLFs * Fixed compile after merge * Revert Makefile * Rename DungeonEntityData.entityType Co-authored-by: Seth Barberee * Renamed symbols per PR comments Co-authored-by: Cheng Hann Gan Co-authored-by: Seth Barberee --- src/friend_rescue_1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/friend_rescue_1.c') diff --git a/src/friend_rescue_1.c b/src/friend_rescue_1.c index 499ba92..325cf4e 100644 --- a/src/friend_rescue_1.c +++ b/src/friend_rescue_1.c @@ -101,7 +101,7 @@ extern u8 gUnknown_80E46C8[]; extern u8 gUnknown_80E4704[]; extern u8 gUnknown_80E4744[]; extern u8 gUnknown_80E4788[]; -extern u8 gUnknown_80E47D8[]; +extern u8 gUnknown_80E47D8[]; extern u8 gUnknown_80E4480[]; extern u8 gUnknown_80E482C[]; @@ -1057,7 +1057,7 @@ void sub_8034848(void) MemoryFill8((u8 *)&gUnknown_203B33C->unk41C, 0 , 4); gUnknown_203B33C->unk41C.itemIndex = ITEM_ID_NOTHING; gUnknown_203B33C->unk41C.numItems = 1; - gUnknown_203B33C->unk41C.unk0 = 0; + gUnknown_203B33C->unk41C.itemFlags = 0; if(gUnknown_203B33C->status == 0) { @@ -1087,7 +1087,7 @@ void sub_80348C4(void) MemoryFill8((u8 *)&gUnknown_203B33C->unk41C, 0 , 4); gUnknown_203B33C->unk41C.itemIndex = ITEM_ID_NOTHING; gUnknown_203B33C->unk41C.numItems = 1; - gUnknown_203B33C->unk41C.unk0 = 0; + gUnknown_203B33C->unk41C.itemFlags = 0; if(gUnknown_203B33C->status == 0) { @@ -1240,7 +1240,7 @@ void sub_8034B88(void) { gUnknown_203B33C->unk41C.itemIndex = ITEM_ID_NOTHING; gUnknown_203B33C->unk41C.numItems = 1; - gUnknown_203B33C->unk41C.unk0 = 0; + gUnknown_203B33C->unk41C.itemFlags = 0; switch(sub_801CA08(1)) { case 2: -- cgit v1.2.3