diff options
Diffstat (limited to 'constants')
-rw-r--r-- | constants/deco_constants.asm | 210 | ||||
-rw-r--r-- | constants/engine_flags.asm | 1 | ||||
-rw-r--r-- | constants/map_constants.asm | 45 | ||||
-rw-r--r-- | constants/pokemon_data_constants.asm | 6 | ||||
-rw-r--r-- | constants/sfx_constants.asm | 2 |
5 files changed, 156 insertions, 108 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 1038e40f7..de8edb652 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -1,105 +1,105 @@ -const_value = 1
- const DECO_PLANT
- const DECO_BED
- const DECO_CARPET
- const DECO_POSTER
- const DECO_DOLL
- const DECO_BIGDOLL
-
-const_value = 1
- const PUT_IT_AWAY
- const MAGNAPLANT
- const TROPICPLANT
- const JUMBOPLANT
- const TOWN_MAP_D
- const FAMICOM
- const SUPER_NES
- const NINTENDO_64
- const VIRTUAL_BOY
- const GOLD_TROPHY
- const SILVER_TROPHY
- const SURF_PIKA_DOLL
- const _BED
- const _CARPET
- const _POSTER
- const _DOLL
- const BIG_
- const FEATHERY_BED
- const PIKACHU_BED
- const PINK_BED
- const POLKADOT_BED
- const RED_CARPET
- const BLUE_CARPET
- const YELLOW_CARPET
- const GREEN_CARPET
-
-const_value = 1
- const SET_UP_BED
- const PUT_AWAY_BED
- const SET_UP_CARPET
- const PUT_AWAY_CARPET
- const SET_UP_PLANT
- const PUT_AWAY_PLANT
- const SET_UP_POSTER
- const PUT_AWAY_POSTER
- const SET_UP_CONSOLE
- const PUT_AWAY_CONSOLE
- const SET_UP_BIG_DOLL
- const PUT_AWAY_BIG_DOLL
- const SET_UP_DOLL
- const PUT_AWAY_DOLL
- const SET_UP_ORNAMENT
- const PUT_AWAY_ORNAMENT
-
-const_value = 2
- const DECO_FEATHERY_BED ; 2
- const DECO_PINK_BED ; 3
- const DECO_POLKADOT_BED ; 4
- const DECO_PIKACHU_BED ; 5
-const_value = const_value + 1
- const DECO_RED_CARPET ; 7
- const DECO_BLUE_CARPET ; 8
- const DECO_YELLOW_CARPET ; 9
- const DECO_GREEN_CARPET ; a
-const_value = const_value + 1
- const DECO_MAGNAPLANT ; c
- const DECO_TROPICPLANT ; d
- const DECO_JUMBOPLANT ; e
-const_value = const_value + 1
- const DECO_TOWN_MAP ; 10
- const DECO_PIKACHU_POSTER ; 11
- const DECO_CLEFAIRY_POSTER ; 12
- const DECO_JIGGLYPUFF_POSTER ; 13
-const_value = const_value + 1
- const DECO_FAMICOM ; 15
- const DECO_SNES ; 16
- const DECO_N64 ; 17
- const DECO_VIRTUAL_BOY ; 18
-const_value = const_value + 1
- const DECO_BIG_SNORLAX_DOLL ; 1a
- const DECO_BIG_ONIX_DOLL ; 1b
- const DECO_BIG_LAPRAS_DOLL ; 1c
-const_value = const_value + 1
- const DECO_PIKACHU_DOLL ; 1e
- const DECO_SURF_PIKACHU_DOLL ; 1f
- const DECO_CLEFAIRY_DOLL ; 20
- const DECO_JIGGLYPUFF_DOLL ; 21
- const DECO_BULBASAUR_DOLL ; 22
- const DECO_CHARMANDER_DOLL ; 23
- const DECO_SQUIRTLE_DOLL ; 24
- const DECO_POLIWAG_DOLL ; 25
- const DECO_DIGLETT_DOLL ; 26
- const DECO_STARMIE_DOLL ; 27
- const DECO_MAGIKARP_DOLL ; 28
- const DECO_ODDISH_DOLL ; 29
- const DECO_GENGAR_DOLL ; 2a
- const DECO_SHELLDER_DOLL ; 2b
- const DECO_GRIMER_DOLL ; 2c
- const DECO_VOLTORB_DOLL ; 2d
- const DECO_WEEDLE_DOLL ; 2e
- const DECO_UNOWN_DOLL ; 2f
- const DECO_GEODUDE_DOLL ; 30
- const DECO_MACHOP_DOLL ; 31
- const DECO_TENTACOOL_DOLL ; 32
- const DECO_GOLD_TROPHY_DOLL ; 33
- const DECO_SILVER_TROPHY_DOLL ; 34
+const_value = 1 + const DECO_PLANT + const DECO_BED + const DECO_CARPET + const DECO_POSTER + const DECO_DOLL + const DECO_BIGDOLL + +const_value = 1 + const PUT_IT_AWAY + const MAGNAPLANT + const TROPICPLANT + const JUMBOPLANT + const TOWN_MAP_D + const FAMICOM + const SUPER_NES + const NINTENDO_64 + const VIRTUAL_BOY + const GOLD_TROPHY + const SILVER_TROPHY + const SURF_PIKA_DOLL + const _BED + const _CARPET + const _POSTER + const _DOLL + const BIG_ + const FEATHERY_BED + const PIKACHU_BED + const PINK_BED + const POLKADOT_BED + const RED_CARPET + const BLUE_CARPET + const YELLOW_CARPET + const GREEN_CARPET + +const_value = 1 + const SET_UP_BED + const PUT_AWAY_BED + const SET_UP_CARPET + const PUT_AWAY_CARPET + const SET_UP_PLANT + const PUT_AWAY_PLANT + const SET_UP_POSTER + const PUT_AWAY_POSTER + const SET_UP_CONSOLE + const PUT_AWAY_CONSOLE + const SET_UP_BIG_DOLL + const PUT_AWAY_BIG_DOLL + const SET_UP_DOLL + const PUT_AWAY_DOLL + const SET_UP_ORNAMENT + const PUT_AWAY_ORNAMENT + +const_value = 2 + const DECO_FEATHERY_BED ; 2 + const DECO_PINK_BED ; 3 + const DECO_POLKADOT_BED ; 4 + const DECO_PIKACHU_BED ; 5 +const_value = const_value + 1 + const DECO_RED_CARPET ; 7 + const DECO_BLUE_CARPET ; 8 + const DECO_YELLOW_CARPET ; 9 + const DECO_GREEN_CARPET ; a +const_value = const_value + 1 + const DECO_MAGNAPLANT ; c + const DECO_TROPICPLANT ; d + const DECO_JUMBOPLANT ; e +const_value = const_value + 1 + const DECO_TOWN_MAP ; 10 + const DECO_PIKACHU_POSTER ; 11 + const DECO_CLEFAIRY_POSTER ; 12 + const DECO_JIGGLYPUFF_POSTER ; 13 +const_value = const_value + 1 + const DECO_FAMICOM ; 15 + const DECO_SNES ; 16 + const DECO_N64 ; 17 + const DECO_VIRTUAL_BOY ; 18 +const_value = const_value + 1 + const DECO_BIG_SNORLAX_DOLL ; 1a + const DECO_BIG_ONIX_DOLL ; 1b + const DECO_BIG_LAPRAS_DOLL ; 1c +const_value = const_value + 1 + const DECO_PIKACHU_DOLL ; 1e + const DECO_SURF_PIKACHU_DOLL ; 1f + const DECO_CLEFAIRY_DOLL ; 20 + const DECO_JIGGLYPUFF_DOLL ; 21 + const DECO_BULBASAUR_DOLL ; 22 + const DECO_CHARMANDER_DOLL ; 23 + const DECO_SQUIRTLE_DOLL ; 24 + const DECO_POLIWAG_DOLL ; 25 + const DECO_DIGLETT_DOLL ; 26 + const DECO_STARMIE_DOLL ; 27 + const DECO_MAGIKARP_DOLL ; 28 + const DECO_ODDISH_DOLL ; 29 + const DECO_GENGAR_DOLL ; 2a + const DECO_SHELLDER_DOLL ; 2b + const DECO_GRIMER_DOLL ; 2c + const DECO_VOLTORB_DOLL ; 2d + const DECO_WEEDLE_DOLL ; 2e + const DECO_UNOWN_DOLL ; 2f + const DECO_GEODUDE_DOLL ; 30 + const DECO_MACHOP_DOLL ; 31 + const DECO_TENTACOOL_DOLL ; 32 + const DECO_GOLD_TROPHY_DOLL ; 33 + const DECO_SILVER_TROPHY_DOLL ; 34 diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 4dfe7732a..fc91be58c 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -162,3 +162,4 @@ const ENGINE_KRIS_IN_CABLE_CLUB const ENGINE_DUNSPARCE_SWARM ; a0 const ENGINE_YANMA_SWARM +NUM_ENGINE_FLAGS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index dc3337b2a..50b9aec25 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,5 +1,8 @@ -GROUP_N_A EQU -1 -MAP_N_A EQU -1 +GROUP_N_A EQU -1 +MAP_N_A EQU -1 + +GROUP_NONE EQU 0 +MAP_NONE EQU 0 ; map group ids const_def @@ -753,3 +756,41 @@ OW_RIGHT EQU $c const SIGNPOST_IFNOTSET const SIGNPOST_ITEM const SIGNPOST_COPY + +; I'm relocating spawn constants here, so that they can be used anywhere in the disassembly. + + +const_value = -1 + const SPAWN_N_A + + const SPAWN_HOME + const SPAWN_DEBUG + + const SPAWN_PALLET + const SPAWN_VIRIDIAN + const SPAWN_PEWTER + const SPAWN_CERULEAN + const SPAWN_ROCK_TUNNEL + const SPAWN_VERMILION + const SPAWN_LAVENDER + const SPAWN_SAFFRON + const SPAWN_CELADON + const SPAWN_FUCHSIA + const SPAWN_CINNABAR + const SPAWN_INDIGO + + const SPAWN_NEW_BARK + const SPAWN_CHERRYGROVE + const SPAWN_VIOLET + const SPAWN_UNION_CAVE + const SPAWN_AZALEA + const SPAWN_CIANWOOD + const SPAWN_GOLDENROD + const SPAWN_OLIVINE + const SPAWN_ECRUTEAK + const SPAWN_MAHOGANY + const SPAWN_LAKE + const SPAWN_BLACKTHORN + const SPAWN_MT_SILVER + const SPAWN_FAST_SHIP +NUM_SPAWNS EQU const_value diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index fd84c727c..354b86b89 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -93,3 +93,9 @@ const_value SET 1 const ATK_GT_DEF const ATK_LT_DEF const ATK_EQ_DEF + +NUM_GRASSMON EQU 7 +NUM_WATERMON EQU 3 + +GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 +WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index c00b7696a..794b9b593 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -42,7 +42,7 @@ const SFX_ELEVATOR_END const SFX_THROW_BALL const SFX_BALL_POOF - const SFX_UNKNOWN_2A + const SFX_FAINT const SFX_RUN const SFX_SLOT_MACHINE_START const SFX_FANFARE |