diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-17 18:18:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 18:18:47 -0400 |
| commit | 96fd719a1906346db062daf13e1107b3c4b220ed (patch) | |
| tree | 5df2369f01325a40ca65a4f744545460e348a198 /data/scripts/battle_pike.inc | |
| parent | 50e48898d2ab25b792b563825dca79d327bcb542 (diff) | |
| parent | 89bcf3cbd9ad9d3c3631159c5ba20d3660819066 (diff) | |
Merge pull request #1081 from GriffinRichards/add-localids
Add local object event ids for referenced objects
Diffstat (limited to 'data/scripts/battle_pike.inc')
| -rw-r--r-- | data/scripts/battle_pike.inc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index 83cc6ec61..67eb19011 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -1,3 +1,4 @@ +@ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal 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 @@ -17,28 +18,28 @@ BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25 end BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos:: @ 82C3E93 - setobjectxyperm 1, 2, 5 - setobjectxyperm 2, 6, 5 + setobjectxyperm LOCALID_OBJ_0, 2, 5 + setobjectxyperm LOCALID_OBJ_1, 6, 5 end BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos:: @ 82C3EA2 - setobjectxyperm 1, 4, 4 - setobjectxyperm 2, 3, 4 + setobjectxyperm LOCALID_OBJ_0, 4, 4 + setobjectxyperm LOCALID_OBJ_1, 3, 4 end BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos:: @ 82C3EB1 - setobjectxyperm 1, 4, 4 - setobjectxyperm 2, 0, 0 + setobjectxyperm LOCALID_OBJ_0, 4, 4 + setobjectxyperm LOCALID_OBJ_1, 0, 0 end BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos:: @ 82C3EC0 - setobjectxyperm 1, 5, 5 - setobjectxyperm 2, 0, 0 + setobjectxyperm LOCALID_OBJ_0, 5, 5 + setobjectxyperm LOCALID_OBJ_1, 0, 0 end BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos:: @ 82C3ECF - setobjectxyperm 1, 4, 3 - setobjectxyperm 2, 4, 4 + setobjectxyperm LOCALID_OBJ_0, 4, 3 + setobjectxyperm LOCALID_OBJ_1, 4, 4 end BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE @@ -57,7 +58,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8 goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom compare VAR_RESULT, PIKE_ROOM_BRAIN goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL + hideobjectat LOCALID_OBJ_1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL setvar VAR_TEMP_4, 1 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end @@ -70,7 +71,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35 BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F setvar VAR_TEMP_4, 1 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially + hideobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @ Pike Queen hidden initially end BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E |