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

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2021-07-20 15:18:31 -04:00
parent bea170e8e9
commit 06351bf63c
576 changed files with 17798 additions and 17798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
data/scripts/battle_pike.inc
View File

@@ -1,9 +1,9 @@
@ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal
BattleFrontier_BattlePikeRoom_MapScripts: @ 82C3E1B
BattleFrontier_BattlePikeRoom_MapScripts:
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
BattleFrontier_BattlePikeRoom_OnTransition:
pike_setroomobjects
pike_getroomtype
switch VAR_RESULT
@@ -17,36 +17,36 @@ BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos:: @ 82C3E93
BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos::
setobjectxyperm LOCALID_OBJ_0, 2, 5
setobjectxyperm LOCALID_OBJ_1, 6, 5
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos:: @ 82C3EA2
BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos::
setobjectxyperm LOCALID_OBJ_0, 4, 4
setobjectxyperm LOCALID_OBJ_1, 3, 4
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos:: @ 82C3EB1
BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos::
setobjectxyperm LOCALID_OBJ_0, 4, 4
setobjectxyperm LOCALID_OBJ_1, 0, 0
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos:: @ 82C3EC0
BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos::
setobjectxyperm LOCALID_OBJ_0, 5, 5
setobjectxyperm LOCALID_OBJ_1, 0, 0
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos:: @ 82C3ECF
BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos::
setobjectxyperm LOCALID_OBJ_0, 4, 3
setobjectxyperm LOCALID_OBJ_1, 4, 4
end
BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
BattleFrontier_BattlePikeRoom_OnWarp:
map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects
.2byte 0
BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects::
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST
pike_getroomtype
@@ -63,33 +63,33 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35
BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom::
setvar VAR_TEMP_4, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F
BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects::
setvar VAR_TEMP_4, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
hideobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E
BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp::
setvar VAR_0x8007, PIKE_ROOM_LEFT
goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp:: @ 82C3F59
BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp::
setvar VAR_0x8007, PIKE_ROOM_CENTER
goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64
BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp::
setvar VAR_0x8007, PIKE_ROOM_RIGHT
goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp::
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
@@ -110,7 +110,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -118,7 +118,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030
waitstate
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -126,12 +126,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
waitstate
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom:: @ 82C4062
BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom::
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_2, 1
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D
BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack::
setvar VAR_TEMP_3, 0
setvar VAR_TEMP_2, 0
lockall
@@ -139,12 +139,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D
closemessage
end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom:: @ 82C4082
BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom::
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_2, 1
end
BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D
BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack::
setvar VAR_TEMP_3, 0
setvar VAR_TEMP_2, 0
lockall
@@ -152,7 +152,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D
closemessage
end
BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
BattleFrontier_BattlePikeRoomNormal_EventScript_Exit::
pike_ispartyfullhealth
compare VAR_RESULT, TRUE
call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
@@ -172,29 +172,29 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
waitstate
end
BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128
BattleFrontier_BattlePikeRoom_EventScript_DisableHealing::
pike_nohealing TRUE
return
BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136
BattleFrontier_BattlePikeRoom_EventScript_EnableHealing::
pike_nohealing FALSE
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144
BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7
return
BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
waitmovement 0
call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
return
BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174
BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit::
pike_exitwildmonroom
pike_ispartyfullhealth
compare VAR_RESULT, TRUE
@@ -215,12 +215,12 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174
waitstate
end
BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom:: @ 82C4202
BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom::
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_2, 1
end
BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D
BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack::
setvar VAR_TEMP_3, 0
setvar VAR_TEMP_2, 0
lockall
@@ -228,13 +228,13 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D
closemessage
end
BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
BattleFrontier_BattlePike_EventScript_Retire::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS CHALLENGE_STATUS_LOST
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
waitstate
end
BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E
BattleFrontier_BattlePikeRoom_OnResume:
setorcopyvar VAR_0x8006, VAR_RESULT @ Save VAR_RESULT from being overwritten
frontier_get FRONTIER_DATA_CHALLENGE_STATUS
compare VAR_RESULT, CHALLENGE_STATUS_PAUSED
@@ -242,14 +242,14 @@ BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E
compare VAR_RESULT, CHALLENGE_STATUS_SAVING
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume
call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume:: @ 82C426B
BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume::
setorcopyvar VAR_RESULT, VAR_0x8006
end
BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves:: @ 82C4271
BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves::
frontier_resetsketch
return
BattleFrontier_BattlePikeRoom_Movement_HidePlayer: @ 82C427A
BattleFrontier_BattlePikeRoom_Movement_HidePlayer:
set_invisible
step_end