diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc | 5 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeLobby/scripts.inc | 52 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc | 78 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc | 3 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 20 | ||||
| -rw-r--r-- | data/scripts/battle_pike.inc | 37 | ||||
| -rw-r--r-- | data/scripts/field_poison.inc | 5 |
7 files changed, 74 insertions, 126 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index bf9f00bc5..06f0e0516 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -10,9 +10,8 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 delay 16 frontier_set FRONTIER_DATA_BATTLE_NUM, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS - special CallBattlePikeFunction - battlepike_nohealing TRUE + pike_cleartrainerids + pike_nohealing TRUE applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index cbdf0ca7b..69b8d3b13 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -25,16 +25,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 special HealPlayerParty - setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS - special CallBattlePikeFunction + pike_resethelditems lockall msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage - battlepike_setstreak 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 0 - special CallBattlePikeFunction + pike_set PIKE_DATA_WIN_STREAK 0 + pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 setvar VAR_TEMP_0, 255 releaseall @@ -58,23 +54,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D frontier_givepoints msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS frontier_checkairshow - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA - setvar VAR_0x8005, 3 - special CallBattlePikeFunction + pike_get PIKE_DATA_TOTAL_STREAKS addvar VAR_RESULT, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 3 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction + pike_set PIKE_DATA_TOTAL_STREAKS, VAR_RESULT special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS - special CallBattlePikeFunction + pike_resethelditems message BattleFrontier_BattlePikeLobby_Text_25C1DF waitmessage - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE - setvar VAR_0x8005, 0 - special CallBattlePikeFunction + pike_save 0 playse SE_SAVE waitse msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT @@ -89,17 +77,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 waitmessage frontier_checkairshow frontier_set FRONTIER_DATA_BATTLE_NUM, 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 0 - special CallBattlePikeFunction + pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE - setvar VAR_0x8005, 0 - special CallBattlePikeFunction + pike_resethelditems + pike_save 0 playse SE_SAVE waitse msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT @@ -156,23 +138,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_TEMP_0, 0 setvar VAR_TEMP_1, 0 frontier_set FRONTIER_DATA_SELECTED_MON_ORDER - setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE - special CallBattlePikeFunction + pike_init frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA - setvar VAR_0x8005, 4 - setvar VAR_0x8006, 1 - special CallBattlePikeFunction - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS - special CallBattlePikeFunction + pike_set PIKE_DATA_WIN_STREAK_ACTIVE, TRUE + pike_savehelditems frontier_set FRONTIER_DATA_PAUSED, FALSE special LoadPlayerParty closemessage delay 2 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS - special CallBattlePikeFunction + pike_savehelditems compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index f4e10e3ab..5419eb081 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167 BattleFrontier_BattlePikeRoomNormal_EventScript_25D171:: @ 825D171 setvar VAR_TEMP_0, 1 - battlepike_getroomtype + pike_getroomtype switch VAR_RESULT case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6 case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_25D50E @@ -26,9 +26,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6 delay 16 applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795 waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG - setvar VAR_0x8005, 0 - special CallBattlePikeFunction + pike_gettrainerintro 0 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage @@ -39,7 +37,6 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D1C6:: @ 825D1C6 waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D226 - BattleFrontier_BattlePikeRoomNormal_EventScript_25D20A:: @ 825D20A frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 @@ -59,9 +56,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D231:: @ 825D231 closemessage applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D795 waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG - setvar VAR_0x8005, 0 - special CallBattlePikeFunction + pike_gettrainerintro 0 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage @@ -98,8 +93,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2BF:: @ 825D2BF lockall applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DF waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN - special CallBattlePikeFunction + pike_prequeenheal switch VAR_RESULT case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4DC case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_25D4EA @@ -112,7 +106,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2 waitmovement 0 - playse 267 + playse SE_CURTAIN call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8E7 delay 4 call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4 @@ -121,7 +115,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB delay 4 waitse delay 60 - playse 268 + playse SE_CURTAIN1 delay 65 call BattleFrontier_BattlePikeRoomNormal_EventScript_25D8A4 showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @@ -132,12 +126,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB waitse applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E7 waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE - special CallBattlePikeFunction + pike_getbrainstatus switch VAR_RESULT - case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416 - case 3, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD - case 4, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443 + case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePikeRoomNormal_EventScript_25D416 + case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD + case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_25D443 frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH compare VAR_RESULT, FALSE goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_25D3BD @@ -199,9 +192,9 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC waitmovement 0 - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK VAR_RESULT call BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom waitstate end @@ -256,17 +249,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E waitmovement 0 applymovement 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 + pike_gettrainerintro 0 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 + pike_gettrainerintro 1 msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE @@ -294,12 +283,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D605:: @ 825D605 message BattleFrontier_BattlePikeRoomNormal_Text_25DBD1 applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7AA waitmovement 0 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON - special CallBattlePikeFunction + pike_getstatusmon copyvar VAR_0x8004, VAR_RESULT - compare VAR_0x8004, 0 + compare VAR_0x8004, PIKE_STATUS_KIRLIA call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D643 - compare VAR_0x8004, 1 + compare VAR_0x8004, PIKE_STATUS_DUSCLOPS call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5 msgbox BattleFrontier_BattlePikeRoomNormal_Text_25DD3F, MSGBOX_DEFAULT closemessage @@ -312,18 +300,16 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D643:: @ 825D643 waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS - special CallBattlePikeFunction - compare VAR_RESULT, 2 + pike_getstatus + compare VAR_RESULT, PIKE_STATUS_TOXIC call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D751 - compare VAR_RESULT, 1 + compare VAR_RESULT, PIKE_STATUS_BURN call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D758 - compare VAR_RESULT, 3 + compare VAR_RESULT, PIKE_STATUS_PARALYSIS call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D75F - compare VAR_RESULT, 4 + compare VAR_RESULT, PIKE_STATUS_SLEEP call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D766 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE - special CallBattlePikeFunction + pike_fadescreen waitstate applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2 waitmovement 0 @@ -349,14 +335,12 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D6D5:: @ 825D6D5 waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS - special CallBattlePikeFunction - compare VAR_RESULT, 0 + pike_getstatus + compare VAR_RESULT, PIKE_STATUS_FREEZE call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D76D - compare VAR_RESULT, 1 + compare VAR_RESULT, PIKE_STATUS_BURN call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D774 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE - special CallBattlePikeFunction + pike_fadescreen waitstate applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7A2 waitmovement 0 @@ -555,7 +539,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA: @ 825D7EA step_end BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED - battlepike_getroomtype + pike_getroomtype switch VAR_RESULT case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_25D831 @@ -563,8 +547,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D7ED:: @ 825D7ED BattleFrontier_BattlePikeRoomNormal_EventScript_25D81B:: @ 825D81B lock faceplayer - setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG - special CallBattlePikeFunction + pike_getnpcmsg msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage @@ -580,8 +563,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D831:: @ 825D831 end BattleFrontier_BattlePikeRoomNormal_EventScript_25D83E:: @ 825D83E - setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS - special CallBattlePikeFunction + pike_healonetwomons compare VAR_RESULT, 2 call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_25D881 compare VAR_RESULT, 1 diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc index b9323da2e..356e88366 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc @@ -11,8 +11,7 @@ BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_6 - special CallBattlePikeFunction + pike_inwildmonroom end BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cd8f3dd4f..a0bf811a5 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -34,9 +34,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 lockall message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume waitmessage - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE - setvar VAR_0x8005, CHALLENGE_STATUS_SAVING - special CallBattlePikeFunction + pike_save CHALLENGE_STATUS_SAVING playse SE_SAVE waitse frontier_set FRONTIER_DATA_PAUSED, FALSE @@ -124,9 +122,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData waitmessage special LoadPlayerParty - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE - setvar VAR_0x8005, CHALLENGE_STATUS_PAUSED - special CallBattlePikeFunction + pike_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse fadescreen 1 @@ -152,9 +148,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM - special CallBattlePikeFunction - compare VAR_RESULT, 1 + pike_sethintroom + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_TEMP_5, 255 end @@ -175,7 +170,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 end BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB - battlepike_gethint + pike_gethint compare VAR_RESULT, PIKE_HINT_BRAIN goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint lock @@ -194,8 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00 end BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A - setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID - special CallBattlePikeFunction + pike_gethintroomid switch VAR_RESULT case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint case PIKE_ROOM_CENTER, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint @@ -215,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53 goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60 - battlepike_gethint + pike_gethint switch VAR_RESULT case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia case PIKE_HINT_WHISPERING, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 81440320c..a0f0f6618 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -3,8 +3,8 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25 - battlepike_setroomobjects - battlepike_getroomtype + pike_setroomobjects + pike_getroomtype switch VAR_RESULT case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeRoomNormal_EventScript_2C3EB1 @@ -48,7 +48,7 @@ BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - battlepike_getroomtype + pike_getroomtype compare VAR_RESULT, PIKE_ROOM_STATUS goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 compare VAR_RESULT, PIKE_ROOM_HARD_BATTLE @@ -89,14 +89,14 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64 end BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT - battlepike_setnextroom - battlepike_getroomtype + pike_setnextroom + pike_getroomtype switch VAR_RESULT case PIKE_ROOM_SINGLE_BATTLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom case PIKE_ROOM_HEAL_FULL, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom @@ -152,18 +152,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_2C408D:: @ 82C408D end BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 - battlepike_ispartyfullhealth + pike_ispartyfullhealth compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing compare VAR_RESULT, TRUE call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT - battlepike_isfinalroom + pike_isfinalroom compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom compare VAR_RESULT, FALSE @@ -172,11 +172,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2 end BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128 - battlepike_nohealing TRUE + pike_nohealing TRUE return BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136 - battlepike_nohealing FALSE + pike_nohealing FALSE return BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144 @@ -194,20 +194,19 @@ BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C return BattleFrontier_BattlePikeRoomWildMons_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_7 - special CallBattlePikeFunction - battlepike_ispartyfullhealth + pike_exitwildmonroom + pike_ispartyfullhealth compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing compare VAR_RESULT, TRUE call_if_ne BattleFrontier_BattlePikeRoom_EventScript_EnableHealing - battlepike_getstreak + pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 - battlepike_setstreak VAR_RESULT + pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT frontier_get FRONTIER_DATA_BATTLE_NUM addvar VAR_RESULT, 1 frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT - battlepike_isfinalroom + pike_isfinalroom compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom compare VAR_RESULT, FALSE diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index f33292fe6..80e1a1ed8 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -29,9 +29,8 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 message gText_PlayerWhitedOut waitmessage waitbuttonpress - setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN - special CallBattlePikeFunction - compare VAR_RESULT, 1 + pike_inchallenge + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePike_EventScript_Retire setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction |