diff options
Diffstat (limited to 'maps/CeladonGameCorner.asm')
| -rw-r--r-- | maps/CeladonGameCorner.asm | 139 |
1 files changed, 66 insertions, 73 deletions
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 5d3382f53..9b95241e3 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M @@ -10,11 +10,9 @@ const_value set 2 const CELADONGAMECORNER_GRAMPS CeladonGameCorner_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonGameCornerClerkScript: jumpstd gamecornercoinvendor @@ -28,7 +26,7 @@ CeladonGameCornerPokefanMScript: writetext CeladonGameCornerPokefanMText waitbutton closetext - spriteface CELADONGAMECORNER_POKEFAN_M, LEFT + turnobject CELADONGAMECORNER_POKEFAN_M, LEFT end CeladonGameCornerTeacherScript: @@ -37,7 +35,7 @@ CeladonGameCornerTeacherScript: writetext CeladonGameCornerTeacherText waitbutton closetext - spriteface CELADONGAMECORNER_TEACHER, RIGHT + turnobject CELADONGAMECORNER_TEACHER, RIGHT end CeladonGameCornerFishingGuruScript: @@ -46,7 +44,7 @@ CeladonGameCornerFishingGuruScript: writetext CeladonGameCornerFishingGuruText waitbutton closetext - spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT + turnobject CELADONGAMECORNER_FISHING_GURU, RIGHT end CeladonGameCornerFisherScript: @@ -59,7 +57,7 @@ CeladonGameCornerFisherScript: checkitem COIN_CASE iffalse .NoCoinCase checkcoins MAX_COINS - 1 - if_equal HAVE_MORE, .FullCoinCase + ifequal HAVE_MORE, .FullCoinCase stringtotext .coinname, MEM_BUFFER_1 scall .GiveCoins givecoins 18 @@ -68,7 +66,7 @@ CeladonGameCornerFisherScript: writetext CeladonGameCornerFisherText2 waitbutton closetext - spriteface LAST_TALKED, LEFT + turnobject LAST_TALKED, LEFT end .GiveCoins: @@ -82,14 +80,14 @@ CeladonGameCornerFisherScript: writetext CeladonGameCornerFisherNoCoinCaseText waitbutton closetext - spriteface LAST_TALKED, LEFT + turnobject LAST_TALKED, LEFT end .FullCoinCase: writetext CeladonGameCornerFisherFullCoinCaseText waitbutton closetext - spriteface LAST_TALKED, LEFT + turnobject LAST_TALKED, LEFT end CeladonGymGuyScript: @@ -101,7 +99,7 @@ CeladonGameCornerGrampsScript: writetext CeladonGameCornerGrampsText waitbutton closetext - spriteface CELADONGAMECORNER_GRAMPS, LEFT + turnobject CELADONGAMECORNER_GRAMPS, LEFT end CeladonGameCornerPoster1Script: @@ -112,23 +110,23 @@ CeladonGameCornerPoster2Script: CeladonGameCornerLuckySlotMachineScript: random 6 - if_equal 0, CeladonGameCornerSlotMachineScript + ifequal 0, CeladonGameCornerSlotMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerSlotMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerCardFlipScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -139,7 +137,7 @@ MapCeladonGameCornerSignpost9Script: opentext writetext UnknownText_0x72567 waitbutton - special Special_CardFlip + special CardFlip closetext end @@ -282,66 +280,61 @@ UnknownText_0x72567: done CeladonGameCorner_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 14, 13, 6, CELADON_CITY - warp_def 15, 13, 6, CELADON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 38 - bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript - bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script - bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript - bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript - bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + db 0, 0 ; filler + + db 2 ; warp events + warp_event 14, 13, CELADON_CITY, 6 + warp_event 15, 13, CELADON_CITY, 6 + + db 0 ; coord events + + db 38 ; bg events + bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript + bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script + bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript + bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript + bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 12, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 12, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 13, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 13, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript - bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript + bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 18, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 18, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript - bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script - bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script + bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script + bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script -.ObjectEvents: - db 9 - object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 - object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + db 9 ; object events + object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 - object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 - object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 - object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 + object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 + object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 |