diff options
| author | dannye <33dannye@gmail.com> | 2021-04-30 14:03:34 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-30 14:03:34 -0500 |
| commit | 0cbd5acb76d0f5df35ebf529bd227c201e0b3115 (patch) | |
| tree | fcc3124631cbbc05d3f4df670d13e5f2a3e02e59 /constants | |
| parent | 3d7293abf6d09879106457d12b52bfb4b88922ea (diff) | |
| parent | 6a31663c960a5c1da9dbbf12d49e0252860b96d0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/gfx_constants.asm | 3 | ||||
| -rw-r--r-- | constants/map_object_constants.asm | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 099ff2d7..e6290c8a 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -22,6 +22,9 @@ HP_BAR_GREEN EQU 0 HP_BAR_YELLOW EQU 1 HP_BAR_RED EQU 2 +; wOAMBuffer +NUM_SPRITE_OAM_STRUCTS EQU 40 + ; hAutoBGTransferEnabled TRANSFERTOP EQU 0 TRANSFERMIDDLE EQU 1 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 9993a6a9..899e01f0 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -38,6 +38,8 @@ SPRITESTATEDATA1_LENGTH EQU const_value const SPRITESTATEDATA2_0F ; f SPRITESTATEDATA2_LENGTH EQU const_value +NUM_SPRITESTATEDATA_STRUCTS EQU 16 + ; different kinds of people events ITEM EQU $80 TRAINER EQU $40 |