Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-05-27 10:45:16 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use constants in distortion world object events (#1114)

Browse Source 
Signed-off-by: Kuruyia <github@kuruyia.net>
This commit is contained in:
Alexandre Sollier 2026-04-26 17:43:28 +02:00 committed by GitHub
parent 086332ec98
commit b9df57dfab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 102 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generated/object_events_gfx.txt
View File

@ -261,3 +261,9 @@ OBJ_EVENT_GFX_UNK_259
OBJ_EVENT_GFX_UNK_260
OBJ_EVENT_GFX_UNK_261
OBJ_EVENT_GFX_WALL_BLOCKING_ROTOMS_ROOM
OBJ_EVENT_GFX_UNK_263
OBJ_EVENT_GFX_DIST_WORLD_B1F_MESPRIT
OBJ_EVENT_GFX_DIST_WORLD_B6F_UXIE
OBJ_EVENT_GFX_DIST_WORLD_B6F_MESPRIT
OBJ_EVENT_GFX_DIST_WORLD_B6F_AZELF
OBJ_EVENT_GFX_INVISIBLE = 8192

184
src/overlay009/ov9_02249960.c
View File

@ -14,7 +14,9 @@
#include "generated/map_headers.h"
#include "generated/movement_actions.h"
#include "generated/movement_types.h"
#include "generated/object_events_gfx.h"
#include "generated/sdat.h"
#include "generated/trainer_types.h"
#include "struct_decls/map_object.h"
#include "struct_decls/map_object_manager.h"
@ -6121,7 +6123,7 @@ static const DistWorldElevatorPlatformPath *GetMovingPlatformElevatorPath(u32 in
static MapObject *AddMovingPlatformMapObject(DistWorldSystem *system, int tileX, int tileY, int tileZ, int index, int elevatorPathIndex, u32 mapHeaderID)
{
MapObject *mapObj = MapObjectMan_AddMapObject(system->fieldSystem->mapObjMan, tileX, tileZ, 0, 0x2000, 0x0, DistWorldSystem_GetMapHeaderID(system));
MapObject *mapObj = MapObjectMan_AddMapObject(system->fieldSystem->mapObjMan, tileX, tileZ, 0, OBJ_EVENT_GFX_INVISIBLE, 0x0, DistWorldSystem_GetMapHeaderID(system));
MapObject_SetY(mapObj, tileY);
MapObject_SetLocalID(mapObj, 0xFD);
@ -12864,9 +12866,9 @@ static const DistWorldObjectEvent sMapObjectEvent1F_CynthiaPortal = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_1F_CYNTHIA_PORTAL,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_DOWN,
@ -12886,9 +12888,9 @@ static const DistWorldObjectEvent sMapObjectEvent1F_CynthiaElevator = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_1F_CYNTHIA_ELEVATOR,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x5,
.dir = FACE_RIGHT,
@ -12914,9 +12916,9 @@ static const DistWorldObjectEvent sMapObjectEventB1F_Mesprit = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B1F_MESPRIT,
.graphicsID = 0x108,
.graphicsID = OBJ_EVENT_GFX_DIST_WORLD_B1F_MESPRIT,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -12941,9 +12943,9 @@ static const DistWorldObjectEvent sMapObjectEventB2F_Cynthia1 = {
.rotationAngle = 0x5A,
.objEvent = {
.localID = MAP_OBJECT_B2F_CYNTHIA_1,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2,
.dir = FACE_DOWN,
@ -12963,9 +12965,9 @@ static const DistWorldObjectEvent sMapObjectEventB2F_Cynthia2 = {
.rotationAngle = 0x5A,
.objEvent = {
.localID = MAP_OBJECT_B2F_CYNTHIA_2,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2,
.dir = FACE_UP,
@ -12991,9 +12993,9 @@ static const DistWorldObjectEvent sMapObjectEventB3F_Cyrus = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B3F_CYRUS,
.graphicsID = 0x78,
.graphicsID = OBJ_EVENT_GFX_CYRUS,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13018,9 +13020,9 @@ static const DistWorldObjectEvent sMapObjectEventB4F_Cyrus = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B4F_CYRUS,
.graphicsID = 0x78,
.graphicsID = OBJ_EVENT_GFX_CYRUS,
.movementType = MOVEMENT_TYPE_067,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_LEFT,
@ -13045,9 +13047,9 @@ static const DistWorldObjectEvent sMapObjectEventB5F_MespritBoulder = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B5F_MESPRIT_BOULDER,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2712,
.dir = FACE_UP,
@ -13067,9 +13069,9 @@ static const DistWorldObjectEvent sMapObjectEventB5F_AzelfBoulder = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B5F_AZELF_BOULDER,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2712,
.dir = FACE_UP,
@ -13089,9 +13091,9 @@ static const DistWorldObjectEvent sMapObjectEventB5F_UxieBoulder = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B5F_UXIE_BOULDER,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2712,
.dir = FACE_UP,
@ -13111,9 +13113,9 @@ static const DistWorldObjectEvent sMapObjectEventB5F_Uxie = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B5F_UXIE,
.graphicsID = 0x97,
.graphicsID = OBJ_EVENT_GFX_UXIE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13133,9 +13135,9 @@ static const DistWorldObjectEvent sMapObjectEventB5F_Azelf = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B5F_AZELF,
.graphicsID = 0x99,
.graphicsID = OBJ_EVENT_GFX_AZELF,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13155,9 +13157,9 @@ static const DistWorldObjectEvent sMapObjectEventB5F_Mesprit = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B5F_MESPRIT,
.graphicsID = 0x98,
.graphicsID = OBJ_EVENT_GFX_MESPRIT,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13187,9 +13189,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_MespritBoulderOutside = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_MESPRIT_BOULDER_OUTSIDE,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2712,
.dir = FACE_UP,
@ -13209,9 +13211,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_AzelfBoulderOutside = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_AZELF_BOULDER_OUTSIDE,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2712,
.dir = FACE_UP,
@ -13231,9 +13233,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_UxieBoulderOutside = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_UXIE_BOULDER_OUTSIDE,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2712,
.dir = FACE_UP,
@ -13253,9 +13255,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_Mesprit = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_MESPRIT,
.graphicsID = 0x10A,
.graphicsID = OBJ_EVENT_GFX_DIST_WORLD_B6F_MESPRIT,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13275,9 +13277,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_Uxie = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_UXIE,
.graphicsID = 0x109,
.graphicsID = OBJ_EVENT_GFX_DIST_WORLD_B6F_UXIE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13297,9 +13299,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_Azelf = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_AZELF,
.graphicsID = 0x10B,
.graphicsID = OBJ_EVENT_GFX_DIST_WORLD_B6F_AZELF,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13319,9 +13321,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_Cynthia = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_CYNTHIA,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2,
.dir = FACE_UP,
@ -13341,9 +13343,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_CynthiaElevator = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_CYNTHIA_ELEVATOR,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2,
.dir = FACE_RIGHT,
@ -13363,9 +13365,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_MespritBoulderPitText1 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_MESPRIT_BOULDER_PIT_TEXT_1,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13385,9 +13387,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_MespritBoulderPitText2 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_MESPRIT_BOULDER_PIT_TEXT_2,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13407,9 +13409,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_MespritBoulderPitText3 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_MESPRIT_BOULDER_PIT_TEXT_3,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13429,9 +13431,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_UxieBoulderPitText1 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_UXIE_BOULDER_PIT_TEXT_1,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13451,9 +13453,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_UxieBoulderPitText2 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_UXIE_BOULDER_PIT_TEXT_2,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13473,9 +13475,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_UxieBoulderPitText3 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_UXIE_BOULDER_PIT_TEXT_3,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13495,9 +13497,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_AzelfBoulderPitText1 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_AZELF_BOULDER_PIT_TEXT_1,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13517,9 +13519,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_AzelfBoulderPitText2 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_AZELF_BOULDER_PIT_TEXT_2,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13539,9 +13541,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_AzelfBoulderPitText3 = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_AZELF_BOULDER_PIT_TEXT_3,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x8,
.dir = FACE_UP,
@ -13561,9 +13563,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_MespritBoulderInPit = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_MESPRIT_BOULDER_IN_PIT,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13583,9 +13585,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_AzelfBoulderInPit = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_AZELF_BOULDER_IN_PIT,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13605,9 +13607,9 @@ static const DistWorldObjectEvent sMapObjectEventB6F_UxieBoulderInPit = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B6F_UXIE_BOULDER_IN_PIT,
.graphicsID = 0x54,
.graphicsID = OBJ_EVENT_GFX_STRENGTH_BOULDER,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13651,9 +13653,9 @@ static const DistWorldObjectEvent sMapObjectEventB7F_CynthiaInitial = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B7F_CYNTHIA_INITIAL,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x6,
.dir = FACE_UP,
@ -13673,9 +13675,9 @@ static const DistWorldObjectEvent sMapObjectEventB7F_CynthiaTalking = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B7F_CYNTHIA_TALKING,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x6,
.dir = FACE_RIGHT,
@ -13695,9 +13697,9 @@ static const DistWorldObjectEvent sMapObjectEventB7F_CynthiaPostBattle = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B7F_CYNTHIA_POST_BATTLE,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x6,
.dir = FACE_UP,
@ -13717,9 +13719,9 @@ static const DistWorldObjectEvent sMapObjectEventB7F_CyrusInitial = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B7F_CYRUS_INITIAL,
.graphicsID = 0x78,
.graphicsID = OBJ_EVENT_GFX_CYRUS,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x5,
.dir = FACE_DOWN,
@ -13739,9 +13741,9 @@ static const DistWorldObjectEvent sMapObjectEventB7F_CyrusTalking = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_B7F_CYRUS_TALKING,
.graphicsID = 0x78,
.graphicsID = OBJ_EVENT_GFX_CYRUS,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x5,
.dir = FACE_LEFT,
@ -13770,9 +13772,9 @@ static const DistWorldObjectEvent sMapObjectEventGiratinaRoom_Giratina = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_GIRATINA_ROOM_GIRATINA,
.graphicsID = 0xE6,
.graphicsID = OBJ_EVENT_GFX_GIRATINA_ORIGIN,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x5,
.dir = FACE_UP,
@ -13792,9 +13794,9 @@ static const DistWorldObjectEvent sMapObjectEventGiratinaRoom_Cynthia = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_GIRATINA_ROOM_CYNTHIA,
.graphicsID = 0x8A,
.graphicsID = OBJ_EVENT_GFX_CYNTHIA,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13814,9 +13816,9 @@ static const DistWorldObjectEvent sMapObjectEventGiratinaRoom_Cyrus = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_GIRATINA_ROOM_CYRUS,
.graphicsID = 0x78,
.graphicsID = OBJ_EVENT_GFX_CYRUS,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x0,
.dir = FACE_UP,
@ -13836,9 +13838,9 @@ static const DistWorldObjectEvent sMapObjectEventGiratinaRoom_Portal = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_GIRATINA_ROOM_PORTAL,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x3,
.dir = FACE_UP,
@ -13858,9 +13860,9 @@ static const DistWorldObjectEvent sMapObjectEventGiratinaRoom_CynthiaText = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_GIRATINA_ROOM_CYNTHIA_TEXT,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x6,
.dir = FACE_UP,
@ -13889,9 +13891,9 @@ static const DistWorldObjectEvent sMapObjectEventTurnbackCaveRoom_Portal = {
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_TURNBACK_CAVE_PORTAL,
.graphicsID = 0x2000,
.graphicsID = OBJ_EVENT_GFX_INVISIBLE,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x0,
.script = 0x2,
.dir = FACE_UP,
@ -13911,9 +13913,9 @@ static const DistWorldObjectEvent sMapObjectEventTurnbackCaveRoom_GriseousOrbIte
.rotationAngle = 0x0,
.objEvent = {
.localID = MAP_OBJECT_TURNBACK_CAVE_GRISEOUS_ORB_ITEM,
.graphicsID = 0x57,
.graphicsID = OBJ_EVENT_GFX_POKEBALL,
.movementType = MOVEMENT_TYPE_NONE,
.trainerType = 0x0,
.trainerType = TRAINER_TYPE_NONE,
.hiddenFlag = 0x538,
.script = SCRIPT_ID(VISIBLE_ITEMS, 321),
.dir = FACE_UP,

5
src/scrcmd.c
View File

@ -20,6 +20,7 @@
#include "generated/journal_location_events.h"
#include "generated/movement_actions.h"
#include "generated/movement_types.h"
#include "generated/object_events_gfx.h"
#include "generated/pokemon_contest_ranks.h"
#include "generated/save_types.h"
#include "generated/signpost_commands.h"
@ -2377,7 +2378,7 @@ static BOOL ScrCmd_AddFreeCamera(ScriptContext *ctx)
u16 zPos = ScriptContext_GetVar(ctx);
MapObject **cameraObject = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT);
*cameraObject = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, xPos, zPos, 0, 0x2000, 0x0, ctx->fieldSystem->location->mapId);
*cameraObject = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, xPos, zPos, 0, OBJ_EVENT_GFX_INVISIBLE, 0x0, ctx->fieldSystem->location->mapId);
MapObject_RecalculateObjectHeight(*cameraObject);
MapObject_SetHidden(*cameraObject, TRUE);
@ -2413,7 +2414,7 @@ static BOOL ScrCmd_AddCameraOverrideObject(ScriptContext *ctx)
u16 zPos = ScriptContext_GetVar(ctx);
MapObject **cameraObject = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_CAMERA_OBJECT);
*cameraObject = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, xPos, zPos, 0, 0x2000, 0x0, ctx->fieldSystem->location->mapId);
*cameraObject = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, xPos, zPos, 0, OBJ_EVENT_GFX_INVISIBLE, 0x0, ctx->fieldSystem->location->mapId);
MapObject_RecalculateObjectHeight(*cameraObject);
MapObject_SetHidden(*cameraObject, TRUE);