From 1640f8b835dd8c0f6efbfe858313cf99335b3ce8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 5 Aug 2022 15:24:15 -0400 Subject: [PATCH 1/2] Document metatile behaviors --- .gitignore | 1 + include/constants/metatile_behaviors.h | 39 ++- include/metatile_behavior.h | 42 +-- src/battle_setup.c | 2 +- src/event_object_movement.c | 8 +- src/field_control_avatar.c | 8 +- src/field_effect_helpers.c | 2 +- src/field_player_avatar.c | 14 +- src/field_tasks.c | 4 +- src/metatile_behavior.c | 366 ++++++++++++------------- 10 files changed, 243 insertions(+), 243 deletions(-) diff --git a/.gitignore b/.gitignore index 444bb926b..dacec54a5 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ types_*.taghl _Deparsed_XSubs.pm porymap.project.cfg .vscode/*.* +*.js diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index c953ae20b..3564f0886 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -1,33 +1,41 @@ #ifndef GUARD_METATILE_BEHAVIORS #define GUARD_METATILE_BEHAVIORS -#define METATILE_COUNT 0xF0 #define MB_NORMAL 0x00 -#define MB_01 0x01 +#define MB_UNUSED_01 0x01 #define MB_TALL_GRASS 0x02 +// #define MB_CAVE 0x08 +// #define MB_RUNNING_DISALLOWED 0x0A -#define MB_0B 0x0B -#define MB_0C 0x0C +#define MB_INDOOR_ENCOUNTER 0x0B +#define MB_MOUNTAIN_TOP 0x0C +// #define MB_POND_WATER 0x10 #define MB_SEMI_DEEP_WATER 0x11 #define MB_DEEP_WATER 0x12 #define MB_WATERFALL 0x13 +// #define MB_OCEAN_WATER 0x15 #define MB_PUDDLE 0x16 #define MB_SHALLOW_WATER 0x17 +// #define MB_UNDERWATER_BLOCKED_ABOVE 0x19 -#define MB_1A 0x1A -#define MB_1B 0x1B +#define MB_UNUSED_WATER 0x1A +#define MB_CELADON_WATER 0x1B +// #define MB_STRENGTH_BUTTON 0x20 #define MB_SAND 0x21 #define MB_SEAWEED 0x22 #define MB_ICE 0x23 +// #define MB_THIN_ICE 0x26 #define MB_CRACKED_ICE 0x27 #define MB_HOT_SPRINGS 0x28 +// #define MB_ROCK_STAIRS 0x2A #define MB_SAND_CAVE 0x2B +// #define MB_IMPASSABLE_EAST 0x30 #define MB_IMPASSABLE_WEST 0x31 #define MB_IMPASSABLE_NORTH 0x32 @@ -40,8 +48,7 @@ #define MB_JUMP_WEST 0x39 #define MB_JUMP_NORTH 0x3A #define MB_JUMP_SOUTH 0x3B -#define MB_JUMP_SOUTHEAST 0x3E -#define MB_JUMP_SOUTHWEST 0x3F +// #define MB_WALK_EAST 0x40 #define MB_WALK_WEST 0x41 #define MB_WALK_NORTH 0x42 @@ -50,7 +57,8 @@ #define MB_SLIDE_WEST 0x45 #define MB_SLIDE_NORTH 0x46 #define MB_SLIDE_SOUTH 0x47 -#define MB_UNKNOWN_MOVEMENT_48 0x48 +#define MB_TRICK_HOUSE_PUZZLE_8_FLOOR 0x48 +// #define MB_EASTWARD_CURRENT 0x50 #define MB_WESTWARD_CURRENT 0x51 #define MB_NORTHWARD_CURRENT 0x52 @@ -60,6 +68,7 @@ #define MB_SPIN_UP 0x56 #define MB_SPIN_DOWN 0x57 #define MB_STOP_SPINNING 0x58 +// #define MB_CAVE_DOOR 0x60 #define MB_LADDER 0x61 #define MB_EAST_ARROW_WARP 0x62 @@ -76,7 +85,9 @@ #define MB_UP_LEFT_STAIR_WARP 0x6D #define MB_DOWN_RIGHT_STAIR_WARP 0x6E #define MB_DOWN_LEFT_STAIR_WARP 0x6F +// #define MB_UNION_ROOM_WARP 0x71 +// #define MB_COUNTER 0x80 #define MB_BOOKSHELF 0x81 #define MB_POKEMART_SHELF 0x82 @@ -90,12 +101,12 @@ #define MB_KITCHEN 0x8A #define MB_DRESSER 0x8B #define MB_SNACKS 0x8C -#define MB_8D 0x8D +#define MB_CABLE_CLUB_WIRELESS_MONITOR 0x8D #define MB_BATTLE_RECORDS 0x8E #define MB_QUESTIONNAIRE 0x8F #define MB_FOOD 0x90 -#define MB_INDIGO_PLATEAU_MARK_DPAD 0x91 -#define MB_INDIGO_PLATEAU_MARK_2_DPAD 0x92 +#define MB_INDIGO_PLATEAU_SIGN_1 0x91 +#define MB_INDIGO_PLATEAU_SIGN_2 0x92 #define MB_BLUEPRINTS 0x93 #define MB_PAINTING 0x94 #define MB_POWER_PLANT_MACHINE 0x95 @@ -106,13 +117,17 @@ #define MB_TRASH_BIN 0x9A #define MB_CUP 0x9B #define MB_PORTHOLE 0x9C +#define MB_WINDOW 0x9D #define MB_BLINKING_LIGHTS 0x9E #define MB_NEATLY_LINED_UP_TOOLS 0x9F #define MB_IMPRESSIVE_MACHINE 0xA0 #define MB_VIDEO_GAME 0xA1 #define MB_BURGLARY 0xA2 #define MB_TRAINER_TOWER_MONITOR 0xA3 +// #define MB_CYCLING_ROAD_PULL_DOWN 0xD0 #define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1 +// +#define NUM_METATILE_BEHAVIORS 0xF0 #endif // GUARD_METATILE_BEHAVIORS diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index aedc8b5b0..6e129c830 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -31,10 +31,9 @@ bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior); bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior); -bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior); +bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior); bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior); bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior); bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior); @@ -48,18 +47,16 @@ bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior); bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior); bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior); bool8 MetatileBehavior_IsCounter(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 metatileBehavior, u8 playerDirection); bool8 MetatileBehavior_IsPC(u8 metatileBehavior); bool8 MetatileBehavior_HasRipples(u8 metatileBehavior); bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior); -bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior); +bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior); +bool8 MetatileBehavior_IsAshGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior); bool8 MetatileBehavior_IsBridge(u8 metatileBehavior); bool8 MetatileBehavior_GetBridgeType(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior); bool8 MetatileBehavior_IsMountain(u8 metatileBehavior); bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior); @@ -68,7 +65,6 @@ bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior); bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior); bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior); bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior); -bool8 MetatileBehavior_IsMB1A(u8 metatileBehavior); bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior); bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior); bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior); @@ -78,24 +74,15 @@ bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior); bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior); bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior); bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior); bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior); bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior); bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWater(u8 metatileBehavior); bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior); +bool8 MetatileBehavior_IsCrackedFloor(u8 metatileBehavior); bool32 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior); bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior); @@ -105,15 +92,10 @@ bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior); bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior); bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior); bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 tile, u8 playerDirection); -bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 tile, u8 playerDirection); -bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior); +bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 metatileBehavior, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 metatileBehavior, u8 playerDirection); bool8 TestMetatileAttributeBit(u8 attr, u8 bitmask); bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior); bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior); @@ -127,11 +109,11 @@ bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior); bool8 MetatileBehavior_IsDresser(u8 metatileBehavior); bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior); bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 tile, u8 playerDirection); -bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 metatileBehavior, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 metatileBehavior, u8 playerDirection); bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior); -bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior); -bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior); +bool8 MetatileBehavior_IsIndigoPlateauSign1(u8 metatileBehavior); +bool8 MetatileBehavior_IsIndigoPlateauSign2(u8 metatileBehavior); bool8 MetatileBehavior_IsFood(u8 metatileBehavior); bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior); bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior); @@ -151,5 +133,7 @@ bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior); bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior); bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior); bool8 MetatileBehavior_IsTrainerTowerMonitor(u8 metatileBehavior); +bool8 MetatileBehavior_IsSecretBaseJumpMat(u8 metatileBehavior); +bool8 MetatileBehavior_IsSecretBaseSpinMat(u8 metatileBehavior); #endif // GUARD_METATILE_BEHAVIOR diff --git a/src/battle_setup.c b/src/battle_setup.c index 31d0f068a..9f99defd5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -460,7 +460,7 @@ u8 BattleSetup_GetTerrainId(void) PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - if (MetatileBehavior_IsTallGrass_2(tileBehavior)) + if (MetatileBehavior_IsTallGrass(tileBehavior)) return BATTLE_TERRAIN_GRASS; if (MetatileBehavior_IsLongGrass(tileBehavior)) return BATTLE_TERRAIN_LONG_GRASS; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index f3ba2133b..919ca99c2 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -5148,7 +5148,7 @@ void sub_8063E28(struct ObjectEvent *objectEvent, struct Sprite *sprite) } if (MetatileBehavior_IsIce_2(objectEvent->currentMetatileBehavior) == TRUE - || MetatileBehavior_IsUnknownMovement48(objectEvent->currentMetatileBehavior) == TRUE) + || MetatileBehavior_IsTrickHouseSlipperyFloor(objectEvent->currentMetatileBehavior) == TRUE) objectEvent->disableAnim = TRUE; else objectEvent->disableAnim = FALSE; @@ -8095,13 +8095,13 @@ static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *f static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass_2(objEvent->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass_2(objEvent->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } @@ -8230,7 +8230,7 @@ static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 * typedef bool8 (*MetatileFunc)(u8); static const MetatileFunc metatileFuncs[] = { - MetatileBehavior_IsTallGrass_2, + MetatileBehavior_IsTallGrass, MetatileBehavior_IsLongGrass, MetatileBehavior_IsPuddle, MetatileBehavior_IsSurfable, diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 8cab2d12b..9b3d23fe7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -575,12 +575,12 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me return EventScript_Questionnaire; if (MetatileBehavior_IsPlayerFacingBattleRecords(metatileBehavior, direction) == TRUE) return CableClub_EventScript_ShowBattleRecords; - if (MetatileBehavior_IsIndigoPlateauMark(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign1(metatileBehavior) == TRUE) { MsgSetSignPost(); return EventScript_Indigo_UltimateGoal; } - if (MetatileBehavior_IsIndigoPlateauMark2(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign2(metatileBehavior) == TRUE) { MsgSetSignPost(); return EventScript_Indigo_HighestAuthority; @@ -792,10 +792,10 @@ static u8 GetFacingSignpostType(u16 metatileBehavior, u8 playerDirection) if (MetatileBehavior_IsPlayerFacingPokeMartSign(metatileBehavior, playerDirection) == TRUE) return SIGNPOST_POKEMART; - if (MetatileBehavior_IsIndigoPlateauMark(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign1(metatileBehavior) == TRUE) return SIGNPOST_INDIGO_1; - if (MetatileBehavior_IsIndigoPlateauMark2(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign2(metatileBehavior) == TRUE) return SIGNPOST_INDIGO_2; if (MetatileBehavior_IsSignpost(metatileBehavior) == TRUE) diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 342ff9e8b..9a7dc201d 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -316,7 +316,7 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass_2(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 3660f97a6..b65942866 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -58,8 +58,8 @@ static bool8 ForcedMovement_SlideSouth(void); static bool8 ForcedMovement_SlideNorth(void); static bool8 ForcedMovement_SlideWest(void); static bool8 ForcedMovement_SlideEast(void); -static bool8 ForcedMovement_0xBB(void); -static bool8 ForcedMovement_0xBC(void); +static bool8 ForcedMovement_MatJump(void); +static bool8 ForcedMovement_MatSpin(void); static u8 CheckMovementInputNotOnBike(u8 direction); static void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys); static void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys); @@ -225,7 +225,7 @@ static const struct { bool8 (*check)(u8 metatileBehavior); bool8 (*apply)(void); } sForcedMovementFuncs[] = { - {MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip}, + {MetatileBehavior_IsTrickHouseSlipperyFloor, ForcedMovement_Slip}, {MetatileBehavior_IsIce_2, ForcedMovement_Slip}, {MetatileBehavior_IsWalkSouth, ForcedMovement_WalkSouth}, {MetatileBehavior_IsWalkNorth, ForcedMovement_WalkNorth}, @@ -244,8 +244,8 @@ static const struct { {MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest}, {MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast}, {MetatileBehavior_IsWaterfall, ForcedMovement_PushedSouthByCurrent}, - {MetatileBehavior_UnusedReturnFalse_7, ForcedMovement_0xBB}, - {MetatileBehavior_UnusedReturnFalse_8, ForcedMovement_0xBC}, + {MetatileBehavior_IsSecretBaseJumpMat, ForcedMovement_MatJump}, + {MetatileBehavior_IsSecretBaseSpinMat, ForcedMovement_MatSpin}, {NULL, ForcedMovement_None}, }; @@ -430,13 +430,13 @@ static bool8 ForcedMovement_SlideEast(void) return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2); } -static bool8 ForcedMovement_0xBB(void) +static bool8 ForcedMovement_MatJump(void) { DoPlayerMatJump(); return TRUE; } -static bool8 ForcedMovement_0xBC(void) +static bool8 ForcedMovement_MatSpin(void) { DoPlayerMatSpin(); return TRUE; diff --git a/src/field_tasks.c b/src/field_tasks.c index 20fc8de27..20dcb4696 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -233,7 +233,7 @@ static void AshGrassPerStepCallback(u8 taskId) { data[1] = x; data[2] = y; - if (MetatileBehavior_ReturnFalse_4((u8)MapGridGetMetatileBehaviorAt(x, y))) + if (MetatileBehavior_IsAshGrass((u8)MapGridGetMetatileBehaviorAt(x, y))) { if (MapGridGetMetatileIdAt(x, y) == 0x20a) StartAshFieldEffect(x, y, 0x212, 4); @@ -267,7 +267,7 @@ static void CrackedFloorPerStepCallback(u8 taskId) { data[2] = x; data[3] = y; - if (MetatileBehavior_ReturnFalse_13(behavior)) + if (MetatileBehavior_IsCrackedFloor(behavior)) { if (GetPlayerSpeed() != 4) VarSet(VAR_ICE_STEP_COUNT, 0); diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 95215d7b6..743377e6f 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -2,26 +2,26 @@ #include "metatile_behavior.h" #include "constants/metatile_behaviors.h" -static const bool8 sTileSurfable[METATILE_COUNT] = { - [MB_POND_WATER] = TRUE, - [MB_SEMI_DEEP_WATER] = TRUE, - [MB_DEEP_WATER] = TRUE, - [MB_WATERFALL] = TRUE, - [MB_OCEAN_WATER] = TRUE, - [MB_1A] = TRUE, - [MB_1B] = TRUE, - [MB_EASTWARD_CURRENT] = TRUE, - [MB_WESTWARD_CURRENT] = TRUE, +static const bool8 sBehaviorSurfable[NUM_METATILE_BEHAVIORS] = { + [MB_POND_WATER] = TRUE, + [MB_SEMI_DEEP_WATER] = TRUE, + [MB_DEEP_WATER] = TRUE, + [MB_WATERFALL] = TRUE, + [MB_OCEAN_WATER] = TRUE, + [MB_UNUSED_WATER] = TRUE, + [MB_CELADON_WATER] = TRUE, + [MB_EASTWARD_CURRENT] = TRUE, + [MB_WESTWARD_CURRENT] = TRUE, [MB_NORTHWARD_CURRENT] = TRUE, [MB_SOUTHWARD_CURRENT] = TRUE }; static const u8 sTileBitAttributes[32] = { - [0] = 0x00, - [1] = 0x01, - [2] = 0x02, - [3] = 0x04, - [4] = 0x08, + [0] = 0, + [1] = 1 << 0, + [2] = 1 << 1, + [3] = 1 << 2, + [4] = 1 << 3, }; bool8 MetatileBehavior_IsATile(u8 metatileBehavior) @@ -31,7 +31,7 @@ bool8 MetatileBehavior_IsATile(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_EAST) + if (metatileBehavior == MB_JUMP_EAST) return TRUE; else return FALSE; @@ -39,7 +39,7 @@ bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_WEST) + if (metatileBehavior == MB_JUMP_WEST) return TRUE; else return FALSE; @@ -47,7 +47,7 @@ bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_NORTH) + if (metatileBehavior == MB_JUMP_NORTH) return TRUE; else return FALSE; @@ -55,7 +55,7 @@ bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_SOUTH) + if (metatileBehavior == MB_JUMP_SOUTH) return TRUE; else return FALSE; @@ -63,7 +63,7 @@ bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior) bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior) { - if(metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) + if (metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; else return FALSE; @@ -71,7 +71,7 @@ bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior) bool8 MetatileBehavior_IsSand(u8 metatileBehavior) { - if(metatileBehavior == MB_SAND || metatileBehavior == MB_SAND_CAVE) + if (metatileBehavior == MB_SAND || metatileBehavior == MB_SAND_CAVE) return TRUE; else return FALSE; @@ -79,7 +79,7 @@ bool8 MetatileBehavior_IsSand(u8 metatileBehavior) bool8 MetatileBehavior_IsSandOrShallowFlowingWater(u8 metatileBehavior) { - if(metatileBehavior == MB_SAND || metatileBehavior == MB_SHALLOW_WATER) + if (metatileBehavior == MB_SAND || metatileBehavior == MB_SHALLOW_WATER) return TRUE; else return FALSE; @@ -89,11 +89,11 @@ bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) { - if(metatileBehavior == MB_POND_WATER - || metatileBehavior == MB_PUDDLE - || metatileBehavior == MB_1A - || metatileBehavior == MB_1B - || metatileBehavior == MB_ICE) + if (metatileBehavior == MB_POND_WATER + || metatileBehavior == MB_PUDDLE + || metatileBehavior == MB_UNUSED_WATER + || metatileBehavior == MB_CELADON_WATER + || metatileBehavior == MB_ICE) return TRUE; else return FALSE; @@ -101,7 +101,7 @@ bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) bool8 MetatileBehavior_IsIce(u8 metatileBehavior) { - if(metatileBehavior == MB_ICE) + if (metatileBehavior == MB_ICE) return TRUE; else return FALSE; @@ -109,7 +109,7 @@ bool8 MetatileBehavior_IsIce(u8 metatileBehavior) bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior) { - if(metatileBehavior == MB_WARP_DOOR) + if (metatileBehavior == MB_WARP_DOOR) return TRUE; else return FALSE; @@ -117,7 +117,7 @@ bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior) bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior) { - if(metatileBehavior == MB_WARP_DOOR) + if (metatileBehavior == MB_WARP_DOOR) return TRUE; else return FALSE; @@ -125,7 +125,7 @@ bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior) bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior) { - if(metatileBehavior >= MB_UP_ESCALATOR && metatileBehavior <= MB_DOWN_ESCALATOR) + if (metatileBehavior >= MB_UP_ESCALATOR && metatileBehavior <= MB_DOWN_ESCALATOR) return TRUE; else return FALSE; @@ -135,7 +135,7 @@ bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UP_RIGHT_STAIR_WARP) + if (metatileBehavior == MB_UP_RIGHT_STAIR_WARP) result = TRUE; return result; @@ -145,7 +145,7 @@ bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UP_LEFT_STAIR_WARP) + if (metatileBehavior == MB_UP_LEFT_STAIR_WARP) result = TRUE; return result; @@ -155,7 +155,7 @@ bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_DOWN_RIGHT_STAIR_WARP) + if (metatileBehavior == MB_DOWN_RIGHT_STAIR_WARP) result = TRUE; return result; @@ -165,7 +165,7 @@ bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_DOWN_LEFT_STAIR_WARP) + if (metatileBehavior == MB_DOWN_LEFT_STAIR_WARP) result = TRUE; return result; @@ -175,7 +175,7 @@ bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior >= MB_UP_RIGHT_STAIR_WARP && metatileBehavior <= MB_DOWN_LEFT_STAIR_WARP) + if (metatileBehavior >= MB_UP_RIGHT_STAIR_WARP && metatileBehavior <= MB_DOWN_LEFT_STAIR_WARP) result = TRUE; else result = FALSE; @@ -185,7 +185,7 @@ bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsLadder(u8 metatileBehavior) { - if(metatileBehavior == MB_LADDER) + if (metatileBehavior == MB_LADDER) return TRUE; else return FALSE; @@ -193,7 +193,7 @@ bool8 MetatileBehavior_IsLadder(u8 metatileBehavior) bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior) { - if(metatileBehavior == MB_CAVE_DOOR) + if (metatileBehavior == MB_CAVE_DOOR) return TRUE; else return FALSE; @@ -203,7 +203,7 @@ bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior) { - if(sTileSurfable[metatileBehavior] & 1) + if (sBehaviorSurfable[metatileBehavior] & 1) return TRUE; else return FALSE; @@ -211,7 +211,7 @@ bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior) bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior) { - if(metatileBehavior == MB_SEMI_DEEP_WATER) + if (metatileBehavior == MB_SEMI_DEEP_WATER) return TRUE; else return FALSE; @@ -219,7 +219,7 @@ bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior) bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_EAST_ARROW_WARP) + if (metatileBehavior == MB_EAST_ARROW_WARP) return TRUE; else return FALSE; @@ -227,7 +227,7 @@ bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_WEST_ARROW_WARP) + if (metatileBehavior == MB_WEST_ARROW_WARP) return TRUE; else return FALSE; @@ -235,7 +235,7 @@ bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_NORTH_ARROW_WARP) + if (metatileBehavior == MB_NORTH_ARROW_WARP) return TRUE; else return FALSE; @@ -243,20 +243,20 @@ bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_SOUTH_ARROW_WARP) + if (metatileBehavior == MB_SOUTH_ARROW_WARP) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior) +bool8 MetatileBehavior_IsArrowWarp(u8 metatileBehavior) { u8 result = FALSE; - if(MetatileBehavior_IsEastArrowWarp(metatileBehavior) - || MetatileBehavior_IsWestArrowWarp(metatileBehavior) - || MetatileBehavior_IsNorthArrowWarp(metatileBehavior) - || MetatileBehavior_IsSouthArrowWarp(metatileBehavior)) + if (MetatileBehavior_IsEastArrowWarp(metatileBehavior) + || MetatileBehavior_IsWestArrowWarp(metatileBehavior) + || MetatileBehavior_IsNorthArrowWarp(metatileBehavior) + || MetatileBehavior_IsSouthArrowWarp(metatileBehavior)) result = TRUE; return result; @@ -264,11 +264,11 @@ bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior) { - if((metatileBehavior >= MB_WALK_EAST && metatileBehavior <= MB_UNKNOWN_MOVEMENT_48) - ||(metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT) - || metatileBehavior == MB_WATERFALL - || metatileBehavior == MB_ICE - || (metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN)) + if ((metatileBehavior >= MB_WALK_EAST && metatileBehavior <= MB_TRICK_HOUSE_PUZZLE_8_FLOOR) + || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT) + || metatileBehavior == MB_WATERFALL + || metatileBehavior == MB_ICE + || (metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN)) return TRUE; else return FALSE; @@ -276,15 +276,15 @@ bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior) bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior) { - if(metatileBehavior == MB_ICE) + if (metatileBehavior == MB_ICE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior) +bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior) { - if(metatileBehavior == MB_UNKNOWN_MOVEMENT_48) + if (metatileBehavior == MB_TRICK_HOUSE_PUZZLE_8_FLOOR) return TRUE; else return FALSE; @@ -292,7 +292,7 @@ bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_NORTH) + if (metatileBehavior == MB_WALK_NORTH) return TRUE; else return FALSE; @@ -300,7 +300,7 @@ bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_SOUTH) + if (metatileBehavior == MB_WALK_SOUTH) return TRUE; else return FALSE; @@ -308,7 +308,7 @@ bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_WEST) + if (metatileBehavior == MB_WALK_WEST) return TRUE; else return FALSE; @@ -316,7 +316,7 @@ bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_EAST) + if (metatileBehavior == MB_WALK_EAST) return TRUE; else return FALSE; @@ -324,7 +324,7 @@ bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior) bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_NORTHWARD_CURRENT) + if (metatileBehavior == MB_NORTHWARD_CURRENT) return TRUE; else return FALSE; @@ -332,7 +332,7 @@ bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_SOUTHWARD_CURRENT) + if (metatileBehavior == MB_SOUTHWARD_CURRENT) return TRUE; else return FALSE; @@ -340,7 +340,7 @@ bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_WESTWARD_CURRENT) + if (metatileBehavior == MB_WESTWARD_CURRENT) return TRUE; else return FALSE; @@ -348,7 +348,7 @@ bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_EASTWARD_CURRENT) + if (metatileBehavior == MB_EASTWARD_CURRENT) return TRUE; else return FALSE; @@ -356,7 +356,7 @@ bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_NORTH) + if (metatileBehavior == MB_SLIDE_NORTH) return TRUE; else return FALSE; @@ -364,7 +364,7 @@ bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_SOUTH) + if (metatileBehavior == MB_SLIDE_SOUTH) return TRUE; else return FALSE; @@ -372,7 +372,7 @@ bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_WEST) + if (metatileBehavior == MB_SLIDE_WEST) return TRUE; else return FALSE; @@ -380,7 +380,7 @@ bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_EAST) + if (metatileBehavior == MB_SLIDE_EAST) return TRUE; else return FALSE; @@ -388,17 +388,17 @@ bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior) bool8 MetatileBehavior_IsCounter(u8 metatileBehavior) { - if(metatileBehavior == MB_COUNTER) + if (metatileBehavior == MB_COUNTER) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_TELEVISION) + else if (metatileBehavior == MB_TELEVISION) return TRUE; else return FALSE; @@ -406,7 +406,7 @@ bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection) bool8 MetatileBehavior_IsPC(u8 metatileBehavior) { - if(metatileBehavior == MB_PC) + if (metatileBehavior == MB_PC) return TRUE; else return FALSE; @@ -414,7 +414,7 @@ bool8 MetatileBehavior_IsPC(u8 metatileBehavior) bool8 MetatileBehavior_HasRipples(u8 metatileBehavior) { - if(metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE) + if (metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE) return TRUE; else return FALSE; @@ -422,29 +422,29 @@ bool8 MetatileBehavior_HasRipples(u8 metatileBehavior) bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior) { - if(metatileBehavior == MB_PUDDLE) + if (metatileBehavior == MB_PUDDLE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior) +bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior) { - if(metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) + if (metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; else return FALSE; } bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsAshGrass(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsBridge(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_GetBridgeType(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior) +bool8 MetatileBehavior_IsUnused01(u8 metatileBehavior) { - if(metatileBehavior == MB_01) + if (metatileBehavior == MB_UNUSED_01) return TRUE; else return FALSE; @@ -452,7 +452,7 @@ bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior) bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior) { - if(metatileBehavior == MB_TALL_GRASS) + if (metatileBehavior == MB_TALL_GRASS) return TRUE; else return FALSE; @@ -460,7 +460,7 @@ bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior) bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior) { - if(metatileBehavior == MB_0B) + if (metatileBehavior == MB_INDOOR_ENCOUNTER) return TRUE; else return FALSE; @@ -468,7 +468,7 @@ bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior) bool8 MetatileBehavior_IsMountain(u8 metatileBehavior) { - if(metatileBehavior == MB_0C) + if (metatileBehavior == MB_MOUNTAIN_TOP) return TRUE; else return FALSE; @@ -476,7 +476,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior) bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) { - if(metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) + if (metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) return TRUE; else return FALSE; @@ -484,7 +484,7 @@ bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior) { - if(metatileBehavior == MB_UNDERWATER_BLOCKED_ABOVE) + if (metatileBehavior == MB_UNDERWATER_BLOCKED_ABOVE) return TRUE; else return FALSE; @@ -492,7 +492,7 @@ bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior) bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior) { - if(metatileBehavior == MB_SHALLOW_WATER) + if (metatileBehavior == MB_SHALLOW_WATER) return TRUE; else return FALSE; @@ -500,7 +500,7 @@ bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior) bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior) { - if(metatileBehavior == MB_THIN_ICE) + if (metatileBehavior == MB_THIN_ICE) return TRUE; else return FALSE; @@ -508,7 +508,7 @@ bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior) bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior) { - if(metatileBehavior == MB_CRACKED_ICE) + if (metatileBehavior == MB_CRACKED_ICE) return TRUE; else return FALSE; @@ -516,16 +516,16 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior) bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior) { - if((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) - || metatileBehavior == MB_OCEAN_WATER) + if ((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) + || metatileBehavior == MB_OCEAN_WATER) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedIsMB1A(u8 metatileBehavior) +bool8 MetatileBehavior_IsUnusedWater(u8 metatileBehavior) { - if(metatileBehavior == MB_1A) + if (metatileBehavior == MB_UNUSED_WATER) return TRUE; else return FALSE; @@ -533,7 +533,7 @@ bool8 MetatileBehavior_UnusedIsMB1A(u8 metatileBehavior) bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior) { - if(MetatileBehavior_IsSurfable(metatileBehavior) + if (MetatileBehavior_IsSurfable(metatileBehavior) && !MetatileBehavior_IsWaterfall(metatileBehavior)) return TRUE; else @@ -542,9 +542,9 @@ bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior) bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_EAST - || metatileBehavior == MB_IMPASSABLE_NORTHEAST - || metatileBehavior == MB_IMPASSABLE_SOUTHEAST) + if (metatileBehavior == MB_IMPASSABLE_EAST + || metatileBehavior == MB_IMPASSABLE_NORTHEAST + || metatileBehavior == MB_IMPASSABLE_SOUTHEAST) return TRUE; else return FALSE; @@ -552,9 +552,9 @@ bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior) bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_WEST - || metatileBehavior == MB_IMPASSABLE_NORTHWEST - || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) + if (metatileBehavior == MB_IMPASSABLE_WEST + || metatileBehavior == MB_IMPASSABLE_NORTHWEST + || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) return TRUE; else return FALSE; @@ -562,9 +562,9 @@ bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior) bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_NORTH - || metatileBehavior == MB_IMPASSABLE_NORTHEAST - || metatileBehavior == MB_IMPASSABLE_NORTHWEST) + if (metatileBehavior == MB_IMPASSABLE_NORTH + || metatileBehavior == MB_IMPASSABLE_NORTHEAST + || metatileBehavior == MB_IMPASSABLE_NORTHWEST) return TRUE; else return FALSE; @@ -572,9 +572,9 @@ bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior) bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_SOUTH - || metatileBehavior == MB_IMPASSABLE_SOUTHEAST - || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) + if (metatileBehavior == MB_IMPASSABLE_SOUTH + || metatileBehavior == MB_IMPASSABLE_SOUTHEAST + || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) return TRUE; else return FALSE; @@ -584,7 +584,7 @@ bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior) { - if(metatileBehavior == 0x28) + if (metatileBehavior == MB_HOT_SPRINGS) return TRUE; else return FALSE; @@ -592,37 +592,37 @@ bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior) bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior) { - if(metatileBehavior == MB_WATERFALL) + if (metatileBehavior == MB_WATERFALL) return TRUE; else return FALSE; } bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior){ return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogVerticalLogTop(u8 metatileBehavior){ return FALSE; } +bool8 MetatileBehavior_IsPacifidlogVerticalLogBottom(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogHorizontalLogLeft(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogHorizontalLogRight(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior) { - if(metatileBehavior == MB_REGION_MAP) + if (metatileBehavior == MB_REGION_MAP) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsRoulette(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPokeblockFeeder(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsSecretBaseJumpMat(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsSecretBaseSpinMat(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_LAVARIDGE_1F_WARP) + if (metatileBehavior == MB_LAVARIDGE_1F_WARP) return TRUE; else return FALSE; @@ -630,7 +630,7 @@ bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior) { - if(metatileBehavior == MB_REGULAR_WARP) + if (metatileBehavior == MB_REGULAR_WARP) return TRUE; else return FALSE; @@ -638,7 +638,7 @@ bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior) bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_UNION_ROOM_WARP) + if (metatileBehavior == MB_UNION_ROOM_WARP) return TRUE; else return FALSE; @@ -646,9 +646,9 @@ bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWater(u8 metatileBehavior) { - if((metatileBehavior >= MB_POND_WATER && metatileBehavior <= MB_DEEP_WATER) - || metatileBehavior == MB_OCEAN_WATER - || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT)) + if ((metatileBehavior >= MB_POND_WATER && metatileBehavior <= MB_DEEP_WATER) + || metatileBehavior == MB_OCEAN_WATER + || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT)) return TRUE; else return FALSE; @@ -656,17 +656,17 @@ bool8 MetatileBehavior_IsWater(u8 metatileBehavior) bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_FALL_WARP) + if (metatileBehavior == MB_FALL_WARP) return TRUE; else return FALSE; } -bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior){ return FALSE; } +bool8 MetatileBehavior_IsCrackedFloor(u8 metatileBehavior){ return FALSE; } bool32 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior) { - if(metatileBehavior >= MB_CYCLING_ROAD_PULL_DOWN && metatileBehavior <= MB_CYCLING_ROAD_PULL_DOWN_GRASS) + if (metatileBehavior >= MB_CYCLING_ROAD_PULL_DOWN && metatileBehavior <= MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; else return FALSE; @@ -685,7 +685,7 @@ bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) { - if(metatileBehavior == MB_SEAWEED) + if (metatileBehavior == MB_SEAWEED) return TRUE; else return FALSE; @@ -693,17 +693,17 @@ bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior) { - if(metatileBehavior == MB_RUNNING_DISALLOWED) + if (metatileBehavior == MB_RUNNING_DISALLOWED) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPictureBookShelf(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior) { - if(metatileBehavior == MB_BOOKSHELF) + if (metatileBehavior == MB_BOOKSHELF) return TRUE; else return FALSE; @@ -711,40 +711,40 @@ bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior) bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior) { - if(metatileBehavior == MB_POKEMART_SHELF) + if (metatileBehavior == MB_POKEMART_SHELF) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_POKEMON_CENTER_SIGN) + else if (metatileBehavior == MB_POKEMON_CENTER_SIGN) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_POKEMART_SIGN) + else if (metatileBehavior == MB_POKEMART_SIGN) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy1(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy2(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy3(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy4(u8 metatileBehavior) { return FALSE; } bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2) { - if(sTileBitAttributes[arg1] & arg2) + if (sTileBitAttributes[arg1] & arg2) return TRUE; else return FALSE; @@ -752,7 +752,7 @@ bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2) bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_RIGHT) + if (metatileBehavior == MB_SPIN_RIGHT) return TRUE; else return FALSE; @@ -760,7 +760,7 @@ bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior) bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_LEFT) + if (metatileBehavior == MB_SPIN_LEFT) return TRUE; else return FALSE; @@ -768,7 +768,7 @@ bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior) bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_UP) + if (metatileBehavior == MB_SPIN_UP) return TRUE; else return FALSE; @@ -776,7 +776,7 @@ bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior) bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_DOWN) + if (metatileBehavior == MB_SPIN_DOWN) return TRUE; else return FALSE; @@ -784,7 +784,7 @@ bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior) bool8 MetatileBehavior_IsStopSpinning(u8 metatileBehavior) { - if(metatileBehavior == MB_STOP_SPINNING) + if (metatileBehavior == MB_STOP_SPINNING) return TRUE; else return FALSE; @@ -794,7 +794,7 @@ bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN) + if (metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN) result = TRUE; else result = FALSE; @@ -804,7 +804,7 @@ bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior) bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior) { - if(metatileBehavior == MB_SIGNPOST) + if (metatileBehavior == MB_SIGNPOST) return TRUE; else return FALSE; @@ -812,7 +812,7 @@ bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior) bool8 MetatileBehavior_IsCabinet(u8 metatileBehavior) { - if(metatileBehavior == MB_CABINET) + if (metatileBehavior == MB_CABINET) return TRUE; else return FALSE; @@ -820,7 +820,7 @@ bool8 MetatileBehavior_IsCabinet(u8 metatileBehavior) bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior) { - if(metatileBehavior == MB_KITCHEN) + if (metatileBehavior == MB_KITCHEN) return TRUE; else return FALSE; @@ -828,7 +828,7 @@ bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior) bool8 MetatileBehavior_IsDresser(u8 metatileBehavior) { - if(metatileBehavior == MB_DRESSER) + if (metatileBehavior == MB_DRESSER) return TRUE; else return FALSE; @@ -836,7 +836,7 @@ bool8 MetatileBehavior_IsDresser(u8 metatileBehavior) bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior) { - if(metatileBehavior == MB_SNACKS) + if (metatileBehavior == MB_SNACKS) return TRUE; else return FALSE; @@ -844,27 +844,27 @@ bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior) bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior) { - if(metatileBehavior == MB_STRENGTH_BUTTON) + if (metatileBehavior == MB_STRENGTH_BUTTON) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_8D) + else if (metatileBehavior == MB_CABLE_CLUB_WIRELESS_MONITOR) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_BATTLE_RECORDS) + else if (metatileBehavior == MB_BATTLE_RECORDS) return TRUE; else return FALSE; @@ -872,23 +872,23 @@ bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection) bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior) { - if(metatileBehavior == MB_QUESTIONNAIRE) + if (metatileBehavior == MB_QUESTIONNAIRE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior) +bool8 MetatileBehavior_IsIndigoPlateauSign1(u8 metatileBehavior) { - if(metatileBehavior == MB_INDIGO_PLATEAU_MARK_DPAD) + if (metatileBehavior == MB_INDIGO_PLATEAU_SIGN_1) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior) +bool8 MetatileBehavior_IsIndigoPlateauSign2(u8 metatileBehavior) { - if(metatileBehavior == MB_INDIGO_PLATEAU_MARK_2_DPAD) + if (metatileBehavior == MB_INDIGO_PLATEAU_SIGN_2) return TRUE; else return FALSE; @@ -896,7 +896,7 @@ bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior) bool8 MetatileBehavior_IsFood(u8 metatileBehavior) { - if(metatileBehavior == MB_FOOD) + if (metatileBehavior == MB_FOOD) return TRUE; else return FALSE; @@ -906,7 +906,7 @@ bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior == MB_ROCK_STAIRS) + if (metatileBehavior == MB_ROCK_STAIRS) result = TRUE; else result = FALSE; @@ -916,7 +916,7 @@ bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior) bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior) { - if(metatileBehavior == MB_BLUEPRINTS) + if (metatileBehavior == MB_BLUEPRINTS) return TRUE; else return FALSE; @@ -924,7 +924,7 @@ bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior) bool8 MetatileBehavior_IsPainting(u8 metatileBehavior) { - if(metatileBehavior == MB_PAINTING) + if (metatileBehavior == MB_PAINTING) return TRUE; else return FALSE; @@ -932,7 +932,7 @@ bool8 MetatileBehavior_IsPainting(u8 metatileBehavior) bool8 MetatileBehavior_IsPowerPlantMachine(u8 metatileBehavior) { - if(metatileBehavior == MB_POWER_PLANT_MACHINE) + if (metatileBehavior == MB_POWER_PLANT_MACHINE) return TRUE; else return FALSE; @@ -940,7 +940,7 @@ bool8 MetatileBehavior_IsPowerPlantMachine(u8 metatileBehavior) bool8 MetatileBehavior_IsTelephone(u8 metatileBehavior) { - if(metatileBehavior == MB_TELEPHONE) + if (metatileBehavior == MB_TELEPHONE) return TRUE; else return FALSE; @@ -948,7 +948,7 @@ bool8 MetatileBehavior_IsTelephone(u8 metatileBehavior) bool8 MetatileBehavior_IsComputer(u8 metatileBehavior) { - if(metatileBehavior == MB_COMPUTER) + if (metatileBehavior == MB_COMPUTER) return TRUE; else return FALSE; @@ -956,7 +956,7 @@ bool8 MetatileBehavior_IsComputer(u8 metatileBehavior) bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior) { - if(metatileBehavior == MB_ADVERTISING_POSTER) + if (metatileBehavior == MB_ADVERTISING_POSTER) return TRUE; else return FALSE; @@ -964,7 +964,7 @@ bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior) bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior) { - if(metatileBehavior == MB_FOOD_SMELLS_TASTY) + if (metatileBehavior == MB_FOOD_SMELLS_TASTY) return TRUE; else return FALSE; @@ -972,7 +972,7 @@ bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior) bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior) { - if(metatileBehavior == MB_TRASH_BIN) + if (metatileBehavior == MB_TRASH_BIN) return TRUE; else return FALSE; @@ -980,7 +980,7 @@ bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior) bool8 MetatileBehavior_IsCup(u8 metatileBehavior) { - if(metatileBehavior == MB_CUP) + if (metatileBehavior == MB_CUP) return TRUE; else return FALSE; @@ -991,7 +991,7 @@ bool8 MetatileBehavior_IsBeautifulSkyWindow(u8 metatileBehavior) { return FALSE; bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior) { - if(metatileBehavior == MB_BLINKING_LIGHTS) + if (metatileBehavior == MB_BLINKING_LIGHTS) return TRUE; else return FALSE; @@ -999,7 +999,7 @@ bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior) bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior) { - if(metatileBehavior == MB_NEATLY_LINED_UP_TOOLS) + if (metatileBehavior == MB_NEATLY_LINED_UP_TOOLS) return TRUE; else return FALSE; @@ -1007,7 +1007,7 @@ bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior) bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPRESSIVE_MACHINE) + if (metatileBehavior == MB_IMPRESSIVE_MACHINE) return TRUE; else return FALSE; @@ -1015,7 +1015,7 @@ bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior) bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior) { - if(metatileBehavior == MB_VIDEO_GAME) + if (metatileBehavior == MB_VIDEO_GAME) return TRUE; else return FALSE; @@ -1023,7 +1023,7 @@ bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior) bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior) { - if(metatileBehavior == MB_BURGLARY) + if (metatileBehavior == MB_BURGLARY) return TRUE; else return FALSE; @@ -1031,7 +1031,7 @@ bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior) bool8 MetatileBehavior_IsTrainerTowerMonitor(u8 metatileBehavior) { - if(metatileBehavior == MB_TRAINER_TOWER_MONITOR) + if (metatileBehavior == MB_TRAINER_TOWER_MONITOR) return TRUE; else return FALSE; From 507b2843532b095b1967e5cc0ded6e7bc49a4cf9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 6 Aug 2022 02:31:19 -0400 Subject: [PATCH 2/2] Celadon water -> cycling road water --- include/constants/metatile_behaviors.h | 2 +- src/metatile_behavior.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 3564f0886..4e71cdb7e 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -22,7 +22,7 @@ // #define MB_UNDERWATER_BLOCKED_ABOVE 0x19 #define MB_UNUSED_WATER 0x1A -#define MB_CELADON_WATER 0x1B +#define MB_CYCLING_ROAD_WATER 0x1B // #define MB_STRENGTH_BUTTON 0x20 #define MB_SAND 0x21 diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 743377e6f..81b9fc239 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -3,17 +3,17 @@ #include "constants/metatile_behaviors.h" static const bool8 sBehaviorSurfable[NUM_METATILE_BEHAVIORS] = { - [MB_POND_WATER] = TRUE, - [MB_SEMI_DEEP_WATER] = TRUE, - [MB_DEEP_WATER] = TRUE, - [MB_WATERFALL] = TRUE, - [MB_OCEAN_WATER] = TRUE, - [MB_UNUSED_WATER] = TRUE, - [MB_CELADON_WATER] = TRUE, - [MB_EASTWARD_CURRENT] = TRUE, - [MB_WESTWARD_CURRENT] = TRUE, - [MB_NORTHWARD_CURRENT] = TRUE, - [MB_SOUTHWARD_CURRENT] = TRUE + [MB_POND_WATER] = TRUE, + [MB_SEMI_DEEP_WATER] = TRUE, + [MB_DEEP_WATER] = TRUE, + [MB_WATERFALL] = TRUE, + [MB_OCEAN_WATER] = TRUE, + [MB_UNUSED_WATER] = TRUE, + [MB_CYCLING_ROAD_WATER] = TRUE, + [MB_EASTWARD_CURRENT] = TRUE, + [MB_WESTWARD_CURRENT] = TRUE, + [MB_NORTHWARD_CURRENT] = TRUE, + [MB_SOUTHWARD_CURRENT] = TRUE }; static const u8 sTileBitAttributes[32] = { @@ -92,7 +92,7 @@ bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) if (metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE || metatileBehavior == MB_UNUSED_WATER - || metatileBehavior == MB_CELADON_WATER + || metatileBehavior == MB_CYCLING_ROAD_WATER || metatileBehavior == MB_ICE) return TRUE; else