dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into document-eventscripts

Browse Source
This commit is contained in:
GriffinR
2019-09-22 12:18:48 -04:00
committed by GitHub
parent 58b8d7c297 9d4fc9234b
commit a180d2af49
94 changed files with 2841 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
data/scripts/cable_club.inc
View File

@@ -344,22 +344,22 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22
OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30
setvar VAR_0x8004, 0
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75
multichoice 0, 0, 74, 0
multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2
case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75
multichoice 0, 0, 76, 0
multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2
case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7
case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB
case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7
@@ -370,14 +370,14 @@ OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7
OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2
message OldaleTown_PokemonCenter_2F_Text_2790BE
waitmessage
multichoice 0, 0, 18, 0
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23
case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E
case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55
case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15
case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15
@@ -392,7 +392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23
OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47
setvar VAR_0x8004, 2
goto OldaleTown_PokemonCenter_2F_EventScript_276F60
@@ -991,12 +991,12 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
end
OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C
multichoice 17, 6, 17, 0
multichoice 17, 6, MULTI_YESNOINFO, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F
case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 2, OldaleTown_PokemonCenter_2F_EventScript_277593
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593
@@ -1103,44 +1103,44 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E
multichoice 0, 0, 78, 0
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7
case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E
multichoice 0, 0, 79, 0
multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9
case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7
case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB
multichoice 0, 0, 75, 0
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB
multichoice 0, 0, 77, 0
multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9
case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D
@@ -1157,14 +1157,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D
OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B
message OldaleTown_PokemonCenter_2F_Text_2790BE
waitmessage
multichoice 0, 0, 18, 0
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E
case 1, OldaleTown_PokemonCenter_2F_EventScript_277899
case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0
case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB
case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
@@ -1174,7 +1174,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2
setvar VAR_0x8004, 1
goto OldaleTown_PokemonCenter_2F_EventScript_277931
@@ -1235,12 +1235,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989
message OldaleTown_PokemonCenter_2F_Text_2792CD
waitmessage
multichoice 16, 6, 81, 0
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE
case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6
@@ -1268,12 +1268,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE
OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16
message OldaleTown_PokemonCenter_2F_Text_279334
waitmessage
multichoice 16, 6, 81, 0
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B
case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53
@@ -1301,12 +1301,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B
OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3
message OldaleTown_PokemonCenter_2F_Text_2793A3
waitmessage
multichoice 16, 6, 81, 0
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08
case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0
case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case 127, OldaleTown_PokemonCenter_2F_EventScript_2772EC
case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC
end
OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0
@@ -1445,12 +1445,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34
faceplayer
message MossdeepCity_GameCorner_1F_Text_278A7D
waitmessage
multichoice 0, 0, 80, 0
multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_277C73
case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D
case 2, MossdeepCity_GameCorner_1F_EventScript_277C87
case 127, MossdeepCity_GameCorner_1F_EventScript_277C87
case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87
end
MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73
@@ -1479,12 +1479,12 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91
delay 60
message MossdeepCity_GameCorner_1F_Text_278DAD
waitmessage
multichoice 0, 0, 80, 0
multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9
case 1, MossdeepCity_GameCorner_1F_EventScript_277D35
case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9
case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9
case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9
end
MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
@@ -1528,12 +1528,12 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81
message MossdeepCity_GameCorner_1F_Text_2793A3
waitmessage
multichoice 16, 6, 81, 0
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6
case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE
case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9
case 127, MossdeepCity_GameCorner_1F_EventScript_2772F9
case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9
end
MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE
@@ -1626,15 +1626,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1
.string "Which of our services do you wish\n"
.string "to use?$"
OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B
CableClub_Text_TradeUsingLinkCable:: @ 8277F1B
.string "Trade POKéMON with another player\n"
.string "using a GBA Game Link cable.$"
OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A
CableClub_Text_BattleUsingLinkCable:: @ 8277F5A
.string "You may battle another TRAINER\n"
.string "using a GBA Game Link cable.$"
OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96
CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96
.string "You can use the RECORD CORNER with\n"
.string "others using a GBA Game Link cable.$"
@@ -1804,19 +1804,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B
OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792
.string "Please wait.$"
OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F
CableClub_Text_YouMayTradeHere:: @ 827879F
.string "You may trade your POKéMON here\n"
.string "with another TRAINER.$"
OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5
CableClub_Text_YouMayBattleHere:: @ 82787D5
.string "You may battle with your friends\n"
.string "here.$"
OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC
CableClub_Text_CanMakeBerryPowder:: @ 82787FC
.string "Two to five TRAINERS can make\n"
.string "BERRY POWDER together.$"
OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831
CableClub_Text_CanMixRecords:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
@@ -1824,7 +1824,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
.string "A guide to the WIRELESS CLUB's\n"
.string "various services.$"
OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C
CableClub_Text_CancelSelectedItem:: @ 827889C
.string "Cancels the selected MENU item.$"
OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC

34
data/scripts/contest_hall.inc
View File

@@ -43,24 +43,24 @@ LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A
message LilycoveCity_ContestLobby_Text_27AF28
waitmessage
multichoice 0, 0, 2, 0
multichoice 0, 0, MULTI_ENTERINFO, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279E62
case 1, LilycoveCity_ContestLobby_EventScript_279D97
case 2, LilycoveCity_ContestLobby_EventScript_279E09
case 127, LilycoveCity_ContestLobby_EventScript_279E09
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
end
LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97
message LilycoveCity_ContestLobby_Text_27AF5E
waitmessage
multichoice 0, 0, 3, 0
multichoice 0, 0, MULTI_CONTEST_INFO, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279DDF
case 1, LilycoveCity_ContestLobby_EventScript_279DED
case 2, LilycoveCity_ContestLobby_EventScript_279DFB
case 3, LilycoveCity_ContestLobby_EventScript_279D5A
case 127, LilycoveCity_ContestLobby_EventScript_279D5A
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A
end
LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF
@@ -104,14 +104,14 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62
message LilycoveCity_ContestLobby_Text_27B3FF
waitmessage
multichoice 0, 0, 82, 0
multichoice 0, 0, MULTI_CONTEST_RANK, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_279EB5
case 1, LilycoveCity_ContestLobby_EventScript_279EC0
case 2, LilycoveCity_ContestLobby_EventScript_279ECB
case 3, LilycoveCity_ContestLobby_EventScript_279ED6
case 4, LilycoveCity_ContestLobby_EventScript_279E09
case 127, LilycoveCity_ContestLobby_EventScript_279E09
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
end
LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5
@@ -137,10 +137,10 @@ LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6
LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1
message LilycoveCity_ContestLobby_Text_27B423
waitmessage
multichoice 0, 0, 4, 0
multichoice 0, 0, MULTI_CONTEST_TYPE, 0
switch VAR_RESULT
case 5, LilycoveCity_ContestLobby_EventScript_279E09
case 127, LilycoveCity_ContestLobby_EventScript_279E09
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
goto LilycoveCity_ContestLobby_EventScript_279E13
end
@@ -216,19 +216,19 @@ LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
return
LinkContestRoom1_EventScript_27A024:: @ 827A024
setvar VAR_0x8009, 5
setvar VAR_0x8009, STDSTRING_NORMAL
return
LinkContestRoom1_EventScript_27A02A:: @ 827A02A
setvar VAR_0x8009, 6
setvar VAR_0x8009, STDSTRING_SUPER
return
LinkContestRoom1_EventScript_27A030:: @ 827A030
setvar VAR_0x8009, 7
setvar VAR_0x8009, STDSTRING_HYPER
return
LinkContestRoom1_EventScript_27A036:: @ 827A036
setvar VAR_0x8009, 8
setvar VAR_0x8009, STDSTRING_MASTER
return
LinkContestRoom1_EventScript_27A03C:: @ 827A03C
@@ -241,23 +241,23 @@ LinkContestRoom1_EventScript_27A03C:: @ 827A03C
return
LinkContestRoom1_EventScript_27A079:: @ 827A079
setvar VAR_0x8008, 0
setvar VAR_0x8008, CONTEST_CATEGORY_COOL
return
LinkContestRoom1_EventScript_27A07F:: @ 827A07F
setvar VAR_0x8008, 1
setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY
return
LinkContestRoom1_EventScript_27A085:: @ 827A085
setvar VAR_0x8008, 2
setvar VAR_0x8008, CONTEST_CATEGORY_CUTE
return
LinkContestRoom1_EventScript_27A08B:: @ 827A08B
setvar VAR_0x8008, 3
setvar VAR_0x8008, CONTEST_CATEGORY_SMART
return
LinkContestRoom1_EventScript_27A091:: @ 827A091
setvar VAR_0x8008, 4
setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH
return
LinkContestRoom1_EventScript_27A097:: @ 827A097

8
data/scripts/mystery_event_club.inc
View File

@@ -8,12 +8,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539
PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552
msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT
multichoice 17, 6, 20, 0
multichoice 17, 6, MULTI_YESNOINFO_2, 0
switch VAR_RESULT
case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F
case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591
case 127, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
end
PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
@@ -60,12 +60,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5
PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603
msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT
multichoice 17, 6, 20, 0
multichoice 17, 6, MULTI_YESNOINFO_2, 0
switch VAR_RESULT
case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650
case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C
case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642
case 127, PetalburgCity_PokemonCenter_1F_EventScript_29167C
case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C
end
PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642

2
data/scripts/players_house.inc
View File

@@ -507,7 +507,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
compare VAR_0x8008, 1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT
multichoice 22, 8, 108, 1
multichoice 22, 8, MULTI_TV_LATI, 1
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
copyvar VAR_ROAMER_POKEMON, VAR_RESULT

4
data/scripts/pokeblocks.inc
View File

@@ -714,12 +714,12 @@ LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED
EventScript_PblocLink_DecideLeader: @ 82941F8
message Text_DecideLinkLeader
waitmessage
multichoice 16, 6, 81, 0
multichoice 16, 6, MULTI_LINK_LEADER, 0
switch VAR_RESULT
case 0, EventScript_PblocLink_TryJoinGroup
case 1, EventScript_PblocLink_TryBecomeLeader
case 2, EventScript_PblocLink_CloseLink
case 127, EventScript_PblocLink_CloseLink
case MULTI_B_PRESSED, EventScript_PblocLink_CloseLink
end
EventScript_PblocLink_TryBecomeLeader: @ 8294235

4
data/scripts/trainer_battle.inc
View File

@@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A
compare VAR_RESULT, 0
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
special SetUpTrainerEncounterMusic
special SetUpTrainerMovement
@@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
compare VAR_RESULT, 0
goto_if_eq EventScript_NoDoubleRematchTrainerBattle
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
special SetUpTrainerEncounterMusic
special SetUpTrainerMovement