diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/cgb_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_constants.asm | 61 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 84 |
3 files changed, 74 insertions, 73 deletions
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index a0ecb5c1b..9363415a3 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -17,7 +17,7 @@ const SCGB_0F const SCGB_POKEDEX_SEARCH_OPTION const SCGB_11 - const SCGB_12 + const SCGB_POKEPIC const SCGB_13 const SCGB_PACKPALS const SCGB_TRAINER_CARD diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ede44c546..bedcf29dd 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -668,36 +668,37 @@ EMOTE_OBJECT EQU 7 ; fruit trees const_value SET 1 - const FRUITTREE_ROUTE_29 - const FRUITTREE_ROUTE_30_1 - const FRUITTREE_ROUTE_38 - const FRUITTREE_ROUTE_46_1 - const FRUITTREE_ROUTE_30_2 - const FRUITTREE_ROUTE_33 - const FRUITTREE_ROUTE_31 - const FRUITTREE_ROUTE_43 - const FRUITTREE_VIOLET_CITY - const FRUITTREE_ROUTE_46_2 - const FRUITTREE_ROUTE_35 - const FRUITTREE_ROUTE_45 - const FRUITTREE_ROUTE_36 - const FRUITTREE_ROUTE_26 - const FRUITTREE_ROUTE_39 - const FRUITTREE_ROUTE_44 - const FRUITTREE_ROUTE_37_1 - const FRUITTREE_ROUTE_37_2 - const FRUITTREE_ROUTE_37_3 - const FRUITTREE_AZALEA_TOWN - const FRUITTREE_ROUTE_42_1 - const FRUITTREE_ROUTE_42_2 - const FRUITTREE_ROUTE_42_3 - const FRUITTREE_ROUTE_11 - const FRUITTREE_ROUTE_2 - const FRUITTREE_ROUTE_1 - const FRUITTREE_ROUTE_8 - const FRUITTREE_PEWTER_CITY_1 - const FRUITTREE_PEWTER_CITY_2 - const FRUITTREE_FUCHSIA_CITY + const FRUITTREE_ROUTE_29 ; 01 + const FRUITTREE_ROUTE_30_1 ; 02 + const FRUITTREE_ROUTE_38 ; 03 + const FRUITTREE_ROUTE_46_1 ; 04 + const FRUITTREE_ROUTE_30_2 ; 05 + const FRUITTREE_ROUTE_33 ; 06 + const FRUITTREE_ROUTE_31 ; 07 + const FRUITTREE_ROUTE_43 ; 08 + const FRUITTREE_VIOLET_CITY ; 09 + const FRUITTREE_ROUTE_46_2 ; 0a + const FRUITTREE_ROUTE_35 ; 0b + const FRUITTREE_ROUTE_45 ; 0c + const FRUITTREE_ROUTE_36 ; 0d + const FRUITTREE_ROUTE_26 ; 0e + const FRUITTREE_ROUTE_39 ; 0f + const FRUITTREE_ROUTE_44 ; 10 + const FRUITTREE_ROUTE_37_1 ; 11 + const FRUITTREE_ROUTE_37_2 ; 12 + const FRUITTREE_ROUTE_37_3 ; 13 + const FRUITTREE_AZALEA_TOWN ; 14 + const FRUITTREE_ROUTE_42_1 ; 15 + const FRUITTREE_ROUTE_42_2 ; 16 + const FRUITTREE_ROUTE_42_3 ; 17 + const FRUITTREE_ROUTE_11 ; 18 + const FRUITTREE_ROUTE_2 ; 19 + const FRUITTREE_ROUTE_1 ; 1a + const FRUITTREE_ROUTE_8 ; 1b + const FRUITTREE_PEWTER_CITY_1 ; 1c + const FRUITTREE_PEWTER_CITY_2 ; 1d + const FRUITTREE_FUCHSIA_CITY ; 1e +NUM_FRUIT_TREES EQU const_value +- 1 CMDQUEUE_TYPE EQU 0 CMDQUEUE_ADDR EQU 1 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 3d0c3919a..e7524cd58 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -193,44 +193,44 @@ NUM_SPRITEHEADER_FIELDS EQU const_value ; sprite movement data table indices const_def - const SPRITEMOVEDATA_00 - const SPRITEMOVEDATA_ITEM_TREE - const SPRITEMOVEDATA_WANDER - const SPRITEMOVEDATA_SPINRANDOM_SLOW - const SPRITEMOVEDATA_WALK_UP_DOWN - const SPRITEMOVEDATA_WALK_LEFT_RIGHT - const SPRITEMOVEDATA_STANDING_DOWN - const SPRITEMOVEDATA_STANDING_UP - const SPRITEMOVEDATA_STANDING_LEFT - const SPRITEMOVEDATA_STANDING_RIGHT - const SPRITEMOVEDATA_SPINRANDOM_FAST - const SPRITEMOVEDATA_PLAYER - const SPRITEMOVEDATA_0C - const SPRITEMOVEDATA_0D - const SPRITEMOVEDATA_0E - const SPRITEMOVEDATA_0F - const SPRITEMOVEDATA_10 - const SPRITEMOVEDATA_11 - const SPRITEMOVEDATA_12 - const SPRITEMOVEDATA_FOLLOWING - const SPRITEMOVEDATA_SCRIPTED - const SPRITEMOVEDATA_SNORLAX - const SPRITEMOVEDATA_POKEMON - const SPRITEMOVEDATA_SUDOWOODO - const SPRITEMOVEDATA_SMASHABLE_ROCK - const SPRITEMOVEDATA_STRENGTH_BOULDER - const SPRITEMOVEDATA_FOLLOWNOTEXACT - const SPRITEMOVEDATA_SHADOW - const SPRITEMOVEDATA_EMOTE - const SPRITEMOVEDATA_SCREENSHAKE - const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE - const SPRITEMOVEDATA_SPINCLOCKWISE - const SPRITEMOVEDATA_20 - const SPRITEMOVEDATA_BIGDOLL - const SPRITEMOVEDATA_BOULDERDUST - const SPRITEMOVEDATA_GRASS - const SPRITEMOVEDATA_LAPRAS - const SPRITEMOVEDATA_25 + const SPRITEMOVEDATA_00 ; 00 + const SPRITEMOVEDATA_ITEM_TREE ; 01 + const SPRITEMOVEDATA_WANDER ; 02 + const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03 + const SPRITEMOVEDATA_WALK_UP_DOWN ; 04 + const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05 + const SPRITEMOVEDATA_STANDING_DOWN ; 06 + const SPRITEMOVEDATA_STANDING_UP ; 07 + const SPRITEMOVEDATA_STANDING_LEFT ; 08 + const SPRITEMOVEDATA_STANDING_RIGHT ; 09 + const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a + const SPRITEMOVEDATA_PLAYER ; 0b + const SPRITEMOVEDATA_0C ; 0c + const SPRITEMOVEDATA_0D ; 0d + const SPRITEMOVEDATA_0E ; 0e + const SPRITEMOVEDATA_0F ; 0f + const SPRITEMOVEDATA_10 ; 10 + const SPRITEMOVEDATA_11 ; 11 + const SPRITEMOVEDATA_12 ; 12 + const SPRITEMOVEDATA_FOLLOWING ; 13 + const SPRITEMOVEDATA_SCRIPTED ; 14 + const SPRITEMOVEDATA_SNORLAX ; 15 + const SPRITEMOVEDATA_POKEMON ; 16 + const SPRITEMOVEDATA_SUDOWOODO ; 17 + const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18 + const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19 + const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a + const SPRITEMOVEDATA_SHADOW ; 1b + const SPRITEMOVEDATA_EMOTE ; 1c + const SPRITEMOVEDATA_SCREENSHAKE ; 1d + const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e + const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f + const SPRITEMOVEDATA_20 ; 20 + const SPRITEMOVEDATA_BIGDOLL ; 21 + const SPRITEMOVEDATA_BOULDERDUST ; 22 + const SPRITEMOVEDATA_GRASS ; 23 + const SPRITEMOVEDATA_LAPRAS ; 24 + const SPRITEMOVEDATA_25 ; 25 NUM_SPRITEMOVEDATA EQU const_value +- 1 SPRITEMOVEDATA_FIELDS EQU 6 @@ -477,14 +477,14 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_INDEX_02 const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO const SPRITE_ANIM_INDEX_04 - const SPRITE_ANIM_INDEX_05 + const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR const SPRITE_ANIM_INDEX_SLOT_GOLEM const SPRITE_ANIM_INDEX_SLOTS_CHANSEY const SPRITE_ANIM_INDEX_SLOTS_EGG const SPRITE_ANIM_INDEX_09 - const SPRITE_ANIM_INDEX_WALK_CYCLE + const SPRITE_ANIM_INDEX_RED_WALK const SPRITE_ANIM_INDEX_0B - const SPRITE_ANIM_INDEX_0C + const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR const SPRITE_ANIM_INDEX_0D const SPRITE_ANIM_INDEX_0E const SPRITE_ANIM_INDEX_0F @@ -502,7 +502,7 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_INDEX_1B const SPRITE_ANIM_INDEX_1C const SPRITE_ANIM_INDEX_1D - const SPRITE_ANIM_INDEX_1E + const SPRITE_ANIM_INDEX_BLUE_WALK const SPRITE_ANIM_INDEX_1F const SPRITE_ANIM_INDEX_20 const SPRITE_ANIM_INDEX_21 |