diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-20 21:46:29 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-25 18:37:48 -0600 |
| commit | 4dfa959fa297195a040a8cd0436d561296076f0e (patch) | |
| tree | 5068d00426d1a193312edd7b8fb0ad120bc4fd8e | |
| parent | cfdde42b009a80939297dd441fe39385f54d31f4 (diff) | |
Begin documenting Battle Pike and Frontier Util
73 files changed, 2113 insertions, 2247 deletions
diff --git a/asm/macros/battle_frontier.inc b/asm/macros/battle_frontier.inc index 2a6ee7d74..2382d3ed2 100644 --- a/asm/macros/battle_frontier.inc +++ b/asm/macros/battle_frontier.inc @@ -1,15 +1,95 @@ -@ To be populated with macros for the Battle Frontier CallFacilityFunction specials +@ Frontier Util +.macro frontier_checkoutcome +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_STATUS +special CallFrontierUtilFunc +.endm -@ Frontier Util +.macro frontier_getchallengestatus +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA +setvar VAR_0x8005, 0 +special CallFrontierUtilFunc +.endm + +.macro frontier_setchallengestatus status:req +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA +setvar VAR_0x8005, 0 +setvar VAR_0x8006, \status +special CallFrontierUtilFunc +.endm + +.macro frontier_getlvlmode +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA +setvar VAR_0x8005, 1 +special CallFrontierUtilFunc +.endm .macro frontier_setlvlmode lvlmode:req -setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, \lvlmode special CallFrontierUtilFunc .endm +.macro frontier_getbattlenum +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA +setvar VAR_0x8005, 2 +special CallFrontierUtilFunc +.endm + +.macro frontier_setbattlenum battleNum:req +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA +setvar VAR_0x8005, 2 +copyvar VAR_0x8006, \battleNum +special CallFrontierUtilFunc +.endm + +.macro frontier_getbattleoutcome +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA +setvar VAR_0x8005, 5 +special CallFrontierUtilFunc +.endm + +.macro frontier_set data:req, val=0xFFFF +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA +setvar VAR_0x8005, \data +.if \val == 0xFFFF +@ no value provided +.elseif \val >= VARS_START +copyvar VAR_0x8006, \val +.else +setvar VAR_0x8006, \val +.endif +special CallFrontierUtilFunc +.endm + +.macro frontier_loadselectedmons +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY +setvar VAR_0x8005, FRONTIER_PARTY_SIZE +special CallFrontierUtilFunc +.endm + +@ Facilities with only 1 mode dont provide the mode argument +.macro frontier_results facility:req, mode=0xFF +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW +setvar VAR_0x8005, \facility +.if \mode != 0xFF +setvar VAR_0x8006, \mode +.endif +special CallFrontierUtilFunc +.endm + +.macro frontier_getbrainstatus +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_BRAIN_STATUS +special CallFrontierUtilFunc +.endm + +.macro frontier_resetsketch +setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESET_SKETCH_MOVES +special CallFrontierUtilFunc +.endm + + @ Battle Tower .macro battletower_getstreak @@ -18,16 +98,74 @@ setvar VAR_0x8005, 1 special CallBattleTowerFunc .endm + @ Battle Dome + @ Battle Palace + @ Battle Arena + @ Battle Factory + @ Battle Pike +.macro battlepike_getstreak +setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA +setvar VAR_0x8005, 1 +special CallBattlePikeFunction +.endm + +.macro battlepike_setstreak streak:req +setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA +setvar VAR_0x8005, 1 +.if \streak >= VARS_START +copyvar VAR_0x8006, \streak +.else +setvar VAR_0x8006, \streak +.endif +special CallBattlePikeFunction +.endm + +.macro battlepike_isfinalroom +setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_FINAL_ROOM +special CallBattlePikeFunction +.endm + +.macro battlepike_setroomobjects +setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS +special CallBattlePikeFunction +.endm + +.macro battlepike_getroomtype +setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE +special CallBattlePikeFunction +.endm + +.macro battlepike_setnextroom +setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE +special CallBattlePikeFunction +.endm + +.macro battlepike_gethint +setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT +special CallBattlePikeFunction +.endm + +.macro battlepike_nohealing set:req +setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED +setvar VAR_0x8005, \set +special CallBattlePikeFunction +.endm + +.macro battlepike_ispartyfullhealth +setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH +special CallBattlePikeFunction +.endm + @ Battle Pyramid @ Battle Tent diff --git a/data/event_scripts.s b/data/event_scripts.s index 9f0e27ce6..3600c95a0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -504,9 +504,9 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc" .include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc" .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc" .include "data/maps/BattleFrontier_RankingHall/scripts.inc" .include "data/maps/BattleFrontier_Lounge1/scripts.inc" .include "data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc" diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin index 27a6e52aa..27a6e52aa 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin index 142150cbe..142150cbe 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin index 8ce7f1c37..8ce7f1c37 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index bfa2aa811..ffa394fa1 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3512,24 +3512,24 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", - "name": "BattleFrontier_BattlePikeRandomRoom1_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", + "name": "BattleFrontier_BattlePikeRoomNormal_Layout", "width": 9, "height": 8, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePike", - "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", - "name": "BattleFrontier_BattlePikeRandomRoom2_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", + "name": "BattleFrontier_BattlePikeRoomFinal_Layout", "width": 5, "height": 8, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePike", - "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin" }, { "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", @@ -3572,14 +3572,14 @@ "blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", - "name": "BattleFrontier_BattlePikeRandomRoom3_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", + "name": "BattleFrontier_BattlePikeRoomWildMons_Layout", "width": 9, "height": 20, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePike", - "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin" }, { "id": "LAYOUT_UNKNOWN_084693AC", diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 6eb7e515b..25dbbedf7 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -40,15 +40,13 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC showobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE2 waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -109,23 +107,15 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7 @@ -138,22 +128,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc + frontier_getbrainstatus copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870 compare VAR_RESULT, 2 @@ -224,10 +209,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25783A:: @ 825783A BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 delay 60 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate @@ -327,17 +309,17 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 switch VAR_TEMP_F - case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 - case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 @@ -374,14 +356,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 @@ -426,7 +408,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C:: @ 8257B6C FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C closemessage setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -438,8 +420,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18 special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 - special CallFrontierUtilFunc + frontier_resetsketch return BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 34feceb39..0948e87e8 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -21,8 +21,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 .2byte 0 BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 @@ -37,7 +36,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattleArenaFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -122,7 +121,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 special CallBattleArenaFunction playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -158,7 +157,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -179,7 +178,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 @@ -188,11 +187,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleArenaFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -206,12 +205,10 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -241,7 +238,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -344,9 +341,7 @@ BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 3 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_ARENA waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 1ee9c29dc..4322a12bc 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -8,9 +8,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8004, 10 special CallBattleDomeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 @@ -51,7 +49,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E - compare VAR_TEMP_E, 0 + compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E @@ -67,7 +65,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 waitmovement 0 compare VAR_TEMP_F, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 - compare VAR_TEMP_E, 0 + compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 @@ -134,10 +132,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE8D:: @ 824BE8D special CallBattleDomeFunction BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 @ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5 @@ -177,14 +172,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 setvar VAR_0x8006, 1 @@ -194,7 +184,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77D waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallFrontierUtilFunc switch VAR_RESULT @@ -210,10 +200,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 @@ -305,10 +292,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 compare VAR_TEMP_F, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 switch VAR_TEMP_E - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 + case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 BattleFrontier_BattleDomeBattleRoom_EventScript_24C105:: @ 824C105 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD @@ -377,17 +364,15 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum return BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB switch VAR_TEMP_E - case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 + case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, MSGBOX_DEFAULT @@ -423,16 +408,16 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitse switch VAR_TEMP_E - case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346 - case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 - case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_24C346 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -465,13 +450,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -524,7 +509,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C436:: @ 824C436 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7 BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -552,15 +537,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc + frontier_getbrainstatus copyvar VAR_TEMP_E, VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 setobjectxyperm 15, 13, 9 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index deea13c83..42ba5d33d 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E delay 16 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 12940496d..323da2aed 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -28,8 +28,7 @@ BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F .2byte 0 BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 @@ -48,7 +47,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallBattleDomeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -77,9 +76,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc setvar VAR_0x8004, 2 @@ -104,9 +101,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc setvar VAR_0x8004, 2 @@ -157,7 +152,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 special CallBattleDomeFunction playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -211,7 +206,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -232,16 +227,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special CallBattleDomeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -257,9 +252,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons setvar VAR_0x8004, 15 special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT @@ -292,7 +285,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -410,10 +403,7 @@ BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES waitbuttonpress special RemoveRecordsWindow releaseall @@ -421,10 +411,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 1 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 8987f3e07..4d6265e81 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -120,7 +120,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT @@ -156,8 +156,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D setvar VAR_0x8005, 2 special sub_80F9490 waitstate - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 - special CallFrontierUtilFunc + frontier_resetsketch compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 @@ -185,7 +184,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT @@ -208,13 +207,12 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc + frontier_getbrainstatus switch VAR_RESULT - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B - case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 - case 3, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B - case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 + case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 message BattleFrontier_BattleDomePreBattleRoom_Text_24B6E3 return @@ -242,9 +240,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_TEMP_0, 1 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT special LoadPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -256,7 +252,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index a6e02f443..443641d7f 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -12,10 +12,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 compare VAR_RESULT, FEMALE call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc + frontier_getbrainstatus copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 end @@ -85,7 +84,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -99,10 +98,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8:: @ 825AEF8 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 @ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190 @@ -122,14 +118,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 setvar VAR_0x8006, 1 @@ -137,24 +128,21 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 waitstate BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C switch VAR_TEMP_F - case 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051 - case 3, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF - case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -184,13 +172,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -221,7 +209,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -253,7 +241,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattleFactoryFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc addvar VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index cead1a1d7..028ac761a 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -21,8 +21,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 .2byte 0 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A @@ -43,7 +42,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattleFactoryFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -131,7 +130,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 special CallBattleFactoryFunction playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -180,7 +179,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 switch VAR_RESULT case 2, BattleFrontier_BattleFactoryLobby_EventScript_25879D case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879D - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -194,7 +193,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special CallBattleFactoryFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -202,7 +201,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleFactoryFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -246,7 +245,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -300,10 +299,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 0 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES waitbuttonpress special RemoveRecordsWindow releaseall @@ -311,10 +307,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 1 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 97365a46e..7a92af994 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -73,11 +73,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc - compare VAR_RESULT, 0 + frontier_getbrainstatus + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 - playse 263 + playse SE_TOREEYE waitse msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT closemessage @@ -94,13 +93,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc - compare VAR_RESULT, 0 + frontier_getbrainstatus + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 @@ -240,7 +238,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 special CallBattleFactoryFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 94c21a6d0..3c0da87b0 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -34,16 +34,14 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B waitmovement 0 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -68,22 +66,14 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7 @@ -95,22 +85,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc + frontier_getbrainstatus copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 compare VAR_RESULT, 2 @@ -178,10 +163,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14:: @ 824FB14 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F @@ -241,16 +223,16 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2 waitmovement 0 switch VAR_TEMP_F - case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A - case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA - case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -287,13 +269,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -333,7 +315,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 closemessage setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -345,8 +327,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18 special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 - special CallFrontierUtilFunc + frontier_resetsketch return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 5df680aa8..5922b668e 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -25,7 +25,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 compare VAR_RESULT, 4 call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 649b20f87..7d7e24035 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -21,8 +21,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D .2byte 0 BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 @@ -37,7 +36,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePalaceFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -123,7 +122,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 special CallBattlePalaceFunction playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -182,7 +181,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -203,7 +202,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 @@ -212,11 +211,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattlePalaceFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -230,9 +229,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC @@ -265,7 +262,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -361,10 +358,7 @@ BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 0 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_SINGLES waitbuttonpress special RemoveRecordsWindow releaseall @@ -372,10 +366,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 1 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_DOUBLES waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 6bfd5b045..b4205e01f 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -9,29 +9,27 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 delay 16 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED - setvar VAR_0x8005, 1 - special CallBattlePikeFunction + battlepike_nohealing TRUE applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT closemessage releaseall applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 99 special CallFrontierUtilFunc - call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 + call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 waitstate end @@ -63,7 +61,7 @@ BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812 face_down step_end -BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817 +BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun: @ 825C817 .string "Your Battle Choice challenge\n" .string "has now begun…$" diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index d145ba429..5ce20c009 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -20,8 +20,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD end BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 @@ -31,15 +30,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 lockall msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 0 - special CallBattlePikeFunction + battlepike_setstreak 0 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -99,7 +95,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 waitmessage setvar VAR_0x8004, FRONTIER_UTIL_FUNC_8 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -151,7 +147,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -173,12 +169,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_TEMP_0, 0 setvar VAR_TEMP_1, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -188,7 +184,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special CallBattlePikeFunction setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -202,16 +198,14 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty - call BattleFrontier_BattlePikeLobby_EventScript_25BB49 + call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 setvar VAR_TEMP_0, 0 waitstate @@ -235,7 +229,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -253,9 +247,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_PIKE waitbuttonpress special RemoveRecordsWindow releaseall @@ -325,10 +317,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BB47:: @ 825BB47 releaseall end -BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49 -BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49 -BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49 -BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49 +BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49 playse SE_CURTAIN special CloseBattlePikeCurtain waitstate diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc deleted file mode 100644 index deb0a7974..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ /dev/null @@ -1,895 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE - .byte 0 - -BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605 - case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231 - case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E - case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 - lockall - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG - setvar VAR_0x8005, 0 - special CallBattlePikeFunction - msgbox gStringVar4, MSGBOX_DEFAULT - waitmessage - closemessage - releaseall - setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 - lockall - delay 16 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, MSGBOX_DEFAULT - waitmessage - closemessage - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG - setvar VAR_0x8005, 0 - special CallBattlePikeFunction - msgbox gStringVar4, MSGBOX_DEFAULT - waitmessage - closemessage - releaseall - setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285 - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6 - waitmovement 0 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, MSGBOX_DEFAULT - closemessage - release - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF - delay 22 - lockall - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN - special CallBattlePikeFunction - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT - closemessage - special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 - waitmovement 0 - playse 267 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D - delay 4 - waitse - delay 60 - playse 268 - delay 65 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4 - showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7 - delay 4 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A - waitse - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE - special CallBattlePikeFunction - switch VAR_RESULT - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 7 - special CallFrontierUtilFunc - compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 7 - special CallFrontierUtilFunc - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS - special CallFrontierUtilFunc - compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT - waitmessage - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 - waitmessage - waitfanfare - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL - special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT - closemessage - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 7 - special CallFrontierUtilFunc - compare VAR_RESULT, 0 - goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 7 - special CallFrontierUtilFunc - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS - special CallFrontierUtilFunc - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT - waitmessage - playfanfare MUS_ME_SYMBOLGET - message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 - waitmessage - waitfanfare - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL - special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT - closemessage - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA - waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, MSGBOX_DEFAULT - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA - waitfanfare - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA - waitfanfare - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E - lockall - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 - waitmovement 0 - message BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6 - waitmessage - playfanfare MUS_ME_ASA - waitfanfare - special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, MSGBOX_DEFAULT - closemessage - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 - waitmovement 0 - releaseall - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E - lockall - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5 - waitmovement 0 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA - waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG - setvar VAR_0x8005, 0 - special CallBattlePikeFunction - msgbox gStringVar4, MSGBOX_DEFAULT - closemessage - delay 16 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - msgbox gStringVar4, MSGBOX_DEFAULT - closemessage - setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - switch VAR_RESULT - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC - goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD - waitmovement 0 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4 - waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 - lockall - message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA - waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON - special CallBattlePikeFunction - copyvar VAR_0x8004, VAR_RESULT - compare VAR_0x8004, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 - compare VAR_0x8004, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT - closemessage - releaseall - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, MSGBOX_DEFAULT - closemessage - waitse - playmoncry SPECIES_KIRLIA, 0 - waitmoncry - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS - special CallBattlePikeFunction - compare VAR_RESULT, 2 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 - compare VAR_RESULT, 3 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F - compare VAR_RESULT, 4 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE - special CallBattlePikeFunction - waitstate - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1 - waitmovement 0 - waitse - playmoncry SPECIES_KIRLIA, 0 - waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT - waitse - playmoncry SPECIES_KIRLIA, 0 - waitmoncry - closemessage - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 - waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, MSGBOX_DEFAULT - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, MSGBOX_DEFAULT - closemessage - waitse - playmoncry SPECIES_DUSCLOPS, 0 - waitmoncry - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS - special CallBattlePikeFunction - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE - special CallBattlePikeFunction - waitstate - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 - waitmovement 0 - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1 - waitmovement 0 - waitse - playmoncry SPECIES_DUSCLOPS, 0 - waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT - waitse - playmoncry SPECIES_DUSCLOPS, 0 - waitmoncry - closemessage - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 - waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, MSGBOX_DEFAULT - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC20 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758:: @ 825D758 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC63 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F:: @ 825D75F - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC49 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766:: @ 825D766 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC33 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D:: @ 825D76D - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC97 - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774 - message BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C - waitmessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B - closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC - waitmovement 0 - setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - return - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795 - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798 - walk_up - walk_up - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2 - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4 - walk_down - face_left - delay_16 - delay_16 - face_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA - walk_fast_down - walk_fast_right - walk_fast_right - walk_fast_down - walk_fast_left - face_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1 - face_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3 - walk_left - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4 - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6 - walk_down - walk_down - walk_right - face_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB - face_left - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF - face_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1 - walk_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3 - walk_left - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5 - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8 - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA - face_left - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC - walk_up - walk_up - walk_up - walk_right - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4 - walk_up - walk_up - walk_up - walk_left - walk_up - set_invisible - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC - walk_up - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2 - walk_up - walk_up - walk_up - set_invisible - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7 - set_visible - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA - walk_left - face_right - step_end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction - switch VAR_RESULT - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831 - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B - lock - faceplayer - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG - special CallBattlePikeFunction - msgbox gStringVar4, MSGBOX_DEFAULT - waitmessage - closemessage - release - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, MSGBOX_DEFAULT - closemessage - release - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E - setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS - special CallBattlePikeFunction - compare VAR_RESULT, 2 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 - playfanfare MUS_ME_ASA - waitfanfare - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT - closemessage - release - applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, MSGBOX_DEFAULT - closemessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881 - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, MSGBOX_DEFAULT - closemessage - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D - lock - faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, MSGBOX_DEFAULT - closemessage - release - applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4 - waitmovement 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4 - setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1 - setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1 - setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1 - setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1 - setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1 - setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0 - setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7 - setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1 - setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1 - setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1 - setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1 - setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1 - setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0 - setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A - setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1 - setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1 - setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1 - setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1 - setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1 - setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0 - setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D - setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1 - setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1 - setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1 - setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1 - setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1 - setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0 - setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1 - special DrawWholeMapView - return - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0 - walk_up - walk_up - step_end - -BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3 - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6 - .string "Welcome…\n" - .string "You must be commended for your luck…\p" - .string "Your POKéMON shall be restored\n" - .string "to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13 - .string "I urge you to enjoy the rest of your\n" - .string "Battle Choice challenge…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51 - .string "Ah, you're a lucky one.\n" - .string "I'm in somewhat-good spirits now.\p" - .string "I will restore one of your POKéMON\n" - .string "to full health.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE - .string "The best of luck to you.\n" - .string "Farewell.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1 - .string "Excuse me…\p" - .string "Would you care for a battle?\n" - .string "I'll restore your POKéMON if you win.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F - .string "Very well…\n" - .string "Now, shall we?$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DB49: @ 825DB49 - .string "I see…\n" - .string "How unsporting of you…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DB67: @ 825DB67 - .string "Magnificent…\p" - .string "As promised, I shall restore your\n" - .string "POKéMON to full health.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DBAE: @ 825DBAE - .string "The best of luck to you.\n" - .string "Farewell.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1: @ 825DBD1 - .string "Oh, my!\p" - .string "Watch out!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4: @ 825DBE4 - .string "Now, now!\n" - .string "KIRLIA, stop that!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC01: @ 825DC01 - .string "Now, now!\n" - .string "DUSCLOPS, stop that!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC20: @ 825DC20 - .string "KIRLIA used TOXIC!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC33: @ 825DC33 - .string "KIRLIA used HYPNOSIS!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC49: @ 825DC49 - .string "KIRLIA used THUNDER WAVE!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC63: @ 825DC63 - .string "KIRLIA used WILL-O-WISP!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC7C: @ 825DC7C - .string "DUSCLOPS used WILL-O-WISP!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97 - .string "DUSCLOPS used ICE BEAM!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF - .string "Look here!\n" - .string "That's quite enough!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF - .string "I must apologize to you…\p" - .string "My KIRLIA has a TIMID nature…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DD06: @ 825DD06 - .string "I must apologize to you…\p" - .string "My DUSCLOPS has a TIMID nature…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F: @ 825DD3F - .string "It attacks without warning if it is\n" - .string "startled by another person…\p" - .string "Are you and your POKéMON all right?$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3: @ 825DDA3 - .string "I do apologize for what happened…\n" - .string "I do hope your POKéMON are fine.$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6: @ 825DDE6 - .string "… … … … … …\n" - .string "… … … … … …$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE: @ 825DDFE - .string "Welcome…\p" - .string "Here, we will have you battle\n" - .string "a somewhat-tough TRAINER…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F: @ 825DE3F - .string "How wonderful…\p" - .string "To honor your victory, your POKéMON\n" - .string "shall be restored to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DE94: @ 825DE94 - .string "I urge you to enjoy the rest of your\n" - .string "Battle Choice challenge…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2 - .string "I am LUCY…\n" - .string "I am the law here…\l" - .string "For I am the PIKE QUEEN…\p" - .string "You already know it, but to advance,\n" - .string "you must defeat me…\p" - .string "…I'm not one for idle chatter.\n" - .string "Hurry. Come on…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71 - .string "Your luck…\n" - .string "I hope you didn't use it all up here…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2 - .string "LUCY: … … … … … …\n" - .string "Show me your FRONTIER PASS…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0 - .string "The Luck Symbol was embossed on\n" - .string "the FRONTIER PASS!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003 - .string "…That's all there is…\n" - .string "Disappear already…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C - .string "LUCY: …You again…\p" - .string "… … … … … …\p" - .string "…I've trampled flowers and braved\n" - .string "storms to get to where I am…\p" - .string "I don't feel any compulsion to keep\n" - .string "losing to the same opponent…\p" - .string "… … … … … …\n" - .string "Fine… I'll do it…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8 - .string "Now!\n" - .string "Come on!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6: @ 825E0F6 - .string "LUCY: … … … … … …\p" - .string "…FRONTIER PASS…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118 - .string "The Luck Symbol took on\n" - .string "a golden shine!$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140 - .string "…You, I won't forget…\n" - .string "…Ever…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D - .string "I welcome you…\p" - .string "Giggle…\n" - .string "You seem to be bereft of luck…\p" - .string "If only you hadn't chosen this room,\n" - .string "your POKéMON could have been healed…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD - .string "I welcome you…\p" - .string "Since you have chosen this room, I will\n" - .string "restore one POKéMON to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E238: @ 825E238 - .string "I welcome you…\p" - .string "Since you have chosen this room, I will\n" - .string "restore two POKéMON to full health…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E293: @ 825E293 - .string "I welcome you…\p" - .string "Giggle…\n" - .string "You should thank your lucky stars…\p" - .string "Since you have chosen this room,\n" - .string "all your POKéMON will be restored…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311 - .string "I shall go fetch our master…$" - -BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E - .string "Ah, you're a lucky one!\n" - .string "I'm in good spirits now.\p" - .string "I will restore two of your POKéMON\n" - .string "to full health!$" - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc deleted file mode 100644 index b1a55c33f..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ /dev/null @@ -1,43 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE - .byte 0 - -BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 - delay 16 - applymovement 1, BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB - waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc - lockall - msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, MSGBOX_DEFAULT - closemessage - releaseall - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB - walk_down - walk_down - step_end - -BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - end - -BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 - .string "Congratulations…\n" - .string "Now, this way, please…$" - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc deleted file mode 100644 index ff5e3e1db..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ /dev/null @@ -1,50 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 - .byte 0 - -BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C - map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C - setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_6 - special CallBattlePikeFunction - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - end - -BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A - call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 - compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 - setvar VAR_TEMP_1, 1 - end - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json index a07464a15..2b3daf8b7 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", - "name": "BattleFrontier_BattlePikeRandomRoom2", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", + "name": "BattleFrontier_BattlePikeRoomFinal", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", "music": "MUS_B_TUBE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc new file mode 100644 index 000000000..8a98fa488 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc @@ -0,0 +1,40 @@ +BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomFinal_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomFinal_OnWarp + .byte 0 + +BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7 + .2byte 0 + +BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7 + delay 16 + applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB + waitmovement 0 + frontier_setchallengestatus CHALLENGE_STATUS_WON + lockall + msgbox BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease, MSGBOX_DEFAULT + closemessage + releaseall + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB: @ 825E3DB + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth + .2byte 0 + +BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2 + .string "Congratulations…\n" + .string "Now, this way, please…$" + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json index 630a0e335..6eef87962 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", - "name": "BattleFrontier_BattlePikeRandomRoom1", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", + "name": "BattleFrontier_BattlePikeRoomNormal", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", "music": "MUS_B_TUBE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED", + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D", + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D", "flag": "0" } ], @@ -50,7 +50,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_Exit" }, { "type": "trigger", @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D" }, { "type": "trigger", @@ -77,7 +77,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082" }, { "type": "trigger", @@ -86,7 +86,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082" }, { "type": "trigger", @@ -95,7 +95,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D" }, { "type": "trigger", @@ -104,7 +104,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + "script": "BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D" } ], "bg_events": [] diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc new file mode 100644 index 000000000..6f05367fb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -0,0 +1,884 @@ +BattleFrontier_BattlePikeRoomNormal_MapScripts:: @ 825D152 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomNormal_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp + .byte 0 + +BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D171 + .2byte 0 + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D171:: @ 825D171 + setvar VAR_TEMP_0, 1 + battlepike_getroomtype + switch VAR_RESULT + case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6 + case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D605 + case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D231 + case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E + case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6 + lockall + 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 + msgbox gStringVar4, MSGBOX_DEFAULT + waitmessage + closemessage + releaseall + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D226 + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A:: @ 825D20A + frontier_setchallengestatus CHALLENGE_STATUS_LOST + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D226:: @ 825D226 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798 + waitmovement 0 + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D231:: @ 825D231 + lockall + delay 16 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDFE, MSGBOX_DEFAULT + waitmessage + 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 + msgbox gStringVar4, MSGBOX_DEFAULT + waitmessage + closemessage + releaseall + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D285 + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D285:: @ 825D285 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798 + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B6 + waitmovement 0 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DE3F, MSGBOX_DEFAULT + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DE94, MSGBOX_DEFAULT + closemessage + release + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D798 + waitmovement 0 + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF:: @ 825D2BF + delay 22 + lockall + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF + waitmovement 0 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC + case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA + case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4FC + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E311, MSGBOX_DEFAULT + closemessage + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2 + waitmovement 0 + playse 267 + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7 + delay 4 + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4 + delay 4 + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D + delay 4 + waitse + delay 60 + playse 268 + delay 65 + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4 + showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL + delay 4 + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7 + delay 4 + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A + waitse + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7 + waitmovement 0 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE + special CallBattlePikeFunction + switch VAR_RESULT + case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416 + case 3, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD + case 4, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA + setvar VAR_0x8005, 7 + special CallFrontierUtilFunc + compare VAR_RESULT, 0 + goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DED2, MSGBOX_DEFAULT + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA + setvar VAR_0x8005, 7 + special CallFrontierUtilFunc + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD:: @ 825D3BD + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DF71, MSGBOX_DEFAULT + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D3DA + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D3DA:: @ 825D3DA + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS + special CallFrontierUtilFunc + compare VAR_RESULT, 0 + goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DFA2, MSGBOX_DEFAULT + waitmessage + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePikeRoomNormal_Text_25DFD0 + waitmessage + waitfanfare + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E003, MSGBOX_DEFAULT + closemessage + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D416:: @ 825D416 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA + setvar VAR_0x8005, 7 + special CallFrontierUtilFunc + compare VAR_RESULT, 0 + goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D443 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E02C, MSGBOX_DEFAULT + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA + setvar VAR_0x8005, 7 + special CallFrontierUtilFunc + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D443:: @ 825D443 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E0E8, MSGBOX_DEFAULT + call BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D460 + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D460:: @ 825D460 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS + special CallFrontierUtilFunc + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E0F6, MSGBOX_DEFAULT + waitmessage + playfanfare MUS_ME_SYMBOLGET + message BattleFrontier_BattlePikeRoomNormal_Text_25E118 + waitmessage + waitfanfare + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E140, MSGBOX_DEFAULT + closemessage + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA + waitmovement 0 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC + waitmovement 0 + battlepike_getstreak + addvar VAR_RESULT, 1 + battlepike_setstreak VAR_RESULT + call BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom + waitstate + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC:: @ 825D4DC + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E15D, MSGBOX_DEFAULT + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA:: @ 825D4EA + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E1DD, MSGBOX_DEFAULT + playfanfare MUS_ME_ASA + waitfanfare + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D4FC:: @ 825D4FC + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E238, MSGBOX_DEFAULT + playfanfare MUS_ME_ASA + waitfanfare + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E:: @ 825D50E + lockall + delay 16 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795 + waitmovement 0 + message BattleFrontier_BattlePikeRoomNormal_Text_25D9B6 + waitmessage + playfanfare MUS_ME_ASA + waitfanfare + special HealPlayerParty + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DA13, MSGBOX_DEFAULT + closemessage + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D798 + waitmovement 0 + releaseall + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E + lockall + delay 16 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C1 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C3 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5 + waitmovement 0 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA + waitmovement 0 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB + waitmovement 0 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG + setvar VAR_0x8005, 0 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT + closemessage + delay 16 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD + waitmovement 0 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT + closemessage + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + switch VAR_RESULT + case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC + goto BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC:: @ 825D5DC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD + waitmovement 0 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4 + waitmovement 0 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF + waitmovement 0 + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D605:: @ 825D605 + lockall + 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 + copyvar VAR_0x8004, VAR_RESULT + compare VAR_0x8004, 0 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D643 + compare VAR_0x8004, 1 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD3F, MSGBOX_DEFAULT + closemessage + releaseall + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D643:: @ 825D643 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DBE4, MSGBOX_DEFAULT + closemessage + waitse + playmoncry SPECIES_KIRLIA, 0 + waitmoncry + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS + special CallBattlePikeFunction + compare VAR_RESULT, 2 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D751 + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D758 + compare VAR_RESULT, 3 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F + compare VAR_RESULT, 4 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D766 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE + special CallBattlePikeFunction + waitstate + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2 + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1 + waitmovement 0 + waitse + playmoncry SPECIES_KIRLIA, 0 + waitmoncry + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCAF, MSGBOX_DEFAULT + waitse + playmoncry SPECIES_KIRLIA, 0 + waitmoncry + closemessage + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4 + waitmovement 0 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCCF, MSGBOX_DEFAULT + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5:: @ 825D6D5 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DC01, MSGBOX_DEFAULT + closemessage + waitse + playmoncry SPECIES_DUSCLOPS, 0 + waitmoncry + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS + special CallBattlePikeFunction + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D774 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE + special CallBattlePikeFunction + waitstate + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2 + waitmovement 0 + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1 + waitmovement 0 + waitse + playmoncry SPECIES_DUSCLOPS, 0 + waitmoncry + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DCAF, MSGBOX_DEFAULT + waitse + playmoncry SPECIES_DUSCLOPS, 0 + waitmoncry + closemessage + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3 + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4 + waitmovement 0 + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD06, MSGBOX_DEFAULT + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D751:: @ 825D751 + message BattleFrontier_BattlePikeRoomNormal_Text_25DC20 + waitmessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D758:: @ 825D758 + message BattleFrontier_BattlePikeRoomNormal_Text_25DC63 + waitmessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F:: @ 825D75F + message BattleFrontier_BattlePikeRoomNormal_Text_25DC49 + waitmessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D766:: @ 825D766 + message BattleFrontier_BattlePikeRoomNormal_Text_25DC33 + waitmessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D:: @ 825D76D + message BattleFrontier_BattlePikeRoomNormal_Text_25DC97 + waitmessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D774:: @ 825D774 + message BattleFrontier_BattlePikeRoomNormal_Text_25DC7C + waitmessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B:: @ 825D77B + closemessage + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC + waitmovement 0 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + return + +BattleFrontier_BattlePikeRoomNormal_Movement_25D795: @ 825D795 + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D798: @ 825D798 + walk_up + walk_up + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D79E: @ 825D79E + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2: @ 825D7A2 + walk_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7A4: @ 825D7A4 + walk_down + face_left + delay_16 + delay_16 + face_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA: @ 825D7AA + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_left + face_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7B1: @ 825D7B1 + face_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7B3: @ 825D7B3 + walk_left + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7B4: @ 825D7B4 + face_right + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7B6: @ 825D7B6 + walk_down + walk_down + walk_right + face_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB: @ 825D7BB + face_left + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD: @ 825D7BD + face_right + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF: @ 825D7BF + face_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7C1: @ 825D7C1 + walk_right + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7C3: @ 825D7C3 + walk_left + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7C5: @ 825D7C5 + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8: @ 825D7C8 + face_right + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA: @ 825D7CA + face_left + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC: @ 825D7CC + walk_up + walk_up + walk_up + walk_right + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4: @ 825D7D4 + walk_up + walk_up + walk_up + walk_left + walk_up + set_invisible + walk_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC: @ 825D7DC + walk_up + walk_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF: @ 825D7DF + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2: @ 825D7E2 + walk_up + walk_up + walk_up + set_invisible + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7: @ 825D7E7 + set_visible + walk_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA: @ 825D7EA + walk_left + face_right + step_end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED + battlepike_getroomtype + switch VAR_RESULT + case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D831 + case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E +BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B:: @ 825D81B + lock + faceplayer + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT + waitmessage + closemessage + release + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D831:: @ 825D831 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDA3, MSGBOX_DEFAULT + closemessage + release + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E:: @ 825D83E + setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS + special CallBattlePikeFunction + compare VAR_RESULT, 2 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D881 + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D875 + playfanfare MUS_ME_ASA + waitfanfare + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DABE, MSGBOX_DEFAULT + closemessage + release + applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D79E + waitmovement 0 + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D875:: @ 825D875 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DA51, MSGBOX_DEFAULT + closemessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D881:: @ 825D881 + lock + faceplayer + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E32E, MSGBOX_DEFAULT + closemessage + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D88D:: @ 825D88D + lock + faceplayer + msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DDE6, MSGBOX_DEFAULT + closemessage + release + applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7B4 + waitmovement 0 + end + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4:: @ 825D8A4 + setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1 + setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1 + setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1 + setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1 + setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1 + setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0 + setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7:: @ 825D8E7 + setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1 + setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1 + setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1 + setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1 + setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1 + setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0 + setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D92A:: @ 825D92A + setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1 + setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1 + setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1 + setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1 + setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1 + setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0 + setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRoomNormal_EventScript_25D96D:: @ 825D96D + setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1 + setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1 + setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1 + setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1 + setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1 + setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0 + setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1 + special DrawWholeMapView + return + +BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0: @ 825D9B0 + walk_up + walk_up + step_end + +BattleFrontier_BattlePikeRoomNormal_Movement_25D9B3: @ 825D9B3 + walk_down + walk_down + step_end + +BattleFrontier_BattlePikeRoomNormal_Text_25D9B6: @ 825D9B6 + .string "Welcome…\n" + .string "You must be commended for your luck…\p" + .string "Your POKéMON shall be restored\n" + .string "to full health…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DA13: @ 825DA13 + .string "I urge you to enjoy the rest of your\n" + .string "Battle Choice challenge…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DA51: @ 825DA51 + .string "Ah, you're a lucky one.\n" + .string "I'm in somewhat-good spirits now.\p" + .string "I will restore one of your POKéMON\n" + .string "to full health.$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DABE: @ 825DABE + .string "The best of luck to you.\n" + .string "Farewell.$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DAE1: @ 825DAE1 + .string "Excuse me…\p" + .string "Would you care for a battle?\n" + .string "I'll restore your POKéMON if you win.$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DB2F: @ 825DB2F + .string "Very well…\n" + .string "Now, shall we?$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DB49: @ 825DB49 + .string "I see…\n" + .string "How unsporting of you…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DB67: @ 825DB67 + .string "Magnificent…\p" + .string "As promised, I shall restore your\n" + .string "POKéMON to full health.$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DBAE: @ 825DBAE + .string "The best of luck to you.\n" + .string "Farewell.$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DBD1: @ 825DBD1 + .string "Oh, my!\p" + .string "Watch out!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DBE4: @ 825DBE4 + .string "Now, now!\n" + .string "KIRLIA, stop that!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC01: @ 825DC01 + .string "Now, now!\n" + .string "DUSCLOPS, stop that!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC20: @ 825DC20 + .string "KIRLIA used TOXIC!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC33: @ 825DC33 + .string "KIRLIA used HYPNOSIS!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC49: @ 825DC49 + .string "KIRLIA used THUNDER WAVE!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC63: @ 825DC63 + .string "KIRLIA used WILL-O-WISP!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC7C: @ 825DC7C + .string "DUSCLOPS used WILL-O-WISP!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DC97: @ 825DC97 + .string "DUSCLOPS used ICE BEAM!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DCAF: @ 825DCAF + .string "Look here!\n" + .string "That's quite enough!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DCCF: @ 825DCCF + .string "I must apologize to you…\p" + .string "My KIRLIA has a TIMID nature…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DD06: @ 825DD06 + .string "I must apologize to you…\p" + .string "My DUSCLOPS has a TIMID nature…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DD3F: @ 825DD3F + .string "It attacks without warning if it is\n" + .string "startled by another person…\p" + .string "Are you and your POKéMON all right?$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DDA3: @ 825DDA3 + .string "I do apologize for what happened…\n" + .string "I do hope your POKéMON are fine.$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DDE6: @ 825DDE6 + .string "… … … … … …\n" + .string "… … … … … …$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DDFE: @ 825DDFE + .string "Welcome…\p" + .string "Here, we will have you battle\n" + .string "a somewhat-tough TRAINER…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DE3F: @ 825DE3F + .string "How wonderful…\p" + .string "To honor your victory, your POKéMON\n" + .string "shall be restored to full health…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DE94: @ 825DE94 + .string "I urge you to enjoy the rest of your\n" + .string "Battle Choice challenge…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DED2: @ 825DED2 + .string "I am LUCY…\n" + .string "I am the law here…\l" + .string "For I am the PIKE QUEEN…\p" + .string "You already know it, but to advance,\n" + .string "you must defeat me…\p" + .string "…I'm not one for idle chatter.\n" + .string "Hurry. Come on…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DF71: @ 825DF71 + .string "Your luck…\n" + .string "I hope you didn't use it all up here…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DFA2: @ 825DFA2 + .string "LUCY: … … … … … …\n" + .string "Show me your FRONTIER PASS…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25DFD0: @ 825DFD0 + .string "The Luck Symbol was embossed on\n" + .string "the FRONTIER PASS!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E003: @ 825E003 + .string "…That's all there is…\n" + .string "Disappear already…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E02C: @ 825E02C + .string "LUCY: …You again…\p" + .string "… … … … … …\p" + .string "…I've trampled flowers and braved\n" + .string "storms to get to where I am…\p" + .string "I don't feel any compulsion to keep\n" + .string "losing to the same opponent…\p" + .string "… … … … … …\n" + .string "Fine… I'll do it…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E0E8: @ 825E0E8 + .string "Now!\n" + .string "Come on!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E0F6: @ 825E0F6 + .string "LUCY: … … … … … …\p" + .string "…FRONTIER PASS…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E118: @ 825E118 + .string "The Luck Symbol took on\n" + .string "a golden shine!$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E140: @ 825E140 + .string "…You, I won't forget…\n" + .string "…Ever…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E15D: @ 825E15D + .string "I welcome you…\p" + .string "Giggle…\n" + .string "You seem to be bereft of luck…\p" + .string "If only you hadn't chosen this room,\n" + .string "your POKéMON could have been healed…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E1DD: @ 825E1DD + .string "I welcome you…\p" + .string "Since you have chosen this room, I will\n" + .string "restore one POKéMON to full health…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E238: @ 825E238 + .string "I welcome you…\p" + .string "Since you have chosen this room, I will\n" + .string "restore two POKéMON to full health…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E293: @ 825E293 + .string "I welcome you…\p" + .string "Giggle…\n" + .string "You should thank your lucky stars…\p" + .string "Since you have chosen this room,\n" + .string "all your POKéMON will be restored…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E311: @ 825E311 + .string "I shall go fetch our master…$" + +BattleFrontier_BattlePikeRoomNormal_Text_25E32E: @ 825E32E + .string "Ah, you're a lucky one!\n" + .string "I'm in good spirits now.\p" + .string "I will restore two of your POKéMON\n" + .string "to full health!$" + diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json index 6e0e74960..3a8362b7f 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", - "name": "BattleFrontier_BattlePikeRandomRoom3", - "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", + "name": "BattleFrontier_BattlePikeRoomWildMons", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", "music": "MUS_B_TUBE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, @@ -23,7 +23,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174" }, { "type": "trigger", @@ -32,7 +32,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202" }, { "type": "trigger", @@ -41,7 +41,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202" }, { "type": "trigger", @@ -50,7 +50,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202" }, { "type": "trigger", @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D" }, { "type": "trigger", @@ -77,7 +77,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "1", - "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + "script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D" } ], "bg_events": [] diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc new file mode 100644 index 000000000..cc4c49bd7 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc @@ -0,0 +1,45 @@ +BattleFrontier_BattlePikeRoomWildMons_MapScripts:: @ 825E41A + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466 + .byte 0 + +BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C + map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A + .2byte 0 + +BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C + setvar VAR_TEMP_0, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_6 + special CallBattlePikeFunction + end + +BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A + frontier_setchallengestatus CHALLENGE_STATUS_LOST + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466: @ 825E466 + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470 + .2byte 0 + +BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470:: @ 825E470 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A: @ 825E47A + call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves + frontier_getbattleoutcome + compare VAR_RESULT, B_OUTCOME_LOST + goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3 + compare VAR_RESULT, B_OUTCOME_DREW + goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3 + end + +BattleFrontier_BattlePikeRoomWildMons_EventScript_25E4A3:: @ 825E4A3 + setvar VAR_TEMP_1, 1 + end + diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ac9230c53..aa512a0a7 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver", "flag": "0" } ], @@ -50,7 +50,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp" }, { "type": "trigger", @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp" }, { "type": "trigger", diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 53a796011..4beb3be99 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,18 +1,18 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnWarp .byte 0 -BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891 - map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A +BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeOutcome + map_script_2 VAR_TEMP_0, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby map_script_2 VAR_TEMP_0, 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4 map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78 map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97 .2byte 0 -BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D +BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887 .2byte 0 @@ -21,47 +21,44 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc +BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeOutcome:: @ 825C891 + frontier_checkoutcome end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A +BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: @ 825C89A warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 lockall - message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75 + message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume waitmessage setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 1 special CallBattlePikeFunction playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT + frontier_loadselectedmons + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge, MSGBOX_DEFAULT closemessage releaseall setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 99 special CallFrontierUtilFunc end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc switch VAR_RESULT @@ -77,54 +74,54 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge, MSGBOX_YESNO switch VAR_RESULT case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A @@ -134,7 +131,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD setvar VAR_0x8004, FRONTIER_UTIL_FUNC_6 special CallFrontierUtilFunc - message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 + message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData waitmessage special LoadPlayerParty setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 @@ -148,7 +145,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit, MSGBOX_YESNO switch VAR_RESULT case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A @@ -157,7 +154,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A - message BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C + message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT @@ -181,88 +178,86 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent, MSGBOX_DEFAULT releaseall applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 waitmovement 0 setvar VAR_TEMP_5, 255 end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT - special CallBattlePikeFunction - compare VAR_RESULT, 4 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 +BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB + battlepike_gethint + compare VAR_RESULT, PIKE_HINT_BRAIN + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose, MSGBOX_YESNO switch VAR_RESULT - case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A - case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 - case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 + case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint + case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint + case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint release end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, MSGBOX_DEFAULT +BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence, MSGBOX_DEFAULT release end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID +BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID special CallBattlePikeFunction switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53 + case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint + case PIKE_ROOM_CENTER, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint + case PIKE_ROOM_RIGHT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, MSGBOX_DEFAULT - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 +BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint:: @ 825CB39 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath, MSGBOX_DEFAULT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, MSGBOX_DEFAULT - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 +BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint:: @ 825CB46 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath, MSGBOX_DEFAULT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, MSGBOX_DEFAULT - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 +BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath, MSGBOX_DEFAULT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT - special CallBattlePikeFunction +BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60 + battlepike_gethint switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8 + case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia + case PIKE_HINT_WHISPERING, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering + case PIKE_HINT_POKEMON, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon + case PIKE_HINT_PEOPLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, MSGBOX_DEFAULT +BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia:: @ 825CB9A + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga, MSGBOX_DEFAULT release end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, MSGBOX_DEFAULT +BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering:: @ 825CBA4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering, MSGBOX_DEFAULT release end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, MSGBOX_DEFAULT +BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon:: @ 825CBAE + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon, MSGBOX_DEFAULT release end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, MSGBOX_DEFAULT +BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople:: @ 825CBB8 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople, MSGBOX_DEFAULT release end -BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 +BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint:: @ 825CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence, MSGBOX_DEFAULT release end @@ -285,109 +280,107 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5 face_down step_end -BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1: @ 825CBDD .string "You are currently in\n" .string "the 1st room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CC00: @ 825CC00 +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3: @ 825CC00 .string "You are currently in\n" .string "the 3rd room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CC23: @ 825CC23 +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5: @ 825CC23 .string "You are currently in\n" .string "the 5th room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CC46: @ 825CC46 +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7: @ 825CC46 .string "You are currently in\n" .string "the 7th room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CC69: @ 825CC69 +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9: @ 825CC69 .string "You are currently in\n" .string "the 9th room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C: @ 825CC8C +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11: @ 825CC8C .string "You are currently in\n" .string "the 11th room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0: @ 825CCB0 +BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13: @ 825CCB0 .string "You are currently in\n" .string "the 13th room…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4: @ 825CCD4 +BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge: @ 825CCD4 .string "Will you continue with\n" .string "your challenge?$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB: @ 825CCFB +BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit: @ 825CCFB .string "Would you like to save your challenge\n" .string "and quit the game for now?$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C +BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge: @ 825CD3C .string "Do you wish to retire from your\n" .string "Battle Choice challenge?$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75 +BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume: @ 825CD75 .string "We've been awaiting your return…\p" .string "Before resuming your Battle Choice\n" .string "challenge, let me save the game…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA: @ 825CDDA +BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge: @ 825CDDA .string "Please do enjoy your Battle Choice\n" .string "challenge…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CE08: @ 825CE08 +BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData: @ 825CE08 .string "I am saving your data…\n" .string "A little time, please…$" -BattleFrontier_BattlePikeRandomRoom1_Text_25CE36: @ 825CE36 -BattleFrontier_BattlePikeRandomRoom3_Text_25CE36: @ 825CE36 -BattleFrontier_BattlePikeThreePathRoom_Text_25CE36: @ 825CE36 +BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack: @ 825CE36 .string "The path is blocked!\n" .string "And there is no turning back…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CE69: @ 825CE69 +BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose: @ 825CE69 .string "I beg your pardon, but…\p" .string "Are you perhaps finding it difficult\n" .string "to choose your path?$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB: @ 825CEBB +BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence: @ 825CEBB .string "I see…\n" .string "I apologize for my impertinence…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3: @ 825CEE3 +BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath: @ 825CEE3 .string "Ah, let me see… There is something\n" .string "about the path on the right…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CF23: @ 825CF23 +BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath: @ 825CF23 .string "Ah, let me see… There is something\n" .string "about the path in the center…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CF64: @ 825CF64 +BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath: @ 825CF64 .string "Ah, let me see… There is something\n" .string "about the path on the left…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3: @ 825CFA3 +BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon: @ 825CFA3 .string "It seems to have the distinct aroma\n" .string "of POKéMON wafting around it…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5: @ 825CFE5 +BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople: @ 825CFE5 .string "Is it… A TRAINER?\n" .string "I sense the presence of people…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25D017: @ 825D017 +BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering: @ 825D017 .string "I seem to have heard something…\n" .string "It may have been whispering…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25D054: @ 825D054 +BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga: @ 825D054 .string "For some odd reason, I felt a wave\n" .string "of nostalgia coming from it…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25D094: @ 825D094 +BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent: @ 825D094 .string "I am sorry to say…\p" .string "A terrifying event, yes, a horrible one,\n" .string "is about to befall you…\p" .string "I urge you to pay the utmost care\n" .string "and prepare for the worst…$" -BattleFrontier_BattlePikeThreePathRoom_Text_25D125: @ 825D125 +BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence: @ 825D125 .string "From every path I sense a dreadful\n" .string "presence…$" diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 1bcf1814a..2ca635c41 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -40,32 +40,28 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc - compare VAR_RESULT, 4 + frontier_getbattleoutcome + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 2 + compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare VAR_RESULT, 3 + compare VAR_RESULT, B_OUTCOME_DREW goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare VAR_RESULT, 9 + compare VAR_RESULT, B_OUTCOME_FORFEITED goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE setvar VAR_0x8005, BATTLE_TYPE_TRAINER special CallFrontierUtilFunc setvar VAR_TEMP_D, 1 - BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY special CallBattlePyramidFunction @@ -73,10 +69,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 7 setvar VAR_0x8006, 255 @@ -100,15 +93,13 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons setvar VAR_TEMP_F, 1 end @@ -126,19 +117,14 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT compare VAR_RESULT, 7 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 0b30d96e3..9094273f0 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -21,8 +21,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 .2byte 0 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 @@ -40,7 +39,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -155,7 +154,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -176,7 +175,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE @@ -185,11 +184,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -207,13 +206,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePyramidLobby_EventScript_250D56 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -242,7 +239,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -424,9 +421,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 6 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_PYRAMID waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 7b777b165..def0d0af3 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -28,28 +28,23 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 end BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc - compare VAR_RESULT, 0 + frontier_getbrainstatus + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C call BattleFrontier_BattlePyramidTop_EventScript_242170 - BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C copyvar VAR_TEMP_C, VAR_RESULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc - compare VAR_RESULT, 2 + frontier_getbattleoutcome + compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 3 + compare VAR_RESULT, B_OUTCOME_DREW goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 9 + compare VAR_RESULT, B_OUTCOME_FORFEITED goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 end @@ -73,15 +68,13 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons setvar VAR_TEMP_F, 1 end @@ -90,7 +83,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 faceplayer compare VAR_TEMP_D, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236 - compare VAR_TEMP_C, 0 + compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240 msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT closemessage @@ -107,10 +100,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 closemessage BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -130,10 +120,10 @@ BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 lockall switch VAR_TEMP_C - case 2, BattleFrontier_BattlePyramidTop_EventScript_255335 - case 3, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_255335 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_2552D0 + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_255388 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -143,7 +133,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A @@ -180,7 +170,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -190,7 +180,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index e305260df..5f58f801e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -20,7 +20,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_TEMP_0, 1 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -30,7 +30,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -49,14 +49,10 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E switch VAR_RESULT - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F - + case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F BattleFrontier_BattleTowerBattleRoom_EventScript_241C03:: @ 8241C03 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8005, 3 special CallBattleTowerFunc @@ -73,9 +69,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_242188 waitmovement 0 removeobject 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc - compare VAR_RESULT, 0 + frontier_getbrainstatus + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 @@ -87,12 +82,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F special HealPlayerParty BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_9 - special CallFrontierUtilFunc + frontier_getbrainstatus copyvar VAR_TEMP_F, VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 @@ -153,10 +147,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC goto BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8005, 3 special CallBattleTowerFunc @@ -283,16 +274,16 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF applymovement 1, BattleFrontier_BattleTowerBattleRoom_Movement_2421B2 waitmovement 0 switch VAR_TEMP_F - case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 - case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_242085 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -320,13 +311,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 7 special CallFrontierUtilFunc @@ -357,7 +348,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E closemessage setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -372,15 +363,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8004, FRONTIER_UTIL_FUNC_18 special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 - special CallFrontierUtilFunc - + frontier_resetsketch BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A setvar VAR_0x8004, BATTLE_TOWER_FUNC_15 special CallBattleTowerFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc + frontier_getbattleoutcome return BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index f447434f1..c264ddb3c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249518 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_24951E waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 @@ -56,7 +56,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc @@ -114,10 +114,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249069:: @ 8249069 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8005, 3 special CallBattleTowerFunc @@ -164,7 +161,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 special HealPlayerParty BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD @@ -231,10 +228,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON setvar VAR_0x8004, BATTLE_TOWER_FUNC_2 setvar VAR_0x8005, 3 special CallBattleTowerFunc diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 3767db315..aa28a0cf0 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -43,8 +43,7 @@ BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD .2byte 0 BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 @@ -60,7 +59,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattleTowerFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -200,7 +199,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 6 special CallFrontierUtilFunc return @@ -219,7 +218,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE special CallBattleTowerFunc playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -259,7 +258,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -279,7 +278,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -289,7 +288,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleTowerFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -339,7 +338,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -359,7 +358,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -369,7 +368,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleTowerFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -420,7 +419,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -440,7 +439,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -450,7 +449,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleTowerFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -500,7 +499,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc @@ -520,7 +519,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 @@ -530,7 +529,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattleTowerFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -625,10 +624,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_SINGLES waitbuttonpress special RemoveRecordsWindow releaseall @@ -636,10 +632,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 1 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_DOUBLES waitbuttonpress special RemoveRecordsWindow releaseall @@ -647,10 +640,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 2 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_MULTIS waitbuttonpress special RemoveRecordsWindow releaseall @@ -658,10 +648,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_LINK_MULTIS waitbuttonpress special RemoveRecordsWindow releaseall @@ -709,7 +696,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 end BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 special CallFrontierUtilFunc goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 @@ -916,7 +903,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattlePikeLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallFrontierUtilFunc return diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 9da5e6a14..340b915c5 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -94,7 +94,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 18f39ecd1..b3ea82593 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -35,9 +35,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 showobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B8D waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 0 goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73 @@ -68,10 +66,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST special LoadPlayerParty warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -85,14 +80,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C closemessage FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3 applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E @@ -105,17 +95,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 1 call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43 compare VAR_RESULT, 2 @@ -153,10 +139,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AD8:: @ 8200AD8 FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 delay 60 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON special LoadPlayerParty warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index b5cc43558..7ec338b6f 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -21,20 +21,19 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 .2byte 0 FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 lockall msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -48,7 +47,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED waitmessage setvar VAR_0x8004, 4 special sub_81B9B80 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -64,7 +63,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 special sub_81B9B80 switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -96,7 +95,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 lockall message FallarborTown_BattleTentLobby_Text_2C4FD7 waitmessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -120,7 +119,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD special sub_81B9B80 playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -155,7 +154,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -175,16 +174,16 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B9B80 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -198,9 +197,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF @@ -227,7 +224,7 @@ FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index ecd8e2b95..b6874d99f 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -562,9 +562,7 @@ LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784 lockall - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW - setvar VAR_0x8005, 7 - special CallFrontierUtilFunc + frontier_results FACILITY_LINK_CONTEST waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 765b96482..63600c9e2 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -258,7 +258,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032 special ReducePlayerPartyToSelectedMons - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index e5195dce2..eddd434a1 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -63,23 +63,15 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST special LoadPlayerParty warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B @ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B @@ -89,10 +81,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 SlateportCity_BattleTentBattleRoom_EventScript_209A7B:: @ 8209A7B SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON special LoadPlayerParty warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index a8abf0cb6..952ca1c1b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -68,7 +68,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE special HealPlayerParty SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_DATA setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8f453c147..c6011c3f2 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -21,20 +21,19 @@ SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F .2byte 0 SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 lockall msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -47,7 +46,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 waitmessage setvar VAR_0x8004, 4 special sub_81B9D08 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -63,7 +62,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 special sub_81B9D08 switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_20882A - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -81,7 +80,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 lockall message SlateportCity_BattleTentLobby_Text_2C5BA2 waitmessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -107,7 +106,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 special sub_81B9D08 playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -138,7 +137,7 @@ SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_FRONTIER_FACILITY, 4 setvar VAR_FRONTIER_BATTLE_MODE, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -150,16 +149,16 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B9D08 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -221,7 +220,7 @@ SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 goto SlateportCity_BattleTentLobby_EventScript_2088CA SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index e7d7d2fb4..7dfd53fa8 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -34,9 +34,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 showobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_202575 waitmovement 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 0 goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C @@ -55,23 +53,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8 VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST special LoadPlayerParty warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_setbattlenum VAR_RESULT switch VAR_RESULT case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 @@ -83,17 +73,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + frontier_getbattlenum compare VAR_RESULT, 1 call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565 compare VAR_RESULT, 2 @@ -128,10 +114,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 3 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_WON special LoadPlayerParty warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 88c98fc1a..cf68192fb 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -21,20 +21,19 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF .2byte 0 VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_checkoutcome end VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 lockall msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -48,7 +47,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 waitmessage setvar VAR_0x8004, 6 special sub_81B99B4 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -64,7 +63,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 special sub_81B99B4 switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_2017DD - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -96,7 +95,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD lockall message VerdanturfTown_BattleTentLobby_Text_2C56B8 waitmessage - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -121,7 +120,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 special sub_81B99B4 playse SE_SAVE waitse - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -156,7 +155,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc @@ -176,16 +175,16 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 setvar VAR_TEMP_0, 0 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 4 special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B99B4 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc @@ -199,9 +198,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_loadselectedmons msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 @@ -228,7 +225,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 + setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 4035bc3f3..521cc5e03 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -532,9 +532,9 @@ "BattleFrontier_BattlePikeLobby", "BattleFrontier_BattlePikeCorridor", "BattleFrontier_BattlePikeThreePathRoom", - "BattleFrontier_BattlePikeRandomRoom1", - "BattleFrontier_BattlePikeRandomRoom2", - "BattleFrontier_BattlePikeRandomRoom3", + "BattleFrontier_BattlePikeRoomNormal", + "BattleFrontier_BattlePikeRoomFinal", + "BattleFrontier_BattlePikeRoomWildMons", "BattleFrontier_RankingHall", "BattleFrontier_Lounge1", "BattleFrontier_ExchangeServiceCorner", diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 2a6da1a58..ca1e14d47 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -1,142 +1,127 @@ -BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE +BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp -BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25 + battlepike_setroomobjects + battlepike_getroomtype switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 - case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF + case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 + case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 + case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0 + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2 + case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 + case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93 + case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2 + case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93:: @ 82C3E93 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3E93:: @ 82C3E93 setobjectxyperm 1, 2, 5 setobjectxyperm 2, 6, 5 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2:: @ 82C3EA2 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EA2:: @ 82C3EA2 setobjectxyperm 1, 4, 4 setobjectxyperm 2, 3, 4 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1:: @ 82C3EB1 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1:: @ 82C3EB1 setobjectxyperm 1, 4, 4 setobjectxyperm 2, 0, 0 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0:: @ 82C3EC0 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EC0:: @ 82C3EC0 setobjectxyperm 1, 5, 5 setobjectxyperm 2, 0, 0 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3ECF:: @ 82C3ECF setobjectxyperm 1, 4, 3 setobjectxyperm 2, 4, 4 end -BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 +BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom .2byte 0 -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 +BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction - compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 6 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 7 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 8 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + battlepike_getroomtype + compare VAR_RESULT, PIKE_ROOM_STATUS + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + compare VAR_RESULT, PIKE_ROOM_DOUBLE_BATTLE + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 + compare VAR_RESULT, PIKE_ROOM_BRAIN + goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35:: @ 82C3F35 setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F +BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F:: @ 82C3F3F setvar VAR_TEMP_4, 1 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E - setvar VAR_0x8007, 0 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F +BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E + setvar VAR_0x8007, PIKE_ROOM_LEFT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59:: @ 82C3F59 - setvar VAR_0x8007, 1 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F +BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp:: @ 82C3F59 + setvar VAR_0x8007, PIKE_ROOM_CENTER + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 - setvar VAR_0x8007, 2 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F +BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64 + setvar VAR_0x8007, PIKE_ROOM_RIGHT + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 - special CallBattlePikeFunction +BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F + battlepike_getstreak addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + battlepike_setstreak VAR_RESULT + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE - special CallBattlePikeFunction + frontier_setbattlenum VAR_RESULT + battlepike_setnextroom + battlepike_getroomtype switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 - case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_NPC, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_WILD_MONS, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom + case PIKE_ROOM_HARD_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_DOUBLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 + call BattleFrontier_BattlePike_EventScript_CloseCurtain + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 255, 4, 7 waitstate end -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A +BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 + call BattleFrontier_BattlePike_EventScript_CloseCurtain + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 255, 4, 19 waitstate end @@ -149,164 +134,122 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 +BattleFrontier_BattlePikeRoomNormal_EventScript_2C4082:: @ 82C4082 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D +BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 + battlepike_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 addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + battlepike_setstreak VAR_RESULT + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + frontier_setbattlenum VAR_RESULT + battlepike_isfinalroom + compare VAR_RESULT, TRUE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom + compare VAR_RESULT, FALSE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom waitstate end -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED - setvar VAR_0x8005, 1 - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128 + battlepike_nohealing TRUE return -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED - setvar VAR_0x8005, 0 - special CallBattlePikeFunction +BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136 + battlepike_nohealing FALSE return -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A +BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 + call BattleFrontier_BattlePike_EventScript_CloseCurtain + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7 return -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A +BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 return -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004,BATTLE_PIKE_FUNC_7 - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 1 +BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_7 special CallBattlePikeFunction + battlepike_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 addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + battlepike_setstreak VAR_RESULT + frontier_getbattlenum addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + frontier_setbattlenum VAR_RESULT + battlepike_isfinalroom + compare VAR_RESULT, TRUE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom + compare VAR_RESULT, FALSE + call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom waitstate end -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 +BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4202:: @ 82C4202 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_2, 1 end -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D +BattleFrontier_BattlePikeRoomWildMons_EventScript_2C420D:: @ 82C420D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT + msgbox BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack, MSGBOX_DEFAULT closemessage end BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_setchallengestatus CHALLENGE_STATUS_LOST warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end -BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E -BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E +BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 0 - special CallFrontierUtilFunc + frontier_getchallengestatus compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 - + call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B setorcopyvar VAR_RESULT, VAR_0x8006 end -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_21 - special CallFrontierUtilFunc +BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves:: @ 82C4271 + frontier_resetsketch return -BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A -BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A +BattleFrontier_BattlePikeRoom_Movement_HidePlayer: @ 82C427A set_invisible step_end diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index 805c63264..c655a3c9c 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -2,9 +2,7 @@ TrainerHill_OnResume: @ 82C8336 setvar VAR_TEMP_2, 0 setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER special CallTrainerHillFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc + frontier_getbattleoutcome compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_Lost compare VAR_RESULT, B_OUTCOME_DREW diff --git a/data/text/frontier_brain.inc b/data/text/frontier_brain.inc index 3a9c897f0..3bce8076e 100644 --- a/data/text/frontier_brain.inc +++ b/data/text/frontier_brain.inc @@ -1,101 +1,108 @@ -gText_082C843F:: @ 82C843F +@ Battle Tower +gText_AnabelWonSilver:: @ 82C843F .string "It's very disappointing…$" -gText_082C8458:: @ 82C8458 +gText_AnabelDefeatSilver:: @ 82C8458 .string "Okay, I understand…$" -gText_082C846C:: @ 82C846C +gText_AnabelWonGold:: @ 82C846C .string "I'm terribly sorry…$" -gText_082C8480:: @ 82C8480 +gText_AnabelDefeatGold:: @ 82C8480 .string "Thank you…$" -gText_082C848B:: @ 82C848B +@ Battle Dome +gText_TuckerWonSilver:: @ 82C848B .string "Ahahaha! Aren't you embarrassed?\n" .string "Everyone's watching!$" -gText_082C84C1:: @ 82C84C1 +gText_TuckerDefeatSilver:: @ 82C84C1 .string "Grr…\n" .string "What the…$" -gText_082C84D0:: @ 82C84D0 +gText_TuckerWonGold:: @ 82C84D0 .string "My DOME ACE title isn't just for show!$" -gText_082C84F7:: @ 82C84F7 +gText_TuckerDefeatGold:: @ 82C84F7 .string "Ahahaha!\n" .string "You're inspiring!$" -gText_082C8512:: @ 82C8512 +@ Battle Factory +gText_NolandWonSilver:: @ 82C8512 .string "Way to work!\n" .string "That was a good lesson, eh?$" -gText_082C853B:: @ 82C853B +gText_NolandDefeatSilver:: @ 82C853B .string "Good job!\n" .string "You know what you're doing!$" -gText_082C8561:: @ 82C8561 +gText_NolandWonGold:: @ 82C8561 .string "Hey, hey, hey!\n" .string "You're finished already?$" -gText_082C8589:: @ 82C8589 +gText_NolandDefeatGold:: @ 82C8589 .string "What happened here?$" -gText_082C859D:: @ 82C859D +@ Battle Pike +gText_LucyWonSilver:: @ 82C859D .string "Humph…$" -gText_082C85A4:: @ 82C85A4 +gText_LucyDefeatSilver:: @ 82C85A4 .string "Urk…$" -gText_082C85A9:: @ 82C85A9 +gText_LucyWonGold:: @ 82C85A9 .string "Hah!$" -gText_082C85AE:: @ 82C85AE +gText_LucyDefeatGold:: @ 82C85AE .string "Darn!$" -gText_082C85B4:: @ 82C85B4 +@ Battle Arena +gText_GretaWonSilver:: @ 82C85B4 .string "Oh, come on!\n" .string "You have to try harder than that!$" -gText_082C85E3:: @ 82C85E3 +gText_GretaDefeatSilver:: @ 82C85E3 .string "No way!\n" .string "Good job!$" -gText_082C85F5:: @ 82C85F5 +gText_GretaWonGold:: @ 82C85F5 .string "Heheh!\n" .string "What did you expect?$" -gText_082C8611:: @ 82C8611 +gText_GretaDefeatGold:: @ 82C8611 .string "Huh?\n" .string "Are you serious?!$" -gText_082C8628:: @ 82C8628 +@ Battle Palace +gText_SpenserWonSilver:: @ 82C8628 .string "Your POKéMON are wimpy because\n" .string "you're wimpy as a TRAINER!$" -gText_082C8662:: @ 82C8662 +gText_SpenserDefeatSilver:: @ 82C8662 .string "Ah…\n" .string "Now this is something else…$" -gText_082C8682:: @ 82C8682 +gText_SpenserWonGold:: @ 82C8682 .string "Gwahahaha!\n" .string "My brethren, we have nothing to fear!$" -gText_082C86B3:: @ 82C86B3 +gText_SpenserDefeatGold:: @ 82C86B3 .string "Gwah!\n" .string "Hahahaha!$" -gText_082C86C3:: @ 82C86C3 +@ Battle Pyramid +gText_BrandonWonSilver:: @ 82C86C3 .string "Hey! What's wrong with you!\n" .string "Let's see some effort! Get up!$" -gText_082C86FE:: @ 82C86FE +gText_BrandonDefeatSilver:: @ 82C86FE .string "That's it! You've done great!\n" .string "You've worked hard for this!$" -gText_082C8739:: @ 82C8739 +gText_BrandonWonGold:: @ 82C8739 .string "Hey! Don't you give up now!\n" .string "Get up! Don't lose faith in yourself!$" -gText_082C877B:: @ 82C877B +gText_BrandonDefeatGold:: @ 82C877B .string "That's it! You've done it!\n" .string "You kept working for this!$" diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 54d50c18a..7fcebb452 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -12,7 +12,8 @@ #define FRONTIER_FACILITY_PIKE 5 #define FRONTIER_FACILITY_PYRAMID 6 #define NUM_FRONTIER_FACILITIES 7 -// The multiplayer battle colosseum rooms re-use VAR_FRONTIER_FACILITY. +// VAR_FRONTIER_FACILITY is re-used for the below facilities as well +#define FACILITY_LINK_CONTEST 7 #define FACILITY_UNION_ROOM 8 #define FACILITY_MULTI_OR_EREADER 9 // Direct Corner multi battles, multi battle with Steven, and e-Reader battles @@ -21,15 +22,23 @@ #define TENT_SLATEPORT 4 // Battle Frontier lvl modes. -#define FRONTIER_LVL_50 0 +#define FRONTIER_LVL_50 0 #define FRONTIER_LVL_OPEN 1 #define FRONTIER_LVL_TENT 2 // Battle Frontier battle modes. -#define FRONTIER_MODE_SINGLES 0 -#define FRONTIER_MODE_DOUBLES 1 -#define FRONTIER_MODE_MULTIS 2 -#define FRONTIER_MODE_LINK_MULTIS 3 +#define FRONTIER_MODE_SINGLES 0 +#define FRONTIER_MODE_DOUBLES 1 +#define FRONTIER_MODE_MULTIS 2 +#define FRONTIER_MODE_LINK_MULTIS 3 +#define FRONTIER_MODE_COUNT 4 + +// TODO +#define CHALLENGE_STATUS_INACTIVE 0 +#define CHALLENGE_STATUS_CANCEL 1 +#define CHALLENGE_STATUS_ONGOING 2 +#define CHALLENGE_STATUS_WON 3 +#define CHALLENGE_STATUS_LOST 4 // Special trainer battles. #define SPECIAL_BATTLE_TOWER 0 @@ -86,9 +95,6 @@ #define FRONTIER_GAMBLER_CHALLENGE_COUNT 12 -// For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. -#define RESULTS_LINK_CONTEST 7 - #define EXCHANGE_CORNER_DECOR1_CLERK 0 #define EXCHANGE_CORNER_DECOR2_CLERK 1 #define EXCHANGE_CORNER_VITAMIN_CLERK 2 diff --git a/include/constants/battle_pike.h b/include/constants/battle_pike.h index e92c4a006..4fb20550e 100644 --- a/include/constants/battle_pike.h +++ b/include/constants/battle_pike.h @@ -10,6 +10,17 @@ #define PIKE_ROOM_HARD_BATTLE 6 #define PIKE_ROOM_DOUBLE_BATTLE 7 #define PIKE_ROOM_BRAIN 8 +#define NUM_PIKE_ROOM_TYPES 9 + +#define PIKE_ROOM_LEFT 0 +#define PIKE_ROOM_CENTER 1 +#define PIKE_ROOM_RIGHT 2 + +#define PIKE_HINT_NOSTALGIA 0 +#define PIKE_HINT_WHISPERING 1 +#define PIKE_HINT_POKEMON 2 +#define PIKE_HINT_PEOPLE 3 +#define PIKE_HINT_BRAIN 4 // For the room with a status effect. #define PIKE_STATUS_KIRLIA 0 @@ -19,8 +30,8 @@ #define BATTLE_PIKE_FUNC_SET_ROOM_TYPE 0 #define BATTLE_PIKE_FUNC_GET_DATA 1 #define BATTLE_PIKE_FUNC_SET_DATA 2 -#define BATTLE_PIKE_FUNC_IN_FINAL_ROOM 3 -#define BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS 4 +#define BATTLE_PIKE_FUNC_IS_FINAL_ROOM 3 +#define BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS 4 #define BATTLE_PIKE_FUNC_GET_ROOM_TYPE 5 #define BATTLE_PIKE_FUNC_6 6 #define BATTLE_PIKE_FUNC_7 7 @@ -34,14 +45,14 @@ #define BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE 15 #define BATTLE_PIKE_FUNC_IS_IN 16 #define BATTLE_PIKE_FUNC_SET_HINT_ROOM 17 -#define BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID 18 +#define BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID 18 #define BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT 19 #define BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS 20 #define BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG 21 #define BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE 22 #define BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN 23 #define BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED 24 -#define BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED 25 +#define BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH 25 #define BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS 26 #define BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS 27 #define BATTLE_PIKE_FUNC_INIT_CHALLENGE 28 diff --git a/include/constants/frontier_util.h b/include/constants/frontier_util.h index 52bde509f..4a4804995 100644 --- a/include/constants/frontier_util.h +++ b/include/constants/frontier_util.h @@ -5,16 +5,24 @@ #define FRONTIER_PLAYER_LOST_TEXT 1 #define FRONTIER_PLAYER_WON_TEXT 2 -#define FRONTIER_UTIL_FUNC_0 0 -#define FRONTIER_UTIL_FUNC_1 1 -#define FRONTIER_UTIL_FUNC_2 2 +// return values for GetFrontierBrainStatus +#define FRONTIER_BRAIN_NOT_READY 0 +#define FRONTIER_BRAIN_SILVER 1 +#define FRONTIER_BRAIN_GOLD 2 +#define FRONTIER_BRAIN_STREAK 3 // for encountering the brain after getting both symbols +#define FRONTIER_BRAIN_STREAK_LONG 4 // + + +#define FRONTIER_UTIL_FUNC_GET_STATUS 0 +#define FRONTIER_UTIL_FUNC_GET_DATA 1 +#define FRONTIER_UTIL_FUNC_SET_DATA 2 #define FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY 3 #define FRONTIER_UTIL_FUNC_SOFT_RESET 4 #define FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS 5 #define FRONTIER_UTIL_FUNC_6 6 #define FRONTIER_UTIL_FUNC_RESULTS_WINDOW 7 #define FRONTIER_UTIL_FUNC_8 8 -#define FRONTIER_UTIL_FUNC_9 9 +#define FRONTIER_UTIL_FUNC_GET_BRAIN_STATUS 9 #define FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN 10 #define FRONTIER_UTIL_FUNC_11 11 #define FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS 12 @@ -26,7 +34,16 @@ #define FRONTIER_UTIL_FUNC_18 18 #define FRONTIER_UTIL_FUNC_19 19 #define FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME 20 -#define FRONTIER_UTIL_FUNC_21 21 +#define FRONTIER_UTIL_FUNC_RESET_SKETCH_MOVES 21 #define FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT 22 +#define FRONTIER_DATA_CHALLENGE_STATUS 0 +#define FRONTIER_DATA_LVL_MODE 1 +#define FRONTIER_DATA_BATTLE_NUM 2 +#define FRONTIER_DATA_3 3 +#define FRONTIER_DATA_4 4 +#define FRONTIER_DATA_BATTLE_OUTCOME 5 +#define FRONTIER_DATA_6 6 +#define FRONTIER_DATA_SYMBOL 7 + #endif // GUARD_CONSTANTS_FRONTIER_UTIL_H diff --git a/include/constants/layouts.h b/include/constants/layouts.h index fe905a2c6..ba20cb3a5 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -352,13 +352,13 @@ #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351 -#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 352 -#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 353 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL 352 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL 353 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 #define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357 -#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358 #define LAYOUT_UNKNOWN_084693AC 359 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index bedaaca2a..14b3f1d56 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -498,9 +498,9 @@ #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS (39 | (26 << 8)) #define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) #define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) #define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) diff --git a/include/frontier_util.h b/include/frontier_util.h index 627b5bef5..adea712e0 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -2,7 +2,7 @@ #define GUARD_FRONTIER_UTIL_H void CallFrontierUtilFunc(void); -u8 sub_81A3610(void); +u8 GetFrontierBrainStatus(void); void CopyFrontierTrainerText(u8 whichText, u16 trainerId); void sub_81A3908(void); u32 GetCurrentFacilityWinStreak(void); diff --git a/include/global.h b/include/global.h index d33be5d82..bcb77aaaf 100644 --- a/include/global.h +++ b/include/global.h @@ -323,7 +323,7 @@ struct BattleFrontier /*0xBE3*/ u8 field_BE0[POKEMON_NAME_LENGTH + 1]; /*0xBEB*/ u8 field_BEB; /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer; - /*0xCA8*/ u8 field_CA8; + /*0xCA8*/ u8 challengeOutcome; /*0xCA9*/ u8 lvlMode:2; // 0x1, 0x2 -> 0x3 /*0xCA9*/ u8 field_CA9_a:1; // 0x4 /*0xCA9*/ u8 field_CA9_b:1; // 0x8 @@ -338,7 +338,7 @@ struct BattleFrontier /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 towerWinStreaks[4][2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; - /*0xD00*/ u16 field_D00; + /*0xD00*/ u16 symbolFlags; /*0xD02*/ u16 field_D02; /*0xD04*/ u16 field_D04; /*0xD06*/ u8 field_D06; diff --git a/include/strings.h b/include/strings.h index 43b87e888..9eddf1a0e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1326,34 +1326,35 @@ extern const u8 gText_FrontierFacilityRoomsCleared[]; extern const u8 gText_FrontierFacilityKOsStreak[]; extern const u8 gText_FrontierFacilityFloorsCleared[]; -extern const u8 gText_082C843F[]; -extern const u8 gText_082C848B[]; -extern const u8 gText_082C8628[]; -extern const u8 gText_082C85B4[]; -extern const u8 gText_082C8512[]; -extern const u8 gText_082C859D[]; -extern const u8 gText_082C86C3[]; -extern const u8 gText_082C8458[]; -extern const u8 gText_082C84C1[]; -extern const u8 gText_082C8662[]; -extern const u8 gText_082C85E3[]; -extern const u8 gText_082C853B[]; -extern const u8 gText_082C85A4[]; -extern const u8 gText_082C86FE[]; -extern const u8 gText_082C846C[]; -extern const u8 gText_082C84D0[]; -extern const u8 gText_082C8682[]; -extern const u8 gText_082C85F5[]; -extern const u8 gText_082C8561[]; -extern const u8 gText_082C85A9[]; -extern const u8 gText_082C8739[]; -extern const u8 gText_082C8480[]; -extern const u8 gText_082C84F7[]; -extern const u8 gText_082C86B3[]; -extern const u8 gText_082C8611[]; -extern const u8 gText_082C8589[]; -extern const u8 gText_082C85AE[]; -extern const u8 gText_082C877B[]; +// Frontier Brain +extern const u8 gText_AnabelWonSilver[]; +extern const u8 gText_TuckerWonSilver[]; +extern const u8 gText_SpenserWonSilver[]; +extern const u8 gText_GretaWonSilver[]; +extern const u8 gText_NolandWonSilver[]; +extern const u8 gText_LucyWonSilver[]; +extern const u8 gText_BrandonWonSilver[]; +extern const u8 gText_AnabelDefeatSilver[]; +extern const u8 gText_TuckerDefeatSilver[]; +extern const u8 gText_SpenserDefeatSilver[]; +extern const u8 gText_GretaDefeatSilver[]; +extern const u8 gText_NolandDefeatSilver[]; +extern const u8 gText_LucyDefeatSilver[]; +extern const u8 gText_BrandonDefeatSilver[]; +extern const u8 gText_AnabelWonGold[]; +extern const u8 gText_TuckerWonGold[]; +extern const u8 gText_SpenserWonGold[]; +extern const u8 gText_GretaWonGold[]; +extern const u8 gText_NolandWonGold[]; +extern const u8 gText_LucyWonGold[]; +extern const u8 gText_BrandonWonGold[]; +extern const u8 gText_AnabelDefeatGold[]; +extern const u8 gText_TuckerDefeatGold[]; +extern const u8 gText_SpenserDefeatGold[]; +extern const u8 gText_GretaDefeatGold[]; +extern const u8 gText_NolandDefeatGold[]; +extern const u8 gText_LucyDefeatGold[]; +extern const u8 gText_BrandonDefeatGold[]; // Battle Tower. extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[]; diff --git a/src/battle_arena.c b/src/battle_arena.c index f785fa7c3..2f11b504b 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -786,7 +786,7 @@ static void InitArenaChallenge(void) bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0; @@ -856,7 +856,7 @@ static void SetArenaData(void) static void sub_81A5AC4(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; sub_81A4C30(); diff --git a/src/battle_dome.c b/src/battle_dome.c index 9c63bba42..234df1947 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -30,6 +30,7 @@ #include "scanline_effect.h" #include "script_pokemon_util_80F87D8.h" #include "graphics.h" +#include "constants/frontier_util.h" #include "constants/species.h" #include "constants/moves.h" #include "constants/trainers.h" @@ -2261,7 +2262,7 @@ static void InitDomeChallenge(void) u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0; @@ -2575,7 +2576,7 @@ static void InitDomeTrainers(void) } } - if (sub_81A3610()) + if (GetFrontierBrainStatus() != FRONTIER_BRAIN_NOT_READY) { for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -3328,7 +3329,7 @@ static void SetDomeOpponentGraphicsId(void) static void sub_81902F8(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; sub_81A4C30(); @@ -6016,7 +6017,7 @@ static void sub_8194F58(void) species[0] = 0; species[1] = 0; species[2] = 0; - if ((gSaveBlock2Ptr->frontier.field_D0A != -gSaveBlock2Ptr->frontier.field_D0B) && gSaveBlock2Ptr->frontier.field_CA8 != 1) + if ((gSaveBlock2Ptr->frontier.field_D0A != -gSaveBlock2Ptr->frontier.field_D0B) && gSaveBlock2Ptr->frontier.challengeOutcome != 1) return; statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); diff --git a/src/battle_factory.c b/src/battle_factory.c index bc47b1fda..44a82b39c 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -187,7 +187,7 @@ static void InitFactoryChallenge(void) u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0; @@ -254,7 +254,7 @@ static void SetBattleFactoryData(void) static void sub_81A613C(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; sub_81A4C30(); diff --git a/src/battle_palace.c b/src/battle_palace.c index fb8cc0729..61ccfedfd 100644 --- a/src/battle_palace.c +++ b/src/battle_palace.c @@ -62,7 +62,7 @@ static void sub_8195980(void) u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0; @@ -156,7 +156,7 @@ static void sub_8195C7C(void) static void sub_8195CE4(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; sub_81A4C30(); diff --git a/src/battle_pike.c b/src/battle_pike.c index 36bf8dcbf..575c4235b 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -51,7 +51,7 @@ static u8 sNpcId; static void SetRoomType(void); static void GetBattlePikeData(void); static void SetBattlePikeData(void); -static void GetInFinalRoom(void); +static void IsNextRoomFinal(void); static void SetupRoomEventObjects(void); static void GetRoomType(void); static void sub_81A7400(void); @@ -72,8 +72,8 @@ static void ClearPikeTrainerIds(void); static void BufferRecordMixingTrainerMessage(void); static void GetCurrentRoomPikeQueenFightType(void); static void HealSomeMonsBeforePikeQueen(void); -static void SetHealingRoomsDisabled(void); -static void CanAnyPartyMonsBeHealed(void); +static void SetHealingroomTypesDisabled(void); +static void IsPartyFullHealed(void); static void BackupMonHeldItems(void); static void RestoreMonHeldItems(void); static void InitPikeChallenge(void); @@ -419,7 +419,7 @@ static const struct PikeRoomNPC sNPCTable[] = } }; -static const u16 sNPCSpeeches[][6] = +static const u16 sNPCSpeeches[][EASY_CHAT_BATTLE_WORDS_COUNT] = { {EC_WORD_I_AM, EC_WORD_LOST, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, {EC_WORD_I_VE, EC_WORD_NO, EC_WORD_SENSE, EC_WORD_OF, EC_WORD_WHERE, EC_WORD_I_AM}, @@ -465,61 +465,61 @@ static const u16 sNPCSpeeches[][6] = {EC_MOVE2(TOXIC), EC_WORD_IS, EC_WORD_A, EC_WORD_TERRIBLE, EC_WORD_THING, EC_WORD_ISN_T_IT_QUES}, }; -// Only the 5th array in this data is used by the code. -static const u8 sPikeQueenWinStreakAppearances[][4] = +// Table duplicated from frontier_util, only Battle Pike entry used +static const u8 sFrontierBrainStreakAppearances[NUM_FRONTIER_FACILITIES][4] = { - {35, 70, 35, 1}, - { 4, 9, 5, 0}, - {21, 42, 21, 1}, - {28, 56, 28, 1}, - {21, 42, 21, 1}, - {28, 140, 56, 1}, - {21, 70, 35, 0}, + [FRONTIER_FACILITY_TOWER] = {35, 70, 35, 1}, + [FRONTIER_FACILITY_DOME] = { 4, 9, 5, 0}, + [FRONTIER_FACILITY_PALACE] = {21, 42, 21, 1}, + [FRONTIER_FACILITY_ARENA] = {28, 56, 28, 1}, + [FRONTIER_FACILITY_FACTORY] = {21, 42, 21, 1}, + [FRONTIER_FACILITY_PIKE] = {28, 140, 56, 1}, + [FRONTIER_FACILITY_PYRAMID] = {21, 70, 35, 0}, }; static void (* const sBattlePikeFunctions[])(void) = { - SetRoomType, - GetBattlePikeData, - SetBattlePikeData, - GetInFinalRoom, - SetupRoomEventObjects, - GetRoomType, - sub_81A7400, - sub_81A740C, - sub_81A7418, - nullsub_76, - nullsub_124, - GetRoomInflictedStatus, - GetRoomInflictedStatusMon, - HealOneOrTwoMons, - BufferNPCMessage, - StatusInflictionScreenFade, - GetInBattlePike, - SetHintedRoom, - GetHintedRoomIndex, - GetRoomTypeHint, - ClearPikeTrainerIds, - BufferRecordMixingTrainerMessage, - GetCurrentRoomPikeQueenFightType, - HealSomeMonsBeforePikeQueen, - SetHealingRoomsDisabled, - CanAnyPartyMonsBeHealed, - BackupMonHeldItems, - RestoreMonHeldItems, - InitPikeChallenge + [BATTLE_PIKE_FUNC_SET_ROOM_TYPE] = SetRoomType, + [BATTLE_PIKE_FUNC_GET_DATA] = GetBattlePikeData, + [BATTLE_PIKE_FUNC_SET_DATA] = SetBattlePikeData, + [BATTLE_PIKE_FUNC_IS_FINAL_ROOM] = IsNextRoomFinal, + [BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS] = SetupRoomEventObjects, + [BATTLE_PIKE_FUNC_GET_ROOM_TYPE] = GetRoomType, + [BATTLE_PIKE_FUNC_6] = sub_81A7400, + [BATTLE_PIKE_FUNC_7] = sub_81A740C, + [BATTLE_PIKE_FUNC_8] = sub_81A7418, + [BATTLE_PIKE_FUNC_NULL_9] = nullsub_76, + [BATTLE_PIKE_FUNC_NULL_10] = nullsub_124, + [BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus, + [BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON] = GetRoomInflictedStatusMon, + [BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS] = HealOneOrTwoMons, + [BATTLE_PIKE_FUNC_BUFFER_NPC_MSG] = BufferNPCMessage, + [BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE] = StatusInflictionScreenFade, + [BATTLE_PIKE_FUNC_IS_IN] = GetInBattlePike, + [BATTLE_PIKE_FUNC_SET_HINT_ROOM] = SetHintedRoom, + [BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID] = GetHintedRoomIndex, + [BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT] = GetRoomTypeHint, + [BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS] = ClearPikeTrainerIds, + [BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG] = BufferRecordMixingTrainerMessage, + [BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE] = GetCurrentRoomPikeQueenFightType, + [BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN] = HealSomeMonsBeforePikeQueen, + [BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED] = SetHealingroomTypesDisabled, + [BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH] = IsPartyFullHealed, + [BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS] = BackupMonHeldItems, + [BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS] = RestoreMonHeldItems, + [BATTLE_PIKE_FUNC_INIT_CHALLENGE] = InitPikeChallenge }; static const u8 sRoomTypeHints[] = { - 3, // PIKE_ROOM_SINGLE_BATTLE - 3, // PIKE_ROOM_HEAL_FULL - 1, // PIKE_ROOM_NPC - 0, // PIKE_ROOM_STATUS - 0, // PIKE_ROOM_HEAL_PART - 2, // PIKE_ROOM_WILD_MONS - 2, // PIKE_ROOM_HARD_BATTLE - 1, // PIKE_ROOM_DOUBLE_BATTLE - 4, // PIKE_ROOM_BRAIN + PIKE_HINT_PEOPLE, // PIKE_ROOM_SINGLE_BATTLE + PIKE_HINT_PEOPLE, // PIKE_ROOM_HEAL_FULL + PIKE_HINT_WHISPERING, // PIKE_ROOM_NPC + PIKE_HINT_NOSTALGIA, // PIKE_ROOM_STATUS + PIKE_HINT_NOSTALGIA, // PIKE_ROOM_HEAL_PART + PIKE_HINT_POKEMON, // PIKE_ROOM_WILD_MONS + PIKE_HINT_POKEMON, // PIKE_ROOM_HARD_BATTLE + PIKE_HINT_WHISPERING, // PIKE_ROOM_DOUBLE_BATTLE + PIKE_HINT_BRAIN, // PIKE_ROOM_BRAIN }; static const u8 sNumMonsToHealBeforePikeQueen[][3] = @@ -683,7 +683,7 @@ static void SetBattlePikeData(void) } } -static void GetInFinalRoom(void) +static void IsNextRoomFinal(void) { if (gSaveBlock2Ptr->frontier.curChallengeBattleNum > 14) gSpecialVar_Result = TRUE; @@ -708,7 +708,7 @@ static void sub_81A740C(void) static void sub_81A7418(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; save_serialize_map(); @@ -1014,10 +1014,10 @@ static bool8 AtLeastOneHealthyMon(void) static u8 GetNextRoomType(void) { - u8 roomTypesAvailability[8]; + bool8 roomTypesDisabled[NUM_PIKE_ROOM_TYPES - 1]; // excludes Brain room, which cant be disabled u8 i; u8 nextRoomType; - u8 roomTypeGroup; + u8 roomHint; u8 numRoomCandidates; u8 *roomCandidates; u8 id; @@ -1033,54 +1033,54 @@ static u8 GetNextRoomType(void) return gSaveBlock2Ptr->frontier.pikeHintedRoomType; } - for (i = 0; i < 8; i++) - roomTypesAvailability[i] = 0; + for (i = 0; i < ARRAY_COUNT(roomTypesDisabled); i++) + roomTypesDisabled[i] = FALSE; - numRoomCandidates = 8; + numRoomCandidates = NUM_PIKE_ROOM_TYPES - 1; - // The room types associated with the lady's hint cannot be in the other two rooms. - roomTypeGroup = sRoomTypeHints[gSaveBlock2Ptr->frontier.pikeHintedRoomType]; - for (i = 0; i < 8; i++) + // The other two room types cannot be the same type as the one associated with the lady's hint + roomHint = sRoomTypeHints[gSaveBlock2Ptr->frontier.pikeHintedRoomType]; + for (i = 0; i < ARRAY_COUNT(roomTypesDisabled); i++) { - if (sRoomTypeHints[i] == roomTypeGroup) + if (sRoomTypeHints[i] == roomHint) { - roomTypesAvailability[i] = 1; + roomTypesDisabled[i] = TRUE; numRoomCandidates--; } } // Remove room type candidates that would have no effect on the player's party. - if (roomTypesAvailability[PIKE_ROOM_DOUBLE_BATTLE] != 1 && !AtLeastTwoAliveMons()) + if (roomTypesDisabled[PIKE_ROOM_DOUBLE_BATTLE] != TRUE && !AtLeastTwoAliveMons()) { - roomTypesAvailability[PIKE_ROOM_DOUBLE_BATTLE] = 1; + roomTypesDisabled[PIKE_ROOM_DOUBLE_BATTLE] = TRUE; numRoomCandidates--; } - if (roomTypesAvailability[PIKE_ROOM_STATUS] != 1 && !AtLeastOneHealthyMon()) + if (roomTypesDisabled[PIKE_ROOM_STATUS] != TRUE && !AtLeastOneHealthyMon()) { - roomTypesAvailability[PIKE_ROOM_STATUS] = 1; + roomTypesDisabled[PIKE_ROOM_STATUS] = TRUE; numRoomCandidates--; } // Remove healing room type candidates if healing rooms are disabled. if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) { - if (roomTypesAvailability[PIKE_ROOM_HEAL_FULL] != 1) + if (roomTypesDisabled[PIKE_ROOM_HEAL_FULL] != TRUE) { - roomTypesAvailability[PIKE_ROOM_HEAL_FULL] = 1; + roomTypesDisabled[PIKE_ROOM_HEAL_FULL] = TRUE; numRoomCandidates--; } - if (roomTypesAvailability[PIKE_ROOM_HEAL_PART] != 1) + if (roomTypesDisabled[PIKE_ROOM_HEAL_PART] != TRUE) { - roomTypesAvailability[PIKE_ROOM_HEAL_PART] = 1; + roomTypesDisabled[PIKE_ROOM_HEAL_PART] = TRUE; numRoomCandidates--; } } roomCandidates = AllocZeroed(numRoomCandidates); id = 0; - for (i = 0; i < 8; i++) + for (i = 0; i < ARRAY_COUNT(roomTypesDisabled); i++) { - if (roomTypesAvailability[i] == 0) + if (roomTypesDisabled[i] == FALSE) roomCandidates[id++] = i; } @@ -1098,6 +1098,7 @@ static u16 GetNPCRoomGraphicsId(void) return sNPCTable[sNpcId].graphicsId; } +// Unused static u8 sub_81A7B84(void) { return sUnknown_0300128E; @@ -1323,8 +1324,8 @@ static void GetInBattlePike(void) bool8 InBattlePike(void) { return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM - || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC; } @@ -1344,9 +1345,9 @@ static void SetHintedRoom(void) { gSaveBlock2Ptr->frontier.pikeHintedRoomIndex = Random() % 3; if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) - count = 6; + count = NUM_PIKE_ROOM_TYPES - 3; // exclude healing rooms and Brain room else - count = 8; + count = NUM_PIKE_ROOM_TYPES - 1; // exclude Brain room roomCandidates = AllocZeroed(count); for (i = 0, id = 0; i < count; i++) @@ -1373,9 +1374,6 @@ static void SetHintedRoom(void) static void GetHintedRoomIndex(void) { - // 0 = left room - // 1 = center room - // 2 = right room gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikeHintedRoomIndex; } @@ -1500,7 +1498,7 @@ static u8 GetPikeQueenFightType(u8 nextRoom) { u8 numPikeSymbols; - u8 var = 5; + u8 facility = FRONTIER_FACILITY_PIKE; u8 ret = 0; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u16 winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode]; @@ -1511,16 +1509,16 @@ static u8 GetPikeQueenFightType(u8 nextRoom) { case 0: case 1: - if (winStreak == sPikeQueenWinStreakAppearances[var][numPikeSymbols] - sPikeQueenWinStreakAppearances[var][3]) + if (winStreak == sFrontierBrainStreakAppearances[facility][numPikeSymbols] - sFrontierBrainStreakAppearances[facility][3]) ret = numPikeSymbols + 1; break; case 2: default: - if (winStreak == sPikeQueenWinStreakAppearances[var][0] - sPikeQueenWinStreakAppearances[var][3]) + if (winStreak == sFrontierBrainStreakAppearances[facility][0] - sFrontierBrainStreakAppearances[facility][3]) ret = 3; - else if (winStreak == sPikeQueenWinStreakAppearances[var][1] - sPikeQueenWinStreakAppearances[var][3] - || (winStreak > sPikeQueenWinStreakAppearances[var][1] - && (winStreak - sPikeQueenWinStreakAppearances[var][1] + sPikeQueenWinStreakAppearances[var][3]) % sPikeQueenWinStreakAppearances[var][2] == 0)) + else if (winStreak == sFrontierBrainStreakAppearances[facility][1] - sFrontierBrainStreakAppearances[facility][3] + || (winStreak > sFrontierBrainStreakAppearances[facility][1] + && (winStreak - sFrontierBrainStreakAppearances[facility][1] + sFrontierBrainStreakAppearances[facility][3]) % sFrontierBrainStreakAppearances[facility][2] == 0)) ret = 4; break; } @@ -1541,17 +1539,17 @@ static void HealSomeMonsBeforePikeQueen(void) gSpecialVar_Result = toHealCount; } -static void SetHealingRoomsDisabled(void) +static void SetHealingroomTypesDisabled(void) { gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled = gSpecialVar_0x8005; } -static void CanAnyPartyMonsBeHealed(void) +static void IsPartyFullHealed(void) { u8 i, j; gSpecialVar_Result = TRUE; - for (i = 0; i < 3; i++) + for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { bool32 canBeHealed = FALSE; struct Pokemon *mon = &gPlayerParty[i]; @@ -1613,7 +1611,7 @@ static void InitPikeChallenge(void) { u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; if (!(gSaveBlock2Ptr->frontier.field_CDC & gUnknown_08612690[lvlMode])) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 6dcd4063b..99076f173 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -842,7 +842,7 @@ static void InitPyramidChallenge(void) bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; if (lvlMode != FRONTIER_LVL_50) @@ -930,7 +930,7 @@ static void SetBattlePyramidData(void) static void sub_81A9134(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; save_serialize_map(); @@ -1434,7 +1434,7 @@ void sub_81A9E90(void) if (InBattlePyramid()) { RestorePyramidPlayerParty(); - gSaveBlock2Ptr->frontier.field_CA8 = 2; + gSaveBlock2Ptr->frontier.challengeOutcome = 2; VarSet(VAR_TEMP_E, 0); LoadPlayerParty(); } diff --git a/src/battle_tent.c b/src/battle_tent.c index 34e3e9628..f9385571f 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -98,7 +98,7 @@ void sub_81B99B4(void) static void sub_81B99D4(void) { - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); @@ -128,7 +128,7 @@ static void sub_81B9A90(void) static void sub_81B9ABC(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; sub_81A4C30(); @@ -160,7 +160,7 @@ void sub_81B9B80(void) static void sub_81B9BA0(void) { - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); @@ -178,7 +178,7 @@ static void sub_81B9C10(void) static void sub_81B9C2C(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; sub_81A4C30(); @@ -215,7 +215,7 @@ void sub_81B9D08(void) static void sub_81B9D28(void) { - gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.challengeOutcome = 0; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); @@ -233,7 +233,7 @@ static void sub_81B9D98(void) static void sub_81B9DB4(void) { - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; sub_81A4C30(); diff --git a/src/battle_tower.c b/src/battle_tower.c index aa4ca84e6..151610035 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -1156,7 +1156,7 @@ static void sub_8161F94(void) u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); - gSaveBlock2Ptr->frontier.field_CA8 = 1; + gSaveBlock2Ptr->frontier.challengeOutcome = 1; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 0; gSaveBlock2Ptr->frontier.field_CA9_a = 0; gSaveBlock2Ptr->frontier.field_CA9_b = 0; @@ -2428,7 +2428,7 @@ static void SaveBattleTowerProgress(void) if (gSpecialVar_0x8005 == 0 && (challengeNum > 1 || gSaveBlock2Ptr->frontier.curChallengeBattleNum != 0)) sub_8163EE4(); - gSaveBlock2Ptr->frontier.field_CA8 =gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.challengeOutcome =gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.field_CA9_a = 1; sub_81A4C30(); @@ -3158,7 +3158,7 @@ static void CopyEReaderTrainerFarewellMessage(void) void sub_81653CC(void) { - if (gSaveBlock2Ptr->frontier.field_CA8 == 1) + if (gSaveBlock2Ptr->frontier.challengeOutcome == 1) sub_80F01B8(); if (FlagGet(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE) == TRUE) { diff --git a/src/frontier_pass.c b/src/frontier_pass.c index d8b36ffbd..33ac5b0fe 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1553,9 +1553,9 @@ static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a fro else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_LOBBY) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM) - || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1) - || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2) - || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3)) + || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL) + || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL) + || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS)) return FRONTIER_FACILITY_PIKE + 1; else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) diff --git a/src/frontier_util.c b/src/frontier_util.c index 87aff022e..138b678ed 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -49,16 +49,16 @@ struct FrontierBrainMon }; // This file's functions. -static void sub_81A17A0(void); -static void sub_81A1830(void); -static void sub_81A1968(void); +static void GetChallengeStatus(void); +static void GetFrontierData(void); +static void SetFrontierData(void); static void LoadSelectedParty(void); static void DoSoftReset_(void); static void SetFrontierTrainers(void); static void sub_81A1B38(void); static void ShowFacilityResultsWindow(void); static void sub_81A31FC(void); -static void sub_81A35EC(void); +static void Script_GetFrontierBrainStatus(void); static void IsTrainerFrontierBrain(void); static void sub_81A3B64(void); static void GetFacilitySymbolCount(void); @@ -70,7 +70,7 @@ static void sub_81A4230(void); static void sub_81A43A8(void); static void sub_81A4410(void); static void BufferFrontierTrainerName(void); -static void sub_81A447C(void); +static void ResetSketchedMoves(void); static void SetFacilityBrainEventObject(void); static void ShowTowerResultsWindow(u8); static void ShowDomeResultsWindow(u8); @@ -83,15 +83,15 @@ static void ShowLinkContestResultsWindow(void); static void CopyFrontierBrainText(bool8 playerWonText); // const rom data -static const u8 gUnknown_08611550[][4] = -{ - [FRONTIER_FACILITY_TOWER] = {0x23, 0x46, 0x23, 0x01}, - [FRONTIER_FACILITY_DOME] = {0x04, 0x09, 0x05, 0x00}, - [FRONTIER_FACILITY_PALACE] = {0x15, 0x2a, 0x15, 0x01}, - [FRONTIER_FACILITY_ARENA] = {0x1c, 0x38, 0x1c, 0x01}, - [FRONTIER_FACILITY_FACTORY] = {0x15, 0x2a, 0x15, 0x01}, - [FRONTIER_FACILITY_PIKE] = {0x1c, 0x8c, 0x38, 0x01}, - [FRONTIER_FACILITY_PYRAMID] = {0x15, 0x46, 0x23, 0x00}, +static const u8 sFrontierBrainStreakAppearances[NUM_FRONTIER_FACILITIES][4] = +{ + [FRONTIER_FACILITY_TOWER] = {35, 70, 35, 1}, + [FRONTIER_FACILITY_DOME] = { 4, 9, 5, 0}, + [FRONTIER_FACILITY_PALACE] = {21, 42, 21, 1}, + [FRONTIER_FACILITY_ARENA] = {28, 56, 28, 1}, + [FRONTIER_FACILITY_FACTORY] = {21, 42, 21, 1}, + [FRONTIER_FACILITY_PIKE] = {28, 140, 56, 1}, + [FRONTIER_FACILITY_PYRAMID] = {21, 70, 35, 0}, }; static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = @@ -104,7 +104,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_ALAKAZAM, .heldItem = ITEM_BRIGHT_POWDER, .fixedIV = 24, - .nature = 15, + .nature = NATURE_MODEST, .evs = {106, 0, 152, 152, 100, 0}, .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_DISABLE}, }, @@ -112,7 +112,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_ENTEI, .heldItem = ITEM_LUM_BERRY, .fixedIV = 24, - .nature = 1, + .nature = NATURE_LONELY, .evs = {100, 152, 152, 0, 100, 6}, .moves = {MOVE_FIRE_BLAST, MOVE_CALM_MIND, MOVE_RETURN, MOVE_ROAR}, }, @@ -120,7 +120,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SNORLAX, .heldItem = ITEM_QUICK_CLAW, .fixedIV = 24, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {152, 152, 0, 0, 106, 100}, .moves = {MOVE_BODY_SLAM, MOVE_BELLY_DRUM, MOVE_YAWN, MOVE_SHADOW_BALL}, }, @@ -131,7 +131,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_RAIKOU, .heldItem = ITEM_LUM_BERRY, .fixedIV = 31, - .nature = 15, + .nature = NATURE_MODEST, .evs = {158, 0, 252, 100, 0, 0}, .moves = {MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_REFLECT, MOVE_REST}, }, @@ -139,7 +139,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_LATIOS, .heldItem = ITEM_BRIGHT_POWDER, .fixedIV = 31, - .nature = 15, + .nature = NATURE_MODEST, .evs = {252, 0, 252, 6, 0, 0}, .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_RECOVER, MOVE_DRAGON_CLAW}, }, @@ -147,7 +147,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SNORLAX, .heldItem = ITEM_CHESTO_BERRY, .fixedIV = 31, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {252, 252, 0, 0, 6, 0}, .moves = {MOVE_CURSE, MOVE_RETURN, MOVE_REST, MOVE_SHADOW_BALL}, }, @@ -161,7 +161,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SWAMPERT, .heldItem = ITEM_FOCUS_BAND, .fixedIV = 20, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {152, 152, 106, 0, 100, 0}, .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER}, }, @@ -169,7 +169,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SALAMENCE, .heldItem = ITEM_LUM_BERRY, .fixedIV = 20, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {152, 152, 106, 100, 0, 0}, .moves = {MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE}, }, @@ -177,7 +177,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_CHARIZARD, .heldItem = ITEM_WHITE_HERB, .fixedIV = 20, - .nature = 17, + .nature = NATURE_QUIET, .evs = {100, 152, 106, 152, 0, 0}, .moves = {MOVE_OVERHEAT, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE, MOVE_EARTHQUAKE}, }, @@ -188,7 +188,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SWAMPERT, .heldItem = ITEM_LEFTOVERS, .fixedIV = 31, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {252, 252, 6, 0, 0, 0}, .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, }, @@ -196,7 +196,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_METAGROSS, .heldItem = ITEM_QUICK_CLAW, .fixedIV = 31, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {252, 252, 6, 0, 0, 0}, .moves = {MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_PROTECT}, }, @@ -204,7 +204,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_LATIAS, .heldItem = ITEM_CHESTO_BERRY, .fixedIV = 31, - .nature = 15, + .nature = NATURE_MODEST, .evs = {252, 0, 252, 6, 0, 0}, .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_REST}, }, @@ -218,7 +218,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_CROBAT, .heldItem = ITEM_BRIGHT_POWDER, .fixedIV = 16, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {152, 0, 0, 152, 100, 106}, .moves = {MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_FLY}, }, @@ -226,7 +226,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SLAKING, .heldItem = ITEM_SCOPE_LENS, .fixedIV = 16, - .nature = 0, + .nature = NATURE_HARDY, .evs = {152, 152, 0, 106, 100, 0}, .moves = {MOVE_EARTHQUAKE, MOVE_SWAGGER, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK}, }, @@ -234,7 +234,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_LAPRAS, .heldItem = ITEM_QUICK_CLAW, .fixedIV = 16, - .nature = 17, + .nature = NATURE_QUIET, .evs = {0, 0, 252, 0, 106, 152}, .moves = {MOVE_ICE_BEAM, MOVE_HORN_DRILL, MOVE_CONFUSE_RAY, MOVE_PROTECT}, }, @@ -245,7 +245,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_ARCANINE, .heldItem = ITEM_WHITE_HERB, .fixedIV = 31, - .nature = 11, + .nature = NATURE_HASTY, .evs = {6, 252, 252, 0, 0, 0}, .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_ROAR, MOVE_PROTECT}, }, @@ -253,7 +253,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SLAKING, .heldItem = ITEM_SCOPE_LENS, .fixedIV = 31, - .nature = 0, + .nature = NATURE_HARDY, .evs = {6, 252, 0, 252, 0, 0}, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_YAWN}, }, @@ -261,7 +261,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SUICUNE, .heldItem = ITEM_KINGS_ROCK, .fixedIV = 31, - .nature = 11, + .nature = NATURE_HASTY, .evs = {252, 0, 252, 6, 0, 0}, .moves = {MOVE_BLIZZARD, MOVE_SURF, MOVE_BITE, MOVE_CALM_MIND}, }, @@ -275,7 +275,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_HERACROSS, .heldItem = ITEM_SALAC_BERRY, .fixedIV = 20, - .nature = 13, + .nature = NATURE_JOLLY, .evs = {106, 152, 0, 152, 0, 100}, .moves = {MOVE_MEGAHORN, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL}, }, @@ -283,7 +283,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_UMBREON, .heldItem = ITEM_LEFTOVERS, .fixedIV = 20, - .nature = 20, + .nature = NATURE_CALM, .evs = {152, 0, 100, 0, 152, 106}, .moves = {MOVE_BODY_SLAM, MOVE_CONFUSE_RAY, MOVE_PSYCHIC, MOVE_FAINT_ATTACK}, }, @@ -291,7 +291,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SHEDINJA, .heldItem = ITEM_BRIGHT_POWDER, .fixedIV = 20, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {0, 252, 6, 252, 0, 0}, .moves = {MOVE_SHADOW_BALL, MOVE_RETURN, MOVE_CONFUSE_RAY, MOVE_AERIAL_ACE}, }, @@ -302,7 +302,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_UMBREON, .heldItem = ITEM_CHESTO_BERRY, .fixedIV = 31, - .nature = 20, + .nature = NATURE_CALM, .evs = {252, 0, 0, 0, 252, 6}, .moves = {MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_REST, MOVE_PSYCHIC}, }, @@ -310,7 +310,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_GENGAR, .heldItem = ITEM_LEFTOVERS, .fixedIV = 31, - .nature = 15, + .nature = NATURE_MODEST, .evs = {252, 0, 252, 0, 6, 0}, .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_DESTINY_BOND}, }, @@ -318,7 +318,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_BRELOOM, .heldItem = ITEM_LUM_BERRY, .fixedIV = 31, - .nature = 13, + .nature = NATURE_JOLLY, .evs = {6, 252, 0, 252, 0, 0}, .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_HEADBUTT}, }, @@ -333,7 +333,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_METANG, .heldItem = ITEM_SITRUS_BERRY, .fixedIV = 31, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {0, 252, 252, 0, 6, 0}, .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_METAL_CLAW}, }, @@ -341,7 +341,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SKARMORY, .heldItem = ITEM_SITRUS_BERRY, .fixedIV = 31, - .nature = 8, + .nature = NATURE_IMPISH, .evs = {252, 0, 0, 0, 6, 252}, .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_PROTECT, MOVE_STEEL_WING}, }, @@ -349,7 +349,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_AGGRON, .heldItem = ITEM_SITRUS_BERRY, .fixedIV = 31, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {0, 252, 0, 0, 252, 6}, .moves = {MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW}, }, @@ -359,7 +359,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_METANG, .heldItem = ITEM_SITRUS_BERRY, .fixedIV = 31, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {0, 252, 252, 0, 6, 0}, .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_METAL_CLAW}, }, @@ -367,7 +367,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SKARMORY, .heldItem = ITEM_SITRUS_BERRY, .fixedIV = 31, - .nature = 8, + .nature = NATURE_IMPISH, .evs = {252, 0, 0, 0, 6, 252}, .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_PROTECT, MOVE_STEEL_WING}, }, @@ -375,7 +375,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_AGGRON, .heldItem = ITEM_SITRUS_BERRY, .fixedIV = 31, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {0, 252, 0, 0, 252, 6}, .moves = {MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW}, }, @@ -389,7 +389,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SEVIPER, .heldItem = ITEM_QUICK_CLAW, .fixedIV = 16, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {252, 0, 252, 0, 6, 0}, .moves = {MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_FANG, MOVE_GIGA_DRAIN}, }, @@ -397,7 +397,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SHUCKLE, .heldItem = ITEM_CHESTO_BERRY, .fixedIV = 16, - .nature = 5, + .nature = NATURE_BOLD, .evs = {252, 0, 0, 0, 106, 252}, .moves = {MOVE_TOXIC, MOVE_SANDSTORM, MOVE_PROTECT, MOVE_REST}, }, @@ -405,7 +405,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_MILOTIC, .heldItem = ITEM_LEFTOVERS, .fixedIV = 16, - .nature = 15, + .nature = NATURE_MODEST, .evs = {152, 0, 100, 0, 152, 106}, .moves = {MOVE_ICE_BEAM, MOVE_MIRROR_COAT, MOVE_SURF, MOVE_RECOVER}, }, @@ -416,7 +416,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_SEVIPER, .heldItem = ITEM_FOCUS_BAND, .fixedIV = 31, - .nature = 5, + .nature = NATURE_BOLD, .evs = {252, 0, 0, 0, 252, 6}, .moves = {MOVE_SWAGGER, MOVE_CRUNCH, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN}, }, @@ -424,7 +424,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_STEELIX, .heldItem = ITEM_BRIGHT_POWDER, .fixedIV = 31, - .nature = 2, + .nature = NATURE_BRAVE, .evs = {252, 0, 0, 0, 6, 252}, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION, MOVE_SCREECH}, }, @@ -432,7 +432,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_GYARADOS, .heldItem = ITEM_CHESTO_BERRY, .fixedIV = 31, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {252, 6, 0, 0, 0, 252}, .moves = {MOVE_DRAGON_DANCE, MOVE_RETURN, MOVE_ROAR, MOVE_REST}, }, @@ -446,7 +446,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_REGIROCK, .heldItem = ITEM_QUICK_CLAW, .fixedIV = 16, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {152, 152, 0, 0, 106, 100}, .moves = {MOVE_EXPLOSION, MOVE_SUPERPOWER, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER}, }, @@ -454,7 +454,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_REGISTEEL, .heldItem = ITEM_LEFTOVERS, .fixedIV = 16, - .nature = 3, + .nature = NATURE_ADAMANT, .evs = {152, 152, 0, 0, 6, 200}, .moves = {MOVE_EARTHQUAKE, MOVE_METAL_CLAW, MOVE_TOXIC, MOVE_IRON_DEFENSE}, }, @@ -462,7 +462,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_REGICE, .heldItem = ITEM_CHESTO_BERRY, .fixedIV = 16, - .nature = 15, + .nature = NATURE_MODEST, .evs = {106, 0, 152, 0, 100, 152}, .moves = {MOVE_ICE_BEAM, MOVE_AMNESIA, MOVE_THUNDER, MOVE_REST}, }, @@ -473,7 +473,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_ARTICUNO, .heldItem = ITEM_SCOPE_LENS, .fixedIV = 31, - .nature = 16, + .nature = NATURE_MILD, .evs = {6, 0, 252, 252, 0, 0}, .moves = {MOVE_BLIZZARD, MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_REFLECT}, }, @@ -481,7 +481,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_ZAPDOS, .heldItem = ITEM_LUM_BERRY, .fixedIV = 31, - .nature = 16, + .nature = NATURE_MILD, .evs = {6, 0, 252, 252, 0, 0}, .moves = {MOVE_THUNDER, MOVE_DETECT, MOVE_DRILL_PECK, MOVE_LIGHT_SCREEN}, }, @@ -489,7 +489,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = .species = SPECIES_MOLTRES, .heldItem = ITEM_BRIGHT_POWDER, .fixedIV = 31, - .nature = 16, + .nature = NATURE_MILD, .evs = {6, 0, 252, 252, 0, 0}, .moves = {MOVE_FIRE_BLAST, MOVE_HYPER_BEAM, MOVE_AERIAL_ACE, MOVE_SAFEGUARD}, }, @@ -497,7 +497,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] = }, }; -static const u8 gUnknown_086118B4[][7][4] = +static const u8 sBattlePointAwards[][NUM_FRONTIER_FACILITIES][FRONTIER_MODE_COUNT] = { { {1, 2, 3, 3}, {1, 1, 0, 0}, {4, 5, 0, 0}, {1, 0, 0, 0}, {3, 4, 0, 0}, {1, 0, 0, 0}, {5, 0, 0, 0} @@ -591,7 +591,7 @@ static const u8 gUnknown_086118B4[][7][4] = }, }; -static const u16 gUnknown_08611BFC[][2] = +static const u16 sFacilitySymbolBitFlags[NUM_FRONTIER_FACILITIES][2] = { [FRONTIER_FACILITY_TOWER] = {0x0001, 0x0002}, [FRONTIER_FACILITY_DOME] = {0x0004, 0x0008}, @@ -604,16 +604,16 @@ static const u16 gUnknown_08611BFC[][2] = static void (* const sFrontierUtilFuncs[])(void) = { - [FRONTIER_UTIL_FUNC_0] = sub_81A17A0, - [FRONTIER_UTIL_FUNC_1] = sub_81A1830, - [FRONTIER_UTIL_FUNC_2] = sub_81A1968, + [FRONTIER_UTIL_FUNC_GET_STATUS] = GetChallengeStatus, + [FRONTIER_UTIL_FUNC_GET_DATA] = GetFrontierData, + [FRONTIER_UTIL_FUNC_SET_DATA] = SetFrontierData, [FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY] = LoadSelectedParty, [FRONTIER_UTIL_FUNC_SOFT_RESET] = DoSoftReset_, [FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS] = SetFrontierTrainers, [FRONTIER_UTIL_FUNC_6] = sub_81A1B38, [FRONTIER_UTIL_FUNC_RESULTS_WINDOW] = ShowFacilityResultsWindow, [FRONTIER_UTIL_FUNC_8] = sub_81A31FC, - [FRONTIER_UTIL_FUNC_9] = sub_81A35EC, + [FRONTIER_UTIL_FUNC_GET_BRAIN_STATUS] = Script_GetFrontierBrainStatus, [FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN] = IsTrainerFrontierBrain, [FRONTIER_UTIL_FUNC_11] = sub_81A3B64, [FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS] = GetFacilitySymbolCount, @@ -625,7 +625,7 @@ static void (* const sFrontierUtilFuncs[])(void) = [FRONTIER_UTIL_FUNC_18] = sub_81A43A8, [FRONTIER_UTIL_FUNC_19] = sub_81A4410, [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName, - [FRONTIER_UTIL_FUNC_21] = sub_81A447C, + [FRONTIER_UTIL_FUNC_RESET_SKETCH_MOVES] = ResetSketchedMoves, [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainEventObject, }; @@ -663,7 +663,7 @@ static const struct WindowTemplate gUnknown_08611C84 = }; // Second field - whether the character is female. -static const u8 sFacilityToBrainEventObjGfx[][2] = +static const u8 sFrontierBrainObjEventGfx[NUM_FRONTIER_FACILITIES][2] = { [FRONTIER_FACILITY_TOWER] = {EVENT_OBJ_GFX_ANABEL, TRUE}, [FRONTIER_FACILITY_DOME] = {EVENT_OBJ_GFX_TUCKER, FALSE}, @@ -714,7 +714,7 @@ static const u8 *const sHallFacilityToRecordsText[] = [RANKING_HALL_BATTLE_TOWER_LINK] = gText_FrontierFacilityWinStreak, }; -static const u16 gFacilityToBrainTrainerId[] = +static const u16 sFrontierBrainTrainerIds[NUM_FRONTIER_FACILITIES] = { [FRONTIER_FACILITY_TOWER] = TRAINER_ANABEL, [FRONTIER_FACILITY_DOME] = TRAINER_TUCKER, @@ -725,60 +725,60 @@ static const u16 gFacilityToBrainTrainerId[] = [FRONTIER_FACILITY_PYRAMID] = TRAINER_BRANDON, }; -static const u8 *const gUnknown_08611D40[] = +static const u8 *const sFrontierBrainPlayerLostSilverTexts[NUM_FRONTIER_FACILITIES] = { - gText_082C843F, - gText_082C848B, - gText_082C8628, - gText_082C85B4, - gText_082C8512, - gText_082C859D, - gText_082C86C3, + [FRONTIER_FACILITY_TOWER] = gText_AnabelWonSilver, + [FRONTIER_FACILITY_DOME] = gText_TuckerWonSilver, + [FRONTIER_FACILITY_PALACE] = gText_SpenserWonSilver, + [FRONTIER_FACILITY_ARENA] = gText_GretaWonSilver, + [FRONTIER_FACILITY_FACTORY] = gText_NolandWonSilver, + [FRONTIER_FACILITY_PIKE] = gText_LucyWonSilver, + [FRONTIER_FACILITY_PYRAMID] = gText_BrandonWonSilver, }; -static const u8 *const gUnknown_08611D5C[] = +static const u8 *const sFrontierBrainPlayerWonSilverTexts[NUM_FRONTIER_FACILITIES] = { - gText_082C8458, - gText_082C84C1, - gText_082C8662, - gText_082C85E3, - gText_082C853B, - gText_082C85A4, - gText_082C86FE, + [FRONTIER_FACILITY_TOWER] = gText_AnabelDefeatSilver, + [FRONTIER_FACILITY_DOME] = gText_TuckerDefeatSilver, + [FRONTIER_FACILITY_PALACE] = gText_SpenserDefeatSilver, + [FRONTIER_FACILITY_ARENA] = gText_GretaDefeatSilver, + [FRONTIER_FACILITY_FACTORY] = gText_NolandDefeatSilver, + [FRONTIER_FACILITY_PIKE] = gText_LucyDefeatSilver, + [FRONTIER_FACILITY_PYRAMID] = gText_BrandonDefeatSilver, }; -static const u8 *const gUnknown_08611D78[] = +static const u8 *const sFrontierBrainPlayerLostGoldTexts[NUM_FRONTIER_FACILITIES] = { - gText_082C846C, - gText_082C84D0, - gText_082C8682, - gText_082C85F5, - gText_082C8561, - gText_082C85A9, - gText_082C8739, + [FRONTIER_FACILITY_TOWER] = gText_AnabelWonGold, + [FRONTIER_FACILITY_DOME] = gText_TuckerWonGold, + [FRONTIER_FACILITY_PALACE] = gText_SpenserWonGold, + [FRONTIER_FACILITY_ARENA] = gText_GretaWonGold, + [FRONTIER_FACILITY_FACTORY] = gText_NolandWonGold, + [FRONTIER_FACILITY_PIKE] = gText_LucyWonGold, + [FRONTIER_FACILITY_PYRAMID] = gText_BrandonWonGold, }; -static const u8 *const gUnknown_08611D94[] = +static const u8 *const sFrontierBrainPlayerWonGoldTexts[NUM_FRONTIER_FACILITIES] = { - gText_082C8480, - gText_082C84F7, - gText_082C86B3, - gText_082C8611, - gText_082C8589, - gText_082C85AE, - gText_082C877B, + [FRONTIER_FACILITY_TOWER] = gText_AnabelDefeatGold, + [FRONTIER_FACILITY_DOME] = gText_TuckerDefeatGold, + [FRONTIER_FACILITY_PALACE] = gText_SpenserDefeatGold, + [FRONTIER_FACILITY_ARENA] = gText_GretaDefeatGold, + [FRONTIER_FACILITY_FACTORY] = gText_NolandDefeatGold, + [FRONTIER_FACILITY_PIKE] = gText_LucyDefeatGold, + [FRONTIER_FACILITY_PYRAMID] = gText_BrandonDefeatGold, }; -static const u8 *const *const gUnknown_08611DB0[] = +static const u8 *const *const sFrontierBrainPlayerLostTexts[] = { - gUnknown_08611D40, - gUnknown_08611D78, + sFrontierBrainPlayerLostSilverTexts, + sFrontierBrainPlayerLostGoldTexts, }; -static const u8 *const *const gUnknown_08611DB8[] = +static const u8 *const *const sFrontierBrainPlayerWonTexts[] = { - gUnknown_08611D5C, - gUnknown_08611D94, + sFrontierBrainPlayerWonSilverTexts, + sFrontierBrainPlayerWonGoldTexts, }; // code @@ -787,42 +787,44 @@ void CallFrontierUtilFunc(void) sFrontierUtilFuncs[gSpecialVar_0x8004](); } -static void sub_81A17A0(void) +// Buffers into VAR_TEMP_0 specifically because this is used to react to the outcome in OnFrame map scripts +// TODO: use constants, fix name, rename field, compare to get/set data 0 +static void GetChallengeStatus(void) { VarSet(VAR_TEMP_0, 0xFF); - switch (gSaveBlock2Ptr->frontier.field_CA8) + switch (gSaveBlock2Ptr->frontier.challengeOutcome) { case 0: break; case 1: FrontierGamblerSetWonOrLost(FALSE); - VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); + VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.challengeOutcome); break; case 4: FrontierGamblerSetWonOrLost(FALSE); - VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); + VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.challengeOutcome); break; case 3: FrontierGamblerSetWonOrLost(TRUE); - VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); + VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.challengeOutcome); break; case 2: - VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.field_CA8); + VarSet(VAR_TEMP_0, gSaveBlock2Ptr->frontier.challengeOutcome); break; } } -static void sub_81A1830(void) +static void GetFrontierData(void) { u8 facility = VarGet(VAR_FRONTIER_FACILITY); - u8 currSymbol = GetPlayerSymbolCountForFacility(facility); - if (currSymbol == 2) - currSymbol = 1; + u8 hasSymbol = GetPlayerSymbolCountForFacility(facility); + if (hasSymbol == 2) + hasSymbol = 1; switch (gSpecialVar_0x8005) { case 0: - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_CA8; + gSpecialVar_Result = gSaveBlock2Ptr->frontier.challengeOutcome; break; case 1: gSpecialVar_Result = gSaveBlock2Ptr->frontier.lvlMode; @@ -841,23 +843,23 @@ static void sub_81A1830(void) gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_CA9_b; break; case 7: - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_D00 & gUnknown_08611BFC[facility][currSymbol]; + gSpecialVar_Result = gSaveBlock2Ptr->frontier.symbolFlags & sFacilitySymbolBitFlags[facility][hasSymbol]; break; } } -static void sub_81A1968(void) +static void SetFrontierData(void) { s32 i; u8 facility = VarGet(VAR_FRONTIER_FACILITY); - u8 currSymbol = GetPlayerSymbolCountForFacility(facility); - if (currSymbol == 2) - currSymbol = 1; + u8 hasSymbol = GetPlayerSymbolCountForFacility(facility); + if (hasSymbol == 2) + hasSymbol = 1; switch (gSpecialVar_0x8005) { case 0: - gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8006; + gSaveBlock2Ptr->frontier.challengeOutcome = gSpecialVar_0x8006; break; case 1: gSaveBlock2Ptr->frontier.lvlMode = gSpecialVar_0x8006; @@ -876,7 +878,7 @@ static void sub_81A1968(void) gSaveBlock2Ptr->frontier.field_CA9_b = gSpecialVar_0x8006; break; case 7: - gSaveBlock2Ptr->frontier.field_D00 |= gUnknown_08611BFC[facility][currSymbol]; + gSaveBlock2Ptr->frontier.symbolFlags |= sFacilitySymbolBitFlags[facility][hasSymbol]; break; } } @@ -915,7 +917,7 @@ static void sub_81A1B38(void) static void ShowFacilityResultsWindow(void) { - if (gSpecialVar_0x8006 > 3) + if (gSpecialVar_0x8006 >= FRONTIER_MODE_COUNT) gSpecialVar_0x8006 = 0; switch (gSpecialVar_0x8005) { @@ -940,7 +942,7 @@ static void ShowFacilityResultsWindow(void) case FRONTIER_FACILITY_PYRAMID: ShowPyramidResultsWindow(); break; - case RESULTS_LINK_CONTEST: + case FACILITY_LINK_CONTEST: ShowLinkContestResultsWindow(); break; } @@ -1644,44 +1646,49 @@ static void sub_81A31FC(void) } } -static void sub_81A35EC(void) +static void Script_GetFrontierBrainStatus(void) { VarGet(VAR_FRONTIER_FACILITY); // Unused return value. - gSpecialVar_Result = sub_81A3610(); + gSpecialVar_Result = GetFrontierBrainStatus(); } -u8 sub_81A3610(void) +u8 GetFrontierBrainStatus(void) { - s32 ret = 0; + s32 status = FRONTIER_BRAIN_NOT_READY; s32 facility = VarGet(VAR_FRONTIER_FACILITY); s32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); - u16 val = GetCurrentFacilityWinStreak(); - s32 r5 = val + gUnknown_08611550[facility][3]; + u16 winStreakNoModifier = GetCurrentFacilityWinStreak(); + s32 winStreak = winStreakNoModifier + sFrontierBrainStreakAppearances[facility][3]; s32 symbolsCount; if (battleMode != FRONTIER_MODE_SINGLES) - return 0; + return FRONTIER_BRAIN_NOT_READY; symbolsCount = GetPlayerSymbolCountForFacility(facility); switch (symbolsCount) { + // Missing a symbol case 0: case 1: - if (r5 == gUnknown_08611550[facility][symbolsCount]) - ret = symbolsCount + 1; + if (winStreak == sFrontierBrainStreakAppearances[facility][symbolsCount]) + status = symbolsCount + 1; // FRONTIER_BRAIN_SILVER and FRONTIER_BRAIN_GOLD break; + // Already received both symbols case 2: default: - if (r5 == gUnknown_08611550[facility][0]) - ret = 3; - else if (r5 == gUnknown_08611550[facility][1]) - ret = 4; - else if (r5 > gUnknown_08611550[facility][1] && (r5 - gUnknown_08611550[facility][1]) % gUnknown_08611550[facility][2] == 0) - ret = 4; + // Silver streak is reached + if (winStreak == sFrontierBrainStreakAppearances[facility][0]) + status = FRONTIER_BRAIN_STREAK; + // Gold streak is reached + else if (winStreak == sFrontierBrainStreakAppearances[facility][1]) + status = FRONTIER_BRAIN_STREAK_LONG; + // Some increment of the gold streak is reached + else if (winStreak > sFrontierBrainStreakAppearances[facility][1] && (winStreak - sFrontierBrainStreakAppearances[facility][1]) % sFrontierBrainStreakAppearances[facility][2] == 0) + status = FRONTIER_BRAIN_STREAK_LONG; break; } - return ret; + return status; } void CopyFrontierTrainerText(u8 whichText, u16 trainerId) @@ -1789,8 +1796,8 @@ void sub_81A3908(void) } } } - if (gSaveBlock2Ptr->frontier.field_CA8 != 0) - gSaveBlock2Ptr->frontier.field_CA8 = 1; + if (gSaveBlock2Ptr->frontier.challengeOutcome != 0) + gSaveBlock2Ptr->frontier.challengeOutcome = 1; } u32 GetCurrentFacilityWinStreak(void) @@ -1877,20 +1884,20 @@ static void sub_81A3B64(void) if (challengeNum != 0) challengeNum--; - if (challengeNum >= ARRAY_COUNT(gUnknown_086118B4)) - challengeNum = ARRAY_COUNT(gUnknown_086118B4) - 1; + if (challengeNum >= ARRAY_COUNT(sBattlePointAwards)) + challengeNum = ARRAY_COUNT(sBattlePointAwards) - 1; - points = gUnknown_086118B4[challengeNum][facility][battleMode]; + points = sBattlePointAwards[challengeNum][facility][battleMode]; if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) points += 10; gSaveBlock2Ptr->frontier.battlePoints += points; ConvertIntToDecimalStringN(gStringVar1, points, STR_CONV_MODE_LEFT_ALIGN, 2); - if (gSaveBlock2Ptr->frontier.battlePoints > 9999) - gSaveBlock2Ptr->frontier.battlePoints = 9999; + if (gSaveBlock2Ptr->frontier.battlePoints > MAX_BATTLE_FRONTIER_POINTS) + gSaveBlock2Ptr->frontier.battlePoints = MAX_BATTLE_FRONTIER_POINTS; points = gSaveBlock2Ptr->frontier.field_EBA; - points += gUnknown_086118B4[challengeNum][facility][battleMode]; - IncrementDailyBattlePoints(gUnknown_086118B4[challengeNum][facility][battleMode]); + points += sBattlePointAwards[challengeNum][facility][battleMode]; + IncrementDailyBattlePoints(sBattlePointAwards[challengeNum][facility][battleMode]); if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { points += 10; @@ -1924,12 +1931,12 @@ static void CheckBattleTypeFlag(void) gSpecialVar_Result = FALSE; } -static u8 sub_81A3DD0(u16 species, u8 arg1, s32 arg2) +static u8 AppendBannedMonSpeciesName(u16 species, u8 count, s32 numBannedMonsCaught) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT)) { - arg1++; - switch (arg1) + count++; + switch (count) { case 1: case 3: @@ -1937,20 +1944,20 @@ static u8 sub_81A3DD0(u16 species, u8 arg1, s32 arg2) case 7: case 9: case 11: - if (arg2 == arg1) + if (numBannedMonsCaught == count) StringAppend(gStringVar1, gText_SpaceAndSpace); - else if (arg2 > arg1) + else if (numBannedMonsCaught > count) StringAppend(gStringVar1, gText_CommaSpace); break; case 2: - if (arg1 == arg2) + if (count == numBannedMonsCaught) StringAppend(gStringVar1, gText_SpaceAndSpace); else StringAppend(gStringVar1, gText_CommaSpace); StringAppend(gStringVar1, gText_NewLine); break; default: - if (arg1 == arg2) + if (count == numBannedMonsCaught) StringAppend(gStringVar1, gText_SpaceAndSpace); else StringAppend(gStringVar1, gText_CommaSpace); @@ -1960,7 +1967,7 @@ static u8 sub_81A3DD0(u16 species, u8 arg1, s32 arg2) StringAppend(gStringVar1, gSpeciesNames[species]); } - return arg1; + return count; } static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monLevel, u16 *speciesArray, u16 *itemsArray, u8 *count) @@ -1998,8 +2005,8 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL static void sub_81A3FD4(void) { - u16 speciesArray[6]; - u16 itemArray[6]; + u16 speciesArray[PARTY_SIZE]; + u16 itemArray[PARTY_SIZE]; s32 monId = 0; s32 toChoose = 0; u8 count = 0; @@ -2036,7 +2043,7 @@ static void sub_81A3FD4(void) u16 hp = GetMonData(&gPlayerParty[monId], MON_DATA_HP); if (VarGet(VAR_FRONTIER_FACILITY) == FRONTIER_FACILITY_PYRAMID) { - if (heldItem == 0) + if (heldItem == ITEM_NONE) AppendIfValid(species, heldItem, hp, gSpecialVar_Result, level, speciesArray, itemArray, &count); } else @@ -2065,7 +2072,7 @@ static void sub_81A3FD4(void) gSpecialVar_0x8004 = 1; count = 0; for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++) - count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons); + count = AppendBannedMonSpeciesName(gFrontierBannedSpecies[i], count, caughtBannedMons); if (count == 0) { @@ -2174,7 +2181,7 @@ static void BufferFrontierTrainerName(void) } } -static void sub_81A447C(void) +static void ResetSketchedMoves(void) { u8 i, j, k; @@ -2426,7 +2433,7 @@ u8 GetFrontierBrainTrainerPicIndex(void) else facility = VarGet(VAR_FRONTIER_FACILITY); - return gTrainers[gFacilityToBrainTrainerId[facility]].trainerPic; + return gTrainers[sFrontierBrainTrainerIds[facility]].trainerPic; } u8 GetFrontierBrainTrainerClass(void) @@ -2438,7 +2445,7 @@ u8 GetFrontierBrainTrainerClass(void) else facility = VarGet(VAR_FRONTIER_FACILITY); - return gTrainers[gFacilityToBrainTrainerId[facility]].trainerClass; + return gTrainers[sFrontierBrainTrainerIds[facility]].trainerClass; } void CopyFrontierBrainTrainerName(u8 *dst) @@ -2452,7 +2459,7 @@ void CopyFrontierBrainTrainerName(u8 *dst) facility = VarGet(VAR_FRONTIER_FACILITY); for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gTrainers[gFacilityToBrainTrainerId[facility]].trainerName[i]; + dst[i] = gTrainers[sFrontierBrainTrainerIds[facility]].trainerName[i]; dst[i] = EOS; } @@ -2460,13 +2467,13 @@ void CopyFrontierBrainTrainerName(u8 *dst) bool8 IsFrontierBrainFemale(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); - return sFacilityToBrainEventObjGfx[facility][1]; + return sFrontierBrainObjEventGfx[facility][1]; } void SetFrontierBrainEventObjGfx_2(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); - VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainEventObjGfx[facility][0]); + VarSet(VAR_OBJ_GFX_ID_0, sFrontierBrainObjEventGfx[facility][0]); } #define FRONTIER_BRAIN_OTID 61226 @@ -2769,7 +2776,7 @@ u16 GetFrontierBrainMonSpecies(u8 monId) void SetFrontierBrainEventObjGfx(u8 facility) { gTrainerBattleOpponent_A = TRAINER_FRONTIER_BRAIN; - VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainEventObjGfx[facility][0]); + VarSet(VAR_OBJ_GFX_ID_0, sFrontierBrainObjEventGfx[facility][0]); } u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId) @@ -2804,17 +2811,18 @@ s32 GetFronterBrainSymbol(void) if (symbol == 2) { u16 winStreak = GetCurrentFacilityWinStreak(); - if (winStreak + gUnknown_08611550[facility][3] == gUnknown_08611550[facility][0]) + if (winStreak + sFrontierBrainStreakAppearances[facility][3] == sFrontierBrainStreakAppearances[facility][0]) symbol = 0; - else if (winStreak + gUnknown_08611550[facility][3] == gUnknown_08611550[facility][1]) + else if (winStreak + sFrontierBrainStreakAppearances[facility][3] == sFrontierBrainStreakAppearances[facility][1]) symbol = 1; - else if (winStreak + gUnknown_08611550[facility][3] > gUnknown_08611550[facility][1] - && (winStreak + gUnknown_08611550[facility][3] - gUnknown_08611550[facility][1]) % gUnknown_08611550[facility][2] == 0) + else if (winStreak + sFrontierBrainStreakAppearances[facility][3] > sFrontierBrainStreakAppearances[facility][1] + && (winStreak + sFrontierBrainStreakAppearances[facility][3] - sFrontierBrainStreakAppearances[facility][1]) % sFrontierBrainStreakAppearances[facility][2] == 0) symbol = 1; } return symbol; } +// Called for intro speech as well despite the fact that its handled in the map scripts files instead static void CopyFrontierBrainText(bool8 playerWonText) { s32 facility; @@ -2834,10 +2842,10 @@ static void CopyFrontierBrainText(bool8 playerWonText) switch (playerWonText) { case FALSE: - StringCopy(gStringVar4, gUnknown_08611DB0[symbol][facility]); + StringCopy(gStringVar4, sFrontierBrainPlayerLostTexts[symbol][facility]); break; case TRUE: - StringCopy(gStringVar4, gUnknown_08611DB8[symbol][facility]); + StringCopy(gStringVar4, sFrontierBrainPlayerWonTexts[symbol][facility]); break; } } diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 530e5e323..cb6dba1d4 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -424,7 +424,7 @@ static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 ar level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]); if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level)) return FALSE; - if (gMapHeader.mapLayoutId != LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) + if (gMapHeader.mapLayoutId != LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) return FALSE; CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level); @@ -533,7 +533,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS) { headerId = GetBattlePikeWildMonHeaderId(); if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -676,7 +676,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS) { headerId = GetBattlePikeWildMonHeaderId(); if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) |