diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps/objects/PokemonTower1F.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-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/PokemonTower1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonTower1F.asm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index bacf7244..0f8c64c3 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONTOWER1F_RECEPTIONIST + const POKEMONTOWER1F_MIDDLE_AGED_WOMAN + const POKEMONTOWER1F_BALDING_GUY + const POKEMONTOWER1F_GIRL + const POKEMONTOWER1F_CHANNELER + PokemonTower1F_Object: db $1 ; border block @@ -9,10 +16,10 @@ PokemonTower1F_Object: def_bg_events def_object_events - object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, 1 ; person - object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person - object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person - object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person - object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person + object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, TEXT_POKEMONTOWER1F_RECEPTIONIST + object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_POKEMONTOWER1F_MIDDLE_AGED_WOMAN + object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, TEXT_POKEMONTOWER1F_BALDING_GUY + object_event 13, 7, SPRITE_GIRL, STAY, NONE, TEXT_POKEMONTOWER1F_GIRL + object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER1F_CHANNELER def_warps_to POKEMON_TOWER_1F |