diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 31 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 14 |
3 files changed, 44 insertions, 3 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d4e0a37fc..f28a38fb5 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -13,7 +13,7 @@ const ENGINE_DAY_CARE_LADY_HAS_MON ; wMomSavingMoney const ENGINE_MOM_SAVING_MONEY - const ENGINE_DST + const ENGINE_MOM_ACTIVE ; wUnusedTwoDayTimerOn const ENGINE_0A ; wStatusFlags diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index d4c49c5f5..fc2c3cace 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -276,5 +276,32 @@ NUM_POKEMON EQU const_value +- 1 const EGG ; fd const MON_FE ; fe -; number of Unown forms -NUM_UNOWN EQU 26 +; Unown forms +const_value set 1 + const UNOWN_A ; 1 + const UNOWN_B ; 2 + const UNOWN_C ; 3 + const UNOWN_D ; 4 + const UNOWN_E ; 5 + const UNOWN_F ; 6 + const UNOWN_G ; 7 + const UNOWN_H ; 8 + const UNOWN_I ; 9 + const UNOWN_J ; 10 + const UNOWN_K ; 11 + const UNOWN_L ; 12 + const UNOWN_M ; 13 + const UNOWN_N ; 14 + const UNOWN_O ; 15 + const UNOWN_P ; 16 + const UNOWN_Q ; 17 + const UNOWN_R ; 18 + const UNOWN_S ; 19 + const UNOWN_T ; 20 + const UNOWN_U ; 21 + const UNOWN_V ; 22 + const UNOWN_W ; 23 + const UNOWN_X ; 24 + const UNOWN_Y ; 25 + const UNOWN_Z ; 26 +NUM_UNOWN EQU const_value +- 1 ; 26 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 6dd54f72b..5bd6ad80c 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -132,6 +132,14 @@ SPAWN_RED EQU 2 PLAYER_OBJECT EQU 0 NUM_OBJECTS EQU $10 +; wMomSavingMoney:: ; d854 +MOM_SAVING_SOME_MONEY_F EQU 0 +MOM_SAVING_HALF_MONEY_F EQU 1 +MOM_SAVING_ALL_MONEY_F EQU 2 +MOM_ACTIVE_F EQU 7 + +MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F) + ; wJohtoBadges:: ; d857 const_def const ZEPHYRBADGE @@ -177,6 +185,12 @@ PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 +; wBikeFlags:: ; dbf5 + const_def + const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0 + const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 + const BIKEFLAGS_DOWNHILL_F ; 2 + ; wDayCareMan:: ; def5 DAYCAREMAN_HAS_MON_F EQU 0 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 |