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/LavenderTown.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/LavenderTown.asm')
| -rw-r--r-- | data/maps/objects/LavenderTown.asm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index e2601721..daf2fdff 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,3 +1,8 @@ + object_const_def + const_export LAVENDERTOWN_LITTLE_GIRL + const_export LAVENDERTOWN_COOLTRAINER_M + const_export LAVENDERTOWN_SUPER_NERD + LavenderTown_Object: db $2c ; border block @@ -10,16 +15,16 @@ LavenderTown_Object: warp_event 7, 13, NAME_RATERS_HOUSE, 1 def_bg_events - bg_event 11, 9, 4 ; LavenderTownText4 - bg_event 9, 3, 5 ; LavenderTownText5 - bg_event 16, 13, 6 ; MartSignText - bg_event 4, 5, 7 ; PokeCenterSignText - bg_event 5, 9, 8 ; LavenderTownText8 - bg_event 17, 7, 9 ; LavenderTownText9 + bg_event 11, 9, TEXT_LAVENDERTOWN_SIGN + bg_event 9, 3, TEXT_LAVENDERTOWN_SILPH_SCOPE_SIGN + bg_event 16, 13, TEXT_LAVENDERTOWN_MART_SIGN + bg_event 4, 5, TEXT_LAVENDERTOWN_POKECENTER_SIGN + bg_event 5, 9, TEXT_LAVENDERTOWN_POKEMON_HOUSE_SIGN + bg_event 17, 7, TEXT_LAVENDERTOWN_POKEMON_TOWER_SIGN def_object_events - object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person - object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person + object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_LAVENDERTOWN_LITTLE_GIRL + object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_LAVENDERTOWN_COOLTRAINER_M + object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_LAVENDERTOWN_SUPER_NERD def_warps_to LAVENDER_TOWN |