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 /asm/code_8086A3C.s | |
| 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 'asm/code_8086A3C.s')
| -rw-r--r-- | asm/code_8086A3C.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/code_8086A3C.s b/asm/code_8086A3C.s index b0fe243..8d2e8b2 100644 --- a/asm/code_8086A3C.s +++ b/asm/code_8086A3C.s @@ -248,7 +248,7 @@ sub_8086E40: bx r0 .align 2, 0 _08086E6C: .4byte gUnknown_8100D3C -_08086E70: .4byte gUnknown_203B418 +_08086E70: .4byte gDungeonGlobalData thumb_func_end sub_8086E40 thumb_func_start sub_8086E74 @@ -398,7 +398,7 @@ _08086FA8: pop {r0} bx r0 .align 2, 0 -_08086FB0: .4byte gUnknown_203B418 +_08086FB0: .4byte gDungeonGlobalData _08086FB4: .4byte 0x0001358c thumb_func_end sub_8086F54 @@ -799,7 +799,7 @@ _0808735A: pop {r0} bx r0 .align 2, 0 -_08087360: .4byte gUnknown_203B418 +_08087360: .4byte gDungeonGlobalData thumb_func_end sub_8087334 thumb_func_start ZapdosPreFightDialogue |