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/CeladonDiner.asm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'data/maps/objects/CeladonDiner.asm') diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 33ea922b..98363688 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -1,3 +1,10 @@ + object_const_def + const CELADONDINER_COOK + const CELADONDINER_MIDDLE_AGED_WOMAN + const CELADONDINER_MIDDLE_AGED_MAN + const CELADONDINER_FISHER + const CELADONDINER_GYM_GUIDE + CeladonDiner_Object: db $f ; border block @@ -8,10 +15,10 @@ CeladonDiner_Object: def_bg_events def_object_events - object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person - object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person - object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person - object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person - object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person + object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, TEXT_CELADONDINER_COOK + object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN + object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CELADONDINER_MIDDLE_AGED_MAN + object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, TEXT_CELADONDINER_FISHER + object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CELADONDINER_GYM_GUIDE def_warps_to CELADON_DINER -- cgit v1.3.1-sl0p