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/GameCorner.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/GameCorner.asm')
| -rw-r--r-- | data/maps/objects/GameCorner.asm | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 2b4c8f72..06277a33 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,3 +1,16 @@ + object_const_def + const GAMECORNER_BEAUTY1 + const GAMECORNER_CLERK1 + const GAMECORNER_MIDDLE_AGED_MAN1 + const GAMECORNER_BEAUTY2 + const GAMECORNER_FISHING_GURU + const GAMECORNER_MIDDLE_AGED_WOMAN + const GAMECORNER_GYM_GUIDE + const GAMECORNER_GAMBLER + const GAMECORNER_CLERK2 + const GAMECORNER_GENTLEMAN + const GAMECORNER_ROCKET + GameCorner_Object: db $f ; border block @@ -7,19 +20,19 @@ GameCorner_Object: warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2 def_bg_events - bg_event 9, 4, 12 ; CeladonGameCornerText12 + bg_event 9, 4, TEXT_GAMECORNER_POSTER def_object_events - object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person - object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person - object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person - object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person - object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person - object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person - object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person - object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person - object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person - object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person - object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7 + object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_GAMECORNER_BEAUTY1 + object_event 5, 6, SPRITE_CLERK, STAY, DOWN, TEXT_GAMECORNER_CLERK1 + object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_GAMECORNER_MIDDLE_AGED_MAN1 + object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, TEXT_GAMECORNER_BEAUTY2 + object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_GAMECORNER_FISHING_GURU + object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, TEXT_GAMECORNER_MIDDLE_AGED_WOMAN + object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, TEXT_GAMECORNER_GYM_GUIDE + object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, TEXT_GAMECORNER_GAMBLER + object_event 14, 11, SPRITE_CLERK, STAY, LEFT, TEXT_GAMECORNER_CLERK2 + object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_GAMECORNER_GENTLEMAN + object_event 9, 5, SPRITE_ROCKET, STAY, UP, TEXT_GAMECORNER_ROCKET, OPP_ROCKET, 7 def_warps_to GAME_CORNER |