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

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
parent db8a5c6c2b f8cef9a6a8
commit 949509aade
82 changed files with 3472 additions and 6562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -31,3 +31,4 @@ build/
porymap.project.cfg porymap.project.cfg
.vscode/ .vscode/
*.a *.a
.fuse_hidden*
asm/berry_crush.s
-5515
View File
File diff suppressed because it is too large Load Diff
asm/macros/event.inc
+8 -8
View File
@@ -1101,16 +1101,16 @@
.2byte \index .2byte \index
.endm .endm
@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. @ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK)
.macro fadescreen effect:req .macro fadescreen mode:req
.byte 0x97 .byte 0x97
.byte \effect .byte \mode
.endm .endm
@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. @ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK)
.macro fadescreenspeed effect:req, speed:req .macro fadescreenspeed mode:req, speed:req
.byte 0x98 .byte 0x98
.byte \effect .byte \mode
.byte \speed .byte \speed
.endm .endm
@@ -1517,9 +1517,9 @@
.4byte \pointer .4byte \pointer
.endm .endm
.macro fadescreenswapbuffers byte:req .macro fadescreenswapbuffers mode:req
.byte 0xdc .byte 0xdc
.byte \byte .byte \mode
.endm .endm
.macro buffertrainerclassname out:req, class:req .macro buffertrainerclassname out:req, class:req
data/event_scripts.s
+11 -10
View File
@@ -24,6 +24,7 @@
#include "constants/field_poison.h" #include "constants/field_poison.h"
#include "constants/field_specials.h" #include "constants/field_specials.h"
#include "constants/field_tasks.h" #include "constants/field_tasks.h"
#include "constants/field_weather.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/frontier_util.h" #include "constants/frontier_util.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
@@ -720,9 +721,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
end end
Common_ShowEasyChatScreen:: @ 8271E7C Common_ShowEasyChatScreen:: @ 8271E7C
fadescreen 1 fadescreen FADE_TO_BLACK
special ShowEasyChatScreen special ShowEasyChatScreen
fadescreen 0 fadescreen FADE_FROM_BLACK
return return
Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
@@ -773,17 +774,17 @@ Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
return return
Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
fadescreen 1 fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
fadescreen 0 fadescreen FADE_FROM_BLACK
return return
EventScript_RegionMap:: @ 827208F EventScript_RegionMap:: @ 827208F
lockall lockall
msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
special FieldShowRegionMap special FieldShowRegionMap
waitstate waitstate
releaseall releaseall
@@ -868,7 +869,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
.include "data/scripts/kecleon.inc" .include "data/scripts/kecleon.inc"
Common_EventScript_NameReceivedPartyMon:: @ 82723DD Common_EventScript_NameReceivedPartyMon:: @ 82723DD
fadescreen 1 fadescreen FADE_TO_BLACK
special ChangePokemonNickname special ChangePokemonNickname
waitstate waitstate
return return
@@ -1045,16 +1046,16 @@ Common_EventScript_DirectCornerAttendant:: @ 8273767
end end
Common_EventScript_RemoveStaticPokemon:: @ 827376D Common_EventScript_RemoveStaticPokemon:: @ 827376D
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
release release
end end
Common_EventScript_LegendaryFlewAway:: @ 8273776 Common_EventScript_LegendaryFlewAway:: @ 8273776
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
bufferspeciesname 0, VAR_0x8004 bufferspeciesname 0, VAR_0x8004
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
release release
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+1 -1
View File
@@ -240,7 +240,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A
arena_save CHALLENGE_STATUS_PAUSED arena_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+1 -1
View File
@@ -133,7 +133,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+5 -4
View File
@@ -166,7 +166,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -367,7 +367,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
compare VAR_RESULT, 3 compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1 fadescreen FADE_TO_BLACK
dome_showresultstree dome_showresultstree
waitstate waitstate
end end
@@ -540,11 +540,12 @@ BattleFrontier_BattleDomeLobby_Text_24A51D: @ 824A51D
.string "Here is your prize for your Battle\n" .string "Here is your prize for your Battle\n"
.string "Tournament victory.$" .string "Tournament victory.$"
VerdanturfTown_BattleTentLobby_Text_24A554: @ 824A554 BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
.string "{PLAYER} received the prize\n" .string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$" .string "{STR_VAR_1}.$"
VerdanturfTown_BattleTentLobby_Text_24A56E: @ 824A56E @ Unused
BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
.string "Oh, your BAG appears to be full.\p" .string "Oh, your BAG appears to be full.\p"
.string "Please make room in your BAG, then come\n" .string "Please make room in your BAG, then come\n"
.string "see me.$" .string "see me.$"
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+5 -5
View File
@@ -91,20 +91,20 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
dome_save CHALLENGE_STATUS_PAUSED dome_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
dome_showopponentinfo dome_showopponentinfo
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
fadescreen 1 fadescreen FADE_TO_BLACK
dome_showtourneytree dome_showtourneytree
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -138,7 +138,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C
waitmessage waitmessage
waitbuttonpress waitbuttonpress
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, 2 @ 2 of the 3 party mons are selected for battle setvar VAR_0x8005, 2 @ 2 of the 3 party mons are selected for battle
@@ -227,7 +227,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
fadescreen 1 fadescreen FADE_TO_BLACK
dome_showstatictourneytree dome_showstatictourneytree
waitstate waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+3 -3
View File
@@ -39,7 +39,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
factory_setswapped factory_setswapped
factory_rentmons factory_rentmons
waitstate waitstate
@@ -163,7 +163,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
fadescreen 1 fadescreen FADE_TO_BLACK
factory_swapmons factory_swapmons
waitstate waitstate
compare VAR_RESULT, 1 compare VAR_RESULT, 1
@@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
factory_save CHALLENGE_STATUS_PAUSED factory_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+1 -1
View File
@@ -168,7 +168,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
palace_save CHALLENGE_STATUS_PAUSED palace_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+1 -1
View File
@@ -155,7 +155,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+1 -1
View File
@@ -118,7 +118,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+1 -1
View File
@@ -125,7 +125,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
pike_save CHALLENGE_STATUS_PAUSED pike_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+1 -1
View File
@@ -131,7 +131,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+1 -1
View File
@@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
tower_save CHALLENGE_STATUS_PAUSED tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+1 -1
View File
@@ -219,7 +219,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
tower_save CHALLENGE_STATUS_PAUSED tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+7 -6
View File
@@ -216,7 +216,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE
@@ -351,7 +351,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
@@ -418,7 +418,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
@@ -1003,11 +1003,12 @@ BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641
.string "you have earned this fabulous prize!\p" .string "you have earned this fabulous prize!\p"
.string "$" .string "$"
SlateportCity_BattleTentLobby_Text_23F68C: @ 823F68C BattleFrontier_BattleTowerLobby_Text_ReceivedPrize: @ 823F68C
.string "{PLAYER} received the prize\n" .string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$" .string "{STR_VAR_1}.$"
SlateportCity_BattleTentLobby_Text_23F6A6: @ 823F6A6 @ Unused
BattleFrontier_BattleTowerLobby_Text_BagFullMakeRoom: @ 823F6A6
.string "Oh, your BAG appears to be full.\p" .string "Oh, your BAG appears to be full.\p"
.string "Please make room in your BAG, then come\n" .string "Please make room in your BAG, then come\n"
.string "see me.$" .string "see me.$"
data/maps/BattleFrontier_Lounge7/scripts.inc
+1 -1
View File
@@ -264,7 +264,7 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696 BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
special GetBattleFrontierTutorMoveIndex special GetBattleFrontierTutorMoveIndex
fadescreen 1 fadescreen FADE_TO_BLACK
special CloseBattlePointsWindow special CloseBattlePointsWindow
special CloseBattleFrontierTutorWindow special CloseBattleFrontierTutorWindow
special ChooseMonForMoveTutor special ChooseMonForMoveTutor
data/maps/CaveOfOrigin_B1F/scripts.inc
+2 -2
View File
@@ -50,12 +50,12 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
closemessage closemessage
playse SE_KAIDAN playse SE_KAIDAN
fadescreenspeed 1, 4 fadescreenspeed FADE_TO_BLACK, 4
setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
setvar VAR_SOOTOPOLIS_CITY_STATE, 3 setvar VAR_SOOTOPOLIS_CITY_STATE, 3
removeobject 1 removeobject 1
clearflag FLAG_HIDE_SKY_PILLAR_WALLACE clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
fadescreen 0 fadescreen FADE_FROM_BLACK
release release
end end
data/maps/EverGrandeCity_HallOfFame/scripts.inc
+2 -2
View File
@@ -52,7 +52,7 @@ EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850
EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9 EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
fadescreenspeed 1, 24 fadescreenspeed FADE_TO_BLACK, 24
special GameClear special GameClear
waitstate waitstate
releaseall releaseall
@@ -60,7 +60,7 @@ EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5 EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
fadescreenspeed 1, 24 fadescreenspeed FADE_TO_BLACK, 24
special GameClear special GameClear
waitstate waitstate
releaseall releaseall
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+75 -70
View File
@@ -1,50 +1,53 @@
FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_OnWarp
.byte 0 .byte 0
@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_1
@ The opponent is represented by object event 3, which has the gfx id VAR_OBJ_GFX_ID_0
FallarborTown_BattleTentBattleRoom_OnTransition: @ 82008A9 FallarborTown_BattleTentBattleRoom_OnTransition: @ 82008A9
call FallarborTown_BattleTentBattleRoom_EventScript_2008AF call FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
end end
FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 82008AF
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
return return
FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 82008C7
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82008D2
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD FallarborTown_BattleTentBattleRoom_OnFrame: @ 82008DD
map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_2008E7 map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom
.2byte 0 .2byte 0
FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82008E7
lockall lockall
showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73 goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge
FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F
FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
tower_setopponent tower_setopponent
addobject 3 addobject 3
applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96 applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter
waitmovement 0 waitmovement 0
applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
playse SE_W187 playse SE_W187
waitse waitse
waitmovement 0 waitmovement 0
@@ -54,40 +57,38 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
waitmessage waitmessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
switch VAR_RESULT switch VAR_RESULT
case 1, FallarborTown_BattleTentBattleRoom_EventScript_20099C case 1, FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent
applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
playse SE_W173 playse SE_W173
waitse waitse
waitmovement 0 waitmovement 0
fallarbortent_getopponentname fallarbortent_getopponentname
msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 820097E
FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
special LoadPlayerParty special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 820099C
applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA3 applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
playse SE_BAN playse SE_BAN
waitse waitse
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT
closemessage closemessage
FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3
FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3 case 3, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon
applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_OpponentExit
waitmovement 0 waitmovement 0
removeobject 3 removeobject 3
applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6 applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored, MSGBOX_DEFAULT
special LoadPlayerParty special LoadPlayerParty
@@ -96,99 +97,102 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A
FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43 call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 case 0, FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge
case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A78 case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 case 2, FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge
FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 8200A78
msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case NO, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
case YES, FallarborTown_BattleTentBattleRoom_EventScript_200B51 case YES, FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge
case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6 FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 8200AA6
message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 1, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
case 0, FallarborTown_BattleTentBattleRoom_EventScript_20097E case 0, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8 FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 8200AD8
closemessage closemessage
applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BAB applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos
waitmovement 0 waitmovement 0
applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B92 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle
waitmovement 0 waitmovement 0
goto FallarborTown_BattleTentBattleRoom_EventScript_20090F goto FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter
waitstate waitstate
FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8200AF3
delay 60 delay 60
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
special LoadPlayerParty special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@ Unreachable code block? The flow into the next block also doesnt make sense
arena_get ARENA_DATA_WIN_STREAK arena_get ARENA_DATA_WIN_STREAK
compare VAR_RESULT, MAX_STREAK compare VAR_RESULT, MAX_STREAK
goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT
FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 @ See above
FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8200B43
message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
waitmessage waitmessage
return return
FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8200B4A
message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent
waitmessage waitmessage
return return
FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51 FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 8200B51
message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
waitmessage waitmessage
fallarbortent_save CHALLENGE_STATUS_PAUSED fallarbortent_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge:: @ 8200B73
applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_200BA6 applymovement 2, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0 waitmovement 0
goto FallarborTown_BattleTentBattleRoom_EventScript_200A2A goto FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
end end
FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8200B8D
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92 FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle: @ 8200B92
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94 FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant: @ 8200B94
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96 FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 8200B96
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -196,41 +200,42 @@ FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
walk_in_place_fastest_left walk_in_place_fastest_left
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C @ Unused
FallarborTown_BattleTentBattleRoom_Movement_OpponentStepForward: @ 8200B9C
walk_left walk_left
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E FallarborTown_BattleTentBattleRoom_Movement_OpponentExit: @ 8200B9E
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3 FallarborTown_BattleTentBattleRoom_Movement_AttendantJump: @ 8200BA3
disable_jump_landing_ground_effect disable_jump_landing_ground_effect
jump_in_place_down jump_in_place_down
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6 FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer: @ 8200BA6
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos: @ 8200BAB
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 FallarborTown_BattleTentBattleRoom_OnWarp: @ 8200BB0
map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_200BBA map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects
.2byte 0 .2byte 0
FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 8200BBA
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
removeobject 3 removeobject 3
data/maps/FallarborTown_BattleTentCorridor/scripts.inc
+20 -16
View File
@@ -1,21 +1,21 @@
FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_OnFrame
.byte 0 .byte 0
FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD FallarborTown_BattleTentCorridor_OnFrame: @ 82006AD
map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_2006B7 map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_EnterCorridor
.2byte 0 .2byte 0
FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 FallarborTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 82006B7
lockall lockall
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB applymovement 1, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
waitmovement 0 waitmovement 0
opendoor 2, 1 opendoor 2, 1
waitdooranim waitdooranim
applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 applymovement 1, FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 2, 1 closedoor 2, 1
waitdooranim waitdooranim
@@ -25,40 +25,44 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7
releaseall releaseall
end end
FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB FallarborTown_BattleTentCorridor_Movement_WalkToDoor: @ 82006FB
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700 FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 8200700
walk_up walk_up
FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 8200701
FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
walk_up walk_up
set_invisible set_invisible
step_end step_end
FallarborTown_BattleTentCorridor_Text_200704: @ 8200704 @ Leftover text from when this was a Contest Hall in R/S
@ Unused
FallarborTown_ContestHall_Text_DoAllRightInPreliminary: @ 8200704
.string "We do all right in the preliminary round,\n" .string "We do all right in the preliminary round,\n"
.string "but we can never win the appeals…\p" .string "but we can never win the appeals…\p"
.string "Maybe it means I have to watch what\n" .string "Maybe it means I have to watch what\n"
.string "other contestants are doing…$" .string "other contestants are doing…$"
FallarborTown_BattleTentCorridor_Text_200791: @ 8200791 @ Unused
FallarborTown_ContestHall_Text_MonAllTheseRibbons: @ 8200791
.string "See!\n" .string "See!\n"
.string "My POKéMON won all these RIBBONS!\p" .string "My POKéMON won all these RIBBONS!\p"
.string "Have your POKéMON earned any RIBBONS?\n" .string "Have your POKéMON earned any RIBBONS?\n"
.string "You can check them on your POKéNAV.$" .string "You can check them on your POKéNAV.$"
FallarborTown_BattleTentCorridor_Text_200802: @ 8200802 @ Unused
FallarborTown_ContestHall_Text_CantWinEverywhere: @ 8200802
.string "I can't beat GYM LEADERS…\p" .string "I can't beat GYM LEADERS…\p"
.string "I can't win any CONTESTS…\p" .string "I can't win any CONTESTS…\p"
.string "I've been here, there, and everywhere,\n" .string "I've been here, there, and everywhere,\n"
.string "and it's all for naught…$" .string "and it's all for naught…$"
FallarborTown_BattleTentCorridor_Text_200876: @ 8200876 @ Unused
FallarborTown_ContestHall_Text_SuperRankStage: @ 8200876
.string "POKéMON CONTESTS\n" .string "POKéMON CONTESTS\n"
.string "SUPER RANK STAGE!$" .string "SUPER RANK STAGE!$"
data/maps/FallarborTown_BattleTentLobby/map.json
+6 -6
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_BattleTentLobby_EventScript_200001", "script": "FallarborTown_BattleTentLobby_EventScript_Attendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_BattleTentLobby_EventScript_20020D", "script": "FallarborTown_BattleTentLobby_EventScript_Hiker",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_BattleTentLobby_EventScript_200216", "script": "FallarborTown_BattleTentLobby_EventScript_LittleBoy",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_BattleTentLobby_EventScript_20021F", "script": "FallarborTown_BattleTentLobby_EventScript_Lass",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_BattleTentLobby_EventScript_200228", "script": "FallarborTown_BattleTentLobby_EventScript_Scott",
"flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT" "flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT"
} }
], ],
@@ -104,7 +104,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "FallarborTown_BattleTentLobby_EventScript_20024F" "script": "FallarborTown_BattleTentLobby_EventScript_RulesBoard"
} }
] ]
} }
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+122 -127
View File
@@ -1,32 +1,32 @@
FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85 map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_OnWarp
.byte 0 .byte 0
FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 FallarborTown_BattleTentLobby_OnWarp: @ 81FFE71
map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_1FFE7B map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth
.2byte 0 .2byte 0
FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 81FFE7B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 FallarborTown_BattleTentLobby_OnFrame: @ 81FFE85
map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_1FFEAF map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, FallarborTown_BattleTentLobby_EventScript_1FFEB8 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, FallarborTown_BattleTentLobby_EventScript_1FFFCD map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, FallarborTown_BattleTentLobby_EventScript_ResumeChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, FallarborTown_BattleTentLobby_EventScript_1FFEED map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, FallarborTown_BattleTentLobby_EventScript_WonChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, FallarborTown_BattleTentLobby_EventScript_1FFF93 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, FallarborTown_BattleTentLobby_EventScript_LostChallenge
.2byte 0 .2byte 0
FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus:: @ 81FFEAF
frontier_getstatus frontier_getstatus
end end
FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 81FFEB8
lockall lockall
msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
closemessage closemessage
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
@@ -34,10 +34,10 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8
releaseall releaseall
end end
FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED FallarborTown_BattleTentLobby_EventScript_WonChallenge:: @ 81FFEED
lockall lockall
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_BeatThreeTrainers, MSGBOX_DEFAULT
message FallarborTown_BattleTentLobby_Text_2C4EFF message FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame
waitmessage waitmessage
fallarbortent_setrandomprize fallarbortent_setrandomprize
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
@@ -45,103 +45,102 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
playse SE_SAVE playse SE_SAVE
waitse waitse
FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27
msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_PresentYouWithPrize, MSGBOX_DEFAULT
fallarbortent_giveprize fallarbortent_giveprize
switch VAR_RESULT switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73 case FALSE, FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
message FallarborTown_BattleTentLobby_Text_2C4F69 message FallarborTown_BattleTentLobby_Text_ReceivedPrize
waitmessage waitmessage
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
waitfanfare waitfanfare
msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 81FFF73
msgbox FallarborTown_BattleTentLobby_Text_2C4F83, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize, MSGBOX_DEFAULT
waitmessage waitmessage
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84 FallarborTown_BattleTentLobby_EventScript_PrizeWaiting:: @ 81FFF84
lockall lockall
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_BeatThreeTrainers, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_1FFF27 goto FallarborTown_BattleTentLobby_EventScript_GivePrize
end end
FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 FallarborTown_BattleTentLobby_EventScript_LostChallenge:: @ 81FFF93
lockall lockall
message FallarborTown_BattleTentLobby_Text_2C4FD7 message FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving
waitmessage waitmessage
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
fallarbortent_save 0 fallarbortent_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD FallarborTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 81FFFCD
lockall lockall
message FallarborTown_BattleTentLobby_Text_2C504C message FallarborTown_BattleTentLobby_Text_LookingForwardToArrival
waitmessage waitmessage
fallarbortent_save CHALLENGE_STATUS_SAVING fallarbortent_save CHALLENGE_STATUS_SAVING
playse SE_SAVE playse SE_SAVE
waitse waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto FallarborTown_BattleTentLobby_EventScript_20013C goto FallarborTown_BattleTentLobby_EventScript_EnterChallenge
FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 FallarborTown_BattleTentLobby_EventScript_Attendant:: @ 8200001
lock lock
faceplayer faceplayer
fallarbortent_getprize fallarbortent_getprize
compare VAR_RESULT, 0 compare VAR_RESULT, ITEM_NONE
goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84 goto_if_ne FallarborTown_BattleTentLobby_EventScript_PrizeWaiting
special SavePlayerParty special SavePlayerParty
msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8200021
FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 message FallarborTown_BattleTentLobby_Text_TakeChallenge
message FallarborTown_BattleTentLobby_Text_2C4843
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0 multichoice 17, 6, MULTI_CHALLENGEINFO, 0
switch VAR_RESULT switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_20005D case 0, FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge
case 1, FallarborTown_BattleTentLobby_EventScript_200169 case 1, FallarborTown_BattleTentLobby_EventScript_ExplainChallenge
case 2, FallarborTown_BattleTentLobby_EventScript_2001C5 case 2, FallarborTown_BattleTentLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C5 case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_CancelChallenge
FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 820005D
setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
setvar VAR_RESULT, 2 setvar VAR_RESULT, 2
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176 goto_if_eq FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2 goto_if_eq FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO msgbox FallarborTown_BattleTentLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, FallarborTown_BattleTentLobby_EventScript_2001C2 case NO, FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
case YES, FallarborTown_BattleTentLobby_EventScript_2000E2 case YES, FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge
case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C2 case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 82000E2
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
fallarbortent_init fallarbortent_init
@@ -153,170 +152,166 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB goto_if_eq FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed
FallarborTown_BattleTentLobby_EventScript_EnterChallenge:: @ 820013C
FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent, MSGBOX_DEFAULT
closemessage closemessage
call FallarborTown_BattleTentLobby_EventScript_2001CF call FallarborTown_BattleTentLobby_EventScript_WalkToDoor
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169 FallarborTown_BattleTentLobby_EventScript_ExplainChallenge:: @ 8200169
msgbox FallarborTown_BattleTentLobby_Text_2C48AC, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_ExplainFallarborTent, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_200021 goto FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge
FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons:: @ 8200176
switch VAR_RESULT switch VAR_RESULT
case FRONTIER_LVL_50, FallarborTown_BattleTentLobby_EventScript_200191 case FRONTIER_LVL_50, FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50
case FRONTIER_LVL_OPEN, FallarborTown_BattleTentLobby_EventScript_20019E case FRONTIER_LVL_OPEN, FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen
FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50:: @ 8200191
msgbox FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge
FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191 FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 820019E
msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_2001CD goto FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge
FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 82001AB
msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_2001CD
FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
goto FallarborTown_BattleTentLobby_EventScript_2001C5 goto FallarborTown_BattleTentLobby_EventScript_CancelChallenge
FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 82001C2
special LoadPlayerParty special LoadPlayerParty
FallarborTown_BattleTentLobby_EventScript_CancelChallenge:: @ 82001C5
FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT
msgbox FallarborTown_BattleTentLobby_Text_2C487F, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge:: @ 82001CD
FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD
release release
end end
FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF FallarborTown_BattleTentLobby_EventScript_WalkToDoor:: @ 82001CF
applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE applymovement 1, FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
opendoor 6, 1 opendoor 6, 1
waitdooranim waitdooranim
applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 applymovement 1, FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 6, 1 closedoor 6, 1
waitdooranim waitdooranim
return return
FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor: @ 82001FE
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
FallarborTown_BattleTentLobby_Movement_200202: @ 8200202 FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor: @ 8200202
walk_up walk_up
set_invisible set_invisible
step_end step_end
FallarborTown_BattleTentLobby_Movement_200205: @ 8200205 FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor: @ 8200205
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor: @ 8200209
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D FallarborTown_BattleTentLobby_EventScript_Hiker:: @ 820020D
msgbox FallarborTown_BattleTentLobby_Text_20045A, MSGBOX_NPC msgbox FallarborTown_BattleTentLobby_Text_CameToCampOut, MSGBOX_NPC
end end
FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216 FallarborTown_BattleTentLobby_EventScript_LittleBoy:: @ 8200216
msgbox FallarborTown_BattleTentLobby_Text_200304, MSGBOX_NPC msgbox FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid, MSGBOX_NPC
end end
FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F FallarborTown_BattleTentLobby_EventScript_Lass:: @ 820021F
msgbox FallarborTown_BattleTentLobby_Text_200382, MSGBOX_NPC msgbox FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite, MSGBOX_NPC
end end
FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 FallarborTown_BattleTentLobby_EventScript_Scott:: @ 8200228
lock lock
faceplayer faceplayer
goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245 goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo
msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone, MSGBOX_DEFAULT
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_FALLARBOR setflag FLAG_MET_SCOTT_IN_FALLARBOR
release release
end end
FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo:: @ 8200245
msgbox FallarborTown_BattleTentLobby_Text_200653, MSGBOX_DEFAULT msgbox FallarborTown_BattleTentLobby_Text_ScottMakeChallenge, MSGBOX_DEFAULT
release release
end end
FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F FallarborTown_BattleTentLobby_EventScript_RulesBoard:: @ 820024F
lockall lockall
msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 820025E
message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
waitmessage waitmessage
multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0 multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, 0
switch VAR_RESULT switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_2002BC case 0, FallarborTown_BattleTentLobby_EventScript_RulesLevel
case 1, FallarborTown_BattleTentLobby_EventScript_2002CA case 1, FallarborTown_BattleTentLobby_EventScript_RulesBattle
case 2, FallarborTown_BattleTentLobby_EventScript_2002D8 case 2, FallarborTown_BattleTentLobby_EventScript_RulesMind
case 3, FallarborTown_BattleTentLobby_EventScript_2002E6 case 3, FallarborTown_BattleTentLobby_EventScript_RulesSkill
case 4, FallarborTown_BattleTentLobby_EventScript_2002F4 case 4, FallarborTown_BattleTentLobby_EventScript_RulesBody
case 5, FallarborTown_BattleTentLobby_EventScript_200302 case 5, FallarborTown_BattleTentLobby_EventScript_ExitRules
case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_200302 case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_ExitRules
end end
FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC FallarborTown_BattleTentLobby_EventScript_RulesLevel:: @ 82002BC
msgbox FallarborTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT msgbox BattleTentLobby_Text_ExplainLevelRules, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA FallarborTown_BattleTentLobby_EventScript_RulesBattle:: @ 82002CA
msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 FallarborTown_BattleTentLobby_EventScript_RulesMind:: @ 82002D8
msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 FallarborTown_BattleTentLobby_EventScript_RulesSkill:: @ 82002E6
msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 FallarborTown_BattleTentLobby_EventScript_RulesBody:: @ 82002F4
msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT
goto FallarborTown_BattleTentLobby_EventScript_20025E goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302 FallarborTown_BattleTentLobby_EventScript_ExitRules:: @ 8200302
releaseall releaseall
end end
FallarborTown_BattleTentLobby_Text_200304: @ 8200304 FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid: @ 8200304
.string "Fufufufufu.\p" .string "Fufufufufu.\p"
.string "I'm going to make everyone think\n" .string "I'm going to make everyone think\n"
.string "I'm just a kid and let them play down.\p" .string "I'm just a kid and let them play down.\p"
.string "Then, I'll shock them and grab\n" .string "Then, I'll shock them and grab\n"
.string "the title!$" .string "the title!$"
FallarborTown_BattleTentLobby_Text_200382: @ 8200382 FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite: @ 8200382
.string "You know how BATTLE TENTS offer\n" .string "You know how BATTLE TENTS offer\n"
.string "different events in different towns?\p" .string "different events in different towns?\p"
.string "My favorite is definitely the BATTLE\n" .string "My favorite is definitely the BATTLE\n"
@@ -325,7 +320,7 @@ FallarborTown_BattleTentLobby_Text_200382: @ 8200382
.string "try to win with all their faith in\l" .string "try to win with all their faith in\l"
.string "their POKéMON.$" .string "their POKéMON.$"
FallarborTown_BattleTentLobby_Text_20045A: @ 820045A FallarborTown_BattleTentLobby_Text_CameToCampOut: @ 820045A
.string "I heard something about some tent,\n" .string "I heard something about some tent,\n"
.string "so I came to camp out.\p" .string "so I came to camp out.\p"
.string "I didn't know that tents these days\n" .string "I didn't know that tents these days\n"
@@ -333,7 +328,7 @@ FallarborTown_BattleTentLobby_Text_20045A: @ 820045A
.string "Since I'm here, I may as well try\n" .string "Since I'm here, I may as well try\n"
.string "my hand at battling!$" .string "my hand at battling!$"
FallarborTown_BattleTentLobby_Text_200501: @ 8200501 FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone: @ 8200501
.string "SCOTT: Hi, {PLAYER}{KUN}!\n" .string "SCOTT: Hi, {PLAYER}{KUN}!\n"
.string "So you came out to this BATTLE TENT!\p" .string "So you came out to this BATTLE TENT!\p"
.string "The people in these parts tend to be\n" .string "The people in these parts tend to be\n"
@@ -348,7 +343,7 @@ FallarborTown_BattleTentLobby_Text_200501: @ 8200501
.string "Whoops! Never mind!\n" .string "Whoops! Never mind!\n"
.string "Keep working at it!$" .string "Keep working at it!$"
FallarborTown_BattleTentLobby_Text_200653: @ 8200653 FallarborTown_BattleTentLobby_Text_ScottMakeChallenge: @ 8200653
.string "SCOTT: Instead of wasting your\n" .string "SCOTT: Instead of wasting your\n"
.string "time with the likes of me, why not\l" .string "time with the likes of me, why not\l"
.string "make a challenge?$" .string "make a challenge?$"
data/maps/FarawayIsland_Interior/scripts.inc
+2 -2
View File
@@ -190,10 +190,10 @@ FarawayIsland_Interior_EventScript_MewHideLeft:: @ 8267ED0
FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB
lockall lockall
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
setflag FLAG_HIDE_MEW setflag FLAG_HIDE_MEW
removeobject 1 removeobject 1
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
msgbox FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded, MSGBOX_DEFAULT msgbox FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded, MSGBOX_DEFAULT
closemessage closemessage
releaseall releaseall
data/maps/LilycoveCity_ContestLobby/scripts.inc
+8 -8
View File
@@ -42,7 +42,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
waitmovement 0 waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 0 showcontestwinner 0
lockall lockall
msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
@@ -216,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
waitmovement 0 waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 0 showcontestwinner 0
msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
@@ -504,42 +504,42 @@ LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 1 showcontestwinner 1
releaseall releaseall
end end
LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745 LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 2 showcontestwinner 2
releaseall releaseall
end end
LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 3 showcontestwinner 3
releaseall releaseall
end end
LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753 LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 4 showcontestwinner 4
releaseall releaseall
end end
LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 5 showcontestwinner 5
releaseall releaseall
end end
LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761 LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 6 showcontestwinner 6
releaseall releaseall
end end
data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+5 -5
View File
@@ -182,35 +182,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 9 showcontestwinner 9
releaseall releaseall
end end
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 10 showcontestwinner 10
releaseall releaseall
end end
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 11 showcontestwinner 11
releaseall releaseall
end end
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 12 showcontestwinner 12
releaseall releaseall
end end
LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
fadescreen 1 fadescreen FADE_TO_BLACK
showcontestwinner 13 showcontestwinner 13
releaseall releaseall
end end
data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+2 -2
View File
@@ -25,9 +25,9 @@ LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove
msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
special MoveDeleterChooseMoveToForget special MoveDeleterChooseMoveToForget
fadescreen 0 fadescreen FADE_FROM_BLACK
compare VAR_0x8005, MAX_MON_MOVES compare VAR_0x8005, MAX_MON_MOVES
goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget
special BufferMoveDeleterNicknameAndMove special BufferMoveDeleterNicknameAndMove
data/maps/MagmaHideout_4F/scripts.inc
+2 -2
View File
@@ -62,14 +62,14 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
setvar VAR_SLATEPORT_CITY_STATE, 1 setvar VAR_SLATEPORT_CITY_STATE, 1
setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
setvar VAR_SLATEPORT_HARBOR_STATE, 1 setvar VAR_SLATEPORT_HARBOR_STATE, 1
fadescreen 1 fadescreen FADE_TO_BLACK
removeobject 6 removeobject 6
removeobject 2 removeobject 2
removeobject 3 removeobject 3
removeobject 4 removeobject 4
removeobject 5 removeobject 5
setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
fadescreen 0 fadescreen FADE_FROM_BLACK
releaseall releaseall
end end
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+6 -6
View File
@@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
special SavePlayerParty special SavePlayerParty
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -267,7 +267,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032
special LoadPlayerParty special LoadPlayerParty
switch VAR_RESULT switch VAR_RESULT
case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha
fadescreen 1 fadescreen FADE_TO_BLACK
special SetCB2WhiteOut special SetCB2WhiteOut
waitstate waitstate
@@ -287,7 +287,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
closemessage closemessage
setvar VAR_MOSSDEEP_CITY_STATE, 3 setvar VAR_MOSSDEEP_CITY_STATE, 3
fadedefaultbgm fadedefaultbgm
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3 setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
@@ -304,10 +304,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
setobjectxy 1, 6, 2 setobjectxy 1, 6, 2
turnobject 1, DIR_NORTH turnobject 1, DIR_NORTH
call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer
fadescreen 0 fadescreen FADE_FROM_BLACK
msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT
closemessage closemessage
fadescreen 1 fadescreen FADE_TO_BLACK
setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER
setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
removeobject 4 removeobject 4
@@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
setobjectxyperm 3, 5, 6 setobjectxyperm 3, 5, 6
setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND
addobject 3 addobject 3
fadescreen 0 fadescreen FADE_FROM_BLACK
end end
MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131 MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131
data/maps/MtChimney/scripts.inc
+2 -2
View File
@@ -47,13 +47,13 @@ MtChimney_EventScript_Maxie:: @ 822EE0B
msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
fadescreen 1 fadescreen FADE_TO_BLACK
removeobject 2 removeobject 2
removeobject 29 removeobject 29
removeobject 3 removeobject 3
removeobject 22 removeobject 22
setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA
fadescreen 0 fadescreen FADE_FROM_BLACK
setobjectxyperm 1, 10, 12 setobjectxyperm 1, 10, 12
addobject 1 addobject 1
compare VAR_FACING, DIR_EAST compare VAR_FACING, DIR_EAST
data/maps/MtPyre_Summit/scripts.inc
+2 -2
View File
@@ -45,7 +45,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2 call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2
msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT
closemessage closemessage
fadescreen 1 fadescreen FADE_TO_BLACK
removeobject 2 removeobject 2
removeobject 4 removeobject 4
removeobject 5 removeobject 5
@@ -54,7 +54,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA
fadedefaultbgm fadedefaultbgm
fadescreen 0 fadescreen FADE_FROM_BLACK
delay 20 delay 20
setvar VAR_MT_PYRE_STATE, 1 setvar VAR_MT_PYRE_STATE, 1
compare VAR_0x8008, 0 compare VAR_0x8008, 0
data/maps/Route101/scripts.inc
+1 -1
View File
@@ -220,7 +220,7 @@ Route101_EventScript_BirchsBag:: @ 81EBE16
faceplayer faceplayer
setflag FLAG_SYS_POKEMON_GET setflag FLAG_SYS_POKEMON_GET
setflag FLAG_RESCUED_BIRCH setflag FLAG_RESCUED_BIRCH
fadescreen 1 fadescreen FADE_TO_BLACK
removeobject 4 removeobject 4
setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
data/maps/Route113_GlassWorkshop/scripts.inc
+2 -2
View File
@@ -206,10 +206,10 @@ Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003
Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT
closemessage closemessage
fadescreen 1 fadescreen FADE_TO_BLACK
playse SE_SELECT playse SE_SELECT
delay 30 delay 30
fadescreen 0 fadescreen FADE_FROM_BLACK
msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT
compare VAR_0x8009, 0 compare VAR_0x8009, 0
call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute
data/maps/Route119_WeatherInstitute_2F/scripts.inc
+2 -2
View File
@@ -64,7 +64,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
setvar VAR_WEATHER_INSTITUTE_STATE, 1 setvar VAR_WEATHER_INSTITUTE_STATE, 1
clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
fadedefaultbgm fadedefaultbgm
fadescreen 1 fadescreen FADE_TO_BLACK
setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA
setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
removeobject 1 removeobject 1
@@ -74,7 +74,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
removeobject 7 removeobject 7
applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition
waitmovement 0 waitmovement 0
fadescreen 0 fadescreen FADE_FROM_BLACK
applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer
waitmovement 0 waitmovement 0
copyobjectxytoperm 5 copyobjectxytoperm 5
data/maps/Route120/scripts.inc
+2 -2
View File
@@ -225,10 +225,10 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
end end
Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
removeobject 30 @ Invisible Bridge Kecleon removeobject 30 @ Invisible Bridge Kecleon
removeobject 36 @ Visible Bridge Kecleon removeobject 36 @ Visible Bridge Kecleon
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
goto Route120_EventScript_StevenGiveDeconScope goto Route120_EventScript_StevenGiveDeconScope
end end
data/maps/SkyPillar_Outside/scripts.inc
+2 -2
View File
@@ -80,12 +80,12 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT
closemessage closemessage
playse SE_KAIDAN playse SE_KAIDAN
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_SOOTOPOLIS_CITY_STATE, 4 setvar VAR_SOOTOPOLIS_CITY_STATE, 4
removeobject 1 removeobject 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
releaseall releaseall
end end
data/maps/SkyPillar_Top/scripts.inc
+4 -4
View File
@@ -76,16 +76,16 @@ SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771
end end
SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
releaseall releaseall
end end
SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
bufferspeciesname 0, VAR_0x8004 bufferspeciesname 0, VAR_0x8004
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
releaseall releaseall
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+28 -26
View File
@@ -1,51 +1,54 @@
SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_OnFrame
.byte 0 .byte 0
@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by object event 3, which has the gfx id VAR_OBJ_GFX_ID_1
SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970 SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970
call SlateportCity_BattleTentBattleRoom_EventScript_209976 call SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx
end end
SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8209976
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
return return
SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 820998E
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8209994
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_OnWarp: @ 820999A
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099A4 map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects
.2byte 0 .2byte 0
SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 82099A4
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
end end
SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4 SlateportCity_BattleTentBattleRoom_OnFrame: @ 82099B4
map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_2099BE map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom
.2byte 0 .2byte 0
SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE
applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99 applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
factory_setopponentgfx factory_setopponentgfx
setobjectxyperm 2, 5, 1 setobjectxyperm 2, 5, 1
removeobject 2 removeobject 2
addobject 2 addobject 2
applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter
waitmovement 0 waitmovement 0
battletent_getopponentintro battletent_getopponentintro
lockall lockall
@@ -58,41 +61,40 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 case 1, SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent
SlateportCity_BattleTent_EventScript_WarpToLobbyLost:: @ 8209A1B
SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
special LoadPlayerParty special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@ forced stop
SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 8209A39
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B case 3, SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon
@ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3 warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 3
waitstate waitstate
@ forced stop
SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8209A7B
SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
special LoadPlayerParty special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
@ forced stop @ forced stop
SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99 SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter: @ 8209A99
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_fastest_right
step_end step_end
SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter: @ 8209A9E
walk_down walk_down
walk_down walk_down
walk_down walk_down
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+84 -67
View File
@@ -1,51 +1,52 @@
SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_OnWarp
.byte 0 .byte 0
SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 @ This is Slateport Tent's version of the Battle Factory Pre-Battle Room
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B
SlateportCity_BattleTentCorridor_OnWarp: @ 8208E31
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_SetUpObjects
.2byte 0 .2byte 0
SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B SlateportCity_BattleTentCorridor_EventScript_SetUpObjects:: @ 8208E3B
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_ne SlateportCity_BattleTentCorridor_EventScript_208E56 goto_if_ne SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth
setobjectxy 1, 2, 2 setobjectxy 1, 2, 2
turnobject 1, DIR_SOUTH turnobject 1, DIR_SOUTH
SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth:: @ 8208E56
SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B SlateportCity_BattleTentCorridor_OnFrame: @ 8208E5B
map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65 map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_EnterCorridor
.2byte 0 .2byte 0
SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: @ 8208E65
compare VAR_0x8006, 1 compare VAR_0x8006, 1
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 applymovement 1, SlateportCity_BattleTentCorridor_Movement_AttendantEnter
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_PlayerEnter
waitmovement 0 waitmovement 0
compare VAR_0x8006, 2 compare VAR_0x8006, 2
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044 goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge
slateporttent_generaterentalmons slateporttent_generaterentalmons
slateporttent_generateopponentmons slateporttent_generateopponentmons
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
slateporttent_rentmons slateporttent_rentmons
waitstate waitstate
SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: @ 8208EB4
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
opendoor 2, 1 opendoor 2, 1
waitdooranim waitdooranim
applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 applymovement 1, SlateportCity_BattleTentCorridor_Movement_AttendantExit
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_PlayerExit
waitmovement 0 waitmovement 0
closedoor 2, 1 closedoor 2, 1
waitdooranim waitdooranim
@@ -53,97 +54,97 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
waitstate waitstate
end end
SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 8208EEE
factory_setopponentmons factory_setopponentmons
factory_resethelditems factory_resethelditems
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014 call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if_eq SlateportCity_BattleTentCorridor_EventScript_20901B call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB case 0, SlateportCity_BattleTentCorridor_EventScript_AskSwapMon
case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B case 1, SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge
case 2, SlateportCity_BattleTentCorridor_EventScript_208F89 case 2, SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge
SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge:: @ 8208F5B
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, SlateportCity_BattleTentCorridor_EventScript_208F0D case NO, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
case YES, SlateportCity_BattleTentCorridor_EventScript_209022 case YES, SlateportCity_BattleTentCorridor_EventScript_PauseChallenge
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge:: @ 8208F89
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D case 1, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B case 0, SlateportCity_BattleTent_EventScript_WarpToLobbyLost
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB SlateportCity_BattleTentCorridor_EventScript_AskSwapMon:: @ 8208FBB
slateporttent_generateopponentmons slateporttent_generateopponentmons
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4 case NO, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
case YES, SlateportCity_BattleTentCorridor_EventScript_208FF1 case YES, SlateportCity_BattleTentCorridor_EventScript_SwapMons
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208EB4 case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 SlateportCity_BattleTentCorridor_EventScript_SwapMons:: @ 8208FF1
fadescreen 1 fadescreen FADE_TO_BLACK
slateporttent_swapmons slateporttent_swapmons
waitstate waitstate
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 goto_if_eq SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
goto SlateportCity_BattleTentCorridor_EventScript_208EB4 goto SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014 SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent:: @ 8209014
message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
waitmessage waitmessage
return return
SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent:: @ 820901B
message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
waitmessage waitmessage
return return
SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 SlateportCity_BattleTentCorridor_EventScript_PauseChallenge:: @ 8209022
message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
waitmessage waitmessage
slateporttent_save CHALLENGE_STATUS_PAUSED slateporttent_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge:: @ 8209044
special SavePlayerParty special SavePlayerParty
factory_setparties 0 factory_setparties 0
goto SlateportCity_BattleTentCorridor_EventScript_208F0D goto SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 SlateportCity_BattleTentCorridor_Movement_PlayerEnter: @ 8209059
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E SlateportCity_BattleTentCorridor_Movement_PlayerExit: @ 820905E
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062 SlateportCity_BattleTentCorridor_Movement_AttendantEnter: @ 8209062
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -151,12 +152,14 @@ SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
walk_in_place_fastest_down walk_in_place_fastest_down
step_end step_end
SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068 SlateportCity_BattleTentCorridor_Movement_AttendantExit: @ 8209068
walk_up walk_up
set_invisible set_invisible
step_end step_end
SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B @ Leftover text from when this was a Contest Hall in R/S
@ Unused
SlateportCity_ContestHall_Text_AdviceForContests: @ 820906B
.string "Want a tasty little bit of advice\n" .string "Want a tasty little bit of advice\n"
.string "for CONTESTS?\p" .string "for CONTESTS?\p"
.string "Using a certain move after another\n" .string "Using a certain move after another\n"
@@ -167,12 +170,14 @@ SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
.string "Of course, your opponents might try\n" .string "Of course, your opponents might try\n"
.string "disrupting your POKéMON's showing.$" .string "disrupting your POKéMON's showing.$"
SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A @ Unused
SlateportCity_ContestHall_Text_MyPapaIsContestJudge: @ 820917A
.string "My papa, he's a CONTEST JUDGE.\p" .string "My papa, he's a CONTEST JUDGE.\p"
.string "I wonder what I should be when I\n" .string "I wonder what I should be when I\n"
.string "grow up, a JUDGE or a GYM LEADER?$" .string "grow up, a JUDGE or a GYM LEADER?$"
SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC @ Unused
SlateportCity_ContestHall_Text_ImLikeMajorlyCheesed: @ 82091DC
.string "Hey, man, I'm like majorly cheesed,\n" .string "Hey, man, I'm like majorly cheesed,\n"
.string "you know. Like, you know, I just\l" .string "you know. Like, you know, I just\l"
.string "wanted to know why my POKéMON\l" .string "wanted to know why my POKéMON\l"
@@ -184,7 +189,8 @@ SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
.string "Hey, like, you! Zip it, you know?\n" .string "Hey, like, you! Zip it, you know?\n"
.string "Just, you know, take this!$" .string "Just, you know, take this!$"
SlateportCity_BattleTentCorridor_Text_209322: @ 8209322 @ Unused
SlateportCity_ContestHall_Text_ExplainTorment: @ 8209322
.string "That's, like, TM41, you know?\n" .string "That's, like, TM41, you know?\n"
.string "Hey, it's TORMENT, you hearing me?\p" .string "Hey, it's TORMENT, you hearing me?\p"
.string "Like, it won't let the other guy\n" .string "Like, it won't let the other guy\n"
@@ -192,7 +198,8 @@ SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
.string "Hey, now, you listen here, like,\n" .string "Hey, now, you listen here, like,\n"
.string "I'm not laying a torment on you!$" .string "I'm not laying a torment on you!$"
SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED @ Unused
SlateportCity_ContestHall_Text_MCStepUpTakePartInContest: @ 82093ED
.string "MC: Oh, my, my!\n" .string "MC: Oh, my, my!\n"
.string "Now isn't that a dandy of a POKéMON?\p" .string "Now isn't that a dandy of a POKéMON?\p"
.string "Please! Do step right up and take\n" .string "Please! Do step right up and take\n"
@@ -200,7 +207,8 @@ SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
.string "You'll do well! I'm sure of it!\n" .string "You'll do well! I'm sure of it!\n"
.string "My eyes have never failed me!$" .string "My eyes have never failed me!$"
SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1 @ Unused
SlateportCity_ContestHall_Text_JudgeWouldntDoToMissContest: @ 82094A1
.string "JUDGE: Well, hello there!\n" .string "JUDGE: Well, hello there!\n"
.string "I see that you're a TRAINER!\p" .string "I see that you're a TRAINER!\p"
.string "Then, it just wouldn't do for you\n" .string "Then, it just wouldn't do for you\n"
@@ -208,17 +216,20 @@ SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
.string "Get a CONTEST PASS in VERDANTURF\n" .string "Get a CONTEST PASS in VERDANTURF\n"
.string "CITY and enter anytime!$" .string "CITY and enter anytime!$"
SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E @ Unused
SlateportCity_ContestHall_Text_ItsAppealTime: @ 820954E
.string "It's appeal time!\n" .string "It's appeal time!\n"
.string "What should I lead with?$" .string "What should I lead with?$"
SlateportCity_BattleTentCorridor_Text_209579: @ 8209579 @ Unused
SlateportCity_ContestHall_Text_DidntPayAttentionToAppeal: @ 8209579
.string "They didn't pay much attention to\n" .string "They didn't pay much attention to\n"
.string "my POKéMON's appeal…\p" .string "my POKéMON's appeal…\p"
.string "Humph, that JUDGE, he doesn't know\n" .string "Humph, that JUDGE, he doesn't know\n"
.string "a good thing when he sees it.$" .string "a good thing when he sees it.$"
SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1 @ Unused
SlateportCity_ContestHall_Text_RewardWithSageAdvice: @ 82095F1
.string "Oh, hi! You must be a serious fan to get\n" .string "Oh, hi! You must be a serious fan to get\n"
.string "this close to the action.\p" .string "this close to the action.\p"
.string "I'll reward your enthusiasm with\n" .string "I'll reward your enthusiasm with\n"
@@ -230,35 +241,41 @@ SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
.string "Well, you'd think something good has\n" .string "Well, you'd think something good has\n"
.string "to happen!$" .string "to happen!$"
SlateportCity_BattleTentCorridor_Text_209718: @ 8209718 @ Unused
SlateportCity_ContestHall_Text_MoreFreakedOutThanMon: @ 8209718
.string "I can't do this! I'm more freaked out\n" .string "I can't do this! I'm more freaked out\n"
.string "than my POKéMON.\p" .string "than my POKéMON.\p"
.string "I'm shivering and my heart is racing!$" .string "I'm shivering and my heart is racing!$"
SlateportCity_BattleTentCorridor_Text_209775: @ 8209775 @ Unused
SlateportCity_ContestHall_Text_BattleAndContestAlike: @ 8209775
.string "A battle and a CONTEST aren't the\n" .string "A battle and a CONTEST aren't the\n"
.string "same, but they are alike, too.\p" .string "same, but they are alike, too.\p"
.string "You need to work hard and believe\n" .string "You need to work hard and believe\n"
.string "in the POKéMON you've raised.$" .string "in the POKéMON you've raised.$"
SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6 @ Unused
SlateportCity_ContestHall_Text_MonLooksOnTopOfGame: @ 82097F6
.string "That POKéMON looks like it's on top\n" .string "That POKéMON looks like it's on top\n"
.string "of its game, huh?\p" .string "of its game, huh?\p"
.string "A POKéMON that does good in the\n" .string "A POKéMON that does good in the\n"
.string "secondary judging seems to be more\l" .string "secondary judging seems to be more\l"
.string "relaxed when it's doing appeals.$" .string "relaxed when it's doing appeals.$"
SlateportCity_BattleTentCorridor_Text_209890: @ 8209890 @ Unused
SlateportCity_ContestHall_Text_MyMonBetterThanThatLot: @ 8209890
.string "Will you look at that sorry sight?\p" .string "Will you look at that sorry sight?\p"
.string "Heh, my POKéMON's absolutely better\n" .string "Heh, my POKéMON's absolutely better\n"
.string "than that lot!$" .string "than that lot!$"
SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6 @ Unused
SlateportCity_ContestHall_Text_GetUrgeToMoveWithMon: @ 82098E6
.string "Don't you get the urge to move with\n" .string "Don't you get the urge to move with\n"
.string "POKéMON if they're putting on an\l" .string "POKéMON if they're putting on an\l"
.string "energetic appeal?$" .string "energetic appeal?$"
SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D @ Unused
SlateportCity_ContestHall_Text_HyperRankStage: @ 820993D
.string "POKéMON CONTESTS\n" .string "POKéMON CONTESTS\n"
.string "HYPER RANK STAGE!$" .string "HYPER RANK STAGE!$"
data/maps/SlateportCity_BattleTentLobby/map.json
+6 -6
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_BattleTentLobby_EventScript_2088AA", "script": "SlateportCity_BattleTentLobby_EventScript_Attendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_BattleTentLobby_EventScript_208A3D", "script": "SlateportCity_BattleTentLobby_EventScript_TormentGiver",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_BattleTentLobby_EventScript_208A7E", "script": "SlateportCity_BattleTentLobby_EventScript_Man",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_BattleTentLobby_EventScript_208A87", "script": "SlateportCity_BattleTentLobby_EventScript_Girl",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_BattleTentLobby_EventScript_208A90", "script": "SlateportCity_BattleTentLobby_EventScript_Woman",
"flag": "0" "flag": "0"
} }
], ],
@@ -104,7 +104,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "SlateportCity_BattleTentLobby_EventScript_208A99" "script": "SlateportCity_BattleTentLobby_EventScript_RulesBoard"
} }
] ]
} }
data/maps/SlateportCity_BattleTentLobby/scripts.inc
+114 -114
View File
@@ -1,32 +1,32 @@
SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 SlateportCity_BattleTentLobby_MapScripts:: @ 8208730
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_OnWarp
.byte 0 .byte 0
SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B SlateportCity_BattleTentLobby_OnWarp: @ 820873B
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_208745 map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth
.2byte 0 .2byte 0
SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 8208745
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F SlateportCity_BattleTentLobby_OnFrame: @ 820874F
map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_208779 map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, SlateportCity_BattleTentLobby_EventScript_208782 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, SlateportCity_BattleTentLobby_EventScript_208871 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, SlateportCity_BattleTentLobby_EventScript_ResumeChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, SlateportCity_BattleTentLobby_EventScript_2087B7 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, SlateportCity_BattleTentLobby_EventScript_WonChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, SlateportCity_BattleTentLobby_EventScript_208837 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, SlateportCity_BattleTentLobby_EventScript_LostChallenge
.2byte 0 .2byte 0
SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus:: @ 8208779
frontier_getstatus frontier_getstatus
end end
SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8208782
lockall lockall
msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
closemessage closemessage
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
@@ -34,50 +34,50 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782
releaseall releaseall
end end
SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 SlateportCity_BattleTentLobby_EventScript_WonChallenge:: @ 82087B7
lockall lockall
message SlateportCity_BattleTentLobby_Text_2C5C6F message SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons
waitmessage waitmessage
slateporttent_setrandomprize slateporttent_setrandomprize
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
slateporttent_save 0 slateporttent_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9
msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_AwardYouThisPrize, MSGBOX_DEFAULT
slateporttent_giveprize slateporttent_giveprize
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_20882A case FALSE, SlateportCity_BattleTentLobby_EventScript_NoRoomForPrize
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
message SlateportCity_BattleTentLobby_Text_23F68C message BattleFrontier_BattleTowerLobby_Text_ReceivedPrize @ Odd that it uses Tower's instead of Factory's or its own
waitmessage waitmessage
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
waitfanfare waitfanfare
goto SlateportCity_BattleTentLobby_EventScript_208861 goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A SlateportCity_BattleTentLobby_EventScript_NoRoomForPrize:: @ 820882A
msgbox SlateportCity_BattleTentLobby_Text_2C5D52, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208861 goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 SlateportCity_BattleTentLobby_EventScript_LostChallenge:: @ 8208837
lockall lockall
message SlateportCity_BattleTentLobby_Text_2C5BA2 message SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults
waitmessage waitmessage
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
slateporttent_save 0 slateporttent_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 SlateportCity_BattleTentLobby_EventScript_EndGivePrize:: @ 8208861
msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 SlateportCity_BattleTentLobby_EventScript_ResumeChallenge:: @ 8208871
lockall lockall
message SlateportCity_BattleTentLobby_Text_2C5DA7 message SlateportCity_BattleTentLobby_Text_BeenWaitingForYou
waitmessage waitmessage
slateporttent_save CHALLENGE_STATUS_SAVING slateporttent_save CHALLENGE_STATUS_SAVING
playse SE_SAVE playse SE_SAVE
@@ -85,37 +85,37 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8006, 2 setvar VAR_0x8006, 2
goto SlateportCity_BattleTentLobby_EventScript_2089AC goto SlateportCity_BattleTentLobby_EventScript_EnterChallenge
SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA SlateportCity_BattleTentLobby_EventScript_Attendant:: @ 82088AA
lock lock
faceplayer faceplayer
slateporttent_getprize slateporttent_getprize
compare VAR_RESULT, 0 compare VAR_RESULT, ITEM_NONE
goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9 goto_if_ne SlateportCity_BattleTentLobby_EventScript_GivePrize
special SavePlayerParty special SavePlayerParty
msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge:: @ 82088CA
message SlateportCity_BattleTentLobby_Text_2C586A message SlateportCity_BattleTentLobby_Text_TakeChallenge
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0 multichoice 17, 6, MULTI_CHALLENGEINFO, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_208906 case 0, SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge
case 1, SlateportCity_BattleTentLobby_EventScript_208A07 case 1, SlateportCity_BattleTentLobby_EventScript_ExplainChallenge
case 2, SlateportCity_BattleTentLobby_EventScript_208A2E case 2, SlateportCity_BattleTentLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2E case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_CancelChallenge
SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge:: @ 8208906
setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO msgbox SlateportCity_BattleTentLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, SlateportCity_BattleTentLobby_EventScript_208A2B case NO, SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge
case YES, SlateportCity_BattleTentLobby_EventScript_208950 case YES, SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge
case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2B case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge
SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8208950
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
slateporttent_init slateporttent_init
@@ -126,156 +126,156 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 goto_if_eq SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC SlateportCity_BattleTentLobby_EventScript_EnterChallenge:: @ 82089AC
msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_StepThisWay, MSGBOX_DEFAULT
closemessage closemessage
call SlateportCity_BattleTentLobby_EventScript_2089C9 call SlateportCity_BattleTentLobby_EventScript_WalkToDoor
warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 SlateportCity_BattleTentLobby_EventScript_WalkToDoor:: @ 82089C9
applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 applymovement 1, SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
opendoor 6, 1 opendoor 6, 1
waitdooranim waitdooranim
applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC applymovement 1, SlateportCity_BattleTentLobby_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 6, 1 closedoor 6, 1
waitdooranim waitdooranim
return return
SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8 SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor: @ 82089F8
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC SlateportCity_BattleTentLobby_Movement_AttendantEnterDoor: @ 82089FC
walk_up walk_up
set_invisible set_invisible
step_end step_end
SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor: @ 82089FF
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 SlateportCity_BattleTentLobby_Movement_PlayerEnterDoor: @ 8208A03
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 SlateportCity_BattleTentLobby_EventScript_ExplainChallenge:: @ 8208A07
msgbox SlateportCity_BattleTentLobby_Text_2C589C, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainSlateportTent, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_2088CA goto SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge
SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 8208A14
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
goto SlateportCity_BattleTentLobby_EventScript_208A2E goto SlateportCity_BattleTentLobby_EventScript_CancelChallenge
SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 8208A2B
special LoadPlayerParty special LoadPlayerParty
SlateportCity_BattleTentLobby_EventScript_CancelChallenge:: @ 8208A2E
SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E msgbox SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT
release release
end end
SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 @ Unused
SlateportCity_BattleTentLobby_Movement_UnusedEnterDoor:: @ 8208A38
walk_up walk_up
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D SlateportCity_BattleTentLobby_EventScript_TormentGiver:: @ 8208A3D
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_208A74 goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_ReceivedTorment
msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe, MSGBOX_DEFAULT
giveitem_std ITEM_TM41 giveitem_std ITEM_TM41
compare VAR_RESULT, 0 compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM41 setflag FLAG_RECEIVED_TM41
msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainTorment, MSGBOX_DEFAULT
release release
end end
SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74 SlateportCity_BattleTentLobby_EventScript_ReceivedTorment:: @ 8208A74
msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainTorment, MSGBOX_DEFAULT
release release
end end
SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E SlateportCity_BattleTentLobby_EventScript_Man:: @ 8208A7E
msgbox SlateportCity_BattleTentLobby_Text_208D27, MSGBOX_NPC msgbox SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons, MSGBOX_NPC
end end
SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87 SlateportCity_BattleTentLobby_EventScript_Girl:: @ 8208A87
msgbox SlateportCity_BattleTentLobby_Text_208DA6, MSGBOX_NPC msgbox SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons, MSGBOX_NPC
end end
SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90 SlateportCity_BattleTentLobby_EventScript_Woman:: @ 8208A90
msgbox SlateportCity_BattleTentLobby_Text_208DF1, MSGBOX_NPC msgbox SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection, MSGBOX_NPC
end end
SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 SlateportCity_BattleTentLobby_EventScript_RulesBoard:: @ 8208A99
lockall lockall
msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8 goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
end end
SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8208AA8
message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
waitmessage waitmessage
multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, 0 multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_208B06 case 0, SlateportCity_BattleTentLobby_EventScript_RulesBasics
case 1, SlateportCity_BattleTentLobby_EventScript_208B14 case 1, SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner
case 2, SlateportCity_BattleTentLobby_EventScript_208B22 case 2, SlateportCity_BattleTentLobby_EventScript_RulesSwapNumber
case 3, SlateportCity_BattleTentLobby_EventScript_208B30 case 3, SlateportCity_BattleTentLobby_EventScript_RulesSwapNotes
case 4, SlateportCity_BattleTentLobby_EventScript_208B3E case 4, SlateportCity_BattleTentLobby_EventScript_RulesMons
case 5, SlateportCity_BattleTentLobby_EventScript_208B4C case 5, SlateportCity_BattleTentLobby_EventScript_ExitRules
case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208B4C case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_ExitRules
end end
SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 SlateportCity_BattleTentLobby_EventScript_RulesBasics:: @ 8208B06
msgbox SlateportCity_BattleTentLobby_Text_2C5F08, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainBasicRules, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8 goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
end end
SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14 SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner:: @ 8208B14
msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8 goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
end end
SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22 SlateportCity_BattleTentLobby_EventScript_RulesSwapNumber:: @ 8208B22
msgbox SlateportCity_BattleTentLobby_Text_2C6020, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8 goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
end end
SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30 SlateportCity_BattleTentLobby_EventScript_RulesSwapNotes:: @ 8208B30
msgbox SlateportCity_BattleTentLobby_Text_2C60C0, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapNotes, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8 goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
end end
SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E SlateportCity_BattleTentLobby_EventScript_RulesMons:: @ 8208B3E
msgbox SlateportCity_BattleTentLobby_Text_2C61FE, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
goto SlateportCity_BattleTentLobby_EventScript_208AA8 goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
end end
SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C SlateportCity_BattleTentLobby_EventScript_ExitRules:: @ 8208B4C
releaseall releaseall
end end
SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe: @ 8208B4E
.string "So, like, I couldn't find myself any\n" .string "So, like, I couldn't find myself any\n"
.string "POKéMON that were, like, for me.\p" .string "POKéMON that were, like, for me.\p"
.string "So, I figured, like, hey, I should file\n" .string "So, I figured, like, hey, I should file\n"
@@ -285,7 +285,7 @@ SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E
.string "Hey, like, you! Zip it, you know?\n" .string "Hey, like, you! Zip it, you know?\n"
.string "Just, you know, take this!$" .string "Just, you know, take this!$"
SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C SlateportCity_BattleTentLobby_Text_ExplainTorment: @ 8208C5C
.string "That's, like, TM41, you know?\n" .string "That's, like, TM41, you know?\n"
.string "Hey, it's TORMENT, you hearing me?\p" .string "Hey, it's TORMENT, you hearing me?\p"
.string "Like, it won't let the other guy\n" .string "Like, it won't let the other guy\n"
@@ -293,18 +293,18 @@ SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C
.string "Hey, now, you listen here, like,\n" .string "Hey, now, you listen here, like,\n"
.string "I'm not laying a torment on you!$" .string "I'm not laying a torment on you!$"
SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27 SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons: @ 8208D27
.string "I don't really like BUG POKéMON,\n" .string "I don't really like BUG POKéMON,\n"
.string "but maybe I'll try using some for\l" .string "but maybe I'll try using some for\l"
.string "a change of pace.\p" .string "a change of pace.\p"
.string "Who knows, I might even get to like\n" .string "Who knows, I might even get to like\n"
.string "them!$" .string "them!$"
SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6 SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons: @ 8208DA6
.string "You can battle all you want here even\n" .string "You can battle all you want here even\n"
.string "if you don't have any tough POKéMON.$" .string "if you don't have any tough POKéMON.$"
SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1 SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection: @ 8208DF1
.string "Wouldn't it be nice if they had more of\n" .string "Wouldn't it be nice if they had more of\n"
.string "a selection?$" .string "a selection?$"
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+4 -4
View File
@@ -61,11 +61,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
closemessage closemessage
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
fadescreen 1 fadescreen FADE_TO_BLACK
removeobject 2 removeobject 2
removeobject 3 removeobject 3
removeobject 4 removeobject 4
fadescreen 0 fadescreen FADE_FROM_BLACK
delay 30 delay 30
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -75,7 +75,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
call Common_EventScript_PlayerHandedOverTheItem call Common_EventScript_PlayerHandedOverTheItem
msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT
closemessage closemessage
fadescreen 1 fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA playfanfare MUS_ME_ASA
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
@@ -87,7 +87,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
fadescreen 0 fadescreen FADE_FROM_BLACK
release release
end end
data/maps/SootopolisCity/scripts.inc
+4 -4
View File
@@ -214,7 +214,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed FADE_TO_BLACK, 8
setweather WEATHER_ABNORMAL setweather WEATHER_ABNORMAL
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
@@ -314,7 +314,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed FADE_TO_BLACK, 8
setweather WEATHER_ABNORMAL setweather WEATHER_ABNORMAL
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
@@ -505,7 +505,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed FADE_TO_BLACK, 8
call SootopolisCity_EventScript_SetRoughWater call SootopolisCity_EventScript_SetRoughWater
removeobject 9 removeobject 9
removeobject 10 removeobject 10
@@ -558,7 +558,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed FADE_TO_BLACK, 8
call SootopolisCity_EventScript_SetRoughWater call SootopolisCity_EventScript_SetRoughWater
removeobject 9 removeobject 9
removeobject 10 removeobject 10
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+1 -1
View File
@@ -126,7 +126,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2
SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
return return
data/maps/TrainerHill_Entrance/scripts.inc
+1 -1
View File
@@ -219,7 +219,7 @@ TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
TrainerHill_Entrance_EventScript_Records:: @ 8268388 TrainerHill_Entrance_EventScript_Records:: @ 8268388
lockall lockall
fadescreen 1 fadescreen FADE_TO_BLACK
special ShowTrainerHillRecords special ShowTrainerHillRecords
waitstate waitstate
releaseall releaseall
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+54 -52
View File
@@ -1,68 +1,70 @@
VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_OnWarp
.byte 0 .byte 0
@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_1
@ The opponent is represented by object event 2, which has the gfx id VAR_OBJ_GFX_ID_0
VerdanturfTown_BattleTentBattleRoom_OnTransition: @ 820230A VerdanturfTown_BattleTentBattleRoom_OnTransition: @ 820230A
call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 call VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
end end
VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8202310
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
return return
VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 8202328
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return return
VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8202333
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return return
VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E VerdanturfTown_BattleTentBattleRoom_OnFrame: @ 820233E
map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_202348 map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom
.2byte 0 .2byte 0
VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 8202348
showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820236F
VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
tower_setopponent tower_setopponent
addobject 2 addobject 2
applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter
waitmovement 0 waitmovement 0
battletent_getopponentintro battletent_getopponentintro
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage waitmessage
call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
switch VAR_RESULT switch VAR_RESULT
case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8 case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent
VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 82023AA
VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
special LoadPlayerParty special LoadPlayerParty
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501 case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon
applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
applymovement 3, Common_Movement_WalkInPlaceFastestDown applymovement 3, Common_Movement_WalkInPlaceFastestDown
@@ -76,84 +78,84 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 820243C
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565 call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_20256C call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1 multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT switch VAR_RESULT
case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge
case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20248A case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8 case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge
VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 820248A
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge
case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 82024B8
message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 82024EA
applymovement 3, Common_Movement_WalkInPlaceFastestRight applymovement 3, Common_Movement_WalkInPlaceFastestRight
applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
closemessage closemessage
goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F goto VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter
VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8202501
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
special LoadPlayerParty special LoadPlayerParty
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate waitstate
VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 820251F
message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData
waitmessage waitmessage
verdanturftent_save CHALLENGE_STATUS_PAUSED verdanturftent_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE playse SE_SAVE
waitse waitse
fadescreen 1 fadescreen FADE_TO_BLACK
frontier_reset frontier_reset
end end
VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 VerdanturfTown_BattleTentBattleRoom_OnWarp: @ 8202541
map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20254B map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects
.2byte 0 .2byte 0
VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 820254B
hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 call VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_SetInvisible
removeobject 2 removeobject 2
end end
VerdanturfTown_BattleTentBattleRoom_EventScript_202565:: @ 8202565 VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8202565
message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent
waitmessage waitmessage
return return
VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 820256C
message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent
waitmessage waitmessage
return return
VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573 VerdanturfTown_BattleTentBattleRoom_Movement_SetInvisible: @ 8202573
set_invisible set_invisible
step_end step_end
VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575 VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8202575
set_visible set_visible
walk_up walk_up
walk_up walk_up
@@ -161,7 +163,7 @@ VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
face_right face_right
step_end step_end
VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 820257B
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -169,7 +171,7 @@ VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
face_left face_left
step_end step_end
VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581 VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit: @ 8202581
walk_up walk_up
walk_up walk_up
walk_up walk_up
data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
+21 -16
View File
@@ -1,21 +1,21 @@
VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A
map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090 map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_OnFrame
.byte 0 .byte 0
VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 VerdanturfTown_BattleTentCorridor_OnFrame: @ 8202090
map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_20209A map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor
.2byte 0 .2byte 0
VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 820209A
lockall lockall
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor
waitmovement 0 waitmovement 0
opendoor 2, 1 opendoor 2, 1
waitdooranim waitdooranim
applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 2, 1 closedoor 2, 1
waitdooranim waitdooranim
@@ -25,22 +25,24 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A
releaseall releaseall
end end
VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor: @ 82020DE
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3 VerdanturfTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 82020E3
walk_up walk_up
VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 82020E4
VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4
walk_up walk_up
set_invisible set_invisible
step_end step_end
VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
@ Leftover text from when this was a Contest Hall in R/S
@ Unused
VerdanturfTown_ContestHall_Text_WhichContestYouEntering: @ 82020E7
.string "Which CONTEST are you entering?\n" .string "Which CONTEST are you entering?\n"
.string "Want a piece of advice?\p" .string "Want a piece of advice?\p"
.string "In any CONTEST, for example, a CUTE\n" .string "In any CONTEST, for example, a CUTE\n"
@@ -49,21 +51,24 @@ VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7
.string "You need to work out ways for raising\n" .string "You need to work out ways for raising\n"
.string "POKéMON better.$" .string "POKéMON better.$"
VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4 @ Unused
VerdanturfTown_ContestHall_Text_RaisedMonToBeCute: @ 82021C4
.string "I raised my POKéMON to be cute.\p" .string "I raised my POKéMON to be cute.\p"
.string "I found out you can put POKéMON in\n" .string "I found out you can put POKéMON in\n"
.string "a CONTEST for cuteness!\p" .string "a CONTEST for cuteness!\p"
.string "I'm so glad I raised my POKéMON with\n" .string "I'm so glad I raised my POKéMON with\n"
.string "loving care…$" .string "loving care…$"
VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251 @ Unused
VerdanturfTown_ContestHall_Text_MyMonRules: @ 8202251
.string "My POKéMON rules!\p" .string "My POKéMON rules!\p"
.string "It's cool, tough yet beautiful, cute,\n" .string "It's cool, tough yet beautiful, cute,\n"
.string "and smart. It's complete!\p" .string "and smart. It's complete!\p"
.string "I may as well go for wins in every\n" .string "I may as well go for wins in every\n"
.string "single CONTEST.$" .string "single CONTEST.$"
VerdanturfTown_BattleTentCorridor_Text_2022D6: @ 82022D6 @ Unused
VerdanturfTown_ContestHall_Text_NormalRankStage: @ 82022D6
.string "POKéMON CONTESTS\n" .string "POKéMON CONTESTS\n"
.string "NORMAL RANK STAGE!$" .string "NORMAL RANK STAGE!$"
data/maps/VerdanturfTown_BattleTentLobby/map.json
+7 -7
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201873", "script": "VerdanturfTown_BattleTentLobby_EventScript_Attendant",
"flag": "0" "flag": "0"
}, },
{ {
@@ -37,7 +37,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B", "script": "VerdanturfTown_BattleTentLobby_EventScript_AttractGiver",
"flag": "0" "flag": "0"
}, },
{ {
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC", "script": "VerdanturfTown_BattleTentLobby_EventScript_Boy1",
"flag": "0" "flag": "0"
}, },
{ {
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5", "script": "VerdanturfTown_BattleTentLobby_EventScript_Boy2",
"flag": "0" "flag": "0"
}, },
{ {
@@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0", "script": "VerdanturfTown_BattleTentLobby_EventScript_Scott",
"flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT"
}, },
{ {
@@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7", "script": "VerdanturfTown_BattleTentLobby_EventScript_LittleBoy",
"flag": "0" "flag": "0"
} }
], ],
@@ -117,7 +117,7 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" "script": "VerdanturfTown_BattleTentLobby_EventScript_RulesBoard"
} }
] ]
} }
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+130 -132
View File
@@ -1,30 +1,30 @@
VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0
map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_OnWarp
.byte 0 .byte 0
VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB VerdanturfTown_BattleTentLobby_OnWarp: @ 82016DB
map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_2016E5 map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth
.2byte 0 .2byte 0
VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 82016E5
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF VerdanturfTown_BattleTentLobby_OnFrame: @ 82016EF
map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_201719 map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, VerdanturfTown_BattleTentLobby_EventScript_201722 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, VerdanturfTown_BattleTentLobby_EventScript_201837 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, VerdanturfTown_BattleTentLobby_EventScript_201757 map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, VerdanturfTown_BattleTentLobby_EventScript_WonChallenge
map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, VerdanturfTown_BattleTentLobby_EventScript_2017FD map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, VerdanturfTown_BattleTentLobby_EventScript_LostChallenge
.2byte 0 .2byte 0
VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus:: @ 8201719
frontier_getstatus frontier_getstatus
end end
VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8201722
lockall lockall
msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT
closemessage closemessage
@@ -34,10 +34,10 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722
releaseall releaseall
end end
VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 VerdanturfTown_BattleTentLobby_EventScript_WonChallenge:: @ 8201757
lockall lockall
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak, MSGBOX_DEFAULT
message VerdanturfTown_BattleTentLobby_Text_2C5791 message VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded
waitmessage waitmessage
verdanturftent_setrandomprize verdanturftent_setrandomprize
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
@@ -45,23 +45,23 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
playse SE_SAVE playse SE_SAVE
waitse waitse
VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791
msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize, MSGBOX_DEFAULT
verdanturftent_giveprize verdanturftent_giveprize
switch VAR_RESULT switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD case FALSE, VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
message VerdanturfTown_BattleTentLobby_Text_24A554 message BattleFrontier_BattleDomeLobby_Text_ReceivedPrize @ Odd that it used Dome's copy instead of Palace's
waitmessage waitmessage
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
waitfanfare waitfanfare
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 82017DD
msgbox BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize, MSGBOX_DEFAULT
waitmessage waitmessage
closemessage closemessage
@@ -69,27 +69,27 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD
releaseall releaseall
end end
VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting:: @ 82017EE
lockall lockall
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201791 goto VerdanturfTown_BattleTentLobby_EventScript_GivePrize
end end
VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD VerdanturfTown_BattleTentLobby_EventScript_LostChallenge:: @ 82017FD
lockall lockall
message VerdanturfTown_BattleTentLobby_Text_2C56B8 message VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded
waitmessage waitmessage
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
verdanturftent_save 0 verdanturftent_save 0
playse SE_SAVE playse SE_SAVE
waitse waitse
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
releaseall releaseall
end end
VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 8201837
lockall lockall
msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT
message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge
@@ -99,50 +99,49 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
waitse waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE frontier_set FRONTIER_DATA_PAUSED, FALSE
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto VerdanturfTown_BattleTentLobby_EventScript_2019AE goto VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge
VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 VerdanturfTown_BattleTentLobby_EventScript_Attendant:: @ 8201873
lock lock
faceplayer faceplayer
verdanturftent_getprize verdanturftent_getprize
compare VAR_RESULT, 0 compare VAR_RESULT, ITEM_NONE
goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting
special SavePlayerParty special SavePlayerParty
msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8201893
VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 message VerdanturfTown_BattleTentLobby_Text_TakeChallenge
message VerdanturfTown_BattleTentLobby_Text_2C5129
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, 0 multichoice 17, 6, MULTI_CHALLENGEINFO, 0
switch VAR_RESULT switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_2018CF case 0, VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge
case 1, VerdanturfTown_BattleTentLobby_EventScript_2019DB case 1, VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge
case 2, VerdanturfTown_BattleTentLobby_EventScript_201A37 case 2, VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A37 case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 82018CF
setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
setvar VAR_RESULT, 2 setvar VAR_RESULT, 2
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE compare VAR_0x8004, TRUE
goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO msgbox VerdanturfTown_BattleTentLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, VerdanturfTown_BattleTentLobby_EventScript_201A34 case NO, VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
case YES, VerdanturfTown_BattleTentLobby_EventScript_201954 case YES, VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge
case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A34 case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8201954
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
verdanturftent_init verdanturftent_init
@@ -154,185 +153,184 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed
VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge:: @ 82019AE
VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_NowFollowMe, MSGBOX_DEFAULT
closemessage closemessage
call VerdanturfTown_BattleTentLobby_EventScript_201A41 call VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor
warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge:: @ 82019DB
msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201893 goto VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge
VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons:: @ 82019E8
switch VAR_RESULT switch VAR_RESULT
case FRONTIER_LVL_50, VerdanturfTown_BattleTentLobby_EventScript_201A03 case FRONTIER_LVL_50, VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50
case FRONTIER_LVL_OPEN, VerdanturfTown_BattleTentLobby_EventScript_201A10 case FRONTIER_LVL_OPEN, VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen
VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03 VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50:: @ 8201A03
msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201A3F goto VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge
VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8201A10
msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201A3F goto VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge
VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 8201A1D
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
goto VerdanturfTown_BattleTentLobby_EventScript_201A37 goto VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 8201A34
special LoadPlayerParty special LoadPlayerParty
VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge:: @ 8201A37
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge:: @ 8201A3F
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor:: @ 8201A41
applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 applymovement 1, VerdanturfTown_BattleTentLobby_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_WalkToDoor
waitmovement 0 waitmovement 0
opendoor 6, 1 opendoor 6, 1
waitdooranim waitdooranim
applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 applymovement 1, VerdanturfTown_BattleTentLobby_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
closedoor 6, 1 closedoor 6, 1
waitdooranim waitdooranim
return return
VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70 VerdanturfTown_BattleTentLobby_Movement_WalkToDoor: @ 8201A70
walk_up walk_up
walk_up walk_up
walk_up walk_up
step_end step_end
VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74 VerdanturfTown_BattleTentLobby_Movement_AttendantEnterDoor: @ 8201A74
walk_up walk_up
set_invisible set_invisible
step_end step_end
VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 VerdanturfTown_BattleTentLobby_Movement_PlayerEnterDoor: @ 8201A77
walk_up walk_up
walk_up walk_up
set_invisible set_invisible
step_end step_end
VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B VerdanturfTown_BattleTentLobby_EventScript_AttractGiver:: @ 8201A7B
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_201AB2 goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract
msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep, MSGBOX_DEFAULT
giveitem_std ITEM_TM45 giveitem_std ITEM_TM45
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM45 setflag FLAG_RECEIVED_TM45
msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_AttractionMutual, MSGBOX_DEFAULT
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2 VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract:: @ 8201AB2
msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_AttractionMutual, MSGBOX_DEFAULT
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC VerdanturfTown_BattleTentLobby_EventScript_Boy1:: @ 8201ABC
msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, MSGBOX_NPC msgbox VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves, MSGBOX_NPC
end end
VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 VerdanturfTown_BattleTentLobby_EventScript_Boy2:: @ 8201AC5
lock lock
msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves, MSGBOX_DEFAULT
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 VerdanturfTown_BattleTentLobby_EventScript_Scott:: @ 8201AD0
lock lock
faceplayer faceplayer
goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo
msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers, MSGBOX_DEFAULT
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_VERDANTURF setflag FLAG_MET_SCOTT_IN_VERDANTURF
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo:: @ 8201AED
msgbox VerdanturfTown_BattleTentLobby_Text_202025, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly, MSGBOX_DEFAULT
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7 VerdanturfTown_BattleTentLobby_EventScript_LittleBoy:: @ 8201AF7
lock lock
msgbox VerdanturfTown_BattleTentLobby_Text_201D11, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry, MSGBOX_DEFAULT
release release
end end
VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02 VerdanturfTown_BattleTentLobby_EventScript_RulesBoard:: @ 8201B02
lockall lockall
msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, MSGBOX_DEFAULT msgbox VerdanturfTown_BattleTentLobby_Text_RulesAreListed, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8201B11
message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
waitmessage waitmessage
setvar VAR_0x8004, SCROLL_MULTI_BATTLE_TENT_RULES setvar VAR_0x8004, SCROLL_MULTI_BATTLE_TENT_RULES
special ShowScrollableMultichoice special ShowScrollableMultichoice
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_201B7E case 0, VerdanturfTown_BattleTentLobby_EventScript_RulesLevel
case 1, VerdanturfTown_BattleTentLobby_EventScript_201B8C case 1, VerdanturfTown_BattleTentLobby_EventScript_RulesBasics
case 2, VerdanturfTown_BattleTentLobby_EventScript_201B9A case 2, VerdanturfTown_BattleTentLobby_EventScript_RulesNature
case 3, VerdanturfTown_BattleTentLobby_EventScript_201BA8 case 3, VerdanturfTown_BattleTentLobby_EventScript_RulesMoves
case 4, VerdanturfTown_BattleTentLobby_EventScript_201BB6 case 4, VerdanturfTown_BattleTentLobby_EventScript_RulesUnderpowered
case 5, VerdanturfTown_BattleTentLobby_EventScript_201BC4 case 5, VerdanturfTown_BattleTentLobby_EventScript_RulesWhenInDanger
case 6, VerdanturfTown_BattleTentLobby_EventScript_201BD2 case 6, VerdanturfTown_BattleTentLobby_EventScript_ExitRules
case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201BD2 case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_ExitRules
end end
VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E VerdanturfTown_BattleTentLobby_EventScript_RulesLevel:: @ 8201B7E
msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT msgbox BattleTentLobby_Text_ExplainLevelRules, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C VerdanturfTown_BattleTentLobby_EventScript_RulesBasics:: @ 8201B8C
msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A VerdanturfTown_BattleTentLobby_EventScript_RulesNature:: @ 8201B9A
msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8 VerdanturfTown_BattleTentLobby_EventScript_RulesMoves:: @ 8201BA8
msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6 VerdanturfTown_BattleTentLobby_EventScript_RulesUnderpowered:: @ 8201BB6
msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4 VerdanturfTown_BattleTentLobby_EventScript_RulesWhenInDanger:: @ 8201BC4
msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT
goto VerdanturfTown_BattleTentLobby_EventScript_201B11 goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
end end
VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2 VerdanturfTown_BattleTentLobby_EventScript_ExitRules:: @ 8201BD2
releaseall releaseall
end end
VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4 VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves: @ 8201BD4
.string "If it doesn't like a certain move,\n" .string "If it doesn't like a certain move,\n"
.string "a POKéMON will be reluctant to use it.\p" .string "a POKéMON will be reluctant to use it.\p"
.string "It doesn't matter how strong it is,\n" .string "It doesn't matter how strong it is,\n"
@@ -344,14 +342,14 @@ VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4
.string "potential, it's probably failing at\l" .string "potential, it's probably failing at\l"
.string "using a disliked move against its will.$" .string "using a disliked move against its will.$"
VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11 VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry: @ 8201D11
.string "My big sister is gentle usually.\n" .string "My big sister is gentle usually.\n"
.string "But when she gets angry,\l" .string "But when she gets angry,\l"
.string "she's really, really scary!\p" .string "she's really, really scary!\p"
.string "I bet a gentle POKéMON will be scary\n" .string "I bet a gentle POKéMON will be scary\n"
.string "if it gets angry!$" .string "if it gets angry!$"
VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep: @ 8201D9E
.string "My feelings toward my POKéMON…\n" .string "My feelings toward my POKéMON…\n"
.string "The attraction runs deep…\p" .string "The attraction runs deep…\p"
.string "Oh, hi, you didn't see that, did you?\n" .string "Oh, hi, you didn't see that, did you?\n"
@@ -359,20 +357,20 @@ VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E
.string "How would you like this TM for\n" .string "How would you like this TM for\n"
.string "your POKéMON?$" .string "your POKéMON?$"
VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43 VerdanturfTown_BattleTentLobby_Text_AttractionMutual: @ 8201E43
.string "My feelings toward my POKéMON…\n" .string "My feelings toward my POKéMON…\n"
.string "I'm sure the attraction is mutual!\p" .string "I'm sure the attraction is mutual!\p"
.string "They battle exactly the way I want\n" .string "They battle exactly the way I want\n"
.string "them to!$" .string "them to!$"
VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1 VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves: @ 8201EB1
.string "What kind of moves have you taught\n" .string "What kind of moves have you taught\n"
.string "your POKéMON?\p" .string "your POKéMON?\p"
.string "I think you would give yourself\n" .string "I think you would give yourself\n"
.string "an advantage if they knew how to\l" .string "an advantage if they knew how to\l"
.string "heal or protect themselves.$" .string "heal or protect themselves.$"
VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers: @ 8201F3F
.string "SCOTT: Hey there, {PLAYER}{KUN}!\n" .string "SCOTT: Hey there, {PLAYER}{KUN}!\n"
.string "I thought I might see you here.\p" .string "I thought I might see you here.\p"
.string "A BATTLE TENT's a place where\n" .string "A BATTLE TENT's a place where\n"
@@ -382,7 +380,7 @@ VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F
.string "{PLAYER}{KUN}, I expect you to do\n" .string "{PLAYER}{KUN}, I expect you to do\n"
.string "the best you can!$" .string "the best you can!$"
VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025 VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly: @ 8202025
.string "SCOTT: I visit here regularly in hopes\n" .string "SCOTT: I visit here regularly in hopes\n"
.string "of seeing tough TRAINERS in action\l" .string "of seeing tough TRAINERS in action\l"
.string "in whatever the situation.$" .string "in whatever the situation.$"
data/scripts/abnormal_weather.inc
+2 -2
View File
@@ -179,7 +179,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
closemessage closemessage
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
setweather WEATHER_SUNNY setweather WEATHER_SUNNY
doweather doweather
call AbnormalWeather_EventScript_CleanupMapTiles call AbnormalWeather_EventScript_CleanupMapTiles
@@ -187,7 +187,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE
setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0 setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
releaseall releaseall
end end
data/scripts/apprentice.inc
+1 -1
View File
@@ -96,7 +96,7 @@ Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF
apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM
apprentice_freequestion apprentice_freequestion
Apprentice_EventScript_ChooseHoldItem: @ 82B6B09 Apprentice_EventScript_ChooseHoldItem: @ 82B6B09
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
apprentice_openbag apprentice_openbag
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
data/scripts/berry_blender.inc
+4 -4
View File
@@ -302,7 +302,7 @@ BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
@ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left @ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left
BerryBlender_EventScript_DoBerryBlending: @ 8293D2C BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
copyvar VAR_0x8004, VAR_0x8009 copyvar VAR_0x8004, VAR_0x8009
fadescreen 1 fadescreen FADE_TO_BLACK
special DoBerryBlending special DoBerryBlending
waitstate waitstate
releaseall releaseall
@@ -629,7 +629,7 @@ BerryBlender_EventScript_FourPlayerLink: @ 8294139
BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147 BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
fadescreen 1 fadescreen FADE_TO_BLACK
removeobject 240 removeobject 240
removeobject 239 removeobject 239
removeobject 238 removeobject 238
@@ -678,7 +678,7 @@ BerryBlender_EventScript_LinkError: @ 829419D
end end
BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
fadescreen 1 fadescreen FADE_TO_BLACK
specialvar VAR_RESULT, GetLinkPartnerNames specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
@@ -687,7 +687,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
end end
BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4 BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
fadescreen 0 fadescreen FADE_FROM_BLACK
switch VAR_0x8008 switch VAR_0x8008
case 2, BerryBlender_EventScript_TwoPlayerLink case 2, BerryBlender_EventScript_TwoPlayerLink
case 3, BerryBlender_EventScript_ThreePlayerLink case 3, BerryBlender_EventScript_ThreePlayerLink
data/scripts/berry_tree.inc
+1 -1
View File
@@ -39,7 +39,7 @@ BerryTree_EventScript_WantToPlant:: @ 8274374
end end
BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393 BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
fadescreen 1 fadescreen FADE_TO_BLACK
closemessage closemessage
special Bag_ChooseBerry special Bag_ChooseBerry
waitstate waitstate
data/scripts/cable_club.inc
+9 -9
View File
@@ -723,7 +723,7 @@ EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
end end
EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -734,7 +734,7 @@ EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
end end
EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -745,7 +745,7 @@ EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
end end
EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -756,7 +756,7 @@ EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
end end
EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle special ChooseHalfPartyForBattle
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -838,14 +838,14 @@ RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
CableClub_EventScript_ReadTrainerCard:: @ 827747E CableClub_EventScript_ReadTrainerCard:: @ 827747E
msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
special Script_ShowLinkTrainerCard special Script_ShowLinkTrainerCard
waitstate waitstate
end end
CableClub_EventScript_ReadTrainerCardColored:: @ 827748D CableClub_EventScript_ReadTrainerCardColored:: @ 827748D
msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
special Script_ShowLinkTrainerCard special Script_ShowLinkTrainerCard
waitstate waitstate
end end
@@ -1309,7 +1309,7 @@ EventScript_WirelessBoxResults:: @ 8277B8A
specialvar VAR_RESULT, IsWirelessAdapterConnected specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq CableClub_EventScript_AdapterNotConnected goto_if_eq CableClub_EventScript_AdapterNotConnected
fadescreen 1 fadescreen FADE_TO_BLACK
special sub_801A42C special sub_801A42C
waitstate waitstate
msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT
@@ -1408,7 +1408,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special ChooseMonForWirelessMinigame special ChooseMonForWirelessMinigame
waitstate waitstate
@@ -1427,7 +1427,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special ChooseMonForWirelessMinigame special ChooseMonForWirelessMinigame
waitstate waitstate
data/scripts/day_care.inc
+1 -1
View File
@@ -102,7 +102,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56
compare VAR_RESULT, 2 compare VAR_RESULT, 2
goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons
msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT
fadescreen 1 fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon special ChooseSendDaycareMon
waitstate waitstate
compare VAR_0x8004, 255 compare VAR_0x8004, 255
data/scripts/field_poison.inc
+2 -2
View File
@@ -15,7 +15,7 @@ EventScript_FieldWhiteOut:: @ 82736D9
waitbuttonpress waitbuttonpress
special Script_FadeOutMapMusic special Script_FadeOutMapMusic
waitstate waitstate
fadescreen 1 fadescreen FADE_TO_BLACK
call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
special SetCB2WhiteOut special SetCB2WhiteOut
waitstate waitstate
@@ -42,7 +42,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
goto_if_eq TrainerHill_1F_EventScript_Lost goto_if_eq TrainerHill_1F_EventScript_Lost
special Script_FadeOutMapMusic special Script_FadeOutMapMusic
waitstate waitstate
fadescreen 1 fadescreen FADE_TO_BLACK
special SetCB2WhiteOut special SetCB2WhiteOut
waitstate waitstate
end end
data/scripts/lilycove_lady.inc
+4 -4
View File
@@ -73,7 +73,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E
end end
LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special Script_FavorLadyOpenBagMenu special Script_FavorLadyOpenBagMenu
waitstate waitstate
@@ -326,7 +326,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778
LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785 LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785
msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT
LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D
fadescreen 1 fadescreen FADE_TO_BLACK
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special Script_QuizLadyOpenBagMenu special Script_QuizLadyOpenBagMenu
waitstate waitstate
@@ -350,7 +350,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE
special ClearQuizLadyPlayerAnswer special ClearQuizLadyPlayerAnswer
setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION
LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1
fadescreen 1 fadescreen FADE_TO_BLACK
special QuizLadySetCustomQuestion special QuizLadySetCustomQuestion
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -418,7 +418,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0
end end
LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA
fadescreen 1 fadescreen FADE_TO_BLACK
special OpenPokeblockCaseForContestLady special OpenPokeblockCaseForContestLady
waitstate waitstate
compare VAR_RESULT, 0xFFFF compare VAR_RESULT, 0xFFFF
data/scripts/pc_transfer.inc
+1 -1
View File
@@ -6,7 +6,7 @@ Common_EventScript_GetGiftMonPartySlot:: @ 827378B
return return
Common_EventScript_NameReceivedBoxMon:: @ 8273797 Common_EventScript_NameReceivedBoxMon:: @ 8273797
fadescreen 1 fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname special ChangeBoxPokemonNickname
waitstate waitstate
lock lock
data/scripts/players_house.inc
+2 -2
View File
@@ -101,14 +101,14 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F
incrementgamestat GAME_STAT_CHECKED_CLOCK incrementgamestat GAME_STAT_CHECKED_CLOCK
fadescreen 1 fadescreen FADE_TO_BLACK
special Special_ViewWallClock special Special_ViewWallClock
waitstate waitstate
releaseall releaseall
end end
PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849 PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849
fadescreen 1 fadescreen FADE_TO_BLACK
special StartWallClock special StartWallClock
waitstate waitstate
return return
data/scripts/safari_zone.inc
+1 -1
View File
@@ -52,7 +52,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC
end end
SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0 SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
fadescreen 1 fadescreen FADE_TO_BLACK
special OpenPokeblockCaseOnFeeder special OpenPokeblockCaseOnFeeder
waitstate waitstate
compare VAR_RESULT, 0xFFFF compare VAR_RESULT, 0xFFFF
data/scripts/secret_base.inc
+2 -2
View File
@@ -214,10 +214,10 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8
msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_CancelOnEntrance goto_if_eq SecretBase_EventScript_CancelOnEntrance
fadescreenswapbuffers 1 fadescreenswapbuffers FADE_TO_BLACK
special MoveOutOfSecretBaseFromOutside special MoveOutOfSecretBaseFromOutside
closemessage closemessage
fadescreenswapbuffers 0 fadescreenswapbuffers FADE_FROM_BLACK
msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq SecretBase_EventScript_CancelOnEntrance goto_if_eq SecretBase_EventScript_CancelOnEntrance
data/text/battle_tent.inc
+82 -67
View File
@@ -1,17 +1,17 @@
FallarborTown_BattleTentLobby_Text_2C47EB: @ 82C47EB FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C47EB
.string "I welcome you to the BATTLE TENT\n" .string "I welcome you to the BATTLE TENT\n"
.string "FALLARBOR SITE!\p" .string "FALLARBOR SITE!\p"
.string "I am your guide to the Set KO Tourney!$" .string "I am your guide to the Set KO Tourney!$"
FallarborTown_BattleTentLobby_Text_2C4843: @ 82C4843 FallarborTown_BattleTentLobby_Text_TakeChallenge: @ 82C4843
.string "Now, do you wish to take the challenge\n" .string "Now, do you wish to take the challenge\n"
.string "of a Set KO Tourney?$" .string "of a Set KO Tourney?$"
FallarborTown_BattleTentLobby_Text_2C487F: @ 82C487F FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge: @ 82C487F
.string "We await your challenge on\n" .string "We await your challenge on\n"
.string "another occasion!$" .string "another occasion!$"
FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC FallarborTown_BattleTentLobby_Text_ExplainFallarborTent: @ 82C48AC
.string "In the FALLARBOR BATTLE TENT,\n" .string "In the FALLARBOR BATTLE TENT,\n"
.string "we undertake the Set KO Tourney.\p" .string "we undertake the Set KO Tourney.\p"
.string "All participants enter with a team of\n" .string "All participants enter with a team of\n"
@@ -32,20 +32,21 @@ FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC
.string "three TRAINERS in succession,\l" .string "three TRAINERS in succession,\l"
.string "we will present you with a fine prize.$" .string "we will present you with a fine prize.$"
FallarborTown_BattleTentLobby_Text_2C4B35: @ 82C4B35 FallarborTown_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C4B35
.string "Before showing you to the BATTLE\n" .string "Before showing you to the BATTLE\n"
.string "TENT, I must save. Is that okay?$" .string "TENT, I must save. Is that okay?$"
FallarborTown_BattleTentLobby_Text_2C4B77: @ 82C4B77 @ Unused
FallarborTown_BattleTentLobby_Text_WhichLevelMode: @ 82C4B77
.string "We offer two levels of challenge,\n" .string "We offer two levels of challenge,\n"
.string "Level 50 and Open Level.\l" .string "Level 50 and Open Level.\l"
.string "Which is your choice?$" .string "Which is your choice?$"
FallarborTown_BattleTentLobby_Text_2C4BC8: @ 82C4BC8 FallarborTown_BattleTentLobby_Text_SelectThreeMons: @ 82C4BC8
.string "Very well, now select your\n" .string "Very well, now select your\n"
.string "three POKéMON, please.$" .string "three POKéMON, please.$"
FallarborTown_BattleTentLobby_Text_2C4BFA: @ 82C4BFA FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C4BFA
.string "My dear challenger!\p" .string "My dear challenger!\p"
.string "You do not have the three POKéMON\n" .string "You do not have the three POKéMON\n"
.string "required for entry.\p" .string "required for entry.\p"
@@ -55,7 +56,7 @@ FallarborTown_BattleTentLobby_Text_2C4BFA: @ 82C4BFA
.string "When you have made your preparations,\n" .string "When you have made your preparations,\n"
.string "please do return.$" .string "please do return.$"
FallarborTown_BattleTentLobby_Text_2C4CC0: @ 82C4CC0 FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C4CC0
.string "My dear challenger!\p" .string "My dear challenger!\p"
.string "You do not have the three POKéMON\n" .string "You do not have the three POKéMON\n"
.string "required for entry.\p" .string "required for entry.\p"
@@ -67,11 +68,11 @@ FallarborTown_BattleTentLobby_Text_2C4CC0: @ 82C4CC0
.string "When you have made your preparations,\n" .string "When you have made your preparations,\n"
.string "please do return.$" .string "please do return.$"
FallarborTown_BattleTentLobby_Text_2C4DC3: @ 82C4DC3 FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent: @ 82C4DC3
.string "I shall now guide you to\n" .string "I shall now guide you to\n"
.string "the BATTLE TENT.$" .string "the BATTLE TENT.$"
FallarborTown_BattleTentLobby_Text_2C4DED: @ 82C4DED FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C4DED
.string "My dear challenger!\p" .string "My dear challenger!\p"
.string "You did not save the game before\n" .string "You did not save the game before\n"
.string "shutting down, did you?\p" .string "shutting down, did you?\p"
@@ -81,52 +82,52 @@ FallarborTown_BattleTentLobby_Text_2C4DED: @ 82C4DED
.string "You may, of course, start with a fresh\n" .string "You may, of course, start with a fresh\n"
.string "challenge.$" .string "challenge.$"
FallarborTown_BattleTentLobby_Text_2C4EC3: @ 82C4EC3 FallarborTown_BattleTentLobby_Text_BeatThreeTrainers: @ 82C4EC3
.string "How splendid! You have beaten\n" .string "How splendid! You have beaten\n"
.string "three TRAINERS in succession!$" .string "three TRAINERS in succession!$"
FallarborTown_BattleTentLobby_Text_2C4EFF: @ 82C4EFF FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame: @ 82C4EFF
.string "Please wait while I save the game.$" .string "Please wait while I save the game.$"
FallarborTown_BattleTentLobby_Text_2C4F22: @ 82C4F22 FallarborTown_BattleTentLobby_Text_PresentYouWithPrize: @ 82C4F22
.string "In commemoration of your 3-win streak,\n" .string "In commemoration of your 3-win streak,\n"
.string "we present you with this prize.$" .string "we present you with this prize.$"
FallarborTown_BattleTentLobby_Text_2C4F69: @ 82C4F69 FallarborTown_BattleTentLobby_Text_ReceivedPrize: @ 82C4F69
.string "{PLAYER} received the prize\n" .string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$" .string "{STR_VAR_1}.$"
FallarborTown_BattleTentLobby_Text_2C4F83: @ 82C4F83 FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize: @ 82C4F83
.string "Oh?\n" .string "Oh?\n"
.string "Your BAG seems to be full.\p" .string "Your BAG seems to be full.\p"
.string "I urge you to clear space and\n" .string "I urge you to clear space and\n"
.string "return for your prize.$" .string "return for your prize.$"
FallarborTown_BattleTentLobby_Text_2C4FD7: @ 82C4FD7 FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving: @ 82C4FD7
.string "Thank you so much for participating!\p" .string "Thank you so much for participating!\p"
.string "Please wait while I save the game.$" .string "Please wait while I save the game.$"
FallarborTown_BattleTentLobby_Text_2C501F: @ 82C501F FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2: @ 82C501F
.string "We await your challenge on\n" .string "We await your challenge on\n"
.string "another occasion!$" .string "another occasion!$"
FallarborTown_BattleTentLobby_Text_2C504C: @ 82C504C FallarborTown_BattleTentLobby_Text_LookingForwardToArrival: @ 82C504C
.string "We have been looking forward to\n" .string "We have been looking forward to\n"
.string "your arrival.\p" .string "your arrival.\p"
.string "Before I show you to the BATTLE TENT,\n" .string "Before I show you to the BATTLE TENT,\n"
.string "I must save the game. Please wait.$" .string "I must save the game. Please wait.$"
VerdanturfTown_BattleTentLobby_Text_2C50C3: @ 82C50C3 VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C50C3
.string "I welcome you to the BATTLE TENT\n" .string "I welcome you to the BATTLE TENT\n"
.string "VERDANTURF SITE!\p" .string "VERDANTURF SITE!\p"
.string "Here, the TRAINER's trust toward\n" .string "Here, the TRAINER's trust toward\n"
.string "POKéMON is tested.$" .string "POKéMON is tested.$"
VerdanturfTown_BattleTentLobby_Text_2C5129: @ 82C5129 VerdanturfTown_BattleTentLobby_Text_TakeChallenge: @ 82C5129
.string "Do you wish to take the VERDANTURF\n" .string "Do you wish to take the VERDANTURF\n"
.string "BATTLE TENT challenge?$" .string "BATTLE TENT challenge?$"
VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163 VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent: @ 82C5163
.string "In the VERDANTURF BATTLE TENT,\n" .string "In the VERDANTURF BATTLE TENT,\n"
.string "there is one crucial rule that must\l" .string "there is one crucial rule that must\l"
.string "be obeyed.\p" .string "be obeyed.\p"
@@ -146,16 +147,17 @@ VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163
.string "If you don't save before interrupting,\n" .string "If you don't save before interrupting,\n"
.string "you will be disqualified.$" .string "you will be disqualified.$"
VerdanturfTown_BattleTentLobby_Text_2C539A: @ 82C539A VerdanturfTown_BattleTentLobby_Text_ReturnFortified: @ 82C539A
.string "When you have fortified your heart\n" .string "When you have fortified your heart\n"
.string "and POKéMON, you must return.$" .string "and POKéMON, you must return.$"
VerdanturfTown_BattleTentLobby_Text_2C53DB: @ 82C53DB @ Unused
VerdanturfTown_BattleTentLobby_Text_WhichLevelMode: @ 82C53DB
.string "There are two levels of difficulty,\n" .string "There are two levels of difficulty,\n"
.string "Level 50 and Open Level.\l" .string "Level 50 and Open Level.\l"
.string "Which is your choice of a challenge?$" .string "Which is your choice of a challenge?$"
VerdanturfTown_BattleTentLobby_Text_2C543D: @ 82C543D VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C543D
.string "Sigh…\p" .string "Sigh…\p"
.string "You do not have the three POKéMON\n" .string "You do not have the three POKéMON\n"
.string "required for the challenge.\p" .string "required for the challenge.\p"
@@ -167,7 +169,7 @@ VerdanturfTown_BattleTentLobby_Text_2C543D: @ 82C543D
.string "Come back when you have made\n" .string "Come back when you have made\n"
.string "your preparations.$" .string "your preparations.$"
VerdanturfTown_BattleTentLobby_Text_2C5538: @ 82C5538 VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C5538
.string "Sigh…\p" .string "Sigh…\p"
.string "You do not have the three POKéMON\n" .string "You do not have the three POKéMON\n"
.string "required for the challenge.\p" .string "required for the challenge.\p"
@@ -179,48 +181,48 @@ VerdanturfTown_BattleTentLobby_Text_2C5538: @ 82C5538
.string "Come back when you have made\n" .string "Come back when you have made\n"
.string "your preparations.$" .string "your preparations.$"
VerdanturfTown_BattleTentLobby_Text_2C5633: @ 82C5633 VerdanturfTown_BattleTentLobby_Text_SelectThreeMons: @ 82C5633
.string "Good. Now, you must select your\n" .string "Good. Now, you must select your\n"
.string "three POKéMON.$" .string "three POKéMON.$"
VerdanturfTown_BattleTentLobby_Text_2C5662: @ 82C5662 VerdanturfTown_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C5662
.string "I must save before I show you to\n" .string "I must save before I show you to\n"
.string "the BATTLE TENT. Is that okay?$" .string "the BATTLE TENT. Is that okay?$"
VerdanturfTown_BattleTentLobby_Text_2C56A2: @ 82C56A2 VerdanturfTown_BattleTentLobby_Text_NowFollowMe: @ 82C56A2
.string "Good.\n" .string "Good.\n"
.string "Now, follow me.$" .string "Now, follow me.$"
VerdanturfTown_BattleTentLobby_Text_2C56B8: @ 82C56B8 VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded: @ 82C56B8
.string "I feel privileged for having seen\n" .string "I feel privileged for having seen\n"
.string "your POKéMON's exploits.\p" .string "your POKéMON's exploits.\p"
.string "The results will be recorded.\n" .string "The results will be recorded.\n"
.string "I must ask you to briefly wait.$" .string "I must ask you to briefly wait.$"
VerdanturfTown_BattleTentLobby_Text_2C5731: @ 82C5731 VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak: @ 82C5731
.string "To achieve a 3-win streak…\p" .string "To achieve a 3-win streak…\p"
.string "The bonds that bind your heart with\n" .string "The bonds that bind your heart with\n"
.string "your POKéMON seem firm and true.$" .string "your POKéMON seem firm and true.$"
VerdanturfTown_BattleTentLobby_Text_2C5791: @ 82C5791 VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded: @ 82C5791
.string "Your feat will be recorded.\n" .string "Your feat will be recorded.\n"
.string "I must ask you to briefly wait.$" .string "I must ask you to briefly wait.$"
VerdanturfTown_BattleTentLobby_Text_2C57CD: @ 82C57CD VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize: @ 82C57CD
.string "For the feat of your 3-win streak,\n" .string "For the feat of your 3-win streak,\n"
.string "we present you with this prize.$" .string "we present you with this prize.$"
SlateportCity_BattleTentLobby_Text_2C5810: @ 82C5810 SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C5810
.string "Welcome to the BATTLE TENT\n" .string "Welcome to the BATTLE TENT\n"
.string "SLATEPORT SITE!\p" .string "SLATEPORT SITE!\p"
.string "I am your guide to the Battle Swap\n" .string "I am your guide to the Battle Swap\n"
.string "Tournament.$" .string "Tournament.$"
SlateportCity_BattleTentLobby_Text_2C586A: @ 82C586A SlateportCity_BattleTentLobby_Text_TakeChallenge: @ 82C586A
.string "Would you like to take the Battle\n" .string "Would you like to take the Battle\n"
.string "Swap challenge?$" .string "Swap challenge?$"
SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C SlateportCity_BattleTentLobby_Text_ExplainSlateportTent: @ 82C589C
.string "Here at the SLATEPORT BATTLE TENT,\n" .string "Here at the SLATEPORT BATTLE TENT,\n"
.string "we hold Battle Swap events\l" .string "we hold Battle Swap events\l"
.string "using rental POKéMON.\p" .string "using rental POKéMON.\p"
@@ -238,36 +240,39 @@ SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C
.string "If you don't save before interrupting,\n" .string "If you don't save before interrupting,\n"
.string "you will be disqualified.$" .string "you will be disqualified.$"
SlateportCity_BattleTentLobby_Text_2C5AA5: @ 82C5AA5 SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit: @ 82C5AA5
.string "We look forward to your next visit.$" .string "We look forward to your next visit.$"
SlateportCity_BattleTentLobby_Text_2C5AC9: @ 82C5AC9 @ Unused
SlateportCity_BattleTentLobby_Text_WhichLevelMode: @ 82C5AC9
.string "Which level do you wish to challenge?\n" .string "Which level do you wish to challenge?\n"
.string "Level 50 or Level 100?$" .string "Level 50 or Level 100?$"
SlateportCity_BattleTentLobby_Text_2C5B06: @ 82C5B06 SlateportCity_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C5B06
.string "Before you begin your challenge,\n" .string "Before you begin your challenge,\n"
.string "I need to save data. Is that okay?$" .string "I need to save data. Is that okay?$"
SlateportCity_BattleTentLobby_Text_2C5B4A: @ 82C5B4A @ Unused
SlateportCity_BattleTentLobby_Text_HoldMonsForSafekeeping: @ 82C5B4A
.string "Okay, I will hold your POKéMON for\n" .string "Okay, I will hold your POKéMON for\n"
.string "safekeeping while you compete.$" .string "safekeeping while you compete.$"
SlateportCity_BattleTentLobby_Text_2C5B8C: @ 82C5B8C SlateportCity_BattleTentLobby_Text_StepThisWay: @ 82C5B8C
.string "Please step this way.$" .string "Please step this way.$"
SlateportCity_BattleTentLobby_Text_2C5BA2: @ 82C5BA2 SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults: @ 82C5BA2
.string "Thank you for participating!\p" .string "Thank you for participating!\p"
.string "I will return your POKéMON in exchange\n" .string "I will return your POKéMON in exchange\n"
.string "for our rental POKéMON.\p" .string "for our rental POKéMON.\p"
.string "I must also save your event results.\n" .string "I must also save your event results.\n"
.string "Please wait.$" .string "Please wait.$"
SlateportCity_BattleTentLobby_Text_2C5C30: @ 82C5C30 @ Unused
SlateportCity_BattleTentLobby_Text_ReturnMonsExchangeRentals: @ 82C5C30
.string "I will return your POKéMON in exchange\n" .string "I will return your POKéMON in exchange\n"
.string "for our rental POKéMON.$" .string "for our rental POKéMON.$"
SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons: @ 82C5C6F
.string "Congratulations!\n" .string "Congratulations!\n"
.string "You've won three straight matches!\p" .string "You've won three straight matches!\p"
.string "I will return your POKéMON in exchange\n" .string "I will return your POKéMON in exchange\n"
@@ -275,61 +280,65 @@ SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F
.string "I must also save your event results.\n" .string "I must also save your event results.\n"
.string "Please wait.$" .string "Please wait.$"
SlateportCity_BattleTentLobby_Text_2C5D14: @ 82C5D14 SlateportCity_BattleTentLobby_Text_AwardYouThisPrize: @ 82C5D14
.string "In recognition of your 3-win streak,\n" .string "In recognition of your 3-win streak,\n"
.string "we award you this prize.$" .string "we award you this prize.$"
SlateportCity_BattleTentLobby_Text_2C5D52: @ 82C5D52 SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom: @ 82C5D52
.string "Oh?\n" .string "Oh?\n"
.string "You seem to have no room for this.\p" .string "You seem to have no room for this.\p"
.string "Please make room in your BAG and\n" .string "Please make room in your BAG and\n"
.string "let me know.$" .string "let me know.$"
SlateportCity_BattleTentLobby_Text_2C5DA7: @ 82C5DA7 SlateportCity_BattleTentLobby_Text_BeenWaitingForYou: @ 82C5DA7
.string "We've been waiting for you!\p" .string "We've been waiting for you!\p"
.string "Before we resume your challenge,\n" .string "Before we resume your challenge,\n"
.string "I must save the game.$" .string "I must save the game.$"
SlateportCity_BattleTentLobby_Text_2C5DFA: @ 82C5DFA SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C5DFA
.string "I'm sorry to say this, but you didn't\n" .string "I'm sorry to say this, but you didn't\n"
.string "save before you quit playing last time.\p" .string "save before you quit playing last time.\p"
.string "As a result, you have been disqualified\n" .string "As a result, you have been disqualified\n"
.string "from your challenge.$" .string "from your challenge.$"
SlateportCity_BattleTentLobby_Text_2C5E85: @ 82C5E85 @ Unused
SlateportCity_BattleTentLobby_Text_ReturnPersonalMons: @ 82C5E85
.string "We'll return your personal POKéMON.$" .string "We'll return your personal POKéMON.$"
SlateportCity_BattleTentLobby_Text_2C5EA9: @ 82C5EA9 @ Unused
SlateportCity_BattleTentLobby_Text_ReceivedPrize: @ 82C5EA9
.string "{PLAYER} received the prize\n" .string "{PLAYER} received the prize\n"
.string "{STR_VAR_1}.$" .string "{STR_VAR_1}.$"
SlateportCity_BattleTentLobby_Text_2C5EC3: @ 82C5EC3 @ Unused
SlateportCity_BattleTentLobby_Text_RulesAreListed: @ 82C5EC3
.string "The Battle Swap rules are listed.$" .string "The Battle Swap rules are listed.$"
SlateportCity_BattleTentLobby_Text_2C5EE5: @ 82C5EE5 @ Unused
SlateportCity_BattleTentLobby_Text_ReadWhichHeading: @ 82C5EE5
.string "Which heading do you want to read?$" .string "Which heading do you want to read?$"
SlateportCity_BattleTentLobby_Text_2C5F08: @ 82C5F08 SlateportCity_BattleTentLobby_Text_ExplainBasicRules: @ 82C5F08
.string "In a Battle Swap event, you may use\n" .string "In a Battle Swap event, you may use\n"
.string "only three POKéMON.\p" .string "only three POKéMON.\p"
.string "Whether you are renting or swapping,\n" .string "Whether you are renting or swapping,\n"
.string "your team may not have two or more\l" .string "your team may not have two or more\l"
.string "of the same POKéMON.$" .string "of the same POKéMON.$"
SlateportCity_BattleTentLobby_Text_2C5F9D: @ 82C5F9D SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules: @ 82C5F9D
.string "You may swap POKéMON only with\n" .string "You may swap POKéMON only with\n"
.string "the TRAINER you have just defeated.\p" .string "the TRAINER you have just defeated.\p"
.string "You may swap for only those POKéMON\n" .string "You may swap for only those POKéMON\n"
.string "used by the beaten TRAINER.$" .string "used by the beaten TRAINER.$"
SlateportCity_BattleTentLobby_Text_2C6020: @ 82C6020 SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules: @ 82C6020
.string "After every battle you win, you may\n" .string "After every battle you win, you may\n"
.string "swap for one of your defeated\l" .string "swap for one of your defeated\l"
.string "opponent's POKéMON.\p" .string "opponent's POKéMON.\p"
.string "You will not be able to swap POKéMON\n" .string "You will not be able to swap POKéMON\n"
.string "with the third TRAINER in the event.$" .string "with the third TRAINER in the event.$"
SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0 SlateportCity_BattleTentLobby_Text_ExplainSwapNotes: @ 82C60C0
.string "There are two key points to be aware\n" .string "There are two key points to be aware\n"
.string "of when swapping POKéMON.\p" .string "of when swapping POKéMON.\p"
.string "First, when swapping, you can't check\n" .string "First, when swapping, you can't check\n"
@@ -341,20 +350,23 @@ SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0
.string "This sequence remains unchanged\n" .string "This sequence remains unchanged\n"
.string "even when swaps are made.$" .string "even when swaps are made.$"
SlateportCity_BattleTentLobby_Text_2C61FE: @ 82C61FE SlateportCity_BattleTentLobby_Text_ExplainMonRules: @ 82C61FE
.string "The POKéMON of the SLATEPORT\n" .string "The POKéMON of the SLATEPORT\n"
.string "BATTLE TENT are all rentals.\p" .string "BATTLE TENT are all rentals.\p"
.string "All rental POKéMON are kept at\n" .string "All rental POKéMON are kept at\n"
.string "Level 30.$" .string "Level 30.$"
VerdanturfTown_BattleTentLobby_Text_2C6261: @ 82C6261 @ Unused
VerdanturfTown_BattleTentLobby_Text_RulesAreListed2: @ 82C6261
.string "The VERDANTURF BATTLE TENT\n" .string "The VERDANTURF BATTLE TENT\n"
.string "rules are listed.$" .string "rules are listed.$"
VerdanturfTown_BattleTentLobby_Text_2C628E: @ 82C628E @ Unused
VerdanturfTown_BattleTentLobby_Text_ReadWhichHeading: @ 82C628E
.string "Which heading do you want to read?$" .string "Which heading do you want to read?$"
VerdanturfTown_BattleTentLobby_Text_2C62B1: @ 82C62B1 @ Unused
VerdanturfTown_BattleTentLobby_Text_ExplainBasicRules: @ 82C62B1
.string "Here at the VERDANTURF BATTLE TENT,\n" .string "Here at the VERDANTURF BATTLE TENT,\n"
.string "POKéMON are required to think and\l" .string "POKéMON are required to think and\l"
.string "battle by themselves.\p" .string "battle by themselves.\p"
@@ -362,7 +374,8 @@ VerdanturfTown_BattleTentLobby_Text_2C62B1: @ 82C62B1
.string "with people behave differently\l" .string "with people behave differently\l"
.string "depending on their nature.$" .string "depending on their nature.$"
VerdanturfTown_BattleTentLobby_Text_2C636D: @ 82C636D @ Unused
VerdanturfTown_BattleTentLobby_Text_ExplainNatureRules: @ 82C636D
.string "Depending on its nature, a POKéMON\n" .string "Depending on its nature, a POKéMON\n"
.string "may prefer to attack no matter what.\p" .string "may prefer to attack no matter what.\p"
.string "Another POKéMON may prefer to protect\n" .string "Another POKéMON may prefer to protect\n"
@@ -375,7 +388,8 @@ VerdanturfTown_BattleTentLobby_Text_2C636D: @ 82C636D
.string "It may also dislike certain moves that\n" .string "It may also dislike certain moves that\n"
.string "it has trouble using.$" .string "it has trouble using.$"
VerdanturfTown_BattleTentLobby_Text_2C64BA: @ 82C64BA @ Unused
VerdanturfTown_BattleTentLobby_Text_ExplainMoveRules: @ 82C64BA
.string "There are offensive moves that inflict\n" .string "There are offensive moves that inflict\n"
.string "direct damage on the foe.\p" .string "direct damage on the foe.\p"
.string "There are defensive moves that are\n" .string "There are defensive moves that are\n"
@@ -388,7 +402,8 @@ VerdanturfTown_BattleTentLobby_Text_2C64BA: @ 82C64BA
.string "POKéMON will consider using moves in\n" .string "POKéMON will consider using moves in\n"
.string "these three categories.$" .string "these three categories.$"
VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612 @ Unused
VerdanturfTown_BattleTentLobby_Text_ExplainUnderpoweredRules: @ 82C6612
.string "When not under command by its TRAINER,\n" .string "When not under command by its TRAINER,\n"
.string "a POKéMON may be unable to effectively\l" .string "a POKéMON may be unable to effectively\l"
.string "use certain moves.\p" .string "use certain moves.\p"
@@ -398,21 +413,21 @@ VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612
.string "do not match its nature, it will often\l" .string "do not match its nature, it will often\l"
.string "be unable to live up to its potential.$" .string "be unable to live up to its potential.$"
VerdanturfTown_BattleTentLobby_Text_2C671E: @ 82C671E @ Unused
VerdanturfTown_BattleTentLobby_Text_ExplainWhenInDangerRules: @ 82C671E
.string "Depending on its nature, a POKéMON may\n" .string "Depending on its nature, a POKéMON may\n"
.string "start using moves that don't match its\l" .string "start using moves that don't match its\l"
.string "nature when it is in trouble.\p" .string "nature when it is in trouble.\p"
.string "If a POKéMON begins behaving oddly\n" .string "If a POKéMON begins behaving oddly\n"
.string "in a pinch, watch it carefully.$" .string "in a pinch, watch it carefully.$"
FallarborTown_BattleTentLobby_Text_2C67CD: @ 82C67CD BattleTentLobby_Text_ExplainLevelRules: @ 82C67CD
VerdanturfTown_BattleTentLobby_Text_2C67CD: @ 82C67CD
.string "At this BATTLE TENT, the levels of\n" .string "At this BATTLE TENT, the levels of\n"
.string "your opponents will be adjusted to\l" .string "your opponents will be adjusted to\l"
.string "match the levels of your POKéMON.\p" .string "match the levels of your POKéMON.\p"
.string "However, no TRAINER you face will\n" .string "However, no TRAINER you face will\n"
.string "have any POKéMON below Level 30.$" .string "have any POKéMON below Level 30.$"
VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878 VerdanturfTown_BattleTentLobby_Text_RulesAreListed: @ 82C6878
.string "The VERDANTURF BATTLE TENT\n" .string "The VERDANTURF BATTLE TENT\n"
.string "rules are listed.$" .string "rules are listed.$"
include/constants/field_weather.h
+24
View File
@@ -0,0 +1,24 @@
#ifndef GUARD_CONSTANTS_FIELD_WEATHER_H
#define GUARD_CONSTANTS_FIELD_WEATHER_H
#define MAX_RAIN_SPRITES 24
#define NUM_CLOUD_SPRITES 3
#define NUM_FOG_HORIZONTAL_SPRITES 20
#define NUM_ASH_SPRITES 20
#define NUM_FOG_DIAGONAL_SPRITES 20
#define NUM_SANDSTORM_SPRITES 20
#define NUM_SWIRL_SANDSTORM_SPRITES 5
// Controls how the weather should be changing the screen palettes.
#define WEATHER_PAL_STATE_CHANGING_WEATHER 0
#define WEATHER_PAL_STATE_SCREEN_FADING_IN 1
#define WEATHER_PAL_STATE_SCREEN_FADING_OUT 2
#define WEATHER_PAL_STATE_IDLE 3
// Modes for FadeScreen
#define FADE_FROM_BLACK 0
#define FADE_TO_BLACK 1
#define FADE_FROM_WHITE 2
#define FADE_TO_WHITE 3
#endif // GUARD_CONSTANTS_FIELD_WEATHER_H
include/field_weather.h
+1 -26
View File
@@ -2,32 +2,7 @@
#define GUARD_WEATHER_H #define GUARD_WEATHER_H
#include "sprite.h" #include "sprite.h"
#include "constants/field_weather.h"
#define MAX_RAIN_SPRITES 24
#define NUM_CLOUD_SPRITES 3
#define NUM_FOG_HORIZONTAL_SPRITES 20
#define NUM_ASH_SPRITES 20
#define NUM_FOG_DIAGONAL_SPRITES 20
#define NUM_SANDSTORM_SPRITES 20
#define NUM_SWIRL_SANDSTORM_SPRITES 5
// Controls how the weather should be changing the screen palettes.
enum
{
WEATHER_PAL_STATE_CHANGING_WEATHER,
WEATHER_PAL_STATE_SCREEN_FADING_IN,
WEATHER_PAL_STATE_SCREEN_FADING_OUT,
WEATHER_PAL_STATE_IDLE,
};
// For the FadeScreen function.
enum
{
FADE_FROM_BLACK,
FADE_TO_BLACK,
FADE_FROM_WHITE,
FADE_TO_WHITE,
};
struct Weather struct Weather
{ {
include/strings.h
+21
View File
@@ -2864,6 +2864,27 @@ extern const u8 gText_JumpsInARow[];
extern const u8 gText_BestScore2[]; extern const u8 gText_BestScore2[];
extern const u8 gText_ExcellentsInARow[]; extern const u8 gText_ExcellentsInARow[];
// Berry crush
extern const u8 gText_Var1Berry[];
extern const u8 gText_XDotY[];
extern const u8 gText_1DotBlueF700[];
extern const u8 gText_1DotF700[];
extern const u8 gText_TimeColon[];
extern const u8 gText_SpaceSec[];
extern const u8 gText_XDotY2[];
extern const u8 gText_SpaceMin[];
extern const u8 gText_StrVar1[];
extern const u8 gText_PressingSpeed[];
extern const u8 gText_TimesPerSec[];
extern const u8 gText_XDotY3[];
extern const u8 gText_Silkiness[];
extern const u8 gText_Var1Percent[];
extern const u8 gText_PressesRankings[];
extern const u8 gText_CrushingResults[];
extern const u8 gText_BerryCrush2[];
extern const u8 gText_PressingSpeedRankings[];
extern const u8 gText_Var1Players[];
// Lilycove Lady // Lilycove Lady
extern const u8 gText_ContestLady_Handsome[]; extern const u8 gText_ContestLady_Handsome[];
extern const u8 gText_ContestLady_Vinny[]; extern const u8 gText_ContestLady_Vinny[];
ld_script.txt
-1
View File
@@ -72,7 +72,6 @@ SECTIONS {
src/mevent_news.o(.text); src/mevent_news.o(.text);
src/union_room_chat.o(.text); src/union_room_chat.o(.text);
src/berry_crush.o(.text); src/berry_crush.o(.text);
asm/berry_crush.o(.text);
src/berry_powder.o(.text); src/berry_powder.o(.text);
src/dodrio_berry_picking.o(.text); src/dodrio_berry_picking.o(.text);
src/pokemon_jump.o(.text); src/pokemon_jump.o(.text);
src/battle_pyramid_bag.c
+1 -1
View File
@@ -357,7 +357,7 @@ static void sub_81C4F10(void)
void ChooseItemsToTossFromPyramidBag(void) void ChooseItemsToTossFromPyramidBag(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
CreateTask(Task_ChooseItemsToTossFromPyramidBag, 10); CreateTask(Task_ChooseItemsToTossFromPyramidBag, 10);
} }
src/berry_crush.c
+2514 -156
View File
File diff suppressed because it is too large Load Diff
src/cable_club.c
+4 -4
View File
@@ -816,7 +816,7 @@ static void sub_80B32B4(u8 taskId)
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gLinkType = LINKTYPE_BATTLE; gLinkType = LINKTYPE_BATTLE;
ClearLinkCallback_2(); ClearLinkCallback_2();
task->data[0]++; task->data[0]++;
@@ -862,7 +862,7 @@ static void sub_80B33BC(u8 taskId)
switch (data[0]) switch (data[0])
{ {
case 0: case 0:
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gLinkType = LINKTYPE_BATTLE; gLinkType = LINKTYPE_BATTLE;
ClearLinkCallback_2(); ClearLinkCallback_2();
data[0] = 1; data[0] = 1;
@@ -1077,7 +1077,7 @@ static void sub_80B37FC(u8 taskId)
{ {
case 0: case 0:
ScriptContext2_Enable(); ScriptContext2_Enable();
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
ClearLinkCallback_2(); ClearLinkCallback_2();
task->data[0]++; task->data[0]++;
break; break;
@@ -1110,7 +1110,7 @@ static void sub_80B3894(u8 taskId)
{ {
case 0: case 0:
ScriptContext2_Enable(); ScriptContext2_Enable();
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
ClearLinkRfuCallback(); ClearLinkRfuCallback();
data[0]++; data[0]++;
break; break;
src/decoration.c
+5 -5
View File
@@ -608,7 +608,7 @@ static void DecorationMenuAction_PutAway(u8 taskId)
{ {
RemoveDecorationWindow(0); RemoveDecorationWindow(0);
ClearDialogWindowAndFrame(0, 0); ClearDialogWindowAndFrame(0, 0);
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_8129ABC; gTasks[taskId].func = sub_8129ABC;
} }
@@ -1292,7 +1292,7 @@ void sub_8127F68(u8 taskId)
{ {
if (sub_8127F38() == TRUE) if (sub_8127F38() == TRUE)
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_8128060; gTasks[taskId].func = sub_8128060;
} }
@@ -1682,7 +1682,7 @@ void CancelDecorating(u8 taskId)
void sub_8128BBC(u8 taskId) void sub_8128BBC(u8 taskId)
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = c1_overworld_prev_quest; gTasks[taskId].func = c1_overworld_prev_quest;
} }
@@ -2551,7 +2551,7 @@ void ReturnDecorationPrompt(u8 taskId)
void PutAwayDecoration(u8 taskId) void PutAwayDecoration(u8 taskId)
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_81298EC; gTasks[taskId].func = sub_81298EC;
} }
@@ -2570,7 +2570,7 @@ void StopPuttingAwayDecorations(u8 taskId)
void sub_812A22C(u8 taskId) void sub_812A22C(u8 taskId)
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_812A25C; gTasks[taskId].func = sub_812A25C;
} }
src/easy_chat.c
+1 -1
View File
@@ -1341,7 +1341,7 @@ static void CB2_QuizLadyQuestion(void)
switch (gMain.state) switch (gMain.state)
{ {
case 0: case 0:
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
break; break;
case 1: case 1:
if (!gPaletteFade.active) if (!gPaletteFade.active)
src/egg_hatch.c
+1 -1
View File
@@ -461,7 +461,7 @@ void EggHatch(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
CreateTask(Task_EggHatch, 10); CreateTask(Task_EggHatch, 10);
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
} }
static void Task_EggHatch(u8 taskID) static void Task_EggHatch(u8 taskID)
src/item_use.c
+1 -1
View File
@@ -601,7 +601,7 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
else else
{ {
gFieldCallback = sub_80AF6D4; gFieldCallback = sub_80AF6D4;
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = sub_80FDC00; gTasks[taskId].func = sub_80FDC00;
} }
} }
src/player_pc.c
+3 -3
View File
@@ -484,7 +484,7 @@ static void ItemStorageMenuProcessInput(u8 taskId)
static void ItemStorage_Deposit(u8 taskId) static void ItemStorage_Deposit(u8 taskId)
{ {
gTasks[taskId].func = Task_ItemStorage_Deposit; gTasks[taskId].func = Task_ItemStorage_Deposit;
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
} }
static void Task_ItemStorage_Deposit(u8 taskId) static void Task_ItemStorage_Deposit(u8 taskId)
@@ -714,7 +714,7 @@ static void Mailbox_MailOptionsProcessInput(u8 taskId)
static void Mailbox_DoMailRead(u8 taskId) static void Mailbox_DoMailRead(u8 taskId)
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Mailbox_FadeAndReadMail; gTasks[taskId].func = Mailbox_FadeAndReadMail;
} }
@@ -813,7 +813,7 @@ static void Mailbox_Give(u8 taskId)
Mailbox_NoPokemonForMail(taskId); Mailbox_NoPokemonForMail(taskId);
else else
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Mailbox_DoGiveMailPokeMenu; gTasks[taskId].func = Mailbox_DoGiveMailPokeMenu;
} }
} }
src/pokemon_storage_system.c
+1 -1
View File
@@ -1790,7 +1790,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
} }
else else
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
task->data[0] = 4; task->data[0] = 4;
} }
break; break;
src/pokenav.c
+1 -1
View File
@@ -320,7 +320,7 @@ void CB2_InitPokeNav(void)
void OpenPokenavForTutorial(void) void OpenPokenavForTutorial(void)
{ {
SetMainCallback2(CB2_InitPokenavForTutorial); SetMainCallback2(CB2_InitPokenavForTutorial);
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
} }
static void CB2_InitPokenavForTutorial(void) static void CB2_InitPokenavForTutorial(void)
src/scrcmd.c
+4 -3
View File
@@ -650,13 +650,14 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
switch (mode) switch (mode)
{ {
case 1: case FADE_TO_BLACK:
case FADE_TO_WHITE:
default: default:
CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE); CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
FadeScreen(mode, 0); FadeScreen(mode, 0);
break; break;
case 0: case FADE_FROM_BLACK:
case 2: case FADE_FROM_WHITE:
CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE); CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
FadeScreen(mode, 0); FadeScreen(mode, 0);
break; break;
src/secret_base.c
+1 -1
View File
@@ -423,7 +423,7 @@ static void Task_EnterSecretBase(u8 taskId)
void EnterSecretBase(void) void EnterSecretBase(void)
{ {
CreateTask(Task_EnterSecretBase, 0); CreateTask(Task_EnterSecretBase, 0);
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
} }
src/shop.c
+2 -2
View File
@@ -348,7 +348,7 @@ static void Task_HandleShopMenuBuy(u8 taskId)
data[8] = (u32)CB2_InitBuyMenu >> 16; data[8] = (u32)CB2_InitBuyMenu >> 16;
data[9] = (u32)CB2_InitBuyMenu; data[9] = (u32)CB2_InitBuyMenu;
gTasks[taskId].func = Task_GoToBuyOrSellMenu; gTasks[taskId].func = Task_GoToBuyOrSellMenu;
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
} }
static void Task_HandleShopMenuSell(u8 taskId) static void Task_HandleShopMenuSell(u8 taskId)
@@ -357,7 +357,7 @@ static void Task_HandleShopMenuSell(u8 taskId)
data[8] = (u32)CB2_GoToSellMenu >> 16; data[8] = (u32)CB2_GoToSellMenu >> 16;
data[9] = (u32)CB2_GoToSellMenu; data[9] = (u32)CB2_GoToSellMenu;
gTasks[taskId].func = Task_GoToBuyOrSellMenu; gTasks[taskId].func = Task_GoToBuyOrSellMenu;
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
} }
void CB2_ExitSellMenu(void) void CB2_ExitSellMenu(void)
src/start_menu.c
+1 -1
View File
@@ -581,7 +581,7 @@ static bool8 HandleStartMenuInput(void)
&& gMenuCallback != StartMenuSafariZoneRetireCallback && gMenuCallback != StartMenuSafariZoneRetireCallback
&& gMenuCallback != StartMenuBattlePyramidRetireCallback) && gMenuCallback != StartMenuBattlePyramidRetireCallback)
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
} }
return FALSE; return FALSE;
src/union_room.c
+1 -1
View File
@@ -1583,7 +1583,7 @@ void sub_8014790(u8 taskId)
case 1: case 1:
if (!ScriptContext1_IsScriptSetUp()) if (!ScriptContext1_IsScriptSetUp())
{ {
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
data[0] = 2; data[0] = 2;
} }
break; break;