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/CeladonMartRoof.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/CeladonMartRoof.asm')
| -rw-r--r-- | data/maps/objects/CeladonMartRoof.asm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index f56a0b0d..51350b5d 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,3 +1,7 @@ + object_const_def + const_export CELADONMARTROOF_SUPER_NERD + const_export CELADONMARTROOF_LITTLE_GIRL + CeladonMartRoof_Object: db $42 ; border block @@ -5,13 +9,13 @@ CeladonMartRoof_Object: warp_event 15, 2, CELADON_MART_5F, 1 def_bg_events - bg_event 10, 1, 3 ; CeladonMartRoofText3 - bg_event 11, 1, 4 ; CeladonMartRoofText4 - bg_event 12, 2, 5 ; CeladonMartRoofText5 - bg_event 13, 2, 6 ; CeladonMartRoofText6 + bg_event 10, 1, TEXT_CELADONMARTROOF_VENDING_MACHINE1 + bg_event 11, 1, TEXT_CELADONMARTROOF_VENDING_MACHINE2 + bg_event 12, 2, TEXT_CELADONMARTROOF_VENDING_MACHINE3 + bg_event 13, 2, TEXT_CELADONMARTROOF_CURRENT_FLOOR_SIGN def_object_events - object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person - object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person + object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_CELADONMARTROOF_SUPER_NERD + object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONMARTROOF_LITTLE_GIRL def_warps_to CELADON_MART_ROOF |