diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/ViridianCity.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/ViridianCity.asm')
| -rw-r--r-- | data/maps/objects/ViridianCity.asm | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 873460ca..304f4f9c 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,3 +1,13 @@ + object_const_def + const_export VIRIDIANCITY_YOUNGSTER1 + const_export VIRIDIANCITY_GAMBLER1 + const_export VIRIDIANCITY_YOUNGSTER2 + const_export VIRIDIANCITY_GIRL + const_export VIRIDIANCITY_OLD_MAN_SLEEPY + const_export VIRIDIANCITY_FISHER + const_export VIRIDIANCITY_OLD_MAN + const_export VIRIDIANCITY_OLD_MAN2 + ViridianCity_Object: db $f ; border block @@ -9,21 +19,21 @@ ViridianCity_Object: warp_event 32, 7, VIRIDIAN_GYM, 1 def_bg_events - bg_event 17, 17, 9 ; ViridianCityText8 - bg_event 19, 1, 10 ; ViridianCityText9 - bg_event 21, 29, 11 ; ViridianCityText10 - bg_event 30, 19, 12 ; MartSignText - bg_event 24, 25, 13 ; PokeCenterSignText - bg_event 27, 7, 14 ; ViridianCityText13 + bg_event 17, 17, TEXT_VIRIDIANCITY_SIGN + bg_event 19, 1, TEXT_VIRIDIANCITY_TRAINER_TIPS1 + bg_event 21, 29, TEXT_VIRIDIANCITY_TRAINER_TIPS2 + bg_event 30, 19, TEXT_VIRIDIANCITY_MART_SIGN + bg_event 24, 25, TEXT_VIRIDIANCITY_POKECENTER_SIGN + bg_event 27, 7, TEXT_VIRIDIANCITY_GYM_SIGN def_object_events - object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person - object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person - object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, 3 ; person - object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person - object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person - object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person - object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person - object_event 18, 9, SPRITE_GAMBLER, STAY, NONE, 8 + object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, TEXT_VIRIDIANCITY_YOUNGSTER1 + object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, TEXT_VIRIDIANCITY_GAMBLER1 + object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, TEXT_VIRIDIANCITY_YOUNGSTER2 + object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, TEXT_VIRIDIANCITY_GIRL + object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY + object_event 6, 23, SPRITE_FISHER, STAY, DOWN, TEXT_VIRIDIANCITY_FISHER + object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_VIRIDIANCITY_OLD_MAN + object_event 18, 9, SPRITE_GAMBLER, STAY, NONE, TEXT_VIRIDIANCITY_OLD_MAN2 def_warps_to VIRIDIAN_CITY |