aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route2TradeHouse.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/Route2TradeHouse.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/Route2TradeHouse.asm')
-rw-r--r--data/maps/objects/Route2TradeHouse.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm
index 7b30b9e8..ef2785ba 100644
--- a/data/maps/objects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
@@ -1,3 +1,7 @@
+ object_const_def
+ const ROUTE2TRADEHOUSE_SCIENTIST
+ const ROUTE2TRADEHOUSE_GAMEBOY_KID
+
Route2TradeHouse_Object:
db $a ; border block
@@ -8,7 +12,7 @@ Route2TradeHouse_Object:
def_bg_events
def_object_events
- object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person
- object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person
+ object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, TEXT_ROUTE2TRADEHOUSE_SCIENTIST
+ object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_ROUTE2TRADEHOUSE_GAMEBOY_KID
def_warps_to ROUTE_2_TRADE_HOUSE