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/CeladonMart1F.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/CeladonMart1F.asm')
| -rw-r--r-- | data/maps/objects/CeladonMart1F.asm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index d7f8924f..d1dd2683 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,3 +1,6 @@ + object_const_def + const_export CELADONMART1F_RECEPTIONIST + CeladonMart1F_Object: db $f ; border block @@ -10,10 +13,10 @@ CeladonMart1F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 11, 4, 2 ; CeladonMart1Text2 - bg_event 14, 1, 3 ; CeladonMart1Text3 + bg_event 11, 4, TEXT_CELADONMART1F_DIRECTORY_SIGN + bg_event 14, 1, TEXT_CELADONMART1F_CURRENT_FLOOR_SIGN def_object_events - object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONMART1F_RECEPTIONIST def_warps_to CELADON_MART_1F |