Standardize Event Object to Object Event

This commit is contained in:
GriffinR 2019-11-20 22:55:44 -05:00
parent 215bb31d67
commit ec3e86f1d2
606 changed files with 10080 additions and 10080 deletions

View File

@ -765,7 +765,7 @@
.2byte \y .2byte \y
.endm .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 .macro copyobjectxytoperm index:req
.byte 0x64 .byte 0x64
.2byte \index .2byte \index

View File

@ -1 +1 @@
gSelectedEventObject gSelectedObjectEvent

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -79,7 +79,7 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834
call ContestHall_EventScript_CreateAudience call ContestHall_EventScript_CreateAudience
end 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 @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842 ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
call ContestHall_EventScript_GetRandomAudienceGfxId call ContestHall_EventScript_GetRandomAudienceGfxId

Some files were not shown because too many files have changed in this diff Show More