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_8041AD0.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_8041AD0.s')
| -rw-r--r-- | asm/code_8041AD0.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/code_8041AD0.s b/asm/code_8041AD0.s index be5dbe3..ee181a7 100644 --- a/asm/code_8041AD0.s +++ b/asm/code_8041AD0.s @@ -237,7 +237,7 @@ _080423E2: .align 2, 0 _08042428: .4byte 0xffff0000 _0804242C: .4byte 0x0000ffff -_08042430: .4byte gUnknown_203B418 +_08042430: .4byte gDungeonGlobalData _08042434: .4byte 0x000181f2 _08042438: .4byte 0x000003e7 _0804243C: @@ -334,7 +334,7 @@ _080424A6: .align 2, 0 _080424EC: .4byte 0xffff0000 _080424F0: .4byte 0x0000ffff -_080424F4: .4byte gUnknown_203B418 +_080424F4: .4byte gDungeonGlobalData _080424F8: .4byte 0x000181f2 _080424FC: .4byte 0x000003e7 _08042500: @@ -508,7 +508,7 @@ _080425CC: .align 2, 0 _0804264C: .4byte 0xffff0000 _08042650: .4byte 0x0000ffff -_08042654: .4byte gUnknown_203B418 +_08042654: .4byte gDungeonGlobalData _08042658: .4byte 0x000181f2 _0804265C: .4byte 0x00000165 _08042660: .4byte gUnknown_80F4448 @@ -560,7 +560,7 @@ _080426AC: bx r0 .align 2, 0 _080426B8: .4byte 0x000003e5 -_080426BC: .4byte gUnknown_203B418 +_080426BC: .4byte gDungeonGlobalData _080426C0: .4byte 0x00000644 _080426C4: .4byte 0x00000155 thumb_func_end sub_804267C @@ -675,7 +675,7 @@ _08042778: movs r0, 0x1 b _080427A6 .align 2, 0 -_08042794: .4byte gUnknown_203B418 +_08042794: .4byte gDungeonGlobalData _08042798: .4byte 0x0001820a _0804279C: adds r0, r1, 0 @@ -733,7 +733,7 @@ _080427FA: pop {r0} bx r0 .align 2, 0 -_08042808: .4byte gUnknown_203B418 +_08042808: .4byte gDungeonGlobalData _0804280C: .4byte 0x000135cc _08042810: .4byte gAvailablePokemonNames _08042814: .4byte gPtrFeralFoundItemMessage @@ -785,7 +785,7 @@ _0804284A: bl sub_804151C b _08042896 .align 2, 0 -_08042874: .4byte gUnknown_203B418 +_08042874: .4byte gDungeonGlobalData _08042878: .4byte 0x000181f8 _0804287C: .4byte gUnknown_80F682C _08042880: .4byte 0x000003e5 |