summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BillsHouse.asm10
-rw-r--r--maps/Colosseum.asm4
-rw-r--r--maps/DragonShrine.asm116
-rw-r--r--maps/DragonsDenB1F.asm4
-rw-r--r--maps/EcruteakHouse.asm4
-rw-r--r--maps/GoldenrodDeptStoreRoof.asm36
-rw-r--r--maps/HallOfFame.asm6
-rw-r--r--maps/KrissHouse1F.asm10
-rw-r--r--maps/KurtsHouse.asm14
-rw-r--r--maps/MrPokemonsHouse.asm2
-rw-r--r--maps/OlivinePort.asm14
-rw-r--r--maps/PokeCenter2F.asm4
-rw-r--r--maps/Route31.asm2
-rw-r--r--maps/Route36NationalParkgate.asm20
-rw-r--r--maps/TimeCapsule.asm4
-rw-r--r--maps/TradeCenter.asm4
-rw-r--r--maps/VermilionPort.asm14
-rw-r--r--maps/VioletGym.asm10
-rw-r--r--maps/WarehouseEntrance.asm32
19 files changed, 155 insertions, 155 deletions
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 6445a439a..b4f7abf7d 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader:
GrampsScript_0x189538:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x1896ba
checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1896c0
@@ -120,7 +120,7 @@ UnknownScript_0x18963b:
verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
loadmovesprites
end
@@ -131,7 +131,7 @@ UnknownScript_0x189652:
verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
loadmovesprites
end
@@ -142,7 +142,7 @@ UnknownScript_0x189669:
verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
loadmovesprites
end
@@ -153,7 +153,7 @@ UnknownScript_0x189680:
verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
loadmovesprites
end
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 070bde484..b530d91c5 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
; people-events
db 2
- person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB
- person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB
+ person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
+ person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 6c6ac51c3..e8fdc5016 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -3,91 +3,91 @@ DragonShrine_MapScriptHeader:
db 2
; triggers
- dw UnknownScript_0x18d01e, $0000
- dw UnknownScript_0x18d022, $0000
+ dw .Trigger1, $0000
+ dw .Trigger2, $0000
; callback count
db 0
-UnknownScript_0x18d01e:
- priorityjump UnknownScript_0x18d023
+.Trigger1:
+ priorityjump DragonShrineTestScript
end
-UnknownScript_0x18d022:
+.Trigger2:
end
-UnknownScript_0x18d023:
+DragonShrineTestScript:
applymovement $0, MovementData_0x18d2bf
applymovement $2, MovementData_0x18d2c7
loadfont
writetext UnknownText_0x18d2ea
keeptextopen
-UnknownScript_0x18d030:
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+.Question1:
+ setevent EVENT_001
writetext UnknownText_0x18d3bc
keeptextopen
loadmenudata MenuDataHeader_0x18d215
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x18d0a9
- if_equal $2, UnknownScript_0x18d0cb
- if_equal $3, UnknownScript_0x18d0a9
+ if_equal $1, .RightAnswer
+ if_equal $2, .WrongAnswer
+ if_equal $3, .RightAnswer
end
-UnknownScript_0x18d049:
+.Question2:
setevent EVENT_002
writetext UnknownText_0x18d3d3
keeptextopen
loadmenudata MenuDataHeader_0x18d234
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x18d0a9
- if_equal $2, UnknownScript_0x18d0a9
- if_equal $3, UnknownScript_0x18d0cb
-UnknownScript_0x18d061:
+ if_equal $1, .RightAnswer
+ if_equal $2, .RightAnswer
+ if_equal $3, .WrongAnswer
+.Question3:
setevent EVENT_003
writetext UnknownText_0x18d3f3
keeptextopen
loadmenudata MenuDataHeader_0x18d258
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x18d0cb
- if_equal $2, UnknownScript_0x18d0a9
- if_equal $3, UnknownScript_0x18d0a9
-UnknownScript_0x18d079:
+ if_equal $1, .WrongAnswer
+ if_equal $2, .RightAnswer
+ if_equal $3, .RightAnswer
+.Question4:
setevent EVENT_004
writetext UnknownText_0x18d420
keeptextopen
loadmenudata MenuDataHeader_0x18d283
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x18d0a9
- if_equal $2, UnknownScript_0x18d0cb
- if_equal $3, UnknownScript_0x18d0a9
-UnknownScript_0x18d091:
+ if_equal $1, .RightAnswer
+ if_equal $2, .WrongAnswer
+ if_equal $3, .RightAnswer
+.Question5:
setevent EVENT_005
writetext UnknownText_0x18d44a
keeptextopen
loadmenudata MenuDataHeader_0x18d2a5
interpretmenu2
writebackup
- if_equal $1, UnknownScript_0x18d0cb
- if_equal $2, UnknownScript_0x18d0a9
- if_equal $3, UnknownScript_0x18d0cb
-UnknownScript_0x18d0a9:
+ if_equal $1, .WrongAnswer
+ if_equal $2, .RightAnswer
+ if_equal $3, .WrongAnswer
+.RightAnswer:
checkevent EVENT_005
- iftrue UnknownScript_0x18d100
+ iftrue .PassedTheTest
writetext UnknownText_0x18d82d
keeptextopen
checkevent EVENT_004
- iftrue UnknownScript_0x18d091
+ iftrue .Question5
checkevent EVENT_003
- iftrue UnknownScript_0x18d079
+ iftrue .Question4
checkevent EVENT_002
- iftrue UnknownScript_0x18d061
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
- iftrue UnknownScript_0x18d049
-UnknownScript_0x18d0cb:
+ iftrue .Question3
+ checkevent EVENT_001
+ iftrue .Question2
+.WrongAnswer:
loadmovesprites
spriteface $2, LEFT
loadfont
@@ -102,16 +102,16 @@ UnknownScript_0x18d0cb:
setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
loadfont
checkevent EVENT_005
- iftrue UnknownScript_0x18d091
+ iftrue .Question5
checkevent EVENT_004
- iftrue UnknownScript_0x18d079
+ iftrue .Question4
checkevent EVENT_003
- iftrue UnknownScript_0x18d061
+ iftrue .Question3
checkevent EVENT_002
- iftrue UnknownScript_0x18d049
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
- iftrue UnknownScript_0x18d030
-UnknownScript_0x18d100:
+ iftrue .Question2
+ checkevent EVENT_001
+ iftrue .Question1
+.PassedTheTest:
writetext UnknownText_0x18d47c
closetext
loadmovesprites
@@ -160,7 +160,7 @@ UnknownScript_0x18d100:
playsound SFX_GET_BADGE
waitbutton
special RestartMapMusic
- specialphonecall $8
+ specialphonecall ELMCALL_MASTERBALL
dotrigger $1
domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1
writetext UnknownText_0x18d9f2
@@ -184,30 +184,30 @@ UnknownScript_0x18d100:
playsound SFX_ENTER_DOOR
disappear $5
waitbutton
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
end
ElderScript_0x18d1a5:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
- iftrue UnknownScript_0x18d1f9
+ checkevent EVENT_000
+ iftrue .DontGiveDratiniYet
checkevent EVENT_006
- iftrue UnknownScript_0x18d1ff
+ iftrue .ReceivedDratini
checkevent EVENT_GOT_DRATINI
- iffalse UnknownScript_0x18d1c5
+ iffalse .GiveDratini
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
- iftrue UnknownScript_0x18d1f3
+ iftrue .BeatRivalInMtMoon
writetext UnknownText_0x18d724
closetext
loadmovesprites
end
-UnknownScript_0x18d1c5:
+.GiveDratini:
writetext UnknownText_0x18d604
closetext
checkcode VAR_PARTYCOUNT
- if_equal $6, UnknownScript_0x18d1ed
+ if_equal 6, .PartyFull
writetext UnknownText_0x18d697
playsound SFX_CAUGHT_MON
waitbutton
@@ -221,25 +221,25 @@ UnknownScript_0x18d1c5:
loadmovesprites
end
-UnknownScript_0x18d1ed:
+.PartyFull:
writetext UnknownText_0x18d6ac
closetext
loadmovesprites
end
-UnknownScript_0x18d1f3:
+.BeatRivalInMtMoon:
writetext UnknownText_0x18d782
closetext
loadmovesprites
end
-UnknownScript_0x18d1f9:
+.DontGiveDratiniYet:
writetext UnknownText_0x18d5e5
closetext
loadmovesprites
end
-UnknownScript_0x18d1ff:
+.ReceivedDratini:
writetext UnknownText_0x18d6ca
closetext
loadmovesprites
@@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
; people-events
db 4
- person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_CHRIS1_IN_CABLE_CLUB
- person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_CHRIS1_IN_CABLE_CLUB
- person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_CHRIS1_IN_CABLE_CLUB
+ person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000
+ person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000
+ person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000
person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 21bb85fe3..4481d3597 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -212,12 +212,12 @@ SilverScript_0x18c97e:
playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x18c995
writetext UnknownText_0x18cc83
closetext
loadmovesprites
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
special RestartMapMusic
end
diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
index 183a44a08..066b9125b 100644
--- a/maps/EcruteakHouse.asm
+++ b/maps/EcruteakHouse.asm
@@ -86,7 +86,7 @@ UnknownScript_0x98076:
UnknownScript_0x9807c:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x980a4
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x980aa
checkitem CLEAR_BELL
iftrue UnknownScript_0x98093
@@ -102,7 +102,7 @@ UnknownScript_0x98093:
dotrigger $1
setevent EVENT_RANG_CLEAR_BELL
clearevent EVENT_766
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
end
UnknownScript_0x980a4:
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index c04ded152..5aaf3b8e4 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -7,30 +7,30 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
; callbacks
- dbw 1, UnknownScript_0x5671b
+ dbw 1, .CheckSaleChangeBlock
- dbw 2, UnknownScript_0x5672b
+ dbw 2, .CheckSaleChangeClerk
-UnknownScript_0x5671b:
+.CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
- iftrue UnknownScript_0x56722
+ iftrue .ChangeBlock
return
-UnknownScript_0x56722:
+.ChangeBlock:
changeblock $0, $2, $3f
changeblock $0, $4, $f
return
-UnknownScript_0x5672b:
+.CheckSaleChangeClerk:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
- iftrue UnknownScript_0x56738
- setevent EVENT_6F0
- clearevent EVENT_6F1
+ iftrue .ChangeClerk
+ setevent EVENT_GOLDENROD_SALE_OFF
+ clearevent EVENT_GOLDENROD_SALE_ON
return
-UnknownScript_0x56738:
- clearevent EVENT_6F0
- setevent EVENT_6F1
+.ChangeClerk:
+ clearevent EVENT_GOLDENROD_SALE_OFF
+ setevent EVENT_GOLDENROD_SALE_ON
return
ClerkScript_0x5673f:
@@ -225,11 +225,11 @@ GoldenrodDeptStoreRoof_MapEventHeader:
; people-events
db 8
- person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_6F0
+ person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
person_event SPRITE_POKEFAN_F, 7, 14, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1
person_event SPRITE_FISHER, 5, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x56749, -1
- person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_6F1
- person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_6F1
- person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_6F0
- person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_6F0
- person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_6F0
+ person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON
+ person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
+ person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF
+ person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF
+ person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index a50361a17..ca4f1c948 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -40,9 +40,9 @@ HallOfFameScript:
domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1
special HealParty
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
- iftrue HallOfFame_SkipPhoneCall
- specialphonecall $5
-HallOfFame_SkipPhoneCall:
+ iftrue .SkipPhoneCall
+ specialphonecall ELMCALL_SSTICKET
+.SkipPhoneCall:
halloffame
end
diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
index 680ccfef5..5ad19236f 100644
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -16,13 +16,13 @@ UnknownScript_0x7a4d7:
end
UnknownScript_0x7a4d8:
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
UnknownScript_0x7a4db:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, $2, 15
spriteface $0, LEFT
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x7a4f2
applymovement $2, MovementData_0x7a5fc
jump UnknownScript_0x7a4f6
@@ -77,9 +77,9 @@ UnknownScript_0x7a549:
writetext UnknownText_0x7a850
closetext
loadmovesprites
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x7a55d
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iffalse UnknownScript_0x7a564
jump UnknownScript_0x7a56b
@@ -109,7 +109,7 @@ UnknownScript_0x7a57e:
MomScript_0x7a582:
faceplayer
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
checktriggers
iffalse UnknownScript_0x7a572
loadfont
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index df36a7877..ae065d727 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -70,7 +70,7 @@ UnknownScript_0x18e1bf:
iffalse UnknownScript_0x18e2b2
setevent EVENT_035
UnknownScript_0x18e1cc:
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x18e29f
checkevent EVENT_258
iftrue UnknownScript_0x18e2b4
@@ -89,7 +89,7 @@ UnknownScript_0x18e1cc:
checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
iftrue UnknownScript_0x18e34e
UnknownScript_0x18e202:
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue UnknownScript_0x18e212
checkevent EVENT_002
iftrue UnknownScript_0x18e212
@@ -110,7 +110,7 @@ UnknownScript_0x18e212:
iftrue UnknownScript_0x18e249
checkitem PNK_APRICORN
iftrue UnknownScript_0x18e249
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue UnknownScript_0x18e2ae
checkevent EVENT_002
iftrue UnknownScript_0x18e243
@@ -163,7 +163,7 @@ UnknownScript_0x18e293:
jump UnknownScript_0x18e299
UnknownScript_0x18e299:
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
setflag ENGINE_KURT_MAKING_BALLS
UnknownScript_0x18e29f:
writetext UnknownText_0x18e779
@@ -178,7 +178,7 @@ UnknownScript_0x18e2a5:
end
UnknownScript_0x18e2ab:
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
UnknownScript_0x18e2ae:
writetext UnknownText_0x18e82a
closetext
@@ -349,9 +349,9 @@ UnknownScript_0x18e3e0:
KurtsGranddaughter1:
faceplayer
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue KurtsGranddaughter2Subscript
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue KurtsGranddaughterFunScript
checkevent EVENT_FOREST_IS_RESTLESS
iftrue .Lonely
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index fa9ac1206..44a8d3a70 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -126,7 +126,7 @@ UnknownScript_0x196ec9:
dotrigger $1
domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1
domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3
- specialphonecall $2
+ specialphonecall ELMCALL_ROBBED
clearevent EVENT_COP_IN_ELMS_LAB
checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x196f49
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 3d559e7ba..1c71aad5b 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -20,14 +20,14 @@ UnknownScript_0x748b1:
applymovement $0, MovementData_0x74a32
appear $2
dotrigger $0
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
end
SailorScript_0x748c0:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x74919
writetext UnknownText_0x74a55
closetext
@@ -69,9 +69,9 @@ UnknownScript_0x74919:
UnknownScript_0x7491f:
spriteface $4, RIGHT
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x7498b
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue UnknownScript_0x7498b
spriteface $0, LEFT
loadfont
@@ -94,7 +94,7 @@ UnknownScript_0x7494e:
writetext UnknownText_0x74b11
closetext
loadmovesprites
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
applymovement $0, MovementData_0x74a37
jump SailorScript_0x748c0
@@ -138,7 +138,7 @@ UnknownScript_0x74992:
SailorScript_0x7499c:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x74919
checkevent EVENT_030
iffalse UnknownScript_0x749c0
@@ -159,7 +159,7 @@ UnknownScript_0x749c0:
writetext UnknownText_0x74b11
closetext
loadmovesprites
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
checkcode VAR_FACING
if_equal $3, UnknownScript_0x749e5
applymovement $0, MovementData_0x74a3f
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index 97fcc6c0e..09b16d6d5 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -17,7 +17,7 @@ PokeCenter2F_MapScriptHeader:
special Special_CheckMysteryGift
if_equal $0, .Trigger1Done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue .Trigger1Done
priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy
@@ -46,7 +46,7 @@ PokeCenter2F_MapScriptHeader:
PokeCenter2F_AppearMysteryGiftDeliveryGuy:
appear $5
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
end
Script_TradeCenterClosed:
diff --git a/maps/Route31.asm b/maps/Route31.asm
index 8db796540..ddbc7cd8b 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -15,7 +15,7 @@ UnknownScript_0x1a543c:
return
UnknownScript_0x1a5443:
- specialphonecall $7
+ specialphonecall MOMCALL_WORRIED
return
TrainerBug_catcherWade1:
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index b80ab2635..d938228c3 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -300,7 +300,7 @@ UnknownScript_0x6ad02:
YoungsterScript_0x6ad06:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad14
writetext UnknownText_0x6b399
closetext
@@ -316,7 +316,7 @@ UnknownScript_0x6ad14:
YoungsterScript_0x6ad1a:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad28
writetext UnknownText_0x6b40f
closetext
@@ -332,7 +332,7 @@ UnknownScript_0x6ad28:
RockerScript_0x6ad2e:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad3c
writetext UnknownText_0x6b462
closetext
@@ -348,7 +348,7 @@ UnknownScript_0x6ad3c:
PokefanMScript_0x6ad42:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad50
writetext UnknownText_0x6b4da
closetext
@@ -364,7 +364,7 @@ UnknownScript_0x6ad50:
YoungsterScript_0x6ad56:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad64
writetext UnknownText_0x6b54e
closetext
@@ -380,7 +380,7 @@ UnknownScript_0x6ad64:
YoungsterScript_0x6ad6a:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad78
writetext UnknownText_0x6b5b0
closetext
@@ -396,7 +396,7 @@ UnknownScript_0x6ad78:
LassScript_0x6ad7e:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ad8c
writetext UnknownText_0x6b64b
closetext
@@ -412,7 +412,7 @@ UnknownScript_0x6ad8c:
YoungsterScript_0x6ad92:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6ada0
writetext UnknownText_0x6b6b8
closetext
@@ -428,7 +428,7 @@ UnknownScript_0x6ada0:
YoungsterScript_0x6ada6:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6adb4
writetext UnknownText_0x6b71b
closetext
@@ -444,7 +444,7 @@ UnknownScript_0x6adb4:
YoungsterScript_0x6adba:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iffalse UnknownScript_0x6adc8
writetext UnknownText_0x6b76f
closetext
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 5386ab633..2f85ad340 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader:
; people-events
db 2
- person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS1_IN_CABLE_CLUB
- person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS2_IN_CABLE_CLUB
+ person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_000
+ person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_001
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 98263f7af..e23068c7f 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -73,5 +73,5 @@ TradeCenter_MapEventHeader:
; people-events
db 2
- person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB
- person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB
+ person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
+ person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index a4cf151c2..8b031fc91 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -32,14 +32,14 @@ UnknownScript_0x74da6:
setevent EVENT_739
clearevent EVENT_733
setevent EVENT_030
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
+ setevent EVENT_000
blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY
end
SailorScript_0x74dc4:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x74e1a
writetext UnknownText_0x74f06
closetext
@@ -79,9 +79,9 @@ UnknownScript_0x74e1a:
UnknownScript_0x74e20:
spriteface $3, RIGHT
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x74e86
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue UnknownScript_0x74e86
spriteface $0, LEFT
loadfont
@@ -101,7 +101,7 @@ UnknownScript_0x74e20:
writetext UnknownText_0x74fc2
closetext
loadmovesprites
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
applymovement $0, MovementData_0x74ef8
jump SailorScript_0x74dc4
@@ -145,7 +145,7 @@ UnknownScript_0x74e8d:
SailorScript_0x74e97:
faceplayer
loadfont
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x74e1a
checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x74eda
@@ -163,7 +163,7 @@ SailorScript_0x74e97:
writetext UnknownText_0x74fc2
closetext
loadmovesprites
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_001
applymovement $0, MovementData_0x74efe
jump SailorScript_0x74dc4
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index aaab66e41..932c3b5c8 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -27,25 +27,25 @@ FalknerScript_0x683c2:
scall VioletGymTriggerRockets
.FightDone
checkevent EVENT_GOT_TM31_MUD_SLAP
- iftrue UnknownScript_0x68412
+ iftrue .SpeechAfterTM
setevent EVENT_BEAT_BIRD_KEEPER_ROD
setevent EVENT_BEAT_BIRD_KEEPER_ABE
domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2
- specialphonecall $3
+ specialphonecall ELMCALL_ASSISTANT
writetext UnknownText_0x685c8
keeptextopen
verbosegiveitem TM_MUD_SLAP, 1
- iffalse UnknownScript_0x68416
+ iffalse .NoRoomForMudSlap
setevent EVENT_GOT_TM31_MUD_SLAP
writetext UnknownText_0x68648
closetext
loadmovesprites
end
-UnknownScript_0x68412:
+.SpeechAfterTM:
writetext UnknownText_0x68735
closetext
-UnknownScript_0x68416:
+.NoRoomForMudSlap:
loadmovesprites
end
diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
index 0d50aa8e3..4ee49c1a7 100644
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -265,20 +265,20 @@ UnknownScript_0x7c173:
jump UnknownScript_0x7c1c1
UnknownScript_0x7c1a9:
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
- clearevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_000
+ clearevent EVENT_001
clearevent EVENT_002
jump UnknownScript_0x7c1cd
UnknownScript_0x7c1b5:
- clearevent EVENT_CHRIS1_IN_CABLE_CLUB
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ clearevent EVENT_000
+ setevent EVENT_001
clearevent EVENT_002
jump UnknownScript_0x7c1cd
UnknownScript_0x7c1c1:
- clearevent EVENT_CHRIS1_IN_CABLE_CLUB
- clearevent EVENT_CHRIS2_IN_CABLE_CLUB
+ clearevent EVENT_000
+ clearevent EVENT_001
setevent EVENT_002
jump UnknownScript_0x7c1cd
@@ -296,9 +296,9 @@ UnknownScript_0x7c1cd:
loadfont
writetext UnknownText_0x7c6d8
closetext
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x7c2bb
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd
@@ -348,20 +348,20 @@ UnknownScript_0x7c220:
jump UnknownScript_0x7c26e
UnknownScript_0x7c256:
- setevent EVENT_CHRIS1_IN_CABLE_CLUB
- clearevent EVENT_CHRIS2_IN_CABLE_CLUB
+ setevent EVENT_000
+ clearevent EVENT_001
clearevent EVENT_002
jump UnknownScript_0x7c27a
UnknownScript_0x7c262:
- clearevent EVENT_CHRIS1_IN_CABLE_CLUB
- setevent EVENT_CHRIS2_IN_CABLE_CLUB
+ clearevent EVENT_000
+ setevent EVENT_001
clearevent EVENT_002
jump UnknownScript_0x7c27a
UnknownScript_0x7c26e:
- clearevent EVENT_CHRIS1_IN_CABLE_CLUB
- clearevent EVENT_CHRIS2_IN_CABLE_CLUB
+ clearevent EVENT_000
+ clearevent EVENT_001
setevent EVENT_002
jump UnknownScript_0x7c27a
@@ -379,9 +379,9 @@ UnknownScript_0x7c27a:
loadfont
writetext UnknownText_0x7c82a
closetext
- checkevent EVENT_CHRIS1_IN_CABLE_CLUB
+ checkevent EVENT_000
iftrue UnknownScript_0x7c2bb
- checkevent EVENT_CHRIS2_IN_CABLE_CLUB
+ checkevent EVENT_001
iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 19:15:50 +0000