From 36b2301fd262adc70fc89ecdd3a7a97549b5a6c9 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 2 Dec 2019 13:34:11 -0500 Subject: mostly standardize to object event to prep for disassembly --- src/fldeff_rocksmash.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/fldeff_rocksmash.c') diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 90abda81f..704771865 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -31,10 +31,10 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - mapObjId = GetFieldObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gMapObjects[mapObjId].graphicsId != graphicsId) + mapObjId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[mapObjId].graphicsId != graphicsId) return FALSE; - gSpecialVar_LastTalked = gMapObjects[mapObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[mapObjId].localId; return TRUE; } @@ -51,8 +51,8 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.unk6 = TRUE; mapObjId = gPlayerAvatar.mapObjectId; - if (!FieldObjectIsMovementOverridden(&gMapObjects[mapObjId]) - || FieldObjectClearHeldMovementIfFinished(&gMapObjects[mapObjId])) + if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -62,7 +62,7 @@ static void task08_080C9820(u8 taskId) else { sub_805CB70(); - FieldObjectSetHeldMovement(&gMapObjects[mapObjId], 0x45); + ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45); gTasks[taskId].func = sub_80C98B0; } } @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) static void sub_80C98B0(u8 taskId) { - if (FieldObjectCheckHeldMovementStatus(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.mapObjectId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_80C98FC; @@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + EventObjectSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_80C99A0; -- cgit v1.2.3 From 46a8b0fb29e4b6ba0535350f7eb0b4681b026749 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 2 Dec 2019 16:51:24 -0500 Subject: finish object event rename --- src/fldeff_rocksmash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_rocksmash.c') diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 704771865..a0c97e9e3 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -13,7 +13,7 @@ #include "palette.h" #include "overworld.h" #include "wild_encounter.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "constants/songs.h" #include "constants/map_objects.h" #include "constants/map_types.h" -- cgit v1.2.3 From ddaa88390e53665c6ac73af5e1a2f519dbddb5c6 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 18:49:34 -0500 Subject: eventobject -> objectevent take 3 --- src/fldeff_rocksmash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_rocksmash.c') diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index a0c97e9e3..c62653367 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_80C99A0; -- cgit v1.2.3 From fabe354c015e0d587353093debafff6f44d6ab07 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 20:16:40 -0500 Subject: final pass at unifying on object event --- src/fldeff_rocksmash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/fldeff_rocksmash.c') diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index c62653367..8b82c60c9 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -50,7 +50,7 @@ static void task08_080C9820(u8 taskId) ScriptContext2_Enable(); gPlayerAvatar.unk6 = TRUE; - mapObjId = gPlayerAvatar.mapObjectId; + mapObjId = gPlayerAvatar.objectEventId; if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId]) || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[mapObjId])) { @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) static void sub_80C98B0(u8 taskId) { - if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.mapObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_80C98FC; @@ -90,7 +90,7 @@ static void sub_80C98FC(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_80C99A0; -- cgit v1.2.3 From 8ee35bc615de6a00a3938f8d9eef88c7e900a203 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 21:09:15 -0500 Subject: *actual* final pass at unifying on object event --- src/fldeff_rocksmash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fldeff_rocksmash.c') diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 8b82c60c9..443de8fb7 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -15,7 +15,7 @@ #include "wild_encounter.h" #include "event_object_movement.h" #include "constants/songs.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/map_types.h" static void task08_080C9820(u8 taskId); @@ -106,7 +106,7 @@ static void sub_80C99A0(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_BREAKABLE_ROCK*/0x60) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(/*OBJECT_EVENT_GFX_BREAKABLE_ROCK*/0x60) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_80C9A10; -- cgit v1.2.3 From f30a6c7ac653dfdad4bf998e534ad5fe27571532 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 22:26:38 -0500 Subject: use new gfx constants for fldeffs --- src/fldeff_rocksmash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fldeff_rocksmash.c') diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 443de8fb7..980b72d4f 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -106,7 +106,7 @@ static void sub_80C99A0(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(/*OBJECT_EVENT_GFX_BREAKABLE_ROCK*/0x60) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_80C9A10; -- cgit v1.2.3