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/PokemonMansionB1F.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/PokemonMansionB1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansionB1F.asm | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 12692e81..5d70db70 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -1,3 +1,13 @@ + object_const_def + const POKEMONMANSIONB1F_BURGLAR + const POKEMONMANSIONB1F_SCIENTIST + const POKEMONMANSIONB1F_RARE_CANDY + const POKEMONMANSIONB1F_FULL_RESTORE + const POKEMONMANSIONB1F_TM_BLIZZARD + const POKEMONMANSIONB1F_TM_SOLARBEAM + const POKEMONMANSIONB1F_DIARY + const POKEMONMANSIONB1F_SECRET_KEY + PokemonMansionB1F_Object: db $1 ; border block @@ -7,13 +17,13 @@ PokemonMansionB1F_Object: def_bg_events def_object_events - object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, 1, OPP_BURGLAR, 9 - object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY - object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE - object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD - object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM - object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person - object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY + object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, TEXT_POKEMONMANSIONB1F_BURGLAR, OPP_BURGLAR, 9 + object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, TEXT_POKEMONMANSIONB1F_SCIENTIST, OPP_SCIENTIST, 13 + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_RARE_CANDY, RARE_CANDY + object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_FULL_RESTORE, FULL_RESTORE + object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_TM_BLIZZARD, TM_BLIZZARD + object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_TM_SOLARBEAM, TM_SOLARBEAM + object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSIONB1F_DIARY + object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_SECRET_KEY, SECRET_KEY def_warps_to POKEMON_MANSION_B1F |