From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 13 Jul 2023 20:27:56 -0500 Subject: 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. --- data/maps/objects/PewterGym.asm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/PewterGym.asm') diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index cfaeefbf..ee82ed21 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERGYM_BROCK + const PEWTERGYM_COOLTRAINER_M + const PEWTERGYM_GYM_GUIDE + PewterGym_Object: db $3 ; border block @@ -8,8 +13,8 @@ PewterGym_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1 - object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person + object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_PEWTERGYM_BROCK, OPP_BROCK, 1 + object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_PEWTERGYM_COOLTRAINER_M, OPP_JR_TRAINER_M, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_PEWTERGYM_GYM_GUIDE def_warps_to PEWTER_GYM -- cgit v1.3.1-sl0p