diff options
Diffstat (limited to 'data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index f67c6f081..e642a1386 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_OPPONENT, 2 +.set LOCALID_PLAYER, 3 + SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_OnWarp @@ -5,7 +8,7 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 .byte 0 @ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden - @ The player is represented instead by object event 3, which has the gfx id VAR_OBJ_GFX_ID_1 + @ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_1 SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970 call SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx @@ -34,7 +37,7 @@ SlateportCity_BattleTentBattleRoom_OnWarp: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 82099A4 setvar VAR_TEMP_1, 1 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM + hideobjectat LOCALID_OPPONENT, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end SlateportCity_BattleTentBattleRoom_OnFrame: @ 82099B4 @@ -42,13 +45,13 @@ SlateportCity_BattleTentBattleRoom_OnFrame: @ 82099B4 .2byte 0 SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE - applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter + applymovement LOCALID_PLAYER, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter waitmovement 0 factory_setopponentgfx - setobjectxyperm 2, 5, 1 - removeobject 2 - addobject 2 - applymovement 2, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter + setobjectxyperm LOCALID_OPPONENT, 5, 1 + removeobject LOCALID_OPPONENT + addobject LOCALID_OPPONENT + applymovement LOCALID_OPPONENT, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter waitmovement 0 battletent_getopponentintro lockall |