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/FightingDojo.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/FightingDojo.asm')
| -rw-r--r-- | data/maps/objects/FightingDojo.asm | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 808abf71..15ce598f 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -1,3 +1,12 @@ + object_const_def + const FIGHTINGDOJO_KARATE_MASTER + const FIGHTINGDOJO_BLACKBELT1 + const FIGHTINGDOJO_BLACKBELT2 + const FIGHTINGDOJO_BLACKBELT3 + const FIGHTINGDOJO_BLACKBELT4 + const FIGHTINGDOJO_HITMONLEE_POKE_BALL + const FIGHTINGDOJO_HITMONCHAN_POKE_BALL + FightingDojo_Object: db $3 ; border block @@ -8,12 +17,12 @@ FightingDojo_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 - object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2 - object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3 - object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4 - object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5 - object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person - object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person + object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_KARATE_MASTER + object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT1 + object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT2 + object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT3 + object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT4 + object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL + object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL def_warps_to FIGHTING_DOJO |