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/CeruleanMelaniesHouse.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/CeruleanMelaniesHouse.asm')
| -rw-r--r-- | data/maps/objects/CeruleanMelaniesHouse.asm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/data/maps/objects/CeruleanMelaniesHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm index 6cce0b1b..645211b8 100644 --- a/data/maps/objects/CeruleanMelaniesHouse.asm +++ b/data/maps/objects/CeruleanMelaniesHouse.asm @@ -1,3 +1,9 @@ + object_const_def + const_export CERULEANMELANIESHOUSE_MELANIE + const_export CERULEANMELANIESHOUSE_BULBASAUR + const_export CERULEANMELANIESHOUSE_ODDISH + const_export CERULEANMELANIESHOUSE_SANDSHREW + CeruleanMelaniesHouse_Object: db $a ; border block @@ -8,9 +14,9 @@ CeruleanMelaniesHouse_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_GIRL, STAY, DOWN, 1 ; person - object_event 4, 1, SPRITE_BULBASAUR, STAY, DOWN, 2 ; person - object_event 1, 4, SPRITE_ODDISH, STAY, NONE, 3 ; person - object_event 5, 3, SPRITE_SANDSHREW, STAY, LEFT, 4 ; person + object_event 3, 1, SPRITE_GIRL, STAY, DOWN, TEXT_CERULEANMELANIESHOUSE_MELANIE + object_event 4, 1, SPRITE_BULBASAUR, STAY, DOWN, TEXT_CERULEANMELANIESHOUSE_BULBASAUR + object_event 1, 4, SPRITE_ODDISH, STAY, NONE, TEXT_CERULEANMELANIESHOUSE_ODDISH + object_event 5, 3, SPRITE_SANDSHREW, STAY, LEFT, TEXT_CERULEANMELANIESHOUSE_SANDSHREW def_warps_to CERULEAN_MELANIES_HOUSE |