diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/maps/objects/GameCornerPrizeRoom.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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..e5d75d12 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const_export GAMECORNERPRIZEROOM_BALDING_GUY + const_export 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 |