diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 23:23:44 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 23:23:44 -0400 |
| commit | b89636769c271cadc154e045cca3ea06cb4a61e1 (patch) | |
| tree | 068a164789a9a8e8b303b4322d9d268e2d6bce8b /constants | |
| parent | 15ad69e0c6e35be34dc65322209d3673607d00c5 (diff) | |
Updates to more closely sync with pokecrystal
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 1 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 1 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 9 |
4 files changed, 8 insertions, 5 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 2f8f9260..d97c8033 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -15,7 +15,7 @@ const ENGINE_MOM_SAVING_MONEY const ENGINE_MOM_ACTIVE ; wUnusedTwoDayTimerOn - const ENGINE_0A + const ENGINE_UNUSED_TWO_DAY_TIMER_ON ; wStatusFlags const ENGINE_POKEDEX const ENGINE_UNOWN_DEX diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index dde6a63e..cd03d860 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -21,6 +21,7 @@ SCREEN_META_WIDTH EQU 6 ; metatiles SCREEN_META_HEIGHT EQU 5 ; metatiles SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles +MAP_CONNECTION_PADDING_WIDTH EQU 3 ; metatiles HP_BAR_LENGTH EQU 6 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index d336521a..068998e2 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -12,6 +12,7 @@ ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - Pokered_MonIndices (see data/pokemon/gen1_order.asm) +; - Footprints (see gfx/footprints.asm) const_def 1 const BULBASAUR ; 01 const IVYSAUR ; 02 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 9f93aa33..131621d3 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -83,11 +83,12 @@ LEFT_MASK EQU 1 << LEFT RIGHT_MASK EQU 1 << RIGHT ; wFacingDirection:: + const_def NUM_DIRECTIONS - 1, -1 + shift_const FACE_DOWN ; 8 + shift_const FACE_UP ; 4 + shift_const FACE_LEFT ; 2 + shift_const FACE_RIGHT ; 1 FACE_CURRENT EQU 0 -FACE_DOWN EQU 8 -FACE_UP EQU 4 -FACE_LEFT EQU 2 -FACE_RIGHT EQU 1 ; wPokemonWithdrawDepositParameter:: PC_WITHDRAW EQU 0 |