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

Some script clean up, document secret base secrets show

Browse Source
This commit is contained in:
GriffinR
2020-01-08 04:26:26 -05:00
committed by huderlem
parent 0284014e0e
commit 6a470ddfda
36 changed files with 920 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

507
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
View File

@@ -1,507 +0,0 @@
BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
.byte 0
BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
setvar VAR_0x8004, BATTLE_TOWER_FUNC_14
special CallBattleTowerFunc
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
special SetBattleTowerLinkPlayerGfx
return
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
end
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
setvar VAR_TEMP_0, 1
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E
waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
waitmovement 0
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
frontier_set FRONTIER_DATA_6, 1
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
tower_setopponent
addobject 1
addobject 4
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
tower_getopponentintro 0
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
tower_getopponentintro 1
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069
BattleFrontier_BattleTowerBattleRoom2_EventScript_249026:: @ 8249026
tower_getopponentintro 0
delay 15
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
messageautoscroll gStringVar4
waitmessage
delay 48
tower_getopponentintro 1
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545
waitmovement 0
messageautoscroll gStringVar4
waitmessage
delay 48
BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069
call BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA
BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
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
tower_setbattlewon
switch VAR_RESULT
case 7, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249534
applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249539
waitmovement 0
removeobject 1
removeobject 4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
waitmovement 0
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
messageautoscroll BattleFrontier_BattleTowerBattleRoom2_Text_242217
waitmessage
delay 48
BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
special LoadPlayerParty
frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
frontier_get FRONTIER_DATA_BATTLE_NUM
call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1:: @ 82491B1
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249223
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249251
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_2491E7:: @ 82491E7
message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249219
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219
call BattleFrontier_EventScript_SaveBattle
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223
msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO
switch VAR_RESULT
case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251
message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283
closemessage
clearflag FLAG_TEMP_2
applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_249541
waitmovement 0
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
tower_set TOWER_DATA_LVL_MODE
setvar VAR_0x8004, 3
special Script_TryGainNewFanFromCounter
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
message BattleFrontier_BattleTowerBattleRoom2_Text_242426
waitmessage
tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen FADE_TO_BLACK
frontier_reset
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_249362
case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_249369
case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_249370
case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249377
BattleFrontier_BattleTowerBattleRoom2_EventScript_249354:: @ 8249354
message BattleFrontier_BattleTowerBattleRoom2_Text_249547
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_24935B:: @ 824935B
message BattleFrontier_BattleTowerBattleRoom2_Text_249578
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249362:: @ 8249362
message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249369:: @ 8249369
message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249370:: @ 8249370
message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249377:: @ 8249377
message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
waitmessage
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E:: @ 824937E
copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6
case 3, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2
case 4, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE
case 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA
case 6, BattleFrontier_BattleTowerBattleRoom2_EventScript_249406
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493CA:: @ 82493CA
message BattleFrontier_BattleTowerBattleRoom2_Text_249547
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493D6:: @ 82493D6
message BattleFrontier_BattleTowerBattleRoom2_Text_249578
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493E2:: @ 82493E2
message BattleFrontier_BattleTowerBattleRoom2_Text_2495A9
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493EE:: @ 82493EE
message BattleFrontier_BattleTowerBattleRoom2_Text_2495DA
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2493FA:: @ 82493FA
message BattleFrontier_BattleTowerBattleRoom2_Text_24960B
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249406:: @ 8249406
message BattleFrontier_BattleTowerBattleRoom2_Text_24963C
waitmessage
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249417
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
waitmessage
delay 48
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8
case 2, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249457:: @ 8249457
multichoice 20, 8, MULTI_GO_ON_RETIRE, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
message gText_LinkStandby3
waitmessage
special sub_813B568
waitstate
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8
message BattleFrontier_BattleTowerBattleRoom2_Text_2423A3
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
call BattleFrontier_EventScript_SaveBattle
setflag FLAG_TEMP_2
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
message BattleFrontier_BattleTowerBattleRoom2_Text_24244C
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA:: @ 82494FA
setvar VAR_0x8004, 1
setvar VAR_0x8005, 0
message gText_LinkStandby3
waitmessage
special sub_813B568
waitstate
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514
special sub_813B534
return
BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518
walk_up
walk_up
walk_up
walk_up
face_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
walk_left
walk_up
walk_up
walk_up
face_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
face_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
walk_in_place_fastest_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
walk_down
walk_down
walk_down
walk_down
face_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
walk_right
walk_down
walk_down
walk_down
face_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
walk_up
walk_up
walk_up
set_invisible
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
walk_up
walk_up
walk_up
walk_up
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
walk_right
walk_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
walk_left
walk_left
walk_in_place_fastest_right
step_end
BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
walk_in_place_left
step_end
BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547
.string "The 2nd set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_249578: @ 8249578
.string "The 3rd set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_2495A9: @ 82495A9
.string "The 4th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_2495DA: @ 82495DA
.string "The 5th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_24960B: @ 824960B
.string "The 6th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_24963C: @ 824963C
.string "The 7th set of opponents is next.\n"
.string "Are you ready?$"
BattleFrontier_BattleTowerBattleRoom2_Text_24966D: @ 824966D
.string "The 2nd set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_24969D: @ 824969D
.string "The 3rd set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_2496CD: @ 82496CD
.string "The 4th set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_2496FD: @ 82496FD
.string "The 5th set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_24972D: @ 824972D
.string "The 6th set of opponents is next.\n"
.string "Do your best!$"
BattleFrontier_BattleTowerBattleRoom2_Text_24975D: @ 824975D
.string "The 7th set of opponents is next.\n"
.string "Do your best!$"
gText_LinkStandby3:: @ 824978D
.string "Link standby…$"
gText_YourPartnerHasRetired:: @ 824979B
.string "Your partner has retired.\p"
.string "Your BATTLE ROOM challenge\n"
.string "will be canceled.$"

4
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
.byte 0
BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
special sub_81653CC
special TryHideBattleTowerReporter
end
BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
@@ -857,7 +857,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF
waitstate
playse SE_SAVE
waitse
special sub_80B3BC4
special TrySetBattleTowerLinkType
goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
end

3
data/maps/LilycoveCity_Harbor/scripts.inc
View File

@@ -457,8 +457,7 @@ LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633
walk_up
step_end
@ Unused
LilycoveCity_Harbor_Movement_21E635: @ 821E635
LilycoveCity_Harbor_Movement_UnusedBoardFerry: @ 821E635
walk_up
step_end

45
data/maps/MtChimney/scripts.inc
View File

@@ -184,8 +184,7 @@ MtChimney_Movement_ArchieExitNorth: @ 822EF9C
walk_down
step_end
@ Unused
MtChimney_Movement_22EFA6: @ 822EFA6
MtChimney_Movement_Unused1: @ 822EFA6
walk_down
walk_down
walk_down
@@ -205,8 +204,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6
walk_down
step_end
@ Unused
MtChimney_Movement_22EFB8: @ 822EFB8
MtChimney_Movement_Unused2: @ 822EFB8
walk_down
walk_down
walk_down
@@ -217,8 +215,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8
walk_down
step_end
@ Unused
MtChimney_Movement_22EFC1: @ 822EFC1
MtChimney_Movement_Unused3: @ 822EFC1
walk_right
walk_down
walk_down
@@ -235,8 +232,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1
walk_down
step_end
@ Unused
MtChimney_Movement_22EFD0: @ 822EFD0
MtChimney_Movement_Unused4: @ 822EFD0
walk_fast_down
walk_fast_down
walk_fast_down
@@ -263,8 +259,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0
walk_down
step_end
@ Unused
MtChimney_Movement_22EFE9: @ 822EFE9
MtChimney_Movement_Unused5: @ 822EFE9
delay_16
delay_16
delay_16
@@ -277,8 +272,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9
walk_down
step_end
@ Unused
MtChimney_Movement_22EFF4: @ 822EFF4
MtChimney_Movement_Unused6: @ 822EFF4
delay_16
walk_left
walk_down
@@ -296,8 +290,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4
walk_down
step_end
@ Unused
MtChimney_Movement_22F004: @ 822F004
MtChimney_Movement_Unused7: @ 822F004
delay_16
walk_left
walk_left
@@ -316,8 +309,7 @@ MtChimney_Movement_22F004: @ 822F004
walk_down
step_end
@ Unused
MtChimney_Movement_22F015: @ 822F015
MtChimney_Movement_Unused8: @ 822F015
delay_16
walk_down
walk_left
@@ -327,8 +319,7 @@ MtChimney_Movement_22F015: @ 822F015
walk_in_place_fastest_down
step_end
@ Unused
MtChimney_Movement_22F01D: @ 822F01D
MtChimney_Movement_Unused9: @ 822F01D
walk_down
walk_down
walk_down
@@ -344,13 +335,11 @@ MtChimney_Movement_22F01D: @ 822F01D
walk_down
step_end
@ Unused
MtChimney_Movement_22F02B: @ 822F02B
MtChimney_Movement_Unused10: @ 822F02B
walk_down
step_end
@ Unused
MtChimney_Movement_22F02D: @ 822F02D
MtChimney_Movement_Unused11: @ 822F02D
walk_down
walk_down
walk_down
@@ -360,8 +349,7 @@ MtChimney_Movement_22F02D: @ 822F02D
walk_down
step_end
@ Unused
MtChimney_Movement_22F035: @ 822F035
MtChimney_Movement_Unused12: @ 822F035
delay_16
delay_16
walk_in_place_fastest_left
@@ -373,8 +361,7 @@ MtChimney_Movement_22F035: @ 822F035
walk_down
step_end
@ Unused
MtChimney_Movement_22F03F: @ 822F03F
MtChimney_Movement_Unused13: @ 822F03F
delay_16
delay_16
delay_16
@@ -387,16 +374,14 @@ MtChimney_Movement_22F03F: @ 822F03F
walk_down
step_end
@ Unused
MtChimney_Movement_22F04A: @ 822F04A
MtChimney_Movement_Unused14: @ 822F04A
lock_facing_direction
walk_fast_left
unlock_facing_direction
face_right
step_end
@ Unused
MtChimney_Movement_22F04F: @ 822F04F
MtChimney_Movement_Unused15: @ 822F04F
walk_left
walk_in_place_fastest_right
delay_16

3
data/maps/PetalburgCity/scripts.inc
View File

@@ -351,7 +351,8 @@ PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
waitmovement 0
return
PetalburgCity_Movement_1DC611:: @ 81DC611
@ Unused
PetalburgCity_Movement_Delay48:: @ 81DC611
delay_16
delay_16
delay_16

3
data/maps/PetalburgCity_Gym/scripts.inc
View File

@@ -673,8 +673,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0
walk_up
step_end
@ Unused
PetalburgCity_Gym_Movement_2050D8: @ 82050D8
PetalburgCity_Gym_Movement_Unused: @ 82050D8
walk_in_place_fastest_up
delay_16
delay_16

6
data/maps/Route128/scripts.inc
View File

@@ -78,13 +78,11 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
releaseall
end
@ Unused
Route128_Movement_1F6C76: @ 81F6C76
Route128_Movement_Unused1: @ 81F6C76
walk_fast_left
step_end
@ Unused
Route128_Movement_1F6C78: @ 81F6C78
Route128_Movement_Unused2: @ 81F6C78
walk_left
walk_left
walk_left

3
data/maps/RustboroCity_DevonCorp_3F/scripts.inc
View File

@@ -72,8 +72,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
releaseall
end
@ Unused
RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
RustboroCity_DevonCorp_3F_Movement_Unused: @ 821252F
walk_up
walk_up
walk_up

9
data/maps/RusturfTunnel/scripts.inc
View File

@@ -184,22 +184,19 @@ RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
walk_in_place_fastest_right
step_end
@ Unused
RusturfTunnel_Movement_22D035: @ 822D035
RusturfTunnel_Movement_Unused1: @ 822D035
walk_left
walk_in_place_fastest_right
step_end
@ Unused
RusturfTunnel_Movement_22D038: @ 822D038
RusturfTunnel_Movement_Unused2: @ 822D038
walk_down
walk_in_place_fastest_up
delay_8
walk_in_place_fastest_right
step_end
@ Unused
RusturfTunnel_Movement_22D03D: @ 822D03D
RusturfTunnel_Movement_Unused3: @ 822D03D
walk_up
walk_in_place_fastest_down
delay_8

6
data/maps/SeafloorCavern_Room9/scripts.inc
View File

@@ -153,8 +153,7 @@ SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A
walk_right
step_end
@ Unused
SeafloorCavern_Room9_Movement_235032: @ 8235032
SeafloorCavern_Room9_Movement_Unused1: @ 8235032
walk_left
walk_left
step_end
@@ -164,8 +163,7 @@ SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035
delay_16
step_end
@ Unused
SeafloorCavern_Room9_Movement_235038: @ 8235038
SeafloorCavern_Room9_Movement_Unused2: @ 8235038
walk_right
step_end

3
data/maps/SlateportCity/scripts.inc
View File

@@ -668,8 +668,7 @@ SlateportCity_Movement_TyExit: @ 81DD326
walk_left
step_end
@ Unused
SlateportCity_Movement_1DD334: @ 81DD334
SlateportCity_Movement_Unused: @ 81DD334
walk_down
walk_in_place_fastest_up
step_end

3
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
View File

@@ -129,8 +129,7 @@ SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2
walk_in_place_fastest_left
step_end
@ Unused
SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
SlateportCity_OceanicMuseum_2F_Movement_Unused: @ 820BCC8
walk_up
walk_left
walk_left