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-06 02:34:54 -05:00
committed by GitHub
parent cb90f22c5e 7beddd16dd
commit c51e0f3bae
106 changed files with 1965 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+3 -15
View File
@@ -2,11 +2,14 @@
#include "constants/apprentice.h"
#include "constants/battle.h"
#include "constants/battle_arena.h"
#include "constants/battle_dome.h"
#include "constants/battle_factory.h"
#include "constants/battle_frontier.h"
#include "constants/battle_palace.h"
#include "constants/battle_pike.h"
#include "constants/battle_pyramid.h"
#include "constants/battle_setup.h"
#include "constants/battle_tent.h"
#include "constants/battle_tower.h"
#include "constants/berry.h"
#include "constants/cable_club.h"
@@ -453,21 +456,6 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/SSTidalLowerDeck/scripts.inc"
.include "data/maps/SSTidalRooms/scripts.inc"
.include "data/maps/BattlePyramidSquare01/scripts.inc"
.include "data/maps/BattlePyramidSquare02/scripts.inc"
.include "data/maps/BattlePyramidSquare03/scripts.inc"
.include "data/maps/BattlePyramidSquare04/scripts.inc"
.include "data/maps/BattlePyramidSquare05/scripts.inc"
.include "data/maps/BattlePyramidSquare06/scripts.inc"
.include "data/maps/BattlePyramidSquare07/scripts.inc"
.include "data/maps/BattlePyramidSquare08/scripts.inc"
.include "data/maps/BattlePyramidSquare09/scripts.inc"
.include "data/maps/BattlePyramidSquare10/scripts.inc"
.include "data/maps/BattlePyramidSquare11/scripts.inc"
.include "data/maps/BattlePyramidSquare12/scripts.inc"
.include "data/maps/BattlePyramidSquare13/scripts.inc"
.include "data/maps/BattlePyramidSquare14/scripts.inc"
.include "data/maps/BattlePyramidSquare15/scripts.inc"
.include "data/maps/BattlePyramidSquare16/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/SafariZone_Northwest/scripts.inc"
.include "data/maps/SafariZone_North/scripts.inc"
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+1 -2
View File
@@ -52,8 +52,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 7
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
waitmovement 0
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+17 -42
View File
@@ -6,8 +6,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
.byte 0
BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
setvar VAR_0x8004, 10
special CallBattleDomeFunction
dome_setopponentgfx
frontier_get FRONTIER_DATA_BATTLE_NUM
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
@@ -68,20 +67,16 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 4
special CallBattleDomeFunction
dome_getopponentname
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT
closemessage
applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B
applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789
waitmovement 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
setvar VAR_0x8005, 0
special CallBattleTowerFunc
tower_getopponentintro 0
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 5
special CallBattleDomeFunction
dome_initopponentparty
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C440
setvar VAR_TEMP_2, 0
switch VAR_RESULT
@@ -105,16 +100,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
waitmovement 0
compare VAR_TEMP_2, 2
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
setvar VAR_0x8004, 19
special CallBattleDomeFunction
dome_compareseeds
switch VAR_RESULT
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0
setvar VAR_0x8004, 4
special CallBattleDomeFunction
dome_getopponentname
compare VAR_TEMP_2, 0
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
compare VAR_TEMP_2, 1
@@ -126,10 +119,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
delay 60
BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D
setvar VAR_0x8004, 12
setvar VAR_0x8005, 2
special CallBattleDomeFunction
dome_resolvewinners 2
BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5
@@ -162,11 +152,8 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
playse SE_W227B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60
setvar VAR_0x8004, 3
special CallBattleDomeFunction
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special CallBattleDomeFunction
dome_getroundtext
dome_resolvewinners 1
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -205,20 +192,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
setvar VAR_0x8004, 1
setvar VAR_0x8005, 6
special CallBattleDomeFunction
dome_get DOME_DATA_6
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special CallBattleDomeFunction
dome_get DOME_DATA_7
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallBattleDomeFunction
compare VAR_RESULT, 0
dome_get DOME_DATA_WIN_STREAK_ACTIVE
compare VAR_RESULT, FALSE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
return
@@ -417,9 +398,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special CallBattleDomeFunction
dome_resolvewinners 1
frontier_getsymbols
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -449,9 +428,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420
case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special CallBattleDomeFunction
dome_resolvewinners 1
frontier_getsymbols
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
@@ -496,11 +473,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
special DoSpecialTrainerBattle
waitstate
setvar VAR_TEMP_9, 0
setvar VAR_0x8004, 17
special CallBattleDomeFunction
dome_restorehelditems
special HealPlayerParty
setvar VAR_0x8004, 16
special CallBattleDomeFunction
dome_resetsketch
return
BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481: @ 824C481
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+17 -54
View File
@@ -5,8 +5,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
.byte 0
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
setvar VAR_0x8004, 21
special CallBattleDomeFunction
dome_21
end
BattleFrontier_BattleDomeLobby_MapScript2_2497FB: @ 82497FB
@@ -35,18 +34,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842
lockall
msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special CallBattleDomeFunction
dome_set DOME_DATA_WIN_STREAK, 0
dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
dome_set DOME_DATA_6, 1
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255
releaseall
@@ -73,18 +63,9 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE
frontier_checkairshow
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
setvar VAR_0x8006, 1
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
special CallBattleDomeFunction
dome_set DOME_DATA_6, 1
dome_set DOME_DATA_7, 1
dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE
special LoadPlayerParty
special HealPlayerParty
goto BattleFrontier_BattleDomeLobby_EventScript_249991
@@ -97,21 +78,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE
frontier_checkairshow
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattleDomeFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special CallBattleDomeFunction
dome_set DOME_DATA_WIN_STREAK_ACTIVE, FALSE
dome_set DOME_DATA_6, 1
special LoadPlayerParty
special HealPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
setvar VAR_0x8004, 13
setvar VAR_0x8005, 0
special CallBattleDomeFunction
dome_save 0
playse SE_SAVE
waitse
call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
@@ -139,9 +112,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9
msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT
message BattleFrontier_BattleDomeLobby_Text_24A61A
waitmessage
setvar VAR_0x8004, 13
setvar VAR_0x8005, 1
special CallBattleDomeFunction
dome_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -213,8 +184,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0
special CallBattleDomeFunction
dome_init
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
@@ -224,14 +194,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
setvar VAR_0x8004, 22
special CallBattleDomeFunction
dome_inittrainers
BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_0x8004, 15
special CallBattleDomeFunction
dome_settrainers
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT
closemessage
call BattleFrontier_BattleDomeLobby_EventScript_249C6E
@@ -392,9 +359,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
end
BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
setvar VAR_0x8004, 1
setvar VAR_0x8005, 9
special CallBattleDomeFunction
dome_get DOME_DATA_9
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
compare VAR_RESULT, 1
@@ -404,8 +369,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1
setvar VAR_0x8004, 8
special CallBattleDomeFunction
dome_showresultstree
waitstate
end
@@ -426,8 +390,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4
return
BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED
setvar VAR_0x8004, 20
special CallBattleDomeFunction
dome_getwinnersname
msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC
end
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+8 -19
View File
@@ -82,17 +82,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377
case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3A9:: @ 824B3A9
setvar VAR_0x8004, 12
setvar VAR_0x8005, 9
special CallBattleDomeFunction
dome_resolvewinners 9
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
message BattleFrontier_BattleDomePreBattleRoom_Text_24BAD3
waitmessage
setvar VAR_0x8004, 13
setvar VAR_0x8005, 2
special CallBattleDomeFunction
dome_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -102,16 +98,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8004, 6
special CallBattleDomeFunction
dome_showopponentinfo
waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A
fadescreen 1
setvar VAR_0x8004, 7
special CallBattleDomeFunction
dome_showtourneytree
waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
@@ -153,13 +147,9 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
frontier_resetsketch
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
setvar VAR_0x8004, 2
setvar VAR_0x8005, 8
special CallBattleDomeFunction
setvar VAR_0x8004, 18
special CallBattleDomeFunction
setvar VAR_0x8004, 9
special CallBattleDomeFunction
dome_set DOME_DATA_8
dome_reduceparty
dome_setopponent
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT
closemessage
applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
@@ -238,8 +228,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
fadescreen 1
setvar VAR_0x8004, 11
special CallBattleDomeFunction
dome_showstatictourneytree
waitstate
goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+7 -22
View File
@@ -66,8 +66,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
setvar VAR_0x8004, 11
special CallBattleFactoryFunction
factory_setopponentgfx
removeobject 2
setobjectxyperm 2, 7, 1
addobject 2
@@ -90,7 +89,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
@@ -98,16 +96,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8
@ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
setvar VAR_0x8004, 1
setvar VAR_0x8005, 3
special CallBattleFactoryFunction
factory_get FACTORY_DATA_WIN_STREAK_SWAPS
compare VAR_RESULT, MAX_STREAK
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
addvar VAR_RESULT, 1
setorcopyvar VAR_0x8006, VAR_RESULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
special CallBattleFactoryFunction
factory_set FACTORY_DATA_WIN_STREAK_SWAPS @ uses VAR_0x8006 above
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E
call BattleFrontier_EventScript_IncrementWinStreak
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43
@@ -196,26 +190,17 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
return
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
setvar VAR_0x8004, 1
setvar VAR_0x8005, 3
special CallBattleFactoryFunction
factory_get FACTORY_DATA_WIN_STREAK_SWAPS
compare VAR_RESULT, MAX_STREAK
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
addvar VAR_RESULT, 1
setorcopyvar VAR_0x8006, VAR_RESULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
special CallBattleFactoryFunction
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallBattleFactoryFunction
factory_set FACTORY_DATA_WIN_STREAK_SWAPS @ uses VAR_0x8006 above
factory_get FACTORY_DATA_WIN_STREAK
compare VAR_RESULT, MAX_STREAK
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattleFactoryFunction
factory_set FACTORY_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+10 -33
View File
@@ -28,20 +28,10 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A
lockall
msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 8
special CallBattleFactoryFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 3
setvar VAR_0x8006, 0
special CallBattleFactoryFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattleFactoryFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattleFactoryFunction
factory_setswapped
factory_set FACTORY_DATA_WIN_STREAK_SWAPS, 0
factory_set FACTORY_DATA_WIN_STREAK, 0
factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, FALSE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255
releaseall
@@ -68,9 +58,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
waitmessage
frontier_checkairshow
special LoadPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special CallBattleFactoryFunction
factory_save 0
playse SE_SAVE
waitse
goto BattleFrontier_BattleFactoryLobby_EventScript_25853B
@@ -82,13 +70,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
waitmessage
frontier_checkairshow
special LoadPlayerParty
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattleFactoryFunction
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special CallBattleFactoryFunction
factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, FALSE
factory_save 0
playse SE_SAVE
waitse
@@ -117,9 +100,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592
lockall
message BattleFrontier_BattleFactoryLobby_Text_258E77
waitmessage
setvar VAR_0x8004, 3
setvar VAR_0x8005, 1
special CallBattleFactoryFunction
factory_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -177,13 +158,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653
BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, 0
special CallBattleFactoryFunction
factory_init
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattleFactoryFunction
factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_PAUSED, FALSE
closemessage
delay 2
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+44 -62
View File
@@ -31,33 +31,26 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
waitmovement 0
compare VAR_0x8006, 2
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
setvar VAR_0x8004, 13
special CallBattleFactoryFunction
setvar VAR_0x8004, 12
special CallBattleFactoryFunction
setvar VAR_0x8004, 14
special CallBattleFactoryFunction
factory_generaterentalmons
factory_generateopponentmons
factory_getopponentmontype
setorcopyvar VAR_0x8005, VAR_RESULT
setvar VAR_0x8004, 15
special CallBattleFactoryFunction
factory_getopponentstyle
setorcopyvar VAR_0x8006, VAR_RESULT
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8004, 8
special CallBattleFactoryFunction
setvar VAR_0x8004, 6
special CallBattleFactoryFunction
factory_setswapped
factory_rentmons
waitstate
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT
closemessage
call BattleFrontier_EventScript_GetLvlMode
compare VAR_RESULT, 0
compare VAR_RESULT, FRONTIER_LVL_50
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
compare VAR_RESULT, 1
compare VAR_RESULT, FRONTIER_LVL_OPEN
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
@@ -65,10 +58,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
end
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
setvar VAR_0x8004, 9
special CallBattleFactoryFunction
setvar VAR_0x8004, 16
special CallBattleFactoryFunction
factory_setopponentmons
factory_resethelditems
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
waitfanfare
@@ -160,13 +151,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66
case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
setvar VAR_0x8004, 12
special CallBattleFactoryFunction
setvar VAR_0x8004, 14
special CallBattleFactoryFunction
factory_generateopponentmons
factory_getopponentmontype
setorcopyvar VAR_0x8005, VAR_RESULT
setvar VAR_0x8004, 15
special CallBattleFactoryFunction
factory_getopponentstyle
setorcopyvar VAR_0x8006, VAR_RESULT
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004
@@ -178,13 +166,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
fadescreen 1
setvar VAR_0x8004, 7
special CallBattleFactoryFunction
factory_swapmons
waitstate
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
setvar VAR_0x8004, 8
special CallBattleFactoryFunction
factory_setswapped
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
@@ -221,9 +207,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40:: @ 8259E40
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
message BattleFrontier_BattleFactoryPreBattleRoom_Text_25ABAE
waitmessage
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special CallBattleFactoryFunction
factory_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -232,50 +216,48 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
special SavePlayerParty
setvar VAR_0x8004, 10
setvar VAR_0x8005, 0
special CallBattleFactoryFunction
factory_setparties 0
frontier_set FRONTIER_DATA_6, 1
special CalculatePlayerPartyCount
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT
compare VAR_0x8005, 0
compare VAR_0x8005, TYPE_NORMAL
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
compare VAR_0x8005, 1
compare VAR_0x8005, TYPE_FIGHTING
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
compare VAR_0x8005, 2
compare VAR_0x8005, TYPE_FLYING
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
compare VAR_0x8005, 3
compare VAR_0x8005, TYPE_POISON
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
compare VAR_0x8005, 4
compare VAR_0x8005, TYPE_GROUND
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
compare VAR_0x8005, 5
compare VAR_0x8005, TYPE_ROCK
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
compare VAR_0x8005, 6
compare VAR_0x8005, TYPE_BUG
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
compare VAR_0x8005, 7
compare VAR_0x8005, TYPE_GHOST
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
compare VAR_0x8005, 8
compare VAR_0x8005, TYPE_STEEL
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
compare VAR_0x8005, 10
compare VAR_0x8005, TYPE_FIRE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
compare VAR_0x8005, 11
compare VAR_0x8005, TYPE_WATER
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
compare VAR_0x8005, 12
compare VAR_0x8005, TYPE_GRASS
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
compare VAR_0x8005, 13
compare VAR_0x8005, TYPE_ELECTRIC
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
compare VAR_0x8005, 14
compare VAR_0x8005, TYPE_PSYCHIC
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
compare VAR_0x8005, 15
compare VAR_0x8005, TYPE_ICE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
compare VAR_0x8005, 16
compare VAR_0x8005, TYPE_DRAGON
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
compare VAR_0x8005, 17
compare VAR_0x8005, TYPE_DARK
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
compare VAR_0x8005, 18
compare VAR_0x8005, NUMBER_OF_MON_TYPES
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
return
@@ -352,23 +334,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
compare VAR_0x8006, 0
compare VAR_0x8006, FACTORY_STYLE_NONE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
compare VAR_0x8006, 1
compare VAR_0x8006, FACTORY_STYLE_PREPARATION
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
compare VAR_0x8006, 2
compare VAR_0x8006, FACTORY_STYLE_SLOW_STEADY
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
compare VAR_0x8006, 3
compare VAR_0x8006, FACTORY_STYLE_ENDURANCE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
compare VAR_0x8006, 4
compare VAR_0x8006, FACTORY_STYLE_HIGH_RISK
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
compare VAR_0x8006, 5
compare VAR_0x8006, FACTORY_STYLE_WEAKENING
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
compare VAR_0x8006, 6
compare VAR_0x8006, FACTORY_STYLE_UNPREDICTABLE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
compare VAR_0x8006, 7
compare VAR_0x8006, FACTORY_STYLE_WEATHER
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
compare VAR_0x8006, 8
compare VAR_0x8006, FACTORY_NUM_STYLES
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
return
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+4 -9
View File
@@ -48,8 +48,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5
waitmovement 0
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 2
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1
waitmovement 0
@@ -164,9 +163,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
message BattleFrontier_BattlePalaceBattleRoom_Text_25007E
waitmessage
setvar VAR_0x8004, 7
setvar VAR_0x8005, 2
special CallBattlePalaceFunction
palace_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -233,8 +230,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
setvar VAR_0x8004, 6
special CallBattlePalaceFunction
palace_incrementstreak
frontier_getsymbols
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -269,8 +265,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
setvar VAR_0x8004, 6
special CallBattlePalaceFunction
palace_incrementstreak
frontier_getsymbols
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+1 -2
View File
@@ -12,8 +12,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
waitmovement 0
lockall
setvar VAR_0x8004, 3
special CallBattlePalaceFunction
palace_getcomment
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
compare VAR_RESULT, 1
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+9 -32
View File
@@ -28,14 +28,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0
lockall
msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattlePalaceFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePalaceFunction
palace_set PALACE_DATA_WIN_STREAK, 0
palace_set PALACE_DATA_WIN_STREAK_ACTIVE, FALSE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255
releaseall
@@ -51,7 +45,6 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838
msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT
BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840
msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT
frontier_givepoints
@@ -69,10 +62,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
lockall
message BattleFrontier_BattlePalaceLobby_Text_24E41E
waitmessage
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePalaceFunction
palace_set PALACE_DATA_WIN_STREAK_ACTIVE, FALSE
call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1
msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
closemessage
@@ -84,9 +74,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
frontier_checkairshow
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special CallBattlePalaceFunction
palace_save 0
playse SE_SAVE
waitse
call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
@@ -110,9 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908
msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT
message BattleFrontier_BattlePalaceLobby_Text_24E5F6
waitmessage
setvar VAR_0x8004, 7
setvar VAR_0x8005, 1
special CallBattlePalaceFunction
palace_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -136,17 +122,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956
end
BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
setvar VAR_0x8004, 1
setvar VAR_0x8005, 0
special CallBattlePalaceFunction
compare VAR_RESULT, 0
palace_get PALACE_DATA_PRIZE
compare VAR_RESULT, ITEM_NONE
goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
@@ -189,12 +172,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0
special CallBattlePalaceFunction
setvar VAR_0x8004, 2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattlePalaceFunction
palace_init
palace_set PALACE_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
@@ -245,10 +224,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
special LoadPlayerParty
BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT
BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C
release
end
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+2 -3
View File
@@ -10,9 +10,8 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C
BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
delay 16
frontier_set FRONTIER_DATA_BATTLE_NUM, 1
setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
special CallBattlePikeFunction
battlepike_nohealing TRUE
pike_cleartrainerids
pike_nohealing TRUE
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
waitmovement 0
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+14 -38
View File
@@ -25,16 +25,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
special HealPlayerParty
setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction
pike_resethelditems
lockall
msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
closemessage
battlepike_setstreak 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4
setvar VAR_0x8006, 0
special CallBattlePikeFunction
pike_set PIKE_DATA_WIN_STREAK 0
pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255
releaseall
@@ -58,23 +54,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
frontier_givepoints
msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
frontier_checkairshow
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 3
special CallBattlePikeFunction
pike_get PIKE_DATA_TOTAL_STREAKS
addvar VAR_RESULT, 1
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 3
copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction
pike_set PIKE_DATA_TOTAL_STREAKS, VAR_RESULT
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction
pike_resethelditems
message BattleFrontier_BattlePikeLobby_Text_25C1DF
waitmessage
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 0
special CallBattlePikeFunction
pike_save 0
playse SE_SAVE
waitse
msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
@@ -89,17 +77,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
waitmessage
frontier_checkairshow
frontier_set FRONTIER_DATA_BATTLE_NUM, 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4
setvar VAR_0x8006, 0
special CallBattlePikeFunction
pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 0
special CallBattlePikeFunction
pike_resethelditems
pike_save 0
playse SE_SAVE
waitse
msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT
@@ -156,23 +138,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_TEMP_0, 0
setvar VAR_TEMP_1, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
special CallBattlePikeFunction
pike_init
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4
setvar VAR_0x8006, 1
special CallBattlePikeFunction
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
special CallBattlePikeFunction
pike_set PIKE_DATA_WIN_STREAK_ACTIVE, TRUE
pike_savehelditems
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
closemessage
delay 2
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
special CallBattlePikeFunction
pike_savehelditems
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
special SavePlayerParty
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+30 -48
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167
BattleFrontier_BattlePikeRoomNormal_EventScript_25D171:: @ 825D171
setvar VAR_TEMP_0, 1
battlepike_getroomtype
pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6
case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E
@@ -26,9 +26,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6
delay 16
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0
special CallBattlePikeFunction
pike_gettrainerintro 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
@@ -39,7 +37,6 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6
waitstate
switch VAR_RESULT
case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D226
BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A:: @ 825D20A
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
@@ -59,9 +56,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D231:: @ 825D231
closemessage
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0
special CallBattlePikeFunction
pike_gettrainerintro 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
@@ -98,8 +93,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF:: @ 825D2BF
lockall
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
special CallBattlePikeFunction
pike_prequeenheal
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC
case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA
@@ -112,7 +106,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2
waitmovement 0
playse 267
playse SE_CURTAIN
call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7
delay 4
call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4
@@ -121,7 +115,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB
delay 4
waitse
delay 60
playse 268
playse SE_CURTAIN1
delay 65
call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4
showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
@@ -132,12 +126,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB
waitse
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
special CallBattlePikeFunction
pike_getbrainstatus
switch VAR_RESULT
case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416
case 3, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
case 4, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD
@@ -199,9 +192,9 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC
waitmovement 0
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK VAR_RESULT
call BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
waitstate
end
@@ -256,17 +249,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0
special CallBattlePikeFunction
pike_gettrainerintro 0
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
delay 16
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 1
special CallBattlePikeFunction
pike_gettrainerintro 1
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE
@@ -294,12 +283,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D605:: @ 825D605
message BattleFrontier_BattlePikeRoomNormal_Text_25DBD1
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA
waitmovement 0
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
special CallBattlePikeFunction
pike_getstatusmon
copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, 0
compare VAR_0x8004, PIKE_STATUS_KIRLIA
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D643
compare VAR_0x8004, 1
compare VAR_0x8004, PIKE_STATUS_DUSCLOPS
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5
msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD3F, MSGBOX_DEFAULT
closemessage
@@ -312,18 +300,16 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D643:: @ 825D643
waitse
playmoncry SPECIES_KIRLIA, 0
waitmoncry
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
special CallBattlePikeFunction
compare VAR_RESULT, 2
pike_getstatus
compare VAR_RESULT, PIKE_STATUS_TOXIC
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D751
compare VAR_RESULT, 1
compare VAR_RESULT, PIKE_STATUS_BURN
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D758
compare VAR_RESULT, 3
compare VAR_RESULT, PIKE_STATUS_PARALYSIS
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F
compare VAR_RESULT, 4
compare VAR_RESULT, PIKE_STATUS_SLEEP
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D766
setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
special CallBattlePikeFunction
pike_fadescreen
waitstate
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2
waitmovement 0
@@ -349,14 +335,12 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5:: @ 825D6D5
waitse
playmoncry SPECIES_DUSCLOPS, 0
waitmoncry
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
special CallBattlePikeFunction
compare VAR_RESULT, 0
pike_getstatus
compare VAR_RESULT, PIKE_STATUS_FREEZE
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D
compare VAR_RESULT, 1
compare VAR_RESULT, PIKE_STATUS_BURN
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D774
setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
special CallBattlePikeFunction
pike_fadescreen
waitstate
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2
waitmovement 0
@@ -555,7 +539,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA: @ 825D7EA
step_end
BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED
battlepike_getroomtype
pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B
case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D831
@@ -563,8 +547,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED
BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B:: @ 825D81B
lock
faceplayer
setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
special CallBattlePikeFunction
pike_getnpcmsg
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
closemessage
@@ -580,8 +563,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D831:: @ 825D831
end
BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E:: @ 825D83E
setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
special CallBattlePikeFunction
pike_healonetwomons
compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D881
compare VAR_RESULT, 1
data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
+1 -2
View File
@@ -11,8 +11,7 @@ BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A
BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C
setvar VAR_TEMP_0, 1
setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
special CallBattlePikeFunction
pike_inwildmonroom
end
BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+7 -13
View File
@@ -34,9 +34,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
lockall
message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
waitmessage
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 1
special CallBattlePikeFunction
pike_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -124,9 +122,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
waitmessage
special LoadPlayerParty
setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 2
special CallBattlePikeFunction
pike_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -152,9 +148,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
special CallBattlePikeFunction
compare VAR_RESULT, 1
pike_sethintroom
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
setvar VAR_TEMP_5, 255
end
@@ -175,7 +170,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
battlepike_gethint
pike_gethint
compare VAR_RESULT, PIKE_HINT_BRAIN
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
lock
@@ -194,8 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID
special CallBattlePikeFunction
pike_gethintroomid
switch VAR_RESULT
case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint
case PIKE_ROOM_CENTER, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint
@@ -215,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53
goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
battlepike_gethint
pike_gethint
switch VAR_RESULT
case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia
case PIKE_HINT_WHISPERING, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+14 -35
View File
@@ -14,8 +14,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
lockall
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 4
setvar VAR_0x8006, 1
setvar VAR_0x8007, 55
setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS
setvar VAR_0x8007, SE_SAVE
setvar VAR_RESULT, 0
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
special CallBattlePyramidFunction
@@ -37,8 +37,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
end
BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
special CallBattlePyramidFunction
pyramid_setfloorpal
frontier_getstatus
switch VAR_TEMP_0
case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D
@@ -60,39 +59,27 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
frontier_isbattletype BATTLE_TYPE_TRAINER @ VAR_RESULT seems to be ignored here
setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction
pyramid_healparty
end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 7
setvar VAR_0x8006, 255
special CallBattlePyramidFunction
pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 0
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction
pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
pyramid_clearhelditems
special HealPlayerParty
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
waitstate
end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
pyramid_save CHALLENGE_STATUS_SAVING
special SavePlayerParty
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
pyramid_inittrainers
frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_TEMP_F, 1
end
@@ -103,10 +90,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 32
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS
return
BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
@@ -116,8 +100,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
compare VAR_RESULT, 7
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction
pyramid_seedfloor
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_RESULT, 0
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
@@ -132,8 +115,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
@ TRAINER_PHILLIP is used as a placeholder
BattlePyramid_TrainerBattle:: @ 8252C4F
trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
special CallBattlePyramidFunction
pyramid_showhint
waitmessage
waitbuttonpress
closemessage
@@ -141,14 +123,11 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
end
BattlePyramid_FindItemBall:: @ 8252C6A
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
special CallBattlePyramidFunction
pyramid_setitem
callstd STD_FIND_ITEM
compare VAR_0x8007, 0
goto_if_eq BattlePyramid_FindItemBall_End
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
special CallBattlePyramidFunction
pyramid_hideitem
BattlePyramid_FindItemBall_End:: @ 8252C87
end
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+19 -51
View File
@@ -31,14 +31,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
playse SE_EXPMAX
waitse
closemessage
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
pyramid_set PYRAMID_DATA_WIN_STREAK, 0
pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, FALSE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255
releaseall
@@ -61,8 +55,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
frontier_checkairshow
special LoadPlayerParty
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction
pyramid_clearhelditems
special HealPlayerParty
message BattleFrontier_BattlePyramidLobby_Text_2519F8
waitmessage
@@ -73,11 +66,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
special CallBattlePyramidFunction
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 0
special CallBattlePyramidFunction
pyramid_setprize
pyramid_save 0
playse SE_SAVE
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
@@ -89,8 +79,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
frontier_checkairshow
special LoadPlayerParty
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction
pyramid_clearhelditems
special HealPlayerParty
lockall
message BattleFrontier_BattlePyramidLobby_Text_251B5A
@@ -99,13 +88,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
waitse
message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 0
special CallBattlePyramidFunction
pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, FALSE
pyramid_save 0
playse SE_SAVE
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT
@@ -164,18 +148,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
special CallBattlePyramidFunction
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattlePyramidFunction
pyramid_init
pyramid_set PYRAMID_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
pyramid_seedfloor
pyramid_inittrainers
special LoadPlayerParty
closemessage
delay 2
@@ -251,37 +229,29 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 5
special CallBattlePyramidFunction
compare VAR_RESULT, 0
pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53
setvar VAR_RESULT, 0
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
return
BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 3
special CallBattlePyramidFunction
pyramid_get PYRAMID_DATA_WIN_STREAK_50
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
return
BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 6
special CallBattlePyramidFunction
compare VAR_RESULT, 0
pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91
setvar VAR_RESULT, 0
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
return
BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 4
special CallBattlePyramidFunction
pyramid_get PYRAMID_DATA_WIN_STREAK_OPEN
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
return
@@ -404,9 +374,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
pyramid_get PYRAMID_DATA_WIN_STREAK
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+3 -9
View File
@@ -6,10 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
.byte 0
BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 200
setvar VAR_0x8006, 0
special CallBattlePyramidFunction
pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
setvar VAR_TEMP_F, 1
end
@@ -64,13 +61,10 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
end
BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
pyramid_save CHALLENGE_STATUS_SAVING
special SavePlayerParty
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction
pyramid_inittrainers
frontier_setpartyorder FRONTIER_PARTY_SIZE
setvar VAR_TEMP_F, 1
end
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+7 -18
View File
@@ -32,14 +32,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F
BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 1
applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242182
waitmovement 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
setvar VAR_0x8005, 0
special CallBattleTowerFunc
tower_getopponentintro 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
@@ -48,17 +45,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3
BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 3
special CallBattleTowerFunc
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
call BattleFrontier_EventScript_IncrementWinStreak
setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
special CallBattleTowerFunc
tower_setbattlewon
switch VAR_RESULT
case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188
@@ -141,9 +135,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 3
special CallBattleTowerFunc
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8
@@ -151,9 +143,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6
BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
message BattleFrontier_BattleTowerBattleRoom_Text_242426
waitmessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
special CallBattleTowerFunc
tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -333,8 +323,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
special HealPlayerParty
frontier_resetsketch
BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A
setvar VAR_0x8004, BATTLE_TOWER_FUNC_15
special CallBattleTowerFunc
tower_setinterviewdata
frontier_get FRONTIER_DATA_BATTLE_OUTCOME
return
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+11 -27
View File
@@ -58,8 +58,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 1
addobject 4
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
@@ -67,17 +66,13 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
setvar VAR_0x8005, 0
special CallBattleTowerFunc
tower_getopponentintro 0
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_getopponentintro 1
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox gStringVar4, MSGBOX_DEFAULT
@@ -85,21 +80,17 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
setvar VAR_0x8005, 0
special CallBattleTowerFunc
tower_getopponentintro 0
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
messageautoscroll 0x2021fc4
messageautoscroll gStringVar4
waitmessage
delay 48
setvar VAR_0x8004, BATTLE_TOWER_FUNC_7
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_getopponentintro 1
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
messageautoscroll 0x2021fc4
messageautoscroll gStringVar4
waitmessage
delay 48
@@ -110,17 +101,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 3
special CallBattleTowerFunc
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
call BattleFrontier_EventScript_IncrementWinStreak
setvar VAR_0x8004, BATTLE_TOWER_FUNC_4
special CallBattleTowerFunc
tower_setbattlewon
switch VAR_RESULT
case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
@@ -220,9 +208,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 3
special CallBattleTowerFunc
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
@@ -230,9 +216,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
message BattleFrontier_BattleTowerBattleRoom2_Text_242426
waitmessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED
special CallBattleTowerFunc
tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+20 -62
View File
@@ -51,14 +51,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710
faceplayer
msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 0
special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattleTowerFunc
tower_set TOWER_DATA_WIN_STREAK, 0
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_TEMP_0, 255
release
@@ -78,24 +72,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778
msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT
BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
setvar VAR_0x8004, BATTLE_TOWER_FUNC_GIVE_RIBBONS
special CallBattleTowerFunc
compare VAR_RESULT, 0
tower_giveribbons
compare VAR_RESULT, FALSE
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
message BattleFrontier_BattleTowerLobby_Text_23F844
waitmessage
playfanfare MUS_FANFA4
waitfanfare
msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, MSGBOX_DEFAULT
BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT
frontier_givepoints
msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
call BattleFrontier_BattleTowerLobby_EventScript_23E84D
setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 49
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2
msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT
@@ -111,18 +101,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_1
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 0
special CallBattleTowerFunc
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE
BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830
lock
faceplayer
@@ -141,9 +125,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
frontier_checkairshow
special LoadPlayerParty
special HealPlayerParty
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, 0
special CallBattleTowerFunc
tower_save 0
playse SE_SAVE
waitse
call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
@@ -193,9 +175,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
waitmessage
message BattleFrontier_BattleTowerLobby_Text_23F754
waitmessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -253,12 +233,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattleTowerFunc
tower_init
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
closemessage
@@ -324,12 +300,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattleTowerFunc
tower_init
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
closemessage
@@ -396,12 +368,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattleTowerFunc
tower_init
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
closemessage
@@ -467,19 +435,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_TEMP_0, 0
setvar VAR_0x8004, BATTLE_TOWER_FUNC_0
special CallBattleTowerFunc
setvar VAR_0x8004, BATTLE_TOWER_FUNC_2
setvar VAR_0x8005, 2
setvar VAR_0x8006, 1
special CallBattleTowerFunc
tower_init
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, TRUE
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
closemessage
delay 2
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, 0
special CallBattleTowerFunc
tower_save 0
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
@@ -909,9 +871,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_save CHALLENGE_STATUS_SAVING
special sub_80A08CC
waitstate
playse SE_SAVE
@@ -972,9 +932,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
setvar VAR_0x8004, BATTLE_TOWER_FUNC_SAVE
setvar VAR_0x8005, 1
special CallBattleTowerFunc
tower_save CHALLENGE_STATUS_SAVING
special sub_80A08CC
waitstate
playse SE_SAVE
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+1 -2
View File
@@ -6,8 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
.byte 0
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction
pyramid_healparty
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
+10 -10
View File
@@ -453,25 +453,25 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
end
BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
msgbox BattleFrontier_ExchangeServiceCorner_Text_260099, MSGBOX_NPC
msgbox BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
msgbox BattleFrontier_ExchangeServiceCorner_Text_26002E, MSGBOX_NPC
msgbox BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
lock
msgbox BattleFrontier_ExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT
msgbox BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant, MSGBOX_DEFAULT
release
end
BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
msgbox BattleFrontier_ExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC
msgbox BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
msgbox BattleFrontier_ExchangeServiceCorner_Text_26012D, MSGBOX_NPC
msgbox BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord, MSGBOX_NPC
end
BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
@@ -629,7 +629,7 @@ BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
.string "Please visit us when you have\n"
.string "saved up Battle Points.$"
BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
.string "Oh, they're so nice!\n"
.string "I wish I had them!\l"
.string "Cute cushions!\l"
@@ -637,18 +637,18 @@ BattleFrontier_ExchangeServiceCorner_Text_25FF5D: @ 825FF5D
.string "Little plush DOLLS!\l"
.string "I wish I had them all!$"
BattleFrontier_ExchangeServiceCorner_Text_25FFD0: @ 825FFD0
BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant: @ 825FFD0
.string "Leave it to your mommy!\p"
.string "If it's anything you want, I'll go\n"
.string "through anything to get it, honey!$"
BattleFrontier_ExchangeServiceCorner_Text_26002E: @ 826002E
BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher: @ 826002E
.string "If I can get hold of the items here,\n"
.string "my POKéMON will get tougher.\p"
.string "You bet they will!\n"
.string "No question about it!$"
BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
.string "Hah?\n"
.string "What are you gawking at?\p"
.string "I don't like you staring at my plush\n"
@@ -656,7 +656,7 @@ BattleFrontier_ExchangeServiceCorner_Text_260099: @ 8260099
.string "If you want it, go get one yourself!\n"
.string "Isn't that right, SMOOCHUM?$"
BattleFrontier_ExchangeServiceCorner_Text_26012D: @ 826012D
BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord: @ 826012D
.string "Did you know?\p"
.string "If you stretch your record at any of\n"
.string "the BATTLE facilities, they start\l"
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -90,11 +90,11 @@ BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
battletower_getstreak
tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 50
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
battletower_getstreak
tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 50
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
goto BattleFrontier_ScottsHouse_EventScript_RandomComment
@@ -123,11 +123,11 @@ BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
battletower_getstreak
tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 100
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
battletower_getstreak
tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 100
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
goto BattleFrontier_ScottsHouse_EventScript_RandomComment
data/maps/BattlePyramidSquare01/scripts.inc
+1
View File
@@ -1 +1,2 @@
BattlePyramidSquare01_MapScripts:: @ 823D1A5
.byte 0
data/maps/BattlePyramidSquare02/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BOY_3",
data/maps/BattlePyramidSquare02/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare02_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare03/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
data/maps/BattlePyramidSquare03/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare03_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare04/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
data/maps/BattlePyramidSquare04/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare04_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare05/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
data/maps/BattlePyramidSquare05/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare05_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare06/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
data/maps/BattlePyramidSquare06/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare06_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare07/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
data/maps/BattlePyramidSquare07/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare07_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare08/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
data/maps/BattlePyramidSquare08/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare08_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare09/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
data/maps/BattlePyramidSquare09/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare09_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare10/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
data/maps/BattlePyramidSquare10/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare10_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare11/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
data/maps/BattlePyramidSquare11/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare11_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare12/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
data/maps/BattlePyramidSquare12/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare12_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare13/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
data/maps/BattlePyramidSquare13/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare13_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare14/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
data/maps/BattlePyramidSquare14/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare14_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare15/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
data/maps/BattlePyramidSquare15/scripts.inc
-1
View File
@@ -1 +0,0 @@
BattlePyramidSquare15_MapScripts:: @ 823D1A5
data/maps/BattlePyramidSquare16/map.json
+1
View File
@@ -13,6 +13,7 @@
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"shared_scripts_map": "BattlePyramidSquare01",
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
data/maps/BattlePyramidSquare16/scripts.inc
-3
View File
@@ -1,3 +0,0 @@
BattlePyramidSquare16_MapScripts:: @ 823D1A5
.byte 0
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+6 -17
View File
@@ -40,8 +40,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7
goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73
FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 3
applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B96
waitmovement 0
@@ -50,8 +49,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
waitse
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
setvar VAR_0x8004, 4
special CallVerdanturfTentFunction
battletent_getopponentintro
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
@@ -61,8 +59,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F
playse SE_W173
waitse
waitmovement 0
setvar VAR_0x8004, 6
special CallFallarborTentFunction
fallarbortent_getopponentname
msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
@@ -143,17 +140,11 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
special LoadPlayerParty
warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallBattleArenaFunction
arena_get ARENA_DATA_WIN_STREAK
compare VAR_RESULT, MAX_STREAK
goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
special CallBattleArenaFunction
arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT
FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43
message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
waitmessage
@@ -167,9 +158,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B4A:: @ 8200B4A
FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51
message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
waitmessage
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special CallFallarborTentFunction
fallarbortent_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
data/maps/FallarborTown_BattleTentLobby/scripts.inc
+7 -17
View File
@@ -39,19 +39,15 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED
msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT
message FallarborTown_BattleTentLobby_Text_2C4EFF
waitmessage
setvar VAR_0x8004, 4
special CallFallarborTentFunction
fallarbortent_setrandomprize
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special CallFallarborTentFunction
fallarbortent_save 0
playse SE_SAVE
waitse
FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27
msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT
setvar VAR_0x8004, 5
special CallFallarborTentFunction
fallarbortent_giveprize
switch VAR_RESULT
case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -84,9 +80,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93
message FallarborTown_BattleTentLobby_Text_2C4FD7
waitmessage
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special CallFallarborTentFunction
fallarbortent_save 0
playse SE_SAVE
waitse
msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT
@@ -99,9 +93,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
lockall
message FallarborTown_BattleTentLobby_Text_2C504C
waitmessage
setvar VAR_0x8004, 3
setvar VAR_0x8005, 1
special CallFallarborTentFunction
fallarbortent_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -111,8 +103,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD
FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
lock
faceplayer
setvar VAR_0x8004, 1
special CallFallarborTentFunction
fallarbortent_getprize
compare VAR_RESULT, 0
goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84
special SavePlayerParty
@@ -153,8 +144,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D
FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0
special CallFallarborTentFunction
fallarbortent_init
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
data/maps/MauvilleCity_Gym/scripts.inc
+2 -2
View File
@@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4
MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE
trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons
msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE
msgbox MauvilleCity_Gym_Text_WattsonPostRematch, MSGBOX_AUTOCLOSE
end
MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
@@ -410,7 +410,7 @@ MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42
.string "Oof…\n"
.string "Our batteries ran dry…$"
MauvilleCity_Gym_Text_20EA5E: @ 820EA5E
MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
.string "WATTSON: We'll have to recharge our\n"
.string "batteries again.\p"
.string "When we're fully charged up, we'll\n"
data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+4 -4
View File
@@ -1,14 +1,14 @@
MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_OnWarp
map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
.byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
MossdeepCity_GameCorner_1F_OnWarp: @ 8224B37
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
.2byte 0
MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41
MossdeepCity_GameCorner_1F_OnFrame: @ 8224B41
map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
.2byte 0
data/maps/MossdeepCity_StevensHouse/scripts.inc
+2 -1
View File
@@ -189,7 +189,8 @@ MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E
MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED
.string "{PLAYER} obtained a BELDUM.$"
MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
@ Unused
MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon: @ 8222C03
.string "There is no space for another POKéMON.$"
MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A
data/maps/PetalburgCity_WallysHouse/scripts.inc
+4 -4
View File
@@ -1,9 +1,9 @@
PetalburgCity_WallysHouse_MapScripts:: @ 8204229
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_OnWarp
.byte 0
PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234
PetalburgCity_WallysHouse_OnWarp: @ 8204234
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
.2byte 0
@@ -12,7 +12,7 @@ PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
turnobject 1, DIR_WEST
end
PetalburgCity_WallysHouse_MapScript2_OnFrame: @ 8204247
PetalburgCity_WallysHouse_OnFrame: @ 8204247
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf
.2byte 0
data/maps/RecordCorner/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "RecordCorner_EventScript_2774C6",
"script": "RecordCorner_EventScript_Attendant",
"flag": "0"
}
],
data/maps/SeafloorCavern_Entrance/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Entrance_EventScript_234485",
"script": "SeafloorCavern_Entrance_EventScript_Grunt",
"flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT"
}
],
data/maps/SeafloorCavern_Entrance/scripts.inc
+18 -18
View File
@@ -1,16 +1,16 @@
SeafloorCavern_Entrance_MapScripts:: @ 823446E
map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474
map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_OnResume
.byte 0
SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
SeafloorCavern_Entrance_OnResume: @ 8234474
setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
end
SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485
lockall
compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED
goto_if_eq SeafloorCavern_Entrance_EventScript_GruntSpeechShort
waitse
playse SE_PIN
applymovement 1, Common_Movement_ExclamationMark
@@ -19,51 +19,51 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
waitmovement 0
delay 20
compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
copyobjectxytoperm 1
msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: @ 82344ED
compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast
compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539
msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth
msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: @ 8234523
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: @ 823452E
applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: @ 8234539
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
SeafloorCavern_Entrance_Text_234544: @ 8234544
SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: @ 8234544
.string "Hey!\n"
.string "I remember your face!\p"
.string "If you're here, it must mean that\n"
@@ -79,7 +79,7 @@ SeafloorCavern_Entrance_Text_234544: @ 8234544
.string "That bunch of goons, they sure don't\n"
.string "look good near the sea!$"
SeafloorCavern_Entrance_Text_2346C8: @ 82346C8
SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort: @ 82346C8
.string "A punk like you, do you really think\n"
.string "you can take on TEAM AQUA?\p"
.string "I'd say you're too early by about\n"
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+2 -4
View File
@@ -41,15 +41,13 @@ SlateportCity_BattleTentBattleRoom_MapScript2_2099B4: @ 82099B4
SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99
waitmovement 0
setvar VAR_0x8004, 11
special CallBattleFactoryFunction
factory_setopponentgfx
setobjectxyperm 2, 5, 1
removeobject 2
addobject 2
applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_209A9E
waitmovement 0
setvar VAR_0x8004, 4
special CallVerdanturfTentFunction
battletent_getopponentintro
lockall
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+9 -20
View File
@@ -31,14 +31,11 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
waitmovement 0
compare VAR_0x8006, 2
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044
setvar VAR_0x8004, 9
special CallSlateportTentFunction
setvar VAR_0x8004, 8
special CallSlateportTentFunction
slateporttent_generaterentalmons
slateporttent_generateopponentmons
msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT
fadescreen 1
setvar VAR_0x8004, 6
special CallSlateportTentFunction
slateporttent_rentmons
waitstate
SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
@@ -57,10 +54,8 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
end
SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
setvar VAR_0x8004, 9
special CallBattleFactoryFunction
setvar VAR_0x8004, 16
special CallBattleFactoryFunction
factory_setopponentmons
factory_resethelditems
msgbox SlateportCity_BattleTentCorridor_Text_25A22D, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
waitfanfare
@@ -94,8 +89,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
setvar VAR_0x8004, 8
special CallSlateportTentFunction
slateporttent_generateopponentmons
msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO
switch VAR_RESULT
case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4
@@ -104,8 +98,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
fadescreen 1
setvar VAR_0x8004, 7
special CallSlateportTentFunction
slateporttent_swapmons
waitstate
compare VAR_RESULT, 1
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
@@ -125,9 +118,7 @@ SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
message SlateportCity_BattleTentCorridor_Text_25ABAE
waitmessage
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special CallSlateportTentFunction
slateporttent_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
@@ -136,9 +127,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
special SavePlayerParty
setvar VAR_0x8004, 10
setvar VAR_0x8005, 0
special CallBattleFactoryFunction
factory_setparties 0
goto SlateportCity_BattleTentCorridor_EventScript_208F0D
SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059
data/maps/SlateportCity_BattleTentLobby/scripts.inc
+7 -18
View File
@@ -38,18 +38,14 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7
lockall
message SlateportCity_BattleTentLobby_Text_2C5C6F
waitmessage
setvar VAR_0x8004, 4
special CallSlateportTentFunction
slateporttent_setrandomprize
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special CallSlateportTentFunction
slateporttent_save 0
playse SE_SAVE
waitse
SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9
msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT
setvar VAR_0x8004, 5
special CallSlateportTentFunction
slateporttent_giveprize
switch VAR_RESULT
case 0, SlateportCity_BattleTentLobby_EventScript_20882A
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -68,9 +64,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837
message SlateportCity_BattleTentLobby_Text_2C5BA2
waitmessage
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special CallSlateportTentFunction
slateporttent_save 0
playse SE_SAVE
waitse
@@ -85,9 +79,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
lockall
message SlateportCity_BattleTentLobby_Text_2C5DA7
waitmessage
setvar VAR_0x8004, 3
setvar VAR_0x8005, 1
special CallSlateportTentFunction
slateporttent_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -98,13 +90,11 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871
SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
lock
faceplayer
setvar VAR_0x8004, 1
special CallSlateportTentFunction
slateporttent_getprize
compare VAR_RESULT, 0
goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9
special SavePlayerParty
msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT
SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
message SlateportCity_BattleTentLobby_Text_2C586A
waitmessage
@@ -128,8 +118,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906
SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950
setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0
special CallSlateportTentFunction
slateporttent_init
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE
closemessage
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+3 -7
View File
@@ -39,13 +39,11 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348
goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C
VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F
setvar VAR_0x8004, BATTLE_TOWER_FUNC_CHOOSE_TRAINER
special CallBattleTowerFunc
tower_setopponent
addobject 2
applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_20257B
waitmovement 0
setvar VAR_0x8004, 4
special CallVerdanturfTentFunction
battletent_getopponentintro
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7
@@ -122,9 +120,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F
message VerdanturfTown_BattleTentBattleRoom_Text_25007E
waitmessage
setvar VAR_0x8004, 5
setvar VAR_0x8005, 2
special CallVerdanturfTentFunction
verdanturftent_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+7 -17
View File
@@ -39,19 +39,15 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757
msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT
message VerdanturfTown_BattleTentLobby_Text_2C5791
waitmessage
setvar VAR_0x8004, 6
special CallVerdanturfTentFunction
verdanturftent_setrandomprize
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
setvar VAR_0x8004, 5
setvar VAR_0x8005, 0
special CallVerdanturfTentFunction
verdanturftent_save 0
playse SE_SAVE
waitse
VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791
msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT
setvar VAR_0x8004, 7
special CallVerdanturfTentFunction
verdanturftent_giveprize
switch VAR_RESULT
case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -84,9 +80,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD
message VerdanturfTown_BattleTentLobby_Text_2C56B8
waitmessage
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
setvar VAR_0x8004, 5
setvar VAR_0x8005, 0
special CallVerdanturfTentFunction
verdanturftent_save 0
playse SE_SAVE
waitse
msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT
@@ -100,9 +94,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, MSGBOX_DEFAULT
message VerdanturfTown_BattleTentLobby_Text_24E5F6
waitmessage
setvar VAR_0x8004, 5
setvar VAR_0x8005, 1
special CallVerdanturfTentFunction
verdanturftent_save CHALLENGE_STATUS_SAVING
playse SE_SAVE
waitse
frontier_set FRONTIER_DATA_PAUSED, FALSE
@@ -112,8 +104,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837
VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
lock
faceplayer
setvar VAR_0x8004, 1
special CallVerdanturfTentFunction
verdanturftent_getprize
compare VAR_RESULT, 0
goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE
special SavePlayerParty
@@ -154,8 +145,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF
VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
setvar VAR_TEMP_0, 0
frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
setvar VAR_0x8004, 0
special CallVerdanturfTentFunction
verdanturftent_init
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
frontier_set FRONTIER_DATA_PAUSED, FALSE
special LoadPlayerParty
data/scripts/battle_pike.inc
+18 -19
View File
@@ -3,8 +3,8 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
battlepike_setroomobjects
battlepike_getroomtype
pike_setroomobjects
pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1
@@ -48,7 +48,7 @@ BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST
battlepike_getroomtype
pike_getroomtype
compare VAR_RESULT, PIKE_ROOM_STATUS
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35
compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE
@@ -89,14 +89,14 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
battlepike_setnextroom
battlepike_getroomtype
pike_setnextroom
pike_getroomtype
switch VAR_RESULT
case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
@@ -152,18 +152,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D
end
BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
battlepike_ispartyfullhealth
pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
compare VAR_RESULT, TRUE
call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
battlepike_isfinalroom
pike_isfinalroom
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
compare VAR_RESULT, FALSE
@@ -172,11 +172,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
end
BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128
battlepike_nohealing TRUE
pike_nohealing TRUE
return
BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136
battlepike_nohealing FALSE
pike_nohealing FALSE
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144
@@ -194,20 +194,19 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
return
BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174
setvar VAR_0x8004, BATTLE_PIKE_FUNC_7
special CallBattlePikeFunction
battlepike_ispartyfullhealth
pike_exitwildmonroom
pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
compare VAR_RESULT, TRUE
call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing
battlepike_getstreak
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
battlepike_setstreak VAR_RESULT
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
battlepike_isfinalroom
pike_isfinalroom
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom
compare VAR_RESULT, FALSE
data/scripts/cable_club.inc
+14 -13
View File
@@ -49,7 +49,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
end
@ Unused?
OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
CableClub_EventScript_MysteryGiftThankYou2:: @ 8276B62
msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT
release
end
@@ -301,7 +301,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7
end
CableClub_EventScript_SelectBattleMode:: @ 8276EC2
message CableClub_Text_WhichBattleMode
message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
@@ -795,39 +795,40 @@ EventScript_TradeCenter_Chair3:: @ 8277413
waitstate
end
@ VAR_TEMP_1 for below scripts set by ReceiveGiftItem
EventScript_RecordCenter_Spot0:: @ 827741D
setvar VAR_0x8005, 0
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot1:: @ 8277432
setvar VAR_0x8005, 1
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot2:: @ 8277447
setvar VAR_0x8005, 2
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot3:: @ 827745C
setvar VAR_0x8005, 3
special RecordMixingPlayerSpotTriggered
waitstate
compare VAR_TEMP_1, 0
goto_if_ne RecordCorner_EventScript_277471
compare VAR_TEMP_1, ITEM_NONE
goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
end
RecordCorner_EventScript_277471:: @ 8277471
RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
bufferitemname 1, VAR_TEMP_1
message RecordCorner_Text_PlayerSentOverOneX
waitmessage
@@ -868,7 +869,7 @@ TradeCenter_EventScript_Attendant:: @ 82774B6
closemessage
end
RecordCorner_EventScript_2774C6:: @ 82774C6
RecordCorner_EventScript_Attendant:: @ 82774C6
compare VAR_TEMP_0, 0
goto_if_ne RecordCorner_EventScript_AlreadyMixed
special Script_FacePlayer
@@ -1090,7 +1091,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
end
CableClub_EventScript_WirelessBattleSelect:: @ 827783B
message CableClub_Text_WhichBattleMode
message CableClub_Text_PlayWhichBattleMode
waitmessage
multichoice 0, 0, MULTI_BATTLE_MODE, 0
switch VAR_RESULT
data/scripts/day_care.inc
+2 -2
View File
@@ -262,7 +262,7 @@ Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
step_end
@ Unused. Possibly a commented script, or a typo end added to the above Movement script
Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
Route117_PokemonDayCare_EventScript_UnusedEnd:: @ 8291F5B
end
Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
@@ -279,7 +279,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
end
@ Unused
Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95
special ShowDaycareLevelMenu
waitstate
compare VAR_RESULT, 2
data/scripts/field_poison.inc
+5 -7
View File
@@ -29,15 +29,13 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
message gText_PlayerWhitedOut
waitmessage
waitbuttonpress
setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN
special CallBattlePikeFunction
compare VAR_RESULT, 1
pike_inchallenge
compare VAR_RESULT, TRUE
goto_if_eq BattleFrontier_BattlePike_EventScript_Retire
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
compare VAR_RESULT, 1
pyramid_inchallenge
compare VAR_RESULT, 1 @ On Pyramid floor
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 2
compare VAR_RESULT, 2 @ On Pyramid peak
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
trainerhill_inchallenge
compare VAR_RESULT, TRUE
data/scripts/mauville_man.inc
+2 -1
View File
@@ -289,7 +289,8 @@ MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE
.string "Then tell me, have you any tales that\n"
.string "are even remotely legendary?$"
MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844
@ Unused
MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale: @ 828E844
.string "Incidentally… Would you care to hear\n"
.string "another legendary tale?$"
data/scripts/obtain_item.inc
+1 -2
View File
@@ -128,8 +128,7 @@ EventScript_PickUpItem:: @ 8271C3A
waitfanfare
waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
pyramid_inchallenge
compare VAR_RESULT, 1
goto_if_eq EventScript_PutBattlePyramidItemInBag
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
data/text/cable_club.inc
+5 -3
View File
@@ -201,14 +201,16 @@ CableClub_Text_CanMixRecords:: @ 8278831
.string "The records of two to four players\n"
.string "can be mixed together.$"
OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
@ Unused
CableClub_Text_GuideToVariousServices: @ 827886B
.string "A guide to the WIRELESS CLUB's\n"
.string "various services.$"
CableClub_Text_CancelSelectedItem:: @ 827889C
.string "Cancels the selected MENU item.$"
OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
@ Unused
CableClub_Text_WhichBattleMode: @ 82788BC
.string "Which battle mode would you like?$"
@ Unused
@@ -340,7 +342,7 @@ CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013
CableClub_Text_TradePokemon: @ 827909D
.string "Would you like to trade POKéMON?$"
CableClub_Text_WhichBattleMode: @ 82790BE
CableClub_Text_PlayWhichBattleMode: @ 82790BE
.string "Which Battle Mode would you like\n"
.string "to play?$"