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/CinnabarLabTradeRoom.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/CinnabarLabTradeRoom.asm')
| -rw-r--r-- | data/maps/objects/CinnabarLabTradeRoom.asm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 11702821..294646a7 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -1,3 +1,8 @@ + object_const_def + const_export CINNABARLABTRADEROOM_SUPER_NERD + const_export CINNABARLABTRADEROOM_GRAMPS + const_export CINNABARLABTRADEROOM_BEAUTY + CinnabarLabTradeRoom_Object: db $17 ; border block @@ -8,8 +13,8 @@ CinnabarLabTradeRoom_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person - object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person + object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARLABTRADEROOM_SUPER_NERD + object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, TEXT_CINNABARLABTRADEROOM_GRAMPS + object_event 5, 5, SPRITE_BEAUTY, STAY, UP, TEXT_CINNABARLABTRADEROOM_BEAUTY def_warps_to CINNABAR_LAB_TRADE_ROOM |