diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 11 | ||||
| -rw-r--r-- | constants/map_constants.asm | 104 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 68 |
3 files changed, 127 insertions, 56 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 3df321a82..873769ef4 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,8 +1,8 @@ const_def - const EVENT_CHRIS1_IN_CABLE_CLUB - const EVENT_CHRIS2_IN_CABLE_CLUB + const EVENT_000 + const EVENT_001 const EVENT_002 const EVENT_003 const EVENT_004 @@ -1648,6 +1648,9 @@ const EVENT_63D const EVENT_63E const EVENT_63F +; Sprite visibility: When these events are cleared, the sprite becomes visible; when set, the sprite is hidden. +; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. +; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded. const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB @@ -1824,8 +1827,8 @@ const EVENT_6ED const EVENT_6EE const EVENT_6EF - const EVENT_6F0 - const EVENT_6F1 + const EVENT_GOLDENROD_SALE_OFF + const EVENT_GOLDENROD_SALE_ON const EVENT_6F2 const EVENT_6F3 const EVENT_6F4 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 6e793ef6a..ed4a781f5 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -580,61 +580,61 @@ MAP_N_A EQU -1 const_value SET $80 SPRITE_POKEMON EQU const_value - const SPRITE_UNOWN - const SPRITE_GEODUDE - const SPRITE_GROWLITHE - const SPRITE_WEEDLE - const SPRITE_SHELLDER - const SPRITE_ODDISH - const SPRITE_GENGAR - const SPRITE_ZUBAT - const SPRITE_MAGIKARP - const SPRITE_SQUIRTLE - const SPRITE_TOGEPI - const SPRITE_BUTTERFREE - const SPRITE_DIGLETT - const SPRITE_POLIWAG - const SPRITE_PIKACHU - const SPRITE_CLEFAIRY - const SPRITE_CHARMANDER - const SPRITE_JYNX - const SPRITE_STARMIE - const SPRITE_BULBASAUR - const SPRITE_JIGGLYPUFF - const SPRITE_GRIMER - const SPRITE_EKANS - const SPRITE_PARAS - const SPRITE_TENTACOOL - const SPRITE_TAUROS - const SPRITE_MACHOP - const SPRITE_VOLTORB - const SPRITE_LAPRAS - const SPRITE_RHYDON - const SPRITE_MOLTRES - const SPRITE_SNORLAX - const SPRITE_GYARADOS - const SPRITE_LUGIA - const SPRITE_HO_OH + const SPRITE_UNOWN ; 80 + const SPRITE_GEODUDE ; 81 + const SPRITE_GROWLITHE ; 82 + const SPRITE_WEEDLE ; 83 + const SPRITE_SHELLDER ; 84 + const SPRITE_ODDISH ; 85 + const SPRITE_GENGAR ; 86 + const SPRITE_ZUBAT ; 87 + const SPRITE_MAGIKARP ; 88 + const SPRITE_SQUIRTLE ; 89 + const SPRITE_TOGEPI ; 8a + const SPRITE_BUTTERFREE ; 8b + const SPRITE_DIGLETT ; 8c + const SPRITE_POLIWAG ; 8d + const SPRITE_PIKACHU ; 8e + const SPRITE_CLEFAIRY ; 8f + const SPRITE_CHARMANDER ; 90 + const SPRITE_JYNX ; 91 + const SPRITE_STARMIE ; 92 + const SPRITE_BULBASAUR ; 93 + const SPRITE_JIGGLYPUFF ; 94 + const SPRITE_GRIMER ; 95 + const SPRITE_EKANS ; 96 + const SPRITE_PARAS ; 97 + const SPRITE_TENTACOOL ; 98 + const SPRITE_TAUROS ; 99 + const SPRITE_MACHOP ; 9a + const SPRITE_VOLTORB ; 9b + const SPRITE_LAPRAS ; 9c + const SPRITE_RHYDON ; 9d + const SPRITE_MOLTRES ; 9e + const SPRITE_SNORLAX ; 9f + const SPRITE_GYARADOS ; a0 + const SPRITE_LUGIA ; a1 + const SPRITE_HO_OH ; a2 const_value SET $e0 - const SPRITE_DAYCARE_MON_1 - const SPRITE_DAYCARE_MON_2 + const SPRITE_DAYCARE_MON_1 ; e0 + const SPRITE_DAYCARE_MON_2 ; e1 const_value SET $f0 SPRITE_VARS EQU const_value - const SPRITE_CONSOLE - const SPRITE_DOLL_1 - const SPRITE_DOLL_2 - const SPRITE_BIG_DOLL - const SPRITE_WEIRD_TREE - const SPRITE_OLIVINE_RIVAL - const SPRITE_AZALEA_ROCKET - const SPRITE_FUCHSIA_GYM_1 - const SPRITE_FUCHSIA_GYM_2 - const SPRITE_FUCHSIA_GYM_3 - const SPRITE_FUCHSIA_GYM_4 - const SPRITE_COPYCAT - const SPRITE_JANINE_IMPERSONATOR + const SPRITE_CONSOLE ; f0 + const SPRITE_DOLL_1 ; f1 + const SPRITE_DOLL_2 ; f2 + const SPRITE_BIG_DOLL ; f3 + const SPRITE_WEIRD_TREE ; f4 + const SPRITE_OLIVINE_RIVAL ; f5 + const SPRITE_AZALEA_ROCKET ; f6 + const SPRITE_FUCHSIA_GYM_1 ; f7 + const SPRITE_FUCHSIA_GYM_2 ; f8 + const SPRITE_FUCHSIA_GYM_3 ; f9 + const SPRITE_FUCHSIA_GYM_4 ; fa + const SPRITE_COPYCAT ; fb + const SPRITE_JANINE_IMPERSONATOR ; fc ; sprite types const_value SET 1 @@ -716,8 +716,8 @@ const_value SET 1 const MAPOBJECT_POINTER_HI ; b const MAPOBJECT_FLAG_LO ; c const MAPOBJECT_FLAG_HI ; d - const MAPOBJECT_E - const MAPOBJECT_F + const MAPOBJECT_E ; unused + const MAPOBJECT_F ; unused MAPOBJECT_NOT_VISIBLE EQU -1 MAPOBJECT_SCREEN_HEIGHT EQU 11 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 9346ae0e6..32447e579 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -98,3 +98,71 @@ SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F SPRITE_GFX_LIST_CAPACITY EQU $20 + +const_value = 1 + const MOM_ITEM + const MOM_DOLL + + const_def + const DECO_BED + const DECO_CARPET + const DECO_PLANT + const DECO_POSTER + const DECO_CONSOLE + const DECO_ORNAMENT + const DECO_BIGDOLL + + const_def + const CARPET_00 + const CARPET_01 + const PLANT_02 + const PLANT_03 + const PLANT_04 + const PLANT_05 + const CARPET_06 + const POSTER_07 + const POSTER_08 + const POSTER_09 + const POSTER_0A + const CARPET_0B + const CARPET_0C + const CARPET_0D + const CARPET_0E + const CARPET_0F + const CARPET_10 + const CONSOLE_11 + const CONSOLE_12 + const CONSOLE_13 + const CARPET_14 + const CARPET_FAMICOM + const CONSTENT_SNES + const CARPET_N64 + const CARPET_VIRTUAL_BOY + const CARPET_19 + const BIGDOLL_SNORLAX + const BIGDOLL_ONIX + const BIGDOLL_LAPRAS + const CARPET_1D + const DOLL_PIKACHU + const DOLL_SURFING_PIKACHU + const DOLL_CLEFAIRY + const DOLL_JIGGLYPUFF + const DOLL_BULBASAUR + const DOLL_CHARMANDER + const DOLL_SQUIRTLE + const DOLL_POLIWAG + const DOLL_DIGLETT + const DOLL_STARMIE + const DOLL_MAGIKARP + const DOLL_ODDISH + const DOLL_GENGAR + const DOLL_SHELLDER + const DOLL_GRIMER + const DOLL_VOLTORM + const DOLL_WEEDLE + const DOLL_UNOWN + const DOLL_GEODUDE + const DOLL_MACHOP + const DOLL_TENTACOOL + const CARPET_GOLD_TROPHY + const CARPET_SILVER_TROPHY |