aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route2.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/Route2.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'data/maps/objects/Route2.asm')
-rw-r--r--data/maps/objects/Route2.asm12
1 files changed, 8 insertions, 4 deletions
diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm
index 6ff5c0c7..45e4d2d0 100644
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -1,3 +1,7 @@
+ object_const_def
+ const ROUTE2_MOON_STONE
+ const ROUTE2_HP_UP
+
Route2_Object:
db $f ; border block
@@ -10,12 +14,12 @@ Route2_Object:
warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3
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