summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BillsHouse.asm12
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm120
-rw-r--r--maps/GoldenrodCity.asm4
-rw-r--r--maps/GoldenrodGameCorner.asm4
-rw-r--r--maps/KurtsHouse.asm2
-rw-r--r--maps/RadioTower1F.asm2
-rw-r--r--maps/Route34.asm4
7 files changed, 74 insertions, 74 deletions
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 5c3676070..94e94e877 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -34,7 +34,7 @@ UnknownScript_0x189553:
yesorno
iffalse UnknownScript_0x1896aa
scall UnknownScript_0x1896a5
- special Function73f7
+ special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa
if_not_equal LICKITUNG, UnknownScript_0x1896c6
scall UnknownScript_0x1896b0
@@ -48,7 +48,7 @@ UnknownScript_0x189592:
yesorno
iffalse UnknownScript_0x1896aa
scall UnknownScript_0x1896a5
- special Function73f7
+ special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa
if_not_equal ODDISH, UnknownScript_0x1896c6
scall UnknownScript_0x1896b0
@@ -62,7 +62,7 @@ UnknownScript_0x1895b3:
yesorno
iffalse UnknownScript_0x1896aa
scall UnknownScript_0x1896a5
- special Function73f7
+ special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa
if_not_equal STARYU, UnknownScript_0x1896c6
scall UnknownScript_0x1896b0
@@ -78,7 +78,7 @@ UnknownScript_0x1895d4:
yesorno
iffalse UnknownScript_0x1896aa
scall UnknownScript_0x1896a5
- special Function73f7
+ special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa
if_not_equal GROWLITHE, UnknownScript_0x1896c6
scall UnknownScript_0x1896b0
@@ -92,7 +92,7 @@ UnknownScript_0x1895f9:
yesorno
iffalse UnknownScript_0x1896aa
scall UnknownScript_0x1896a5
- special Function73f7
+ special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa
if_not_equal VULPIX, UnknownScript_0x1896c6
scall UnknownScript_0x1896b0
@@ -106,7 +106,7 @@ UnknownScript_0x18961a:
yesorno
iffalse UnknownScript_0x1896aa
scall UnknownScript_0x1896a5
- special Function73f7
+ special Special_BillsGrandfather
iffalse UnknownScript_0x1896aa
if_not_equal PICHU, UnknownScript_0x1896c6
scall UnknownScript_0x1896b0
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 2b8267f79..effdf3658 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -17,82 +17,82 @@ MapCeladonGameCornerPrizeRoomSignpost0Script:
writetext UnknownText_0x7293e
closetext
checkitem COIN_CASE
- iffalse UnknownScript_0x7278a
+ iffalse CeladonPrizeRoom_NoCoinCase
writetext UnknownText_0x72974
-UnknownScript_0x726fd:
- special Function24b25
+CeladonPrizeRoom_tmcounterloop:
+ special Special_DisplayCoinCaseBalance
loadmenudata MenuDataHeader_0x72790
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x72714
- if_equal $2, UnknownScript_0x72730
- if_equal $3, UnknownScript_0x7274c
- jump UnknownScript_0x72784
+ if_equal $1, .doubleteam
+ if_equal $2, .psychic
+ if_equal $3, .hyperbeam
+ jump CeladonPrizeRoom_cancel
-UnknownScript_0x72714:
+.doubleteam:
checkcoins 1500
- if_equal $2, UnknownScript_0x72778
+ if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, $0
- scall UnknownScript_0x72768
- iffalse UnknownScript_0x72784
- giveitem TM_DOUBLE_TEAM, $1
- iffalse UnknownScript_0x7277e
+ scall CeladonPrizeRoom_askbuy
+ iffalse CeladonPrizeRoom_cancel
+ giveitem TM_DOUBLE_TEAM, 1
+ iffalse CeladonPrizeRoom_notenoughroom
takecoins 1500
- jump UnknownScript_0x7276d
+ jump CeladonPrizeRoom_purchased
-UnknownScript_0x72730:
+.psychic:
checkcoins 3500
- if_equal $2, UnknownScript_0x72778
+ if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC, $0
- scall UnknownScript_0x72768
- iffalse UnknownScript_0x72784
- giveitem TM_PSYCHIC, $1
- iffalse UnknownScript_0x7277e
+ scall CeladonPrizeRoom_askbuy
+ iffalse CeladonPrizeRoom_cancel
+ giveitem TM_PSYCHIC, 1
+ iffalse CeladonPrizeRoom_notenoughroom
takecoins 3500
- jump UnknownScript_0x7276d
+ jump CeladonPrizeRoom_purchased
-UnknownScript_0x7274c:
+.hyperbeam:
checkcoins 7500
- if_equal $2, UnknownScript_0x72778
+ if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, $0
- scall UnknownScript_0x72768
- iffalse UnknownScript_0x72784
- giveitem TM_HYPER_BEAM, $1
- iffalse UnknownScript_0x7277e
+ scall CeladonPrizeRoom_askbuy
+ iffalse CeladonPrizeRoom_cancel
+ giveitem TM_HYPER_BEAM, 1
+ iffalse CeladonPrizeRoom_notenoughroom
takecoins 7500
- jump UnknownScript_0x7276d
+ jump CeladonPrizeRoom_purchased
-UnknownScript_0x72768:
+CeladonPrizeRoom_askbuy:
writetext UnknownText_0x72991
yesorno
end
-UnknownScript_0x7276d:
+CeladonPrizeRoom_purchased:
waitbutton
playsound SFX_TRANSACTION
writetext UnknownText_0x729ad
closetext
- jump UnknownScript_0x726fd
+ jump CeladonPrizeRoom_tmcounterloop
-UnknownScript_0x72778:
+CeladonPrizeRoom_notenoughcoins:
writetext UnknownText_0x729bb
closetext
loadmovesprites
end
-UnknownScript_0x7277e:
+CeladonPrizeRoom_notenoughroom:
writetext UnknownText_0x729d8
closetext
loadmovesprites
end
-UnknownScript_0x72784:
+CeladonPrizeRoom_cancel:
writetext UnknownText_0x729f2
closetext
loadmovesprites
end
-UnknownScript_0x7278a:
+CeladonPrizeRoom_NoCoinCase:
writetext UnknownText_0x72a14
closetext
loadmovesprites
@@ -121,26 +121,26 @@ MapCeladonGameCornerPrizeRoomSignpost1Script:
writetext UnknownText_0x7293e
closetext
checkitem COIN_CASE
- iffalse UnknownScript_0x7278a
-UnknownScript_0x727d3:
+ iffalse CeladonPrizeRoom_NoCoinCase
+.loop:
writetext UnknownText_0x72974
- special Function24b25
+ special Special_DisplayCoinCaseBalance
loadmenudata MenuDataHeader_0x72877
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x727ed
- if_equal $2, UnknownScript_0x7281b
- if_equal $3, UnknownScript_0x72849
- jump UnknownScript_0x72784
+ if_equal $1, .pikachu
+ if_equal $2, .porygon
+ if_equal $3, .larvitar
+ jump CeladonPrizeRoom_cancel
-UnknownScript_0x727ed:
+.pikachu:
checkcoins 2222
- if_equal $2, UnknownScript_0x72778
+ if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x7277e
+ if_equal $6, CeladonPrizeRoom_notenoughroom
pokenamemem PIKACHU, $0
- scall UnknownScript_0x72768
- iffalse UnknownScript_0x72784
+ scall CeladonPrizeRoom_askbuy
+ iffalse CeladonPrizeRoom_cancel
waitbutton
playsound SFX_TRANSACTION
writetext UnknownText_0x729ad
@@ -149,16 +149,16 @@ UnknownScript_0x727ed:
special Special_GameCornerPrizeMonCheckDex
givepoke PIKACHU, 25
takecoins 2222
- jump UnknownScript_0x727d3
+ jump .loop
-UnknownScript_0x7281b:
+.porygon:
checkcoins 5555
- if_equal $2, UnknownScript_0x72778
+ if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x7277e
+ if_equal $6, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, $0
- scall UnknownScript_0x72768
- iffalse UnknownScript_0x72784
+ scall CeladonPrizeRoom_askbuy
+ iffalse CeladonPrizeRoom_cancel
waitbutton
playsound SFX_TRANSACTION
writetext UnknownText_0x729ad
@@ -167,16 +167,16 @@ UnknownScript_0x7281b:
special Special_GameCornerPrizeMonCheckDex
givepoke PORYGON, 15
takecoins 5555
- jump UnknownScript_0x727d3
+ jump .loop
-UnknownScript_0x72849:
+.larvitar:
checkcoins 8888
- if_equal $2, UnknownScript_0x72778
+ if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x7277e
+ if_equal $6, CeladonPrizeRoom_notenoughroom
pokenamemem LARVITAR, $0
- scall UnknownScript_0x72768
- iffalse UnknownScript_0x72784
+ scall CeladonPrizeRoom_askbuy
+ iffalse CeladonPrizeRoom_cancel
waitbutton
playsound SFX_TRANSACTION
writetext UnknownText_0x729ad
@@ -185,7 +185,7 @@ UnknownScript_0x72849:
special Special_GameCornerPrizeMonCheckDex
givepoke LARVITAR, 40
takecoins 8888
- jump UnknownScript_0x727d3
+ jump .loop
MenuDataHeader_0x72877:
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 36c41f244..9bae61fc8 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -43,7 +43,7 @@ MoveTutor:
writetext UnknownText_0x199042
yesorno
iffalse .Refused
- special Function24b25
+ special Special_DisplayCoinCaseBalance
writetext UnknownText_0x199090
yesorno
iffalse .Refused2
@@ -114,7 +114,7 @@ MoveTutor:
takecoins 4000
waitbutton
playsound SFX_TRANSACTION
- special Function24b25
+ special Special_DisplayCoinCaseBalance
writetext UnknownText_0x19918b
closetext
loadmovesprites
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 0d97236b5..95c366828 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -49,7 +49,7 @@ ReceptionistScript_0x56c28:
iffalse UnknownScript_0x56cc3
writetext UnknownText_0x56e8b
UnknownScript_0x56c36: ; 056c36
- special Function24b25
+ special Special_DisplayCoinCaseBalance
loadmenudata MenuDataHeader_0x56cc9
interpretmenu2
writebackup
@@ -153,7 +153,7 @@ ReceptionistScript_0x56d01:
iffalse UnknownScript_0x56cc3
UnknownScript_0x56d0c:
writetext UnknownText_0x56e8b
- special Function24b25
+ special Special_DisplayCoinCaseBalance
loadmenudata MenuDataHeader_0x56db0
interpretmenu2
writebackup
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 7a77031c0..a2c73fb46 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -127,7 +127,7 @@ KurtScript_0x18e178:
writetext UnknownText_0x18e736
keeptextopen
setevent EVENT_DRAGON_SHRINE_QUESTION_2
- special Function88018
+ special Special_SelectApricornForKurt
if_equal $0, .Cancel
if_equal BLU_APRICORN, .Blu
if_equal YLW_APRICORN, .Ylw
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index 04a6cc907..de1167f9d 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -30,7 +30,7 @@ GentlemanScript_0x5cd3d:
iffalse .skip
special Special_ResetLuckyNumberShowFlag
.skip:
- special Function4d9d3
+ special Special_PrintTodaysLuckyNumber
checkflag ENGINE_LUCKY_NUMBER_SHOW
iftrue .GameOver
writetext UnknownText_0x5cf3a
diff --git a/maps/Route34.asm b/maps/Route34.asm
index c1706109d..1294920bb 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -65,13 +65,13 @@ UnknownScript_0x7805b:
DaycareMon1Script_0x78065:
loadfont
- special Function17421
+ special Special_DayCareMon1
loadmovesprites
end
DaycareMon2Script_0x7806b:
loadfont
- special Function17440
+ special Special_DayCareMon2
loadmovesprites
end