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/GameCornerPrizeRoom.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/GameCornerPrizeRoom.asm')
| -rw-r--r-- | data/maps/objects/GameCornerPrizeRoom.asm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index b79e52ef..14523813 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const GAMECORNERPRIZEROOM_BALDING_GUY + const GAMECORNERPRIZEROOM_GAMBLER + GameCornerPrizeRoom_Object: db $f ; border block @@ -6,12 +10,12 @@ GameCornerPrizeRoom_Object: warp_event 5, 7, LAST_MAP, 10 def_bg_events - bg_event 2, 2, 3 ; CeladonPrizeRoomText3 - bg_event 4, 2, 4 ; CeladonPrizeRoomText4 - bg_event 6, 2, 5 ; CeladonPrizeRoomText5 + bg_event 2, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1 + bg_event 4, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_2 + bg_event 6, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3 def_object_events - object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person - object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person + object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, TEXT_GAMECORNERPRIZEROOM_BALDING_GUY + object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_GAMECORNERPRIZEROOM_GAMBLER def_warps_to GAME_CORNER_PRIZE_ROOM |