diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-04 00:47:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 00:47:16 -0400 |
| commit | d596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (patch) | |
| tree | 5bc4cbdd09186fbdf2f7e2294fdde443ff8900bd /maps | |
| parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) | |
| parent | c7bb2d15cfb32a5e965933b90e0acb497c7bf7b2 (diff) | |
Merge pull request #514 from Rangi42/master
[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/GoldenrodGameCorner.asm | 20 | ||||
| -rw-r--r-- | maps/Route35GoldenrodGate.asm | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index dee306ba7..2e49a874b 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -46,10 +46,10 @@ GoldenrodGameCornerPokefanM3Script: turnobject GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT end -GoldenrodGmeCornerCoinVendorScript: +GoldenrodGameCornerCoinVendorScript: jumpstd gamecornercoinvendor -GoldenrodGmeCornerTMVendorScript: +GoldenrodGameCornerTMVendorScript: faceplayer opentext writetext GoldenrodGameCornerPrizeVendorIntroText @@ -57,7 +57,7 @@ GoldenrodGmeCornerTMVendorScript: checkitem COIN_CASE iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript writetext GoldenrodGameCornerPrizeVendorWhichPrizeText -GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 +GoldenrodGameCornerTMVendor_LoopScript: ; 056c36 special DisplayCoinCaseBalance loadmenu GoldenrodGameCornerTMVendorMenuHeader verticalmenu @@ -76,7 +76,7 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 giveitem TM_THUNDER iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump GoldenrodGmeCornerTMVendor_FinishScript + jump GoldenrodGameCornerTMVendor_FinishScript .Blizzard: checkcoins 5500 @@ -87,7 +87,7 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 giveitem TM_BLIZZARD iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump GoldenrodGmeCornerTMVendor_FinishScript + jump GoldenrodGameCornerTMVendor_FinishScript .FireBlast: checkcoins 5500 @@ -98,19 +98,19 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 giveitem TM_FIRE_BLAST iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump GoldenrodGmeCornerTMVendor_FinishScript + jump GoldenrodGameCornerTMVendor_FinishScript GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript: writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText yesorno end -GoldenrodGmeCornerTMVendor_FinishScript: +GoldenrodGameCornerTMVendor_FinishScript: waitsfx playsound SFX_TRANSACTION writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton - jump GoldenrodGmeCornerTMVendor_LoopScript + jump GoldenrodGameCornerTMVendor_LoopScript GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript: writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText @@ -477,8 +477,8 @@ GoldenrodGameCorner_MapEvents: bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript db 12 ; object events - object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 - object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCoinVendorScript, -1 + object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerTMVendorScript, -1 object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 52089c4db..71a1e510b 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -63,15 +63,17 @@ RandyScript: end GiftSpearowMail: - db FLOWER_MAIL + db FLOWER_MAIL db "DARK CAVE leads" next "to another road@" + GiftSpearowName: db "KENYA@" + GiftSpearowOTName: db "RANDY@" - db 0 + db 0 ; filler Route35GoldenrodGatePokefanFScript: faceplayer |