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/OaksLab.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/OaksLab.asm')
| -rw-r--r-- | data/maps/objects/OaksLab.asm | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 7fc869ef..f800e880 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,3 +1,16 @@ + object_const_def + const OAKSLAB_RIVAL + const OAKSLAB_CHARMANDER_POKE_BALL + const OAKSLAB_SQUIRTLE_POKE_BALL + const OAKSLAB_BULBASAUR_POKE_BALL + const OAKSLAB_OAK1 + const OAKSLAB_POKEDEX1 + const OAKSLAB_POKEDEX2 + const OAKSLAB_OAK2 + const OAKSLAB_GIRL + const OAKSLAB_SCIENTIST1 + const OAKSLAB_SCIENTIST2 + OaksLab_Object: db $3 ; border block @@ -8,16 +21,16 @@ OaksLab_Object: def_bg_events def_object_events - object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1 - object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person - object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person - object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person - object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person - object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person - object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person - object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person - object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person - object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person - object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person + object_event 4, 3, SPRITE_BLUE, STAY, NONE, TEXT_OAKSLAB_RIVAL, OPP_RIVAL1, 1 + object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_CHARMANDER_POKE_BALL + object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_SQUIRTLE_POKE_BALL + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_BULBASAUR_POKE_BALL + object_event 5, 2, SPRITE_OAK, STAY, DOWN, TEXT_OAKSLAB_OAK1 + object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX1 + object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX2 + object_event 5, 10, SPRITE_OAK, STAY, UP, TEXT_OAKSLAB_OAK2 + object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, TEXT_OAKSLAB_GIRL + object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST1 + object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST2 def_warps_to OAKS_LAB |