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/PalletTown.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/PalletTown.asm')
| -rw-r--r-- | data/maps/objects/PalletTown.asm | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index a20baad0..172d4add 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -1,3 +1,8 @@ + object_const_def + const_export PALLETTOWN_OAK + const_export PALLETTOWN_GIRL + const_export PALLETTOWN_FISHER + PalletTown_Object: db $b ; border block @@ -7,14 +12,14 @@ PalletTown_Object: warp_event 12, 11, OAKS_LAB, 2 def_bg_events - bg_event 13, 13, 4 ; PalletTownText4 - bg_event 7, 9, 5 ; PalletTownText5 - bg_event 3, 5, 6 ; PalletTownText6 - bg_event 11, 5, 7 ; PalletTownText7 + bg_event 13, 13, TEXT_PALLETTOWN_OAKSLAB_SIGN + bg_event 7, 9, TEXT_PALLETTOWN_SIGN + bg_event 3, 5, TEXT_PALLETTOWN_PLAYERSHOUSE_SIGN + bg_event 11, 5, TEXT_PALLETTOWN_RIVALSHOUSE_SIGN def_object_events - object_event 10, 4, SPRITE_OAK, STAY, NONE, 1 ; person - object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person - object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, 3 ; person + object_event 10, 4, SPRITE_OAK, STAY, NONE, TEXT_PALLETTOWN_OAK + object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, TEXT_PALLETTOWN_GIRL + object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, TEXT_PALLETTOWN_FISHER def_warps_to PALLET_TOWN |