summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-12-24 22:58:42 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-12-24 22:58:42 -0500
commita5e928eb984d8995d17e42d415f687f5affb2935 (patch)
tree987ca936c71a712feabbf831f306b79d1feac7bf /maps
parent1df28a6beb1f25bba384e446febe833c68b17056 (diff)
writebackup --> closewindow; game corner prize vendors; others
Diffstat (limited to 'maps')
-rw-r--r--maps/CeladonDeptStore6F.asm2
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm86
-rw-r--r--maps/DragonShrine.asm10
-rw-r--r--maps/EarlsPokemonAcademy.asm2
-rw-r--r--maps/GoldenrodCity.asm2
-rw-r--r--maps/GoldenrodDeptStore6F.asm2
-rw-r--r--maps/GoldenrodGameCorner.asm348
-rw-r--r--maps/GoldenrodPokeComCenter2FMobile.asm4
8 files changed, 228 insertions, 228 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index d6c2fd97f..3abeda346 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -30,7 +30,7 @@ CeladonVendingMachine:
special PlaceMoneyTopRight
loadmenudata .MenuData
verticalmenu
- writebackup
+ closewindow
if_equal $1, .FreshWater
if_equal $2, .SodaPop
if_equal $3, .Lemonade
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 4b077896f..1f2ca6ea3 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -9,25 +9,25 @@ CeladonGameCornerPrizeRoom_MapScriptHeader:
.MapCallbacks:
db 0
-GentlemanScript_0x726e9:
- jumptextfaceplayer UnknownText_0x728b8
+CeladonGameCornerPrizeRoomGentlemanScript:
+ jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText
-PharmacistScript_0x726ec:
- jumptextfaceplayer UnknownText_0x728e9
+CeladonGameCornerPrizeRoomPharmacistScript:
+ jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText
-MapCeladonGameCornerPrizeRoomSignpost0Script:
+GoldenrodGameCornerTMVendor:
faceplayer
opentext
- writetext UnknownText_0x7293e
+ writetext CeladonPrizeRoom_PrizeVendorIntroText
waitbutton
checkitem COIN_CASE
iffalse CeladonPrizeRoom_NoCoinCase
- writetext UnknownText_0x72974
+ writetext CeladonPrizeRoom_AskWhichPrizeText
CeladonPrizeRoom_tmcounterloop:
special Special_DisplayCoinCaseBalance
- loadmenudata MenuDataHeader_0x72790
+ loadmenudata CeladonPrizeRoom_TMMenuDataHeader
verticalmenu
- writebackup
+ closewindow
if_equal $1, .doubleteam
if_equal $2, .psychic
if_equal $3, .hyperbeam
@@ -67,50 +67,50 @@ CeladonPrizeRoom_tmcounterloop:
jump CeladonPrizeRoom_purchased
CeladonPrizeRoom_askbuy:
- writetext UnknownText_0x72991
+ writetext CeladonPrizeRoom_ConfirmPurchaseText
yesorno
end
CeladonPrizeRoom_purchased:
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x729ad
+ writetext CeladonPrizeRoom_HereYouGoText
waitbutton
jump CeladonPrizeRoom_tmcounterloop
CeladonPrizeRoom_notenoughcoins:
- writetext UnknownText_0x729bb
+ writetext CeladonPrizeRoom_NotEnoughCoinsText
waitbutton
closetext
end
CeladonPrizeRoom_notenoughroom:
- writetext UnknownText_0x729d8
+ writetext CeladonPrizeRoom_NotEnoughRoomText
waitbutton
closetext
end
CeladonPrizeRoom_cancel:
- writetext UnknownText_0x729f2
+ writetext CeladonPrizeRoom_ComeAgainText
waitbutton
closetext
end
CeladonPrizeRoom_NoCoinCase:
- writetext UnknownText_0x72a14
+ writetext CeladonPrizeRoom_NoCoinCaseText
waitbutton
closetext
end
-MenuDataHeader_0x72790:
+CeladonPrizeRoom_TMMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
- dw MenuData2_0x72798
+ dw .MenuData2
db 1 ; default option
-MenuData2_0x72798:
+.MenuData2:
db $80 ; flags
db 4 ; items
db "TM32 1500@"
@@ -119,19 +119,19 @@ MenuData2_0x72798:
db "CANCEL@"
-MapCeladonGameCornerPrizeRoomSignpost1Script:
+GoldenrodGameCornerPokemonVendor:
faceplayer
opentext
- writetext UnknownText_0x7293e
+ writetext CeladonPrizeRoom_PrizeVendorIntroText
waitbutton
checkitem COIN_CASE
iffalse CeladonPrizeRoom_NoCoinCase
.loop:
- writetext UnknownText_0x72974
+ writetext CeladonPrizeRoom_AskWhichPrizeText
special Special_DisplayCoinCaseBalance
- loadmenudata MenuDataHeader_0x72877
+ loadmenudata .MenuDataHeader
verticalmenu
- writebackup
+ closewindow
if_equal $1, .pikachu
if_equal $2, .porygon
if_equal $3, .larvitar
@@ -147,7 +147,7 @@ MapCeladonGameCornerPrizeRoomSignpost1Script:
iffalse CeladonPrizeRoom_cancel
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x729ad
+ writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PIKACHU
special Special_GameCornerPrizeMonCheckDex
@@ -165,7 +165,7 @@ MapCeladonGameCornerPrizeRoomSignpost1Script:
iffalse CeladonPrizeRoom_cancel
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x729ad
+ writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PORYGON
special Special_GameCornerPrizeMonCheckDex
@@ -183,7 +183,7 @@ MapCeladonGameCornerPrizeRoomSignpost1Script:
iffalse CeladonPrizeRoom_cancel
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x729ad
+ writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte LARVITAR
special Special_GameCornerPrizeMonCheckDex
@@ -192,14 +192,14 @@ MapCeladonGameCornerPrizeRoomSignpost1Script:
jump .loop
-MenuDataHeader_0x72877:
+.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
- dw MenuData2_0x7287f
+ dw .MenuData2
db 1 ; default option
-MenuData2_0x7287f:
+.MenuData2:
db $80 ; flags
db 4 ; items
db "PIKACHU 2222@"
@@ -208,13 +208,13 @@ MenuData2_0x7287f:
db "CANCEL@"
-UnknownText_0x728b8:
+CeladonGameCornerPrizeRoomGentlemanText:
text "I wanted PORYGON,"
line "but I was short by"
cont "100 coins…"
done
-UnknownText_0x728e9:
+CeladonGameCornerPrizeRoomPharmacistText:
text "Whew…"
para "I've got to stay"
@@ -225,7 +225,7 @@ UnknownText_0x728e9:
cont "all my money…"
done
-UnknownText_0x7293e:
+CeladonPrizeRoom_PrizeVendorIntroText:
text "Welcome!"
para "We exchange your"
@@ -233,38 +233,38 @@ UnknownText_0x7293e:
cont "prizes!"
done
-UnknownText_0x72974:
+CeladonPrizeRoom_AskWhichPrizeText:
text "Which prize would"
line "you like?"
done
-UnknownText_0x72991:
+CeladonPrizeRoom_ConfirmPurchaseText:
text "OK, so you wanted"
line "a @"
text_from_ram StringBuffer3
text "?"
done
-UnknownText_0x729ad:
+CeladonPrizeRoom_HereYouGoText:
text "Here you go!"
done
-UnknownText_0x729bb:
+CeladonPrizeRoom_NotEnoughCoinsText:
text "You don't have"
line "enough coins."
done
-UnknownText_0x729d8:
+CeladonPrizeRoom_NotEnoughRoomText:
text "You have no room"
line "for it."
done
-UnknownText_0x729f2:
+CeladonPrizeRoom_ComeAgainText:
text "Oh. Please come"
line "back with coins!"
done
-UnknownText_0x72a14:
+CeladonPrizeRoom_NoCoinCaseText:
text "Oh? You don't have"
line "a COIN CASE."
done
@@ -283,10 +283,10 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
.Signposts:
db 2
- signpost 1, 2, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost0Script
- signpost 1, 4, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost1Script
+ signpost 1, 2, SIGNPOST_READ, GoldenrodGameCornerTMVendor
+ signpost 1, 4, SIGNPOST_READ, GoldenrodGameCornerPokemonVendor
.PersonEvents:
db 2
- person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x726e9, -1
- person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x726ec, -1
+ person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
+ person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 347d77bfe..942920874 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -34,7 +34,7 @@ DragonShrineTestScript:
buttonsound
loadmenudata MenuDataHeader_0x18d215
verticalmenu
- writebackup
+ closewindow
if_equal $1, .RightAnswer
if_equal $2, .WrongAnswer
if_equal $3, .RightAnswer
@@ -46,7 +46,7 @@ DragonShrineTestScript:
buttonsound
loadmenudata MenuDataHeader_0x18d234
verticalmenu
- writebackup
+ closewindow
if_equal $1, .RightAnswer
if_equal $2, .RightAnswer
if_equal $3, .WrongAnswer
@@ -56,7 +56,7 @@ DragonShrineTestScript:
buttonsound
loadmenudata MenuDataHeader_0x18d258
verticalmenu
- writebackup
+ closewindow
if_equal $1, .WrongAnswer
if_equal $2, .RightAnswer
if_equal $3, .RightAnswer
@@ -66,7 +66,7 @@ DragonShrineTestScript:
buttonsound
loadmenudata MenuDataHeader_0x18d283
verticalmenu
- writebackup
+ closewindow
if_equal $1, .RightAnswer
if_equal $2, .WrongAnswer
if_equal $3, .RightAnswer
@@ -76,7 +76,7 @@ DragonShrineTestScript:
buttonsound
loadmenudata MenuDataHeader_0x18d2a5
verticalmenu
- writebackup
+ closewindow
if_equal $1, .WrongAnswer
if_equal $2, .RightAnswer
if_equal $3, .WrongAnswer
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 126db4efe..865e34c1c 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -68,7 +68,7 @@ AcademyBlackboard:
.Loop
loadmenudata .MenuHeader
_2dmenu
- writebackup
+ closewindow
if_equal $1, .Poison
if_equal $2, .Paralysis
if_equal $3, .Sleep
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 9e27ccf3b..e50f6e223 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -69,7 +69,7 @@ MoveTutor:
writetext UnknownText_0x1990ce
loadmenudata .MoveMenuDataHeader
verticalmenu
- writebackup
+ closewindow
if_equal $1, .Flamethrower
if_equal $2, .Thunderbolt
if_equal $3, .IceBeam
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 34f5ad350..3d54a45b0 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -16,7 +16,7 @@ GoldenrodVendingMachine:
special PlaceMoneyTopRight
loadmenudata .MenuData
verticalmenu
- writebackup
+ closewindow
if_equal $1, .FreshWater
if_equal $2, .SodaPop
if_equal $3, .Lemonade
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 18d24acdf..d92233639 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -21,128 +21,128 @@ GoldenrodGameCorner_MapScriptHeader:
; callbacks
- dbw 2, UnknownScript_0x56bf9
+ dbw 2, .Callback
-UnknownScript_0x56bf9:
+.Callback
checkevent EVENT_BEAT_ELITE_FOUR
- iffalse UnknownScript_0x56c19
+ iffalse .finish
checkitem COIN_CASE
- iffalse UnknownScript_0x56c0e
+ iffalse .move_tutor_inside
checkcode VAR_WEEKDAY
- if_equal WEDNESDAY, UnknownScript_0x56c11
- if_equal SATURDAY, UnknownScript_0x56c11
-UnknownScript_0x56c0e:
+ if_equal WEDNESDAY, .move_tutor_outside
+ if_equal SATURDAY, .move_tutor_outside
+.move_tutor_inside
appear GOLDENRODGAMECORNER_POKEFAN_M3
return
-UnknownScript_0x56c11:
+.move_tutor_outside
checkflag ENGINE_DAILY_MOVE_TUTOR
- iftrue UnknownScript_0x56c19
+ iftrue .finish
disappear GOLDENRODGAMECORNER_POKEFAN_M3
-UnknownScript_0x56c19: ;0x56c19
+.finish
return
-PokefanMScript_0x56c1a:
+GoldenrodGameCornerPokefanM3Script:
faceplayer
opentext
- writetext UnknownText_0x5718a
+ writetext GoldenrodGameCornerPokefanM3Text
waitbutton
closetext
spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
end
-ClerkScript_0x56c25:
+GoldenrodGmeCornerCoinVendorScript:
jumpstd gamecornercoinvendor
-ReceptionistScript_0x56c28:
+GoldenrodGmeCornerTMVendorScript:
faceplayer
opentext
- writetext UnknownText_0x56e50
+ writetext GoldenrodGameCornerPrizeVendorIntroText
waitbutton
checkitem COIN_CASE
- iffalse UnknownScript_0x56cc3
- writetext UnknownText_0x56e8b
-UnknownScript_0x56c36: ; 056c36
+ iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
+ writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
+GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
special Special_DisplayCoinCaseBalance
- loadmenudata MenuDataHeader_0x56cc9
+ loadmenudata GoldenrodGameCornerTMVendorMenuData
verticalmenu
- writebackup
- if_equal $1, UnknownScript_0x56c4d
- if_equal $2, UnknownScript_0x56c69
- if_equal $3, UnknownScript_0x56c85
- jump UnknownScript_0x56cbd
+ closewindow
+ if_equal $1, .Thunder
+ if_equal $2, .Blizzard
+ if_equal $3, .FireBlast
+ jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
-UnknownScript_0x56c4d:
+.Thunder:
checkcoins 5500
- if_equal $2, UnknownScript_0x56cb1
+ if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_THUNDER, $0
- scall UnknownScript_0x56ca1
- iffalse UnknownScript_0x56cbd
+ scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
+ iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_THUNDER
- iffalse UnknownScript_0x56cb7
+ iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins 5500
- jump UnknownScript_0x56ca6
+ jump GoldenrodGmeCornerTMVendor_FinishScript
-UnknownScript_0x56c69:
+.Blizzard:
checkcoins 5500
- if_equal $2, UnknownScript_0x56cb1
+ if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_BLIZZARD, $0
- scall UnknownScript_0x56ca1
- iffalse UnknownScript_0x56cbd
+ scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
+ iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_BLIZZARD
- iffalse UnknownScript_0x56cb7
+ iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins 5500
- jump UnknownScript_0x56ca6
+ jump GoldenrodGmeCornerTMVendor_FinishScript
-UnknownScript_0x56c85:
+.FireBlast:
checkcoins 5500
- if_equal $2, UnknownScript_0x56cb1
+ if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_FIRE_BLAST, $0
- scall UnknownScript_0x56ca1
- iffalse UnknownScript_0x56cbd
+ scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
+ iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
giveitem TM_FIRE_BLAST
- iffalse UnknownScript_0x56cb7
+ iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
takecoins 5500
- jump UnknownScript_0x56ca6
+ jump GoldenrodGmeCornerTMVendor_FinishScript
-UnknownScript_0x56ca1:
- writetext UnknownText_0x56ea8
+GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript:
+ writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText
yesorno
end
-UnknownScript_0x56ca6:
+GoldenrodGmeCornerTMVendor_FinishScript:
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x56ebd
+ writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
- jump UnknownScript_0x56c36
+ jump GoldenrodGmeCornerTMVendor_LoopScript
-UnknownScript_0x56cb1:
- writetext UnknownText_0x56ecb
+GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript:
+ writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText
waitbutton
closetext
end
-UnknownScript_0x56cb7:
- writetext UnknownText_0x56ee8
+GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript:
+ writetext GoldenrodGameCornerPrizeVendorNoMoreRoomText
waitbutton
closetext
end
-UnknownScript_0x56cbd:
- writetext UnknownText_0x56f09
+GoldenrodGameCornerPrizeVendor_CancelPurchaseScript:
+ writetext GoldenrodGameCornerPrizeVendorQuitText
waitbutton
closetext
end
-UnknownScript_0x56cc3:
- writetext UnknownText_0x56f35
+GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
+ writetext GoldenrodGameCornerPrizeVendorNoCoinCaseText
waitbutton
closetext
end
-MenuDataHeader_0x56cc9:
+GoldenrodGameCornerTMVendorMenuData:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
@@ -158,87 +158,87 @@ MenuData2_0x56cd1:
db "CANCEL@"
-ReceptionistScript_0x56d01:
+GoldenrodGameCornerPrizeMonVendorScript:
faceplayer
opentext
- writetext UnknownText_0x56e50
+ writetext GoldenrodGameCornerPrizeVendorIntroText
waitbutton
checkitem COIN_CASE
- iffalse UnknownScript_0x56cc3
-UnknownScript_0x56d0c:
- writetext UnknownText_0x56e8b
+ iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
+.loop
+ writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
special Special_DisplayCoinCaseBalance
- loadmenudata MenuDataHeader_0x56db0
+ loadmenudata .MenuDataHeader
verticalmenu
- writebackup
- if_equal $1, UnknownScript_0x56d26
- if_equal $2, UnknownScript_0x56d54
- if_equal $3, UnknownScript_0x56d82
- jump UnknownScript_0x56cbd
+ closewindow
+ if_equal $1, .abra
+ if_equal $2, .cubone
+ if_equal $3, .wobbuffet
+ jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
-UnknownScript_0x56d26:
+.abra:
checkcoins 100
- if_equal $2, UnknownScript_0x56cb1
+ if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x56cb7
+ if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem ABRA, $0
- scall UnknownScript_0x56ca1
- iffalse UnknownScript_0x56cbd
+ scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
+ iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x56ebd
+ writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte ABRA
special Special_GameCornerPrizeMonCheckDex
givepoke ABRA, 5
takecoins 100
- jump UnknownScript_0x56d0c
+ jump .loop
-UnknownScript_0x56d54:
+.cubone:
checkcoins 800
- if_equal $2, UnknownScript_0x56cb1
+ if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x56cb7
+ if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem CUBONE, $0
- scall UnknownScript_0x56ca1
- iffalse UnknownScript_0x56cbd
+ scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
+ iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x56ebd
+ writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte CUBONE
special Special_GameCornerPrizeMonCheckDex
givepoke CUBONE, 15
takecoins 800
- jump UnknownScript_0x56d0c
+ jump .loop
-UnknownScript_0x56d82:
+.wobbuffet:
checkcoins 1500
- if_equal $2, UnknownScript_0x56cb1
+ if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x56cb7
+ if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem WOBBUFFET, $0
- scall UnknownScript_0x56ca1
- iffalse UnknownScript_0x56cbd
+ scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
+ iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
waitsfx
playsound SFX_TRANSACTION
- writetext UnknownText_0x56ebd
+ writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte WOBBUFFET
special Special_GameCornerPrizeMonCheckDex
givepoke WOBBUFFET, 15
takecoins 1500
- jump UnknownScript_0x56d0c
+ jump .loop
-MenuDataHeader_0x56db0:
+.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
- dw MenuData2_0x56db8
+ dw .MenuData2
db 1 ; default option
-MenuData2_0x56db8:
+.MenuData2:
db $80 ; flags
db 4 ; items
db "ABRA 100@"
@@ -247,83 +247,83 @@ MenuData2_0x56db8:
db "CANCEL@"
-PharmacistScript_0x56df1:
+GoldenrodGameCornerPharmacistScript:
faceplayer
opentext
- writetext UnknownText_0x56f55
+ writetext GoldenrodGameCornerPharmacistText
waitbutton
closetext
spriteface LAST_TALKED, LEFT
end
-PokefanMScript_0x56dfc:
+GoldenrodGameCornerPokefanM1Script:
faceplayer
opentext
- writetext UnknownText_0x56f9e
+ writetext GoldenrodGameCornerPokefanM1Text
waitbutton
closetext
spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
end
-CooltrainerMScript_0x56e07:
+GoldenrodGameCornerCooltrainerMScript:
faceplayer
opentext
- writetext UnknownText_0x56ff4
+ writetext GoldenrodGameCornerCooltrainerMText
waitbutton
closetext
spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
end
-PokefanFScript_0x56e12:
+GoldenrodGameCornerPokefanFScript:
faceplayer
opentext
- writetext UnknownText_0x5702b
+ writetext GoldenrodGameCornerPokefanFText
waitbutton
closetext
spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
end
-CooltrainerFScript_0x56e1d:
- jumptextfaceplayer UnknownText_0x57097
+GoldenrodGameCornerCooltrainerFScript:
+ jumptextfaceplayer GoldenrodGameCornerCooltrainerFText
-GentlemanScript_0x56e20:
+GoldenrodGameCornerGentlemanScript:
faceplayer
opentext
- writetext UnknownText_0x570b1
+ writetext GoldenrodGameCornerGentlemanText
waitbutton
closetext
spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
end
-PokefanMScript_0x56e2b:
- jumptextfaceplayer UnknownText_0x5710d
+GoldenrodGameCornerPokefanM2Script:
+ jumptextfaceplayer GoldenrodGameCornerPokefanM2Text
-MapGoldenrodGameCornerSignpost30Script:
- jumptext UnknownText_0x571af
+GoldenrodGameCornerLeftTheirDrinkScript:
+ jumptext GoldenrodGameCornerLeftTheirDrinkText
-MapGoldenrodGameCornerSignpost17Script:
- random $6
- if_equal $0, MapGoldenrodGameCornerSignpost7Script
+GoldenrodGameCornerSlotsMachineScript:
+ random 6
+ if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript
refreshscreen $0
- writebyte $0
+ writebyte FALSE
special Special_SlotMachine
closetext
end
-MapGoldenrodGameCornerSignpost7Script:
+GoldenrodGameCornerLuckySlotsMachineScript:
refreshscreen $0
- writebyte $1
+ writebyte TRUE
special Special_SlotMachine
closetext
end
-MapGoldenrodGameCornerSignpost29Script:
+GoldenrodGameCornerCardFlipMachineScript:
refreshscreen $0
special Special_CardFlip
closetext
end
-UnknownText_0x56e50:
+GoldenrodGameCornerPrizeVendorIntroText:
text "Welcome!"
para "We exchange your"
@@ -331,43 +331,43 @@ UnknownText_0x56e50:
cont "fabulous prizes!"
done
-UnknownText_0x56e8b:
+GoldenrodGameCornerPrizeVendorWhichPrizeText:
text "Which prize would"
line "you like?"
done
-UnknownText_0x56ea8:
+GoldenrodGameCornerPrizeVendorConfirmPrizeText:
text_from_ram StringBuffer3
text "."
line "Is that right?"
done
-UnknownText_0x56ebd:
+GoldenrodGameCornerPrizeVendorHereYouGoText:
text "Here you go!"
done
-UnknownText_0x56ecb:
+GoldenrodGameCornerPrizeVendorNeedMoreCoinsText:
text "Sorry! You need"
line "more coins."
done
-UnknownText_0x56ee8:
+GoldenrodGameCornerPrizeVendorNoMoreRoomText:
text "Sorry. You can't"
line "carry any more."
done
-UnknownText_0x56f09:
+GoldenrodGameCornerPrizeVendorQuitText:
text "OK. Please save"
line "your coins and"
cont "come again!"
done
-UnknownText_0x56f35:
+GoldenrodGameCornerPrizeVendorNoCoinCaseText:
text "Oh? You don't have"
line "a COIN CASE."
done
-UnknownText_0x56f55:
+GoldenrodGameCornerPharmacistText:
text "I always play this"
line "slot machine. It"
@@ -375,7 +375,7 @@ UnknownText_0x56f55:
line "others, I think."
done
-UnknownText_0x56f9e:
+GoldenrodGameCornerPokefanM1Text:
text "I just love this"
line "new slot machine."
@@ -384,13 +384,13 @@ UnknownText_0x56f9e:
cont "ones in CELADON."
done
-UnknownText_0x56ff4:
+GoldenrodGameCornerCooltrainerMText:
text "Life is a gamble."
line "I'm going to flip"
cont "cards till I drop!"
done
-UnknownText_0x5702b:
+GoldenrodGameCornerPokefanFText:
text "Card flip…"
para "I prefer it over"
@@ -403,12 +403,12 @@ UnknownText_0x5702b:
line "much lower."
done
-UnknownText_0x57097:
+GoldenrodGameCornerCooltrainerFText:
text "I won't quit until"
line "I win!"
done
-UnknownText_0x570b1:
+GoldenrodGameCornerGentlemanText:
text "I taught BLIZZARD"
line "to my #MON."
@@ -419,7 +419,7 @@ UnknownText_0x570b1:
line "worth it."
done
-UnknownText_0x5710d:
+GoldenrodGameCornerPokefanM2Text:
text "I couldn't win at"
line "the slots, and I"
@@ -433,12 +433,12 @@ UnknownText_0x5710d:
line "UNDERGROUND."
done
-UnknownText_0x5718a:
+GoldenrodGameCornerPokefanM3Text:
text "Wahahah! The coins"
line "keep rolling in!"
done
-UnknownText_0x571af:
+GoldenrodGameCornerLeftTheirDrinkText:
text "Someone left their"
line "drink."
@@ -459,49 +459,49 @@ GoldenrodGameCorner_MapEventHeader:
.Signposts:
db 31
- signpost 6, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 7, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 8, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 9, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 10, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 11, 6, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script
- signpost 6, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 7, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost7Script
- signpost 8, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 9, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 10, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 11, 7, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost17Script
- signpost 6, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 7, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 8, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 9, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 10, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script
- signpost 11, 12, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script
- signpost 6, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 7, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 8, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 9, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 10, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 11, 13, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost29Script
- signpost 6, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 7, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 8, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 9, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 10, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script
- signpost 11, 18, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost29Script
- signpost 1, 12, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost30Script
+ signpost 6, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 7, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 8, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 9, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 10, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 11, 6, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript
+ signpost 6, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 7, 7, SIGNPOST_READ, GoldenrodGameCornerLuckySlotsMachineScript
+ signpost 8, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 9, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 10, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 11, 7, SIGNPOST_LEFT, GoldenrodGameCornerSlotsMachineScript
+ signpost 6, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 7, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 8, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 9, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 10, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript
+ signpost 11, 12, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript
+ signpost 6, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 7, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 8, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 9, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 10, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 11, 13, SIGNPOST_LEFT, GoldenrodGameCornerCardFlipMachineScript
+ signpost 6, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 7, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 8, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 9, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 10, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript
+ signpost 11, 18, SIGNPOST_RIGHT, GoldenrodGameCornerCardFlipMachineScript
+ signpost 1, 12, SIGNPOST_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
.PersonEvents:
db 12
- person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ClerkScript_0x56c25, -1
- person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x56c28, -1
- person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x56d01, -1
- person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x56df1, -1
- person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x56df1, -1
- person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x56dfc, -1
- person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x56e07, -1
- person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56e12, -1
- person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x56e1d, -1
- person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x56e20, -1
- person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x56e2b, -1
- person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
+ person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
+ person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
+ person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
+ person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+ person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+ person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1
+ person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
+ person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
+ person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
+ person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
+ person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
+ person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
index 06d4aece6..56ae85b30 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -27,7 +27,7 @@ UnknownScript_0x625df:
reloadmappart
loadmenudata MenuDataHeader_0x62602
verticalmenu
- writebackup
+ closewindow
if_equal $1, UnknownScript_0x625f0
if_equal $2, UnknownScript_0x625f8
jump UnknownScript_0x62600
@@ -72,7 +72,7 @@ UnknownScript_0x62629:
reloadmappart
loadmenudata MenuDataHeader_0x6264c
verticalmenu
- writebackup
+ closewindow
if_equal $1, UnknownScript_0x6263a
if_equal $2, UnknownScript_0x62642
jump UnknownScript_0x6264a