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
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+14 -14
View File
@@ -1,7 +1,7 @@
.set LOCALID_OPPONENT, 2
.set LOCALID_PLAYER, 3
SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
SlateportCity_BattleTentBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_OnFrame
@@ -10,11 +10,11 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_1
SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970
SlateportCity_BattleTentBattleRoom_OnTransition:
call SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx
end
SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8209976
SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx::
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
@@ -22,29 +22,29 @@ SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8209976
goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
return
SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 820998E
SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale::
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8209994
SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale::
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
SlateportCity_BattleTentBattleRoom_OnWarp: @ 820999A
SlateportCity_BattleTentBattleRoom_OnWarp:
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects
.2byte 0
SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 82099A4
SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects::
setvar VAR_TEMP_1, 1
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
hideobjectat LOCALID_OPPONENT, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
end
SlateportCity_BattleTentBattleRoom_OnFrame: @ 82099B4
SlateportCity_BattleTentBattleRoom_OnFrame:
map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom
.2byte 0
SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE
SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom::
applymovement LOCALID_PLAYER, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter
waitmovement 0
factory_setopponentgfx
@@ -65,14 +65,14 @@ SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE
waitstate
switch VAR_RESULT
case 1, SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent
SlateportCity_BattleTent_EventScript_WarpToLobbyLost:: @ 8209A1B
SlateportCity_BattleTent_EventScript_WarpToLobbyLost::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@ forced stop
SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 8209A39
SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent::
frontier_get FRONTIER_DATA_BATTLE_NUM
addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -83,21 +83,21 @@ SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 8209A39
waitstate
@ forced stop
SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8209A7B
SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
special LoadPlayerParty
warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
waitstate
@ forced stop
SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter: @ 8209A99
SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter:
walk_up
walk_up
walk_up
walk_in_place_fastest_right
step_end
SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter: @ 8209A9E
SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter:
walk_down
walk_down
walk_down