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/code_8040094.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/code_8040094.c')
| -rw-r--r-- | src/code_8040094.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/code_8040094.c b/src/code_8040094.c index fc5abb1..4db3e6c 100644 --- a/src/code_8040094.c +++ b/src/code_8040094.c @@ -1,10 +1,10 @@ #include "global.h" #include "play_time.h" #include "file_system.h" -#include "gUnknown_203B418.h" +#include "dungeon_global_data.h" extern struct PlayTimeStruct *gPlayTimeRef; -extern struct unkStruct_203B418 *gUnknown_203B418; +extern struct DungeonGlobalData *gDungeonGlobalData; extern s32 gUnknown_80F6568[]; extern u8 gUnknown_202EE01; extern const char gUnknown_80F6604; // "zmappat" @@ -41,8 +41,8 @@ void sub_804002C(u32 param_1) int innerCounter; int iVar3; int iVar4; - - gUnknown_203B418->unk1820B = 1; + + gDungeonGlobalData->unk1820B = 1; iVar3 = 0; do { innerCounter = 0; @@ -62,7 +62,7 @@ void sub_804002C(u32 param_1) void sub_8040094(u8 r0) { - gUnknown_203B418->unk18217 = r0; + gDungeonGlobalData->unk18217 = r0; sub_803F7BC(); sub_80060EC(); IncrementPlayTime(gPlayTimeRef); @@ -76,15 +76,15 @@ void sub_8040094(u8 r0) void sub_80400D4(void) { s32 temp; - temp = gUnknown_203B418->unk18200; + temp = gDungeonGlobalData->unk18200; if(temp == 0) return; if(temp > 0x1E) temp = 0x1F; - gUnknown_203B418->unk181FC = gUnknown_80F6568[temp]; - gUnknown_203B418->unk18200--; - if(gUnknown_203B418->unk18200 == 0) - gUnknown_203B418->unk18200 = gUnknown_203B418->unk18204; + gDungeonGlobalData->unk181FC = gUnknown_80F6568[temp]; + gDungeonGlobalData->unk18200--; + if(gDungeonGlobalData->unk18200 == 0) + gDungeonGlobalData->unk18200 = gDungeonGlobalData->unk18204; } void sub_8040124(void) |