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/Route2.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/Route2.asm')
| -rw-r--r-- | data/maps/objects/Route2.asm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 1915b2d3..d3b2550a 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,3 +1,7 @@ + object_const_def + const_export ROUTE2_MOON_STONE + const_export ROUTE2_HP_UP + Route2_Object: db $f ; border block @@ -11,12 +15,12 @@ Route2_Object: warp_event 17, 35, ROUTE_2_GATE, 2 def_bg_events - bg_event 5, 65, 3 ; Route2Text3 - bg_event 11, 11, 4 ; Route2Text4 + bg_event 5, 65, TEXT_ROUTE2_SIGN + bg_event 11, 11, TEXT_ROUTE2_DIGLETTS_CAVE_SIGN def_object_events - object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, 1, MOON_STONE - object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, 2, HP_UP + object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE2_MOON_STONE, MOON_STONE + object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE2_HP_UP, HP_UP def_warps_to ROUTE_2 |