diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-20 21:01:15 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-20 21:01:15 +0100 |
| commit | bc71641386573c7e865d0cec941f84310fbd648f (patch) | |
| tree | 028717e7f893a18d77b7d24e693eaf2abd0d2c49 /src | |
| parent | 164e2ea8eb5501eed7a8b641c3cb97b7e1992e0d (diff) | |
Continue synchronising
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_setup.c | 4 | ||||
| -rw-r--r-- | src/event_object_movement.c | 1128 | ||||
| -rw-r--r-- | src/field_control_avatar.c | 18 | ||||
| -rw-r--r-- | src/overworld.c | 13 | ||||
| -rw-r--r-- | src/script.c | 4 | ||||
| -rw-r--r-- | src/trainer_see.c | 2 |
6 files changed, 601 insertions, 568 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index c0d89c70f..c457cc8ec 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -1038,7 +1038,7 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void TrainerWantsBattle(u8 trainerEventObjId, u8 *trainerScript) +void TrainerWantsBattle(u8 trainerEventObjId, const u8 *trainerScript) { gSelectedEventObject = trainerEventObjId; gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; @@ -1047,7 +1047,7 @@ void TrainerWantsBattle(u8 trainerEventObjId, u8 *trainerScript) ScriptContext2_Enable(); } -bool32 GetTrainerFlagFromScriptPointer(u8 *data) +bool32 GetTrainerFlagFromScriptPointer(const u8 *data) { u32 flag = TrainerBattleLoadArg16(data + 2); return FlagGet(TRAINER_FLAG_START + flag); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 23824538d..743d9bb92 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -65,12 +65,33 @@ static void CreateReflectionEffectSprites(void); static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); static u8 GetEventObjectIdByLocalId(u8); static void RemoveEventObjectInternal(struct EventObject *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables); +static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject); static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); static void sub_805B914(struct EventObject *); static u8 sub_805BE58(const struct SpritePalette *); - +static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); +static void SetEventObjectDynamicGraphicsId(struct EventObject *); +static u8 FindEventObjectPaletteIndexByTag(u16); +static u16 GetEventObjectFlagIdByEventObjectId(u8); +static void GetEventObjectMovingCameraOffset(s16 *, s16 *); +static void EventObjectUpdateMetatileBehaviors(struct EventObject *); +static void GetGroundEffectFlags_Reflection(struct EventObject *, u32 *); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *, u32 *); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *, u32 *); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *, u32 *); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *, u32 *); +static void GetGroundEffectFlags_Tracks(struct EventObject *, u32 *); +static void GetGroundEffectFlags_SandPile(struct EventObject *, u32 *); +static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *, u32 *); +static void GetGroundEffectFlags_Puddle(struct EventObject *, u32 *); +static void GetGroundEffectFlags_Ripple(struct EventObject *, u32 *); +static void GetGroundEffectFlags_ShortGrass(struct EventObject *, u32 *); +static void GetGroundEffectFlags_HotSprings(struct EventObject *, u32 *); +static void GetGroundEffectFlags_Seaweed(struct EventObject *, u32 *); +static void GetGroundEffectFlags_JumpLanding(struct EventObject *, u32 *); +static u8 EventObjectCheckForReflectiveSurface(struct EventObject *); +static void DoRippleFieldEffect(struct EventObject *eventObj, struct Sprite *sprite); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -366,16 +387,16 @@ const u8 gInitialMovementTypeFacingDirections[] = { #include "data/field_event_obj/event_object_graphics_info.h" const struct SpritePalette sEventObjectSpritePalettes[] = { - {gEventObjectPalette0, EVENT_OBJ_PAL_TAG_0}, - {gEventObjectPalette1, EVENT_OBJ_PAL_TAG_1}, - {gEventObjectPalette2, EVENT_OBJ_PAL_TAG_2}, - {gEventObjectPalette3, EVENT_OBJ_PAL_TAG_3}, - {gEventObjectPalette4, EVENT_OBJ_PAL_TAG_4}, - {gEventObjectPalette5, EVENT_OBJ_PAL_TAG_5}, - {gEventObjectPalette6, EVENT_OBJ_PAL_TAG_6}, - {gEventObjectPalette7, EVENT_OBJ_PAL_TAG_7}, - {gEventObjectPalette8, EVENT_OBJ_PAL_TAG_8}, - {gEventObjectPalette9, EVENT_OBJ_PAL_TAG_9}, + {gEventObjectPalette0, EVENT_OBJ_PAL_TAG_0}, + {gEventObjectPalette1, EVENT_OBJ_PAL_TAG_1}, + {gEventObjectPalette2, EVENT_OBJ_PAL_TAG_2}, + {gEventObjectPalette3, EVENT_OBJ_PAL_TAG_3}, + {gEventObjectPalette4, EVENT_OBJ_PAL_TAG_4}, + {gEventObjectPalette5, EVENT_OBJ_PAL_TAG_5}, + {gEventObjectPalette6, EVENT_OBJ_PAL_TAG_6}, + {gEventObjectPalette7, EVENT_OBJ_PAL_TAG_7}, + {gEventObjectPalette8, EVENT_OBJ_PAL_TAG_8}, + {gEventObjectPalette9, EVENT_OBJ_PAL_TAG_9}, {gEventObjectPalette10, EVENT_OBJ_PAL_TAG_10}, {gEventObjectPalette11, EVENT_OBJ_PAL_TAG_11}, {gEventObjectPalette12, EVENT_OBJ_PAL_TAG_12}, @@ -393,14 +414,14 @@ const struct SpritePalette sEventObjectSpritePalettes[] = { {gEventObjectPalette24, EVENT_OBJ_PAL_TAG_24}, {gEventObjectPalette25, EVENT_OBJ_PAL_TAG_25}, {gEventObjectPalette26, EVENT_OBJ_PAL_TAG_26}, - {NULL, 0x0000} + {NULL, 0x0000}, }; const u16 gPlayerReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_9, EVENT_OBJ_PAL_TAG_9, EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9 + EVENT_OBJ_PAL_TAG_9, }; // These were probably intended to be used for the female player's reflection. @@ -408,91 +429,91 @@ const u16 gUnusedPlayerReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_18, EVENT_OBJ_PAL_TAG_18, EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18 + EVENT_OBJ_PAL_TAG_18, }; const u16 gPlayerUnderwaterReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11 + EVENT_OBJ_PAL_TAG_11, }; const struct ReflectionPaletteSet gPlayerReflectionPaletteSets[] = { {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, {EVENT_OBJ_PAL_TAG_17, gPlayerReflectionPaletteTags}, {EVENT_OBJ_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL} + {EVENT_OBJ_PAL_TAG_NONE, NULL}, }; const u16 gQuintyPlumpReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_13, EVENT_OBJ_PAL_TAG_13, EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13 + EVENT_OBJ_PAL_TAG_13, }; const u16 gTruckReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14 + EVENT_OBJ_PAL_TAG_14, }; const u16 gMachokeMoverReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15 + EVENT_OBJ_PAL_TAG_15, }; const u16 gMovingBoxReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19 + EVENT_OBJ_PAL_TAG_19, }; const u16 gCableCarReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20 + EVENT_OBJ_PAL_TAG_20, }; const u16 gSSTidalReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21 + EVENT_OBJ_PAL_TAG_21, }; const u16 gSubmarineShadowReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26 + EVENT_OBJ_PAL_TAG_26, }; const u16 gKyogre2ReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_23, EVENT_OBJ_PAL_TAG_23, EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23 + EVENT_OBJ_PAL_TAG_23, }; const u16 gGroudon2ReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_25, EVENT_OBJ_PAL_TAG_25, EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25 + EVENT_OBJ_PAL_TAG_25, }; const u16 gInvisibleKecleonReflectionPaletteTags[] = { EVENT_OBJ_PAL_TAG_6, EVENT_OBJ_PAL_TAG_6, EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6 + EVENT_OBJ_PAL_TAG_6, }; const struct ReflectionPaletteSet gSpecialObjectReflectionPaletteSets[] = { @@ -508,7 +529,7 @@ const struct ReflectionPaletteSet gSpecialObjectReflectionPaletteSets[] = { {EVENT_OBJ_PAL_TAG_24, gGroudon2ReflectionPaletteTags}, {EVENT_OBJ_PAL_TAG_2, gInvisibleKecleonReflectionPaletteTags}, {EVENT_OBJ_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL} + {EVENT_OBJ_PAL_TAG_NONE, NULL}, }; const u16 gObjectPaletteTags0[] = { @@ -521,7 +542,7 @@ const u16 gObjectPaletteTags0[] = { EVENT_OBJ_PAL_TAG_4, EVENT_OBJ_PAL_TAG_5, EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7 + EVENT_OBJ_PAL_TAG_7, }; const u16 gObjectPaletteTags1[] = { @@ -534,7 +555,7 @@ const u16 gObjectPaletteTags1[] = { EVENT_OBJ_PAL_TAG_4, EVENT_OBJ_PAL_TAG_5, EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7 + EVENT_OBJ_PAL_TAG_7, }; const u16 gObjectPaletteTags2[] = { @@ -547,7 +568,7 @@ const u16 gObjectPaletteTags2[] = { EVENT_OBJ_PAL_TAG_4, EVENT_OBJ_PAL_TAG_5, EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7 + EVENT_OBJ_PAL_TAG_7, }; const u16 gObjectPaletteTags3[] = { @@ -560,14 +581,14 @@ const u16 gObjectPaletteTags3[] = { EVENT_OBJ_PAL_TAG_4, EVENT_OBJ_PAL_TAG_5, EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7 + EVENT_OBJ_PAL_TAG_7, }; const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags0, gObjectPaletteTags1, gObjectPaletteTags2, - gObjectPaletteTags3 + gObjectPaletteTags3, }; #include "data/field_event_obj/berry_tree_graphics_tables.h" @@ -981,7 +1002,7 @@ const u8 gOppositeDirections[] = { DIR_NORTHEAST, DIR_NORTHWEST, DIR_SOUTHEAST, - DIR_SOUTHWEST + DIR_SOUTHWEST, }; const u8 gUnknown_08375757[][4] = { @@ -1127,7 +1148,7 @@ static u8 GetEventObjectIdByLocalId(u8 localId) return EVENT_OBJECTS_COUNT; } -static u8 TryInitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) +static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) { struct EventObject *eventObject; u8 eventObjectId; @@ -1137,8 +1158,8 @@ static u8 TryInitEventObjectStateFromTemplate(struct EventObjectTemplate *templa if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId) != 0) return EVENT_OBJECTS_COUNT; - eventObject = (void *)&gEventObjects[eventObjectId]; - ClearEventObject((struct EventObject *)eventObject); + eventObject = &gEventObjects[eventObjectId]; + ClearEventObject(eventObject); initialX = template->x + 7; initialY = template->y + 7; eventObject->active = TRUE; @@ -1162,9 +1183,9 @@ static u8 TryInitEventObjectStateFromTemplate(struct EventObjectTemplate *templa eventObject->trainerType = template->trainerType; eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - SetEventObjectDirection((struct EventObject *)eventObject, eventObject->previousMovementDirection); + SetEventObjectDirection(eventObject, eventObject->previousMovementDirection); asm("":::"r5","r6"); - SetEventObjectDynamicGraphicsId((struct EventObject *)eventObject); + SetEventObjectDynamicGraphicsId(eventObject); if (gRangedMovementTypes[eventObject->movementType]) { @@ -1194,18 +1215,20 @@ u8 TryInitLocalEventObject(u8 localId) { struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) - return TryInitEventObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + return InitEventObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } return EVENT_OBJECTS_COUNT; } -u8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) { u8 i = 0; - for (i = 0; i < EVENT_OBJECTS_COUNT && gEventObjects[i].active; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { + if (!gEventObjects[i].active) + break; if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) return TRUE; } @@ -1258,15 +1281,15 @@ void RemoveAllEventObjectsExceptPlayer(void) } } -static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *sprTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) +static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { - u8 eventObjectId; u8 spriteId; - const struct EventObjectGraphicsInfo *graphicsInfo; - struct EventObject *eventObject; + u8 eventObjectId; struct Sprite *sprite; + struct EventObject *eventObject; + const struct EventObjectGraphicsInfo *graphicsInfo; - eventObjectId = TryInitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); + eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); if (eventObjectId == EVENT_OBJECTS_COUNT) return EVENT_OBJECTS_COUNT; @@ -1281,21 +1304,18 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE) + { eventObject->invisible = TRUE; - -#ifdef NONMATCHING - sprTemplate->paletteTag = 0xFFFF; -#else - *(u16 *)&sprTemplate->paletteTag = 0xFFFF; -#endif - spriteId = CreateSprite(sprTemplate, 0, 0, 0); + } + *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; + spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { #if DEBUG gUnknown_Debug_03004BC0--; #endif gEventObjects[eventObjectId].active = FALSE; - return 16; + return EVENT_OBJECTS_COUNT; } sprite = &gSprites[spriteId]; sub_8060388(cameraDeltaX + eventObject->currentCoords.x, cameraDeltaY + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); @@ -1319,12 +1339,11 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { - + u8 eventObjectId; struct SpriteTemplate spriteTemplate; - const struct SubspriteTable *subspriteTables = NULL; struct SpriteFrameImage spriteFrameImage; const struct EventObjectGraphicsInfo *graphicsInfo; - u8 eventObjectId; + const struct SubspriteTable *subspriteTables = NULL; graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId); MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); @@ -1387,28 +1406,28 @@ u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, x, y); } -void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - sprTemplate->tileTag = graphicsInfo->tileTag; - sprTemplate->paletteTag = graphicsInfo->paletteTag; - sprTemplate->oam = graphicsInfo->oam; - sprTemplate->anims = graphicsInfo->anims; - sprTemplate->images = graphicsInfo->images; - sprTemplate->affineAnims = graphicsInfo->affineAnims; - sprTemplate->callback = callback; + spriteTemplate->tileTag = graphicsInfo->tileTag; + spriteTemplate->paletteTag = graphicsInfo->paletteTag; + spriteTemplate->oam = graphicsInfo->oam; + spriteTemplate->anims = graphicsInfo->anims; + spriteTemplate->images = graphicsInfo->images; + spriteTemplate->affineAnims = graphicsInfo->affineAnims; + spriteTemplate->callback = callback; *subspriteTables = graphicsInfo->subspriteTables; } -static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], sprTemplate, subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], spriteTemplate, subspriteTables); } -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjTemplate->graphicsId, eventObjTemplate->movementType, sprTemplate, subspriteTables); + MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjTemplate->graphicsId, eventObjTemplate->movementType, spriteTemplate, subspriteTables); } u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) @@ -1419,7 +1438,9 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); if (spriteTemplate.paletteTag != 0xFFFF) + { sub_805BDF8(spriteTemplate.paletteTag); + } spriteId = CreateSprite(&spriteTemplate, x, y, subpriority); if (spriteId != MAX_SPRITES && subspriteTables != NULL) { @@ -1431,18 +1452,14 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) { - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 spriteId; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; - u8 spriteId; + const struct EventObjectGraphicsInfo *graphicsInfo; graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); -#ifdef NONMATCHING - spriteTemplate.paletteTag = 0xFFFF; -#else *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; -#endif x += 7; y += 7; sub_8060470(&x, &y, 8, 16); @@ -1570,13 +1587,13 @@ void sub_805B75C(u8 eventObjectId, s16 x, s16 y) const struct SubspriteTable *subspriteTables; const struct EventObjectGraphicsInfo *graphicsInfo; - #define i spriteId +#define i spriteId for (i = 0; i < 4; i++) { if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) return; } - #undef i +#undef i eventObject = &gEventObjects[eventObjectId]; asm("":::"r5"); @@ -1712,31 +1729,33 @@ void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direc } } -void PlayerObjectTurn(struct PlayerAvatar *player, u8 direction) +void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) { - EventObjectTurn(&gEventObjects[player->eventObjectId], direction); + EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction); } -void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) +static void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) { - u8 treeStage; - u8 treeId; + u8 berryStage; + u8 berryId; eventObject->invisible = TRUE; sprite->invisible = TRUE; - treeStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); - if (treeStage != 0) + berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + if (berryStage != 0) { eventObject->invisible = FALSE; sprite->invisible = FALSE; - treeId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; - treeStage--; - if (treeId > 0x2B) - treeId = 0; - EventObjectSetGraphicsId(eventObject, gBerryTreeGraphicsIdTablePointers[treeId][treeStage]); - sprite->images = gBerryTreePicTablePointers[treeId]; - sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[treeId][treeStage]; - StartSpriteAnim(sprite, treeStage); + berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; + berryStage--; + if (berryId > 0x2B) + { + berryId = 0; + } + EventObjectSetGraphicsId(eventObject, gBerryTreeGraphicsIdTablePointers[berryId][berryStage]); + sprite->images = gBerryTreePicTablePointers[berryId]; + sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; + StartSpriteAnim(sprite, berryStage); } } @@ -1753,7 +1772,7 @@ const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) return gEventObjectGraphicsInfoPointers[graphicsId]; } -void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) +static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) { if (eventObject->graphicsId > SPRITE_VAR) { @@ -1872,13 +1891,17 @@ void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) LoadPalette(sEventObjectSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); } -static void PatchObjectPalettes(const u16 *paletteTags, u8 paletteIndex, u8 maxPaletteIndex) +static void PatchObjectPalettes(const u16 *paletteTags, u8 minSlot, u8 maxSlot) { - for (; paletteIndex < maxPaletteIndex; paletteTags++, paletteIndex++) - PatchObjectPalette(*paletteTags, paletteIndex); + while (minSlot < maxSlot) + { + PatchObjectPalette(*paletteTags, minSlot); + paletteTags++; + minSlot++; + } } -u8 FindEventObjectPaletteIndexByTag(u16 tag) +static u8 FindEventObjectPaletteIndexByTag(u16 tag) { u8 i; @@ -1939,7 +1962,7 @@ void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) eventObject->currentCoords.y = y; } -void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) { eventObject->previousCoords.x = x; eventObject->previousCoords.y = y; @@ -2082,14 +2105,16 @@ static void CameraObject_2(struct Sprite *sprite) sprite->data[3] = 0; } -struct Sprite *FindCameraObject(void) +static struct Sprite *FindCameraObject(void) { u8 i; for (i = 0; i < MAX_SPRITES; i++) { if (gSprites[i].inUse && gSprites[i].callback == ObjectCB_CameraObject) + { return &gSprites[i]; + } } return NULL; } @@ -2121,7 +2146,7 @@ u8 CameraObjectGetFollowedObjectId(void) struct Sprite *cameraSprite = FindCameraObject(); if (cameraSprite == NULL) - return 64; + return MAX_SPRITES; else return cameraSprite->data[0]; } @@ -2166,7 +2191,6 @@ u8 CreateCopySpriteAt(struct Sprite *src, s16 x, s16 y, u8 subpriority) return i; } } - return MAX_SPRITES; } @@ -2181,26 +2205,22 @@ void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) eventObject->movementDirection = direction; } -u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *template = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - - return template->script; + return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; } -u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) +const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) { return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); } -u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *template = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - - return template->flagId; + return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) +static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) { return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); } @@ -2305,7 +2325,7 @@ void TryOverrideTemplateCoordsForEventObject(u8 localId, u8 mapNum, u8 mapGroup) void InitEventObjectPalettes(u8 reflectionType) { FreeAndReserveObjectSpritePalettes(); - sCurrentSpecialObjectPaletteTag = 0x11FF; + sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; sCurrentReflectionType = reflectionType; PatchObjectPalettes(gObjectPaletteTagSets[sCurrentReflectionType], 0, 10); } @@ -2319,7 +2339,7 @@ u16 GetObjectPaletteTag(u8 paletteIndex) return gObjectPaletteTagSets[sCurrentReflectionType][paletteIndex]; // Palette slots 10 and 11 belong to the special object. - for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != 0x11FF; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].mainPaletteTag == sCurrentSpecialObjectPaletteTag) { @@ -2327,48 +2347,48 @@ u16 GetObjectPaletteTag(u8 paletteIndex) } } - return 0x11FF; + return EVENT_OBJ_PAL_TAG_NONE; } movement_type_empty_callback(MovementType_None); movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround); -u8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0) { - return 0; + return FALSE; } SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); sprite->data[1] = 3; - return 1; + return TRUE; } -u8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[4]; @@ -2380,28 +2400,28 @@ u8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprit { sprite->data[1] = 1; } - return 1; + return TRUE; } -u8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); eventObject->singleMovementActive = 1; sprite->data[1] = 6; - return 1; + return TRUE; } -u8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) { eventObject->singleMovementActive = 0; sprite->data[1] = 1; } - return 0; + return FALSE; } -u8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) +bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) { s16 x; s16 y; @@ -2411,13 +2431,13 @@ u8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) s16 maxx; s16 miny; s16 maxy; - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH) == 0) + if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH)) { - return 0; + return FALSE; } if (eventObject->trainerType != 1 && eventObject->trainerType != 3) { - return 0; + return FALSE; } PlayerGetDestCoords(&x, &y); objx = eventObject->currentCoords.x; @@ -2428,9 +2448,9 @@ u8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) maxy = objy + eventObject->trainerRange_berryTreeId; if (minx > x || maxx < x || miny > y || maxy < y) { - return 0; + return FALSE; } - return 1; + return TRUE; } u8 GetVectorDirection(s16 x, s16 y, s16 xAbs, s16 yAbs) @@ -2635,21 +2655,21 @@ u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 direction movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround); -u8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -2657,75 +2677,75 @@ u8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[4]; - memcpy(directions, gStandardDirections, 4); + memcpy(directions, gStandardDirections, sizeof directions); direction = TryGetTrainerEncounterDirection(eventObject, 0); if (direction == DIR_NONE) direction = directions[Random() & 3]; SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown); -u8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0) { - return 0; + return FALSE; } SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); sprite->data[1] = 3; - return 1; + return TRUE; } -u8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gUpAndDownDirections, 2); + memcpy(directions, gUpAndDownDirections, sizeof directions); direction = directions[Random() & 1]; SetEventObjectDirection(eventObject, direction); sprite->data[1] = 5; @@ -2733,69 +2753,69 @@ u8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sp { sprite->data[1] = 1; } - return 1; + return TRUE; } -u8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); eventObject->singleMovementActive = 1; sprite->data[1] = 6; - return 1; + return TRUE; } -u8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) { eventObject->singleMovementActive = 0; sprite->data[1] = 1; } - return 0; + return FALSE; } movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight); -u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0) { - return 0; + return FALSE; } SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); sprite->data[1] = 3; - return 1; + return TRUE; } -u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gLeftAndRightDirections, 2); + memcpy(directions, gLeftAndRightDirections, sizeof directions); direction = directions[Random() & 1]; SetEventObjectDirection(eventObject, direction); sprite->data[1] = 5; @@ -2803,56 +2823,57 @@ u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct { sprite->data[1] = 1; } - return 1; + return TRUE; } -u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); eventObject->singleMovementActive = 1; sprite->data[1] = 6; - return 1; + return TRUE; } -u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) { eventObject->singleMovementActive = 0; sprite->data[1] = 1; } - return 0; + return FALSE; } movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection); -u8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) { sprite->data[1] = 2; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->singleMovementActive = 0; - return 0; + return FALSE; } void MovementType_BerryTreeGrowth(struct Sprite *sprite) { struct EventObject *eventObject; + eventObject = &gEventObjects[sprite->data[0]]; if (!(sprite->data[7] & 1)) { @@ -2867,12 +2888,12 @@ static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject *eventObject, return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite); } -u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) { u8 berryTreeStage; ClearEventObjectMovement(eventObject, sprite); - eventObject->invisible = 1; - sprite->invisible = 1; + eventObject->invisible = TRUE; + sprite->invisible = TRUE; berryTreeStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); if (!berryTreeStage) { @@ -2885,33 +2906,33 @@ u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sp FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); sprite->animNum = 0; } - return 0; + return FALSE; } - eventObject->invisible = 0; - sprite->invisible = 0; + eventObject->invisible = FALSE; + sprite->invisible = FALSE; berryTreeStage--; if (sprite->animNum != berryTreeStage) { sprite->data[1] = 2; - return 1; + return TRUE; } get_berry_tree_graphics(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 0; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->singleMovementActive = 1; sprite->data[1] = 3; @@ -2922,55 +2943,55 @@ u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sp gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); - return 1; + return TRUE; } -u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) { sprite->data[2]++; eventObject->invisible = ((sprite->data[2] & 0x2) >> 1); - sprite->animPaused = 1; + sprite->animPaused = TRUE; if (sprite->data[2] > 64) { get_berry_tree_graphics(eventObject, sprite); sprite->data[1] = 4; sprite->data[2] = 0; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) { sprite->data[2]++; eventObject->invisible = ((sprite->data[2] & 0x2) >> 1); - sprite->animPaused = 1; + sprite->animPaused = TRUE; if (sprite->data[2] > 64) { sprite->data[1] = 0; sprite->data[7] &= (-3); - return 1; + return TRUE; } - return 0; + return FALSE; } movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp); -u8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -2978,24 +2999,24 @@ u8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Spri eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gUpAndDownDirections, 2); + memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections); direction = TryGetTrainerEncounterDirection(eventObject, 1); if (direction == DIR_NONE) { @@ -3003,26 +3024,26 @@ u8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Spri } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight); -u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3030,24 +3051,24 @@ u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct S eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gLeftAndRightDirections, 2); + memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections); direction = TryGetTrainerEncounterDirection(eventObject, 2); if (direction == DIR_NONE) { @@ -3055,26 +3076,26 @@ u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct S } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft); -u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3082,24 +3103,24 @@ u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Spri eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gUpAndLeftDirections, 2); + memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections); direction = TryGetTrainerEncounterDirection(eventObject, 3); if (direction == DIR_NONE) { @@ -3107,26 +3128,26 @@ u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Spri } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight); -u8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3134,24 +3155,24 @@ u8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Spr eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gUpAndRightDirections, 2); + memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections); direction = TryGetTrainerEncounterDirection(eventObject, 4); if (direction == DIR_NONE) { @@ -3159,26 +3180,26 @@ u8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Spr } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft); -u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3186,24 +3207,24 @@ u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sp eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gDownAndLeftDirections, 2); + memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections); direction = TryGetTrainerEncounterDirection(eventObject, 5); if (direction == DIR_NONE) { @@ -3211,26 +3232,26 @@ u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sp } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight); -u8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3238,24 +3259,24 @@ u8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct S eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[2]; - memcpy(directions, gDownAndRightDirections, 2); + memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections); direction = TryGetTrainerEncounterDirection(eventObject, 6); if (direction == DIR_NONE) { @@ -3263,26 +3284,26 @@ u8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct S } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft); -u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3290,24 +3311,24 @@ u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[4]; - memcpy(directions, gDownUpAndLeftDirections, 4); + memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections); direction = TryGetTrainerEncounterDirection(eventObject, 7); if (direction == DIR_NONE) { @@ -3315,26 +3336,26 @@ u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight); -u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3342,24 +3363,24 @@ u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[4]; - memcpy(directions, gDownUpAndRightDirections, 4); + memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections); direction = TryGetTrainerEncounterDirection(eventObject, 8); if (direction == DIR_NONE) { @@ -3367,26 +3388,26 @@ u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceUpLeftAndRight, gMovementTypeFuncs_FaceUpLeftAndRight); -u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3394,24 +3415,24 @@ u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[4]; - memcpy(directions, gUpLeftAndRightDirections, 4); + memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections); direction = TryGetTrainerEncounterDirection(eventObject, 9); if (direction == DIR_NONE) { @@ -3419,26 +3440,26 @@ u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_FaceDownLeftAndRight, gMovementTypeFuncs_FaceDownLeftAndRight); -u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { @@ -3446,24 +3467,24 @@ u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, stru eventObject->singleMovementActive = 0; sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 4; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[4]; - memcpy(directions, gDownLeftAndRightDirections, 4); + memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections); direction = TryGetTrainerEncounterDirection(eventObject, 10); if (direction == DIR_NONE) { @@ -3471,43 +3492,43 @@ u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, stru } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise); -u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; } - return 0; + return FALSE; } -u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[5]; - memcpy(directions, gCounterclockwiseDirections, 5); + memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections); direction = TryGetTrainerEncounterDirection(eventObject, 0); if (direction == DIR_NONE) { @@ -3515,43 +3536,43 @@ u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, st } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 0; - return 1; + return TRUE; } movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise); -u8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { SetMovementDelay(sprite, 0x30); sprite->data[1] = 2; } - return 0; + return FALSE; } -u8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) { sprite->data[1] = 3; } - return 0; + return FALSE; } -u8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; u8 directions[5]; - memcpy(directions, gClockwiseDirections, 5); + memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections); direction = TryGetTrainerEncounterDirection(eventObject, 0); if (direction == DIR_NONE) { @@ -3559,19 +3580,19 @@ u8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sp } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 0; - return 1; + return TRUE; } movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth); -u8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 direction; direction = gInitialMovementTypeFacingDirections[eventObject->movementType]; @@ -3581,13 +3602,14 @@ u8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct S } SetEventObjectDirection(eventObject, direction); sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) { u8 collisionState; u8 movementActionId; + if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 0; @@ -3609,30 +3631,31 @@ u8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct S EventObjectSetSingleMovement(eventObject, sprite, movementActionId); eventObject->singleMovementActive = 1; sprite->data[1] = 3; - return 1; + return TRUE; } -u8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { eventObject->singleMovementActive = 0; sprite->data[1] = 1; } - return 0; + return FALSE; } -u8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *directionSequence) +bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *directionSequence) { u8 collisionState; u8 movementActionId; + if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 0; @@ -3654,17 +3677,17 @@ u8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *s EventObjectSetSingleMovement(eventObject, sprite, movementActionId); eventObject->singleMovementActive = 1; sprite->data[1] = 2; - return 1; + return TRUE; } -u8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { eventObject->singleMovementActive = 0; sprite->data[1] = 1; } - return 0; + return FALSE; } movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown); @@ -3672,7 +3695,7 @@ movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_W u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gUpRightLeftDownDirections, 4); + memcpy(directions, gUpRightLeftDownDirections, sizeof gUpRightLeftDownDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3685,7 +3708,7 @@ movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_W u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gRightLeftDownUpDirections, 4); + memcpy(directions, gRightLeftDownUpDirections, sizeof gRightLeftDownUpDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 2; @@ -3698,7 +3721,7 @@ movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_W u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gDownUpRightLeftDirections, 4); + memcpy(directions, gDownUpRightLeftDirections, sizeof gDownUpRightLeftDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 2; @@ -3711,7 +3734,7 @@ movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_W u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gLeftDownUpRightDirections, 4); + memcpy(directions, gLeftDownUpRightDirections, sizeof gLeftDownUpRightDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3724,7 +3747,7 @@ movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_W u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gUpLeftRightDownDirections, 4); + memcpy(directions, gUpLeftRightDownDirections, sizeof gUpLeftRightDownDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3737,7 +3760,7 @@ movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_W u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gLeftRightDownUpDirections, 4); + memcpy(directions, gLeftRightDownUpDirections, sizeof gLeftRightDownUpDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 2; @@ -3750,7 +3773,7 @@ movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_W u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gStandardDirections, 4); + memcpy(directions, gStandardDirections, sizeof gStandardDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 2; @@ -3763,7 +3786,7 @@ movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_W u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gRightDownUpLeftDirections, 4); + memcpy(directions, gRightDownUpLeftDirections, sizeof gRightDownUpLeftDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3776,7 +3799,7 @@ movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_W u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gLeftUpDownRightDirections, 4); + memcpy(directions, gLeftUpDownRightDirections, sizeof gLeftUpDownRightDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3789,7 +3812,7 @@ movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_W u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gUpDownRightLeftDirections, 4); + memcpy(directions, gUpDownRightLeftDirections, sizeof gUpDownRightLeftDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 2; @@ -3802,7 +3825,7 @@ movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_W u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gRightLeftUpDownDirections, 4); + memcpy(directions, gRightLeftUpDownDirections, sizeof gRightLeftUpDownDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 2; @@ -3815,7 +3838,7 @@ movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_W u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gDownRightLeftUpDirections, 4); + memcpy(directions, gDownRightLeftUpDirections, sizeof gDownRightLeftUpDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3828,7 +3851,7 @@ movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_W u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gRightUpDownLeftDirections, 4); + memcpy(directions, gRightUpDownLeftDirections, sizeof gRightUpDownLeftDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3841,7 +3864,7 @@ movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_W u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gUpDownLeftRightDirections, 4); + memcpy(directions, gUpDownLeftRightDirections, sizeof gUpDownLeftRightDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 2; @@ -3854,7 +3877,7 @@ movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_W u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gLeftRightUpDownDirections, 4); + memcpy(directions, gLeftRightUpDownDirections, sizeof gLeftRightUpDownDirections); if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 2; @@ -3867,7 +3890,7 @@ movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_W u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gDownLeftRightUpDirections, 4); + memcpy(directions, gDownLeftRightUpDirections, sizeof gDownLeftRightUpDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3880,7 +3903,7 @@ movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_W u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gUpLeftDownRightDirections, 4); + memcpy(directions, gUpLeftDownRightDirections, sizeof gUpLeftDownRightDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3893,7 +3916,7 @@ movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_W u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gDownRightUpLeftDirections, 4); + memcpy(directions, gDownRightUpLeftDirections, sizeof gDownRightUpLeftDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3906,7 +3929,7 @@ movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_W u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gLeftDownRightUpDirections, 4); + memcpy(directions, gLeftDownRightUpDirections, sizeof gLeftDownRightUpDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3919,7 +3942,7 @@ movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_W u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gRightUpLeftDownDirections, 4); + memcpy(directions, gRightUpLeftDownDirections, sizeof gRightUpLeftDownDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3932,7 +3955,7 @@ movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_W u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gUpRightDownLeftDirections, 4); + memcpy(directions, gUpRightDownLeftDirections, sizeof gUpRightDownLeftDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3945,7 +3968,7 @@ movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_W u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gDownLeftUpRightDirections, 4); + memcpy(directions, gDownLeftUpRightDirections, sizeof gDownLeftUpRightDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) { eventObject->directionSequenceIndex = 3; @@ -3958,7 +3981,7 @@ movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_W u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gLeftUpRightDownDirections, 4); + memcpy(directions, gLeftUpRightDownDirections, sizeof gLeftUpRightDownDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; @@ -3971,17 +3994,17 @@ movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_W u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) { u8 directions[4]; - memcpy(directions, gRightDownLeftUpDirections, 4); + memcpy(directions, gRightDownLeftUpDirections, sizeof gRightDownLeftUpDirections); if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) { eventObject->directionSequenceIndex = 3; } return MoveNextDirectionInSequence(eventObject, sprite, directions); -}; +} movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer); -u8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); if (eventObject->directionSequenceIndex == 0) @@ -3989,31 +4012,31 @@ u8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite eventObject->directionSequenceIndex = GetPlayerFacingDirection(); } sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { - return 0; + return FALSE; } return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL); } -u8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { eventObject->singleMovementActive = 0; sprite->data[1] = 1; } - return 0; + return FALSE; } bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { - return 0; + return FALSE; } bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) @@ -4021,7 +4044,7 @@ bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, stru EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); eventObject->singleMovementActive = 1; sprite->data[1] = 2; - return 1; + return TRUE; } bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) @@ -4040,7 +4063,7 @@ bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sp } eventObject->singleMovementActive = 1; sprite->data[1] = 2; - return 1; + return TRUE; } bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) @@ -4154,11 +4177,11 @@ bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass); -u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { - return 0; + return FALSE; } return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); } @@ -4167,7 +4190,7 @@ void MovementType_TreeDisguise(struct Sprite *sprite) { struct EventObject *eventObject; eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && sprite->data[7] == 0)) + if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) { EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); @@ -4177,17 +4200,17 @@ void MovementType_TreeDisguise(struct Sprite *sprite) UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -static u8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); - return 0; + return FALSE; } void MovementType_MountainDisguise(struct Sprite *sprite) { struct EventObject *eventObject; eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && sprite->data[7] == 0)) + if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) { EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); @@ -4199,9 +4222,9 @@ void MovementType_MountainDisguise(struct Sprite *sprite) void MovementType_Hidden(struct Sprite *sprite) { - if (sprite->data[7] == 0) + if (!sprite->data[7]) { - gEventObjects[sprite->data[0]].fixedPriority = 1; + gEventObjects[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 2; sprite->oam.priority = 3; sprite->data[7]++; @@ -4209,89 +4232,89 @@ void MovementType_Hidden(struct Sprite *sprite) UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback); } -static u8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite) { return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite); } -u8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); - return 0; + return FALSE; } -u8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 0; } - return 0; + return FALSE; } movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace); -u8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace); -u8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace); -u8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); sprite->data[1] = 1; - return 1; + return TRUE; } movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible); -u8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) { ClearEventObjectMovement(eventObject, sprite); EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); - eventObject->invisible = 1; + eventObject->invisible = TRUE; sprite->data[1] = 1; - return 1; + return TRUE; } -u8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) { if (EventObjectExecSingleMovementAction(eventObject, sprite)) { sprite->data[1] = 2; - return 1; + return TRUE; } - return 0; + return FALSE; } -u8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->singleMovementActive = 0; - return 0; + return FALSE; } static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite) { eventObject->singleMovementActive = 0; - eventObject->heldMovementActive = 0; - eventObject->heldMovementFinished = 0; - eventObject->movementActionId = 0xff; + eventObject->heldMovementActive = FALSE; + eventObject->heldMovementFinished = FALSE; + eventObject->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -4495,16 +4518,16 @@ static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { - return 1; + return TRUE; } - return 0; + return FALSE; } static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y) { u8 i; - for (i = 0; i < 16; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { struct EventObject *eventObject2 = &gEventObjects[i]; @@ -4515,7 +4538,7 @@ static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 return TRUE; } } - return 0; + return FALSE; } bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) @@ -4606,7 +4629,7 @@ void sub_8060470(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -4646,7 +4669,7 @@ bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xff) + if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) return TRUE; return FALSE; @@ -4659,8 +4682,8 @@ bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementAct UnfreezeEventObject(eventObject); eventObject->movementActionId = movementActionId; - eventObject->heldMovementActive = 1; - eventObject->heldMovementFinished = 0; + eventObject->heldMovementActive = TRUE; + eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[2] = 0; return FALSE; } @@ -4680,8 +4703,8 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) void EventObjectClearHeldMovement(struct EventObject *eventObject) { eventObject->movementActionId = 0xFF; - eventObject->heldMovementActive = 0; - eventObject->heldMovementFinished = 0; + eventObject->heldMovementActive = FALSE; + eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[1] = 0; gSprites[eventObject->spriteId].data[2] = 0; } @@ -4908,7 +4931,7 @@ static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, s { if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - eventObject->heldMovementFinished = 1; + eventObject->heldMovementFinished = TRUE; } } @@ -4918,10 +4941,10 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject { eventObject->movementActionId = 0xFF; sprite->data[2] = 0; - return 1; + return TRUE; } - return 0; + return FALSE; } static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 movementActionId) @@ -4930,67 +4953,68 @@ static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct sprite->data[2] = 0; } -void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { SetEventObjectDirection(eventObject, direction); ShiftStillEventObjectCoords(eventObject); sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); - sprite->animPaused = 1; + sprite->animPaused = TRUE; sprite->data[2] = 1; } -u8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) { FaceDirection(eventObject, sprite, DIR_SOUTH); - return 1; + return TRUE; } -u8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { FaceDirection(eventObject, sprite, DIR_NORTH); - return 1; + return TRUE; } -u8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { FaceDirection(eventObject, sprite, DIR_WEST); - return 1; + return TRUE; } -u8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { FaceDirection(eventObject, sprite, DIR_EAST); - return 1; + return TRUE; } -void sub_8060D20(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3) +void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { s16 x; s16 y; + x = eventObject->currentCoords.x; y = eventObject->currentCoords.y; SetEventObjectDirection(eventObject, direction); MoveCoords(direction, &x, &y); ShiftEventObjectCoords(eventObject, x, y); - oamt_npc_ministep_reset(sprite, direction, a3); - sprite->animPaused = 0; - eventObject->triggerGroundEffectsOnMove = 1; + oamt_npc_ministep_reset(sprite, direction, speed); + sprite->animPaused = FALSE; + eventObject->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } extern u8 (*const gUnknown_083759C0[5])(u8); -void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3) +void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { u8 (*const functions[5])(u8); memcpy((void *)functions, gUnknown_083759C0, sizeof(gUnknown_083759C0)); - sub_8060D20(eventObject, sprite, direction, a3); - sub_805FE28(eventObject, sprite, functions[a3](eventObject->facingDirection)); + npc_apply_direction(eventObject, sprite, direction, speed); + sub_805FE28(eventObject, sprite, functions[speed](eventObject->facingDirection)); } void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) { - sub_8060D20(eventObject, sprite, direction, 1); + npc_apply_direction(eventObject, sprite, direction, 1); sub_805FE28(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); } @@ -5001,11 +5025,11 @@ bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct S if (obj_npc_ministep(sprite)) { ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = 1; - sprite->animPaused = 1; - return 1; + eventObject->triggerGroundEffectsOnStop = TRUE; + sprite->animPaused = TRUE; + return TRUE; } - return 0; + return FALSE; } void sub_8060E68(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) @@ -5018,8 +5042,8 @@ void sub_8060E68(struct EventObject *eventObject, struct Sprite *sprite, u8 dire MoveCoords(direction, &x, &y); ShiftEventObjectCoords(eventObject, x, y); sub_806467C(sprite, direction); - sprite->animPaused = 0; - eventObject->triggerGroundEffectsOnMove = 1; + sprite->animPaused = FALSE; + eventObject->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } @@ -5034,8 +5058,8 @@ bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) if (sub_806468C(sprite)) { ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = 1; - sprite->animPaused = 1; + eventObject->triggerGroundEffectsOnStop = TRUE; + sprite->animPaused = TRUE; return TRUE; } return FALSE; @@ -5224,14 +5248,15 @@ u8 sub_806123C(struct EventObject *eventObject, struct Sprite *sprite, u8 (*cons y = 0; MoveCoordsInDirection(eventObject->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); - eventObject->triggerGroundEffectsOnMove = 1; - eventObject->disableCoveringGroundEffects = 1; - } else if (retval == 0xff) + eventObject->triggerGroundEffectsOnMove = TRUE; + eventObject->disableCoveringGroundEffects = TRUE; + } + else if (retval == 0xFF) { ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = 1; - eventObject->landingJump = 1; - sprite->animPaused = 1; + eventObject->triggerGroundEffectsOnStop = TRUE; + eventObject->landingJump = TRUE; + sprite->animPaused = TRUE; } return retval; } @@ -5297,7 +5322,7 @@ bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Spr { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5314,7 +5339,7 @@ bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprit { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5331,7 +5356,7 @@ bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Spr { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5348,7 +5373,7 @@ bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sp { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5422,6 +5447,7 @@ bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct } return FALSE; } + bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) { do_go_anim(eventObject, sprite, DIR_NORTH, 1); @@ -5437,6 +5463,7 @@ bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sp } return FALSE; } + bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) { do_go_anim(eventObject, sprite, DIR_WEST, 1); @@ -5452,6 +5479,7 @@ bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct } return FALSE; } + bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) { do_go_anim(eventObject, sprite, DIR_EAST, 1); @@ -5472,7 +5500,7 @@ void sub_80616CC(struct EventObject *eventObject, struct Sprite *sprite, u8 dire { SetEventObjectDirection(eventObject, direction); sub_805FE28(eventObject, sprite, animNum); - sprite->animPaused = 0; + sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } @@ -5483,7 +5511,7 @@ bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct S if (sprite->data[3] == 0) { sprite->data[2] = 2; - sprite->animPaused = 1; + sprite->animPaused = TRUE; return TRUE; } return FALSE; @@ -5933,7 +5961,7 @@ bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, stru if (sub_8061340(eventObject, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = 0; + eventObject->landingJump = FALSE; return TRUE; } return FALSE; @@ -5952,7 +5980,7 @@ bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct if (sub_8061340(eventObject, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = 0; + eventObject->landingJump = FALSE; return TRUE; } return FALSE; @@ -5971,7 +5999,7 @@ bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, stru if (sub_8061340(eventObject, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = 0; + eventObject->landingJump = FALSE; return TRUE; } return FALSE; @@ -5999,6 +6027,7 @@ bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, str bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) { u8 playerObjectId; + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) { FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)); @@ -6010,6 +6039,7 @@ bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sp bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) { u8 playerObjectId; + if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) { FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y))); @@ -6020,14 +6050,14 @@ bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struc bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->facingDirectionLocked = 1; + eventObject->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->facingDirectionLocked = 0; + eventObject->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } @@ -6274,21 +6304,21 @@ bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, stru bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = 0; + eventObject->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = 1; + eventObject->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->inanimate = 1; + eventObject->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } @@ -6302,14 +6332,14 @@ bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, str bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible = 1; + eventObject->invisible = TRUE; sprite->data[2] = 1; return TRUE; } bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible = 0; + eventObject->invisible = FALSE; sprite->data[2] = 1; return TRUE; } @@ -6389,10 +6419,10 @@ bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struc bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible ^= 1; + eventObject->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = 1; + eventObject->invisible = TRUE; sprite->data[2] = 3; } return FALSE; @@ -6417,10 +6447,10 @@ bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprit bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->invisible ^= 1; + eventObject->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = 1; + eventObject->invisible = TRUE; sprite->data[2] = 3; } return FALSE; @@ -6428,14 +6458,14 @@ bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprit bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->fixedPriority = 1; + eventObject->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) { - eventObject->fixedPriority = 0; + eventObject->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } @@ -6444,7 +6474,7 @@ bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struc { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; InitSpriteAffineAnim(sprite); - sprite->affineAnimPaused = 1; + sprite->affineAnimPaused = TRUE; sprite->subspriteMode = 0; return TRUE; } @@ -6471,7 +6501,7 @@ bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, { if (an_walk_any_2(eventObject, sprite)) { - sprite->affineAnimPaused = 1; + sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; return TRUE; } @@ -6492,7 +6522,7 @@ bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struc { if (an_walk_any_2(eventObject, sprite)) { - sprite->affineAnimPaused = 1; + sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; return TRUE; } @@ -6623,7 +6653,7 @@ bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObjec { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6642,7 +6672,7 @@ bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6661,7 +6691,7 @@ bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObjec { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6680,7 +6710,7 @@ bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObje { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6699,7 +6729,7 @@ bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, s { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6718,7 +6748,7 @@ bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, str { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6737,7 +6767,7 @@ bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, s { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6756,7 +6786,7 @@ bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6775,7 +6805,7 @@ bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6794,7 +6824,7 @@ bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, st { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6813,7 +6843,7 @@ bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6832,7 +6862,7 @@ bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, { if (sub_8061328(eventObject, sprite)) { - eventObject->hasShadow = 0; + eventObject->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -6863,9 +6893,9 @@ bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObje return MovementAction_WalkInPlace_Step1(eventObject, sprite); } -void sub_80630D0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3) +void sub_80630D0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - sub_8060D20(eventObject, sprite, direction, a3); + npc_apply_direction(eventObject, sprite, direction, speed); StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); SeekSpriteAnim(sprite, 0); } @@ -6942,9 +6972,9 @@ bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -void sub_8063208(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3) +void sub_8063208(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - sub_8060D20(eventObject, sprite, direction, a3); + npc_apply_direction(eventObject, sprite, direction, speed); sub_805FE28(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); } @@ -7020,9 +7050,9 @@ bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, return FALSE; } -void sub_8063338(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3) +void sub_8063338(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) { - sub_8060D20(eventObject, sprite, direction, a3); + npc_apply_direction(eventObject, sprite, direction, speed); StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); SeekSpriteAnim(sprite, 0); } @@ -7106,23 +7136,23 @@ bool8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *spri bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->animPaused = 1; + sprite->animPaused = TRUE; return TRUE; } static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite) { if (eventObject->disableAnim) - sprite->animPaused = 1; + sprite->animPaused = TRUE; } static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite) { if (eventObject->enableAnim) { - sprite->animPaused = 0; - eventObject->disableAnim = 0; - eventObject->enableAnim = 0; + sprite->animPaused = FALSE; + eventObject->disableAnim = FALSE; + eventObject->enableAnim = FALSE; } } @@ -7137,7 +7167,7 @@ static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct u16 x, y; s16 x2, y2; const struct EventObjectGraphicsInfo *graphicsInfo; - eventObject->offScreen = 0; + eventObject->offScreen = FALSE; graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); if (sprite->coordOffsetEnabled) { @@ -7154,20 +7184,20 @@ static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct y2 = graphicsInfo->height + (s16)y; if ((s16)x >= 0x100 || x2 < -0x10) { - eventObject->offScreen = 1; + eventObject->offScreen = TRUE; } if ((s16)y >= 0xB0 || y2 < -0x10) { - eventObject->offScreen = 1; + eventObject->offScreen = TRUE; } } static void UpdateEventObjSpriteVisibility(struct EventObject *eventObject, struct Sprite *sprite) { - sprite->invisible = 0; + sprite->invisible = FALSE; if (eventObject->invisible || eventObject->offScreen) { - sprite->invisible = 1; + sprite->invisible = TRUE; } } @@ -7210,13 +7240,13 @@ static void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u GetGroundEffectFlags_JumpLanding(eventObj, flags); } -void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) +static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) { eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); } -void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; u8 type = EventObjectCheckForReflectiveSurface(eventObj); @@ -7236,31 +7266,31 @@ void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) { @@ -7273,7 +7303,7 @@ void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_SandPile(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandPile(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) @@ -7291,7 +7321,7 @@ void GetGroundEffectFlags_SandPile(struct EventObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) { if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) @@ -7311,7 +7341,7 @@ void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 } } -void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) @@ -7320,13 +7350,13 @@ void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) @@ -7344,7 +7374,7 @@ void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) @@ -7362,13 +7392,13 @@ void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) } } -void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) { if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -7405,7 +7435,7 @@ void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) } } -u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) +static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) { const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); @@ -7477,7 +7507,7 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) return 0; } -void SetEventObjectSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +static void SetEventObjectSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite) { if (eventObj->disableCoveringGroundEffects) return; @@ -7937,7 +7967,7 @@ bool8 FreezeEventObject(struct EventObject *eventObject) void FreezeEventObjects(void) { u8 i; - for (i = 0; i < 16; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) FreezeEventObject(&gEventObjects[i]); } @@ -7945,7 +7975,7 @@ void FreezeEventObjects(void) void FreezeEventObjectsExceptOne(u8 eventObjectId) { u8 i; - for (i = 0; i < 16; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) if (i != eventObjectId && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) FreezeEventObject(&gEventObjects[i]); } @@ -7963,7 +7993,7 @@ void UnfreezeEventObject(struct EventObject *eventObject) void UnfreezeEventObjects(void) { u8 i; - for (i = 0; i < 16; i++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i++) if (gEventObjects[i].active) UnfreezeEventObject(&gEventObjects[i]); } @@ -8207,7 +8237,7 @@ static bool8 WaitForMovementDelay(struct Sprite *sprite) void SetAndStartSpriteAnim(struct Sprite *sprite, u8 animNum, u8 animCmdIndex) { sprite->animNum = animNum; - sprite->animPaused = 0; + sprite->animPaused = FALSE; SeekSpriteAnim(sprite, animCmdIndex); } @@ -8241,9 +8271,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) y2 = y - (sprite->centerToCornerVecY >> 1); if ((s16)x > 255 || x2 < -16) - sprite->invisible = 1; + sprite->invisible = TRUE; if ((s16)y > 175 || y2 < -16) - sprite->invisible = 1; + sprite->invisible = TRUE; } static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) @@ -8282,7 +8312,7 @@ void DoShadowFieldEffect(struct EventObject *eventObject) } } -void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) { const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 7a438e100..426e65f06 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -88,8 +88,8 @@ static void GetPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *); static u16 GetPlayerCurMetatileBehavior(int); static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8); -static u8 *GetInteractionScript(struct MapPosition*, u8, u8); -static u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); +static const u8 *GetInteractionScript(struct MapPosition*, u8, u8); +static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); static u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); @@ -313,7 +313,7 @@ static u16 GetPlayerCurMetatileBehavior(int runningState) static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatileBehavior, u8 direction) { - u8 *script = GetInteractionScript(position, metatileBehavior, direction); + const u8 *script = GetInteractionScript(position, metatileBehavior, direction); if (script == NULL) return FALSE; @@ -329,9 +329,9 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil return TRUE; } -static u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction); + const u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction); if (script != NULL) return script; @@ -350,7 +350,7 @@ static u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavio return NULL; } -u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { u8 eventObjectId; s32 i; @@ -375,10 +375,10 @@ u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehav return GetEventObjectScriptPointerByEventObjectId(eventObjectId); } -static u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { u8 eventObjectId; - u8 *script; + const u8 *script; eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) @@ -935,7 +935,7 @@ u8 TrySetDiveWarp(void) return 0; } -u8 *GetEventObjectScriptPointerPlayerFacing(void) +const u8 *GetEventObjectScriptPointerPlayerFacing(void) { u8 direction; struct MapPosition position; diff --git a/src/overworld.c b/src/overworld.c index 7b4f5190f..17ecfaf8d 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -120,6 +120,9 @@ static u8 npc_something3(u8, u8); static u8 LinkPlayerDetectCollision(u8, u8, s16, s16); static void CreateLinkPlayerSprite(u8); static void SpriteCB_LinkPlayer(struct Sprite *); +static u16 sub_8055758(const u8 *); +static void sub_8055808(const u8 *); +static void sub_8055840(const u8 *); static const struct WarpData sDummyWarpData = { @@ -1939,7 +1942,7 @@ bool32 sub_8054FC0(u16 a1) void sub_8054FF8(u32 a1, u16 a2, struct UnkStruct_8054FF8 *a3, u16 *a4) { - u8 *script; + const u8 *script; if (gUnknown_03000580[a1] == 0x80) { @@ -2327,7 +2330,7 @@ bool32 sub_8055660(struct UnkStruct_8054FF8 *a1) return TRUE; } -u8 *sub_805568C(struct UnkStruct_8054FF8 *a1) +const u8 *sub_805568C(struct UnkStruct_8054FF8 *a1) { struct MapPosition unkStruct; u8 linkPlayerId; @@ -2356,7 +2359,7 @@ u8 *sub_805568C(struct UnkStruct_8054FF8 *a1) return GetInteractedLinkPlayerScript(&unkStruct, a1->field_C, a1->d); } -u16 sub_8055758(u8 *script) +static u16 sub_8055758(const u8 *script) { if (script == DoubleBattleColosseum_EventScript_1A4383) return 10; @@ -2397,7 +2400,7 @@ void sub_80557F4(void) ScriptContext2_Enable(); } -void sub_8055808(u8 *script) +static void sub_8055808(const u8 *script) { PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); @@ -2411,7 +2414,7 @@ void sub_8055824(void) ScriptContext2_Enable(); } -void sub_8055840(u8 *script) +static void sub_8055840(const u8 *script) { PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); diff --git a/src/script.c b/src/script.c index 8625cfdc2..2c6495552 100644 --- a/src/script.c +++ b/src/script.c @@ -12,7 +12,7 @@ enum SCRIPT_MODE_NATIVE, }; -EWRAM_DATA u8 *gUnknown_0202E8AC = NULL; +EWRAM_DATA const u8 *gUnknown_0202E8AC = NULL; static u8 sScriptContext1Status; static struct ScriptContext sScriptContext1; @@ -356,7 +356,7 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec return TRUE; } -u8 *GetRamScript(u8 objectId, u8 *script) +const u8 *GetRamScript(u8 objectId, const u8 *script) { struct RamScriptData *scriptData = &gSaveBlock1.ramScript.data; gUnknown_0202E8AC = 0; diff --git a/src/trainer_see.c b/src/trainer_see.c index ee4cb6e0f..edb178c4e 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -52,7 +52,7 @@ bool8 CheckTrainers(void) static bool8 CheckTrainer(u8 eventObjId) { - u8 *scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjId); + const u8 *scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjId); if (GetTrainerFlagFromScriptPointer(scriptPtr)) { |