Standardize Event Object to Object Event

asm/macros/event.inc

@@ -765,7 +765,7 @@
 	.2byte \y
 	.endm
 
-	@ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen.
+	@ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen.
 	.macro copyobjectxytoperm index:req
 	.byte 0x64
 	.2byte \index

common_syms/field_control_avatar.txt

@@ -1 +1 @@
-gSelectedEventObject
+gSelectedObjectEvent

data/layouts/layouts.json

@@ -4412,4 +4412,4 @@
       "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
     }
   ]
-}
+}

data/maps/AbandonedShip_Corridors_1F/map.json

@@ -129,4 +129,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Corridors_B1F/map.json

@@ -110,4 +110,4 @@
       "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor"
     }
   ]
-}
+}

data/maps/AbandonedShip_Deck/map.json

@@ -53,4 +53,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_HiddenFloorCorridors/map.json

@@ -93,4 +93,4 @@
       "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door"
     }
   ]
-}
+}

data/maps/AbandonedShip_HiddenFloorRooms/map.json

@@ -215,4 +215,4 @@
       "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
     }
   ]
-}
+}

data/maps/AbandonedShip_Room_B1F/map.json

@@ -46,4 +46,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Rooms2_1F/map.json

@@ -105,4 +105,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Rooms2_B1F/map.json

@@ -73,4 +73,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Rooms_1F/map.json

@@ -113,4 +113,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Rooms_B1F/map.json

@@ -66,4 +66,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Underwater1/map.json

@@ -32,4 +32,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AbandonedShip_Underwater2/map.json

@@ -25,4 +25,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AlteringCave/map.json

@@ -25,4 +25,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AncientTomb/map.json

@@ -78,4 +78,4 @@
       "script": "AncientTomb_EventScript_CaveEntranceSide"
     }
   ]
-}
+}

data/maps/AquaHideout_1F/map.json

@@ -79,4 +79,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AquaHideout_B1F/map.json

@@ -311,4 +311,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AquaHideout_B2F/map.json

@@ -186,4 +186,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/AquaHideout_UnusedRubyMap1/map.json

@@ -17,4 +17,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AquaHideout_UnusedRubyMap2/map.json

@@ -17,4 +17,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/AquaHideout_UnusedRubyMap3/map.json

@@ -17,4 +17,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/ArtisanCave_1F/map.json

@@ -46,4 +46,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/ArtisanCave_B1F/map.json

@@ -79,4 +79,4 @@
       "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON"
     }
   ]
-}
+}

data/maps/BattleColosseum2P/map.json

@@ -65,4 +65,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/BattleColosseum4P/map.json

@@ -83,4 +83,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleArenaBattleRoom/map.json

@@ -135,4 +135,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleArenaCorridor/map.json

@@ -31,4 +31,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleArenaLobby/map.json

@@ -108,4 +108,4 @@
       "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattleDomeBattleRoom/map.json

@@ -213,4 +213,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleDomeCorridor/map.json

@@ -46,4 +46,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleDomeLobby/map.json

@@ -144,4 +144,4 @@
       "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json

@@ -46,4 +46,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json

@@ -122,4 +122,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleFactoryLobby/map.json

@@ -136,4 +136,4 @@
       "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json

@@ -31,4 +31,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json

@@ -98,4 +98,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePalaceCorridor/map.json

@@ -138,4 +138,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePalaceLobby/map.json

@@ -143,4 +143,4 @@
       "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattlePikeCorridor/map.json

@@ -31,4 +31,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePikeLobby/map.json

@@ -109,4 +109,4 @@
       "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json

@@ -108,4 +108,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json

@@ -31,4 +31,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json

@@ -81,4 +81,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json

@@ -126,4 +126,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json

@@ -226,4 +226,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattlePyramidLobby/map.json

@@ -95,4 +95,4 @@
       "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattlePyramidTop/map.json

@@ -54,4 +54,4 @@
     }
   ],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleTowerBattleRoom/map.json

@@ -72,4 +72,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json

@@ -96,4 +96,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleTowerCorridor/map.json

@@ -31,4 +31,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleTowerCorridor2/map.json

@@ -70,4 +70,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleTowerElevator/map.json

@@ -31,4 +31,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_BattleTowerLobby/map.json

@@ -198,4 +198,4 @@
       "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE"
     }
   ]
-}
+}

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json

@@ -135,4 +135,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_ExchangeServiceCorner/map.json

@@ -157,4 +157,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge1/map.json

@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge2/map.json

@@ -98,4 +98,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge3/map.json

@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge4/map.json

@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge5/map.json

@@ -85,4 +85,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge6/map.json

@@ -39,4 +39,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge7/map.json

@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge8/map.json

@@ -65,4 +65,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Lounge9/map.json

@@ -46,4 +46,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_Mart/map.json

@@ -85,4 +85,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_OutsideEast/map.json

@@ -526,4 +526,4 @@
       "script": "Common_EventScript_ShowPokemonCenterSign"
     }
   ]
-}
+}

data/maps/BattleFrontier_OutsideWest/map.json

@@ -455,4 +455,4 @@
       "script": "Common_EventScript_ShowPokemartSign"
     }
   ]
-}
+}

data/maps/BattleFrontier_PokemonCenter_1F/map.json

@@ -105,4 +105,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_PokemonCenter_2F/map.json

@@ -92,4 +92,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_RankingHall/map.json

@@ -169,4 +169,4 @@
       "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn"
     }
   ]
-}
+}

data/maps/BattleFrontier_ReceptionGate/map.json

@@ -98,4 +98,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattleFrontier_ScottsHouse/map.json

@@ -46,4 +46,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare01/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare02/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare03/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare04/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare05/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare06/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare07/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare08/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare09/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare10/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare11/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare12/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare13/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare14/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare15/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BattlePyramidSquare16/map.json

@@ -109,4 +109,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BirthIsland_Exterior/map.json

@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/BirthIsland_Harbor/map.json

@@ -52,4 +52,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/CaveOfOrigin_1F/map.json

@@ -32,4 +32,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/CaveOfOrigin_B1F/map.json

@@ -39,4 +39,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/CaveOfOrigin_Entrance/map.json

@@ -32,4 +32,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json

@@ -32,4 +32,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json

@@ -32,4 +32,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json

@@ -32,4 +32,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/ContestHall/map.json

@@ -213,4 +213,4 @@
   "warp_events": [],
   "coord_events": [],
   "bg_events": []
-}
+}

data/maps/ContestHall/scripts.inc

@@ -79,7 +79,7 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834
 	call ContestHall_EventScript_CreateAudience
 	end
 
-@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist)
+@ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist)
 @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
 ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
 	call ContestHall_EventScript_GetRandomAudienceGfxId