diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-09-09 19:22:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 16:22:48 -0700 |
| commit | 8237e29a164211eb2ec4cd161eb4183cc1947fee (patch) | |
| tree | 67dc502264b755dc620f56969f3bea68a40b17af /src/friend_rescue_1.c | |
| parent | 4eff1882443b0004d9c9fa4895cdfefdc356565f (diff) | |
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 <seth.barberee@gmail.com>
* Renamed symbols per PR comments
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
Diffstat (limited to 'src/friend_rescue_1.c')
| -rw-r--r-- | src/friend_rescue_1.c | 8 |
1 files changed, 4 insertions, 4 deletions
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: |