From f0e15ca5162e5bf0cac44a8084845f3fb8868ddb Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 6 Aug 2022 06:51:41 +0000 Subject: [PATCH] Merge pull request #528 from GriffinRichards/doc-behaviors --- pokefirered.sym | 52 +++++++++++++++++++++--------------------- pokefirered_rev1.sym | 52 +++++++++++++++++++++--------------------- pokeleafgreen.sym | 52 +++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 52 +++++++++++++++++++++--------------------- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index 49149f214..3a787f538 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -3182,10 +3182,10 @@ 08059cf0 g 00000014 MetatileBehavior_IsWestArrowWarp 08059d04 g 00000014 MetatileBehavior_IsNorthArrowWarp 08059d18 g 00000014 MetatileBehavior_IsSouthArrowWarp -08059d2c g 00000042 MetatileBehavior_UnusedIsArrowWarp +08059d2c g 00000042 MetatileBehavior_IsArrowWarp 08059d70 g 0000003c MetatileBehavior_IsForcedMovementTile 08059dac g 00000014 MetatileBehavior_IsIce_2 -08059dc0 g 00000014 MetatileBehavior_IsUnknownMovement48 +08059dc0 g 00000014 MetatileBehavior_IsTrickHouseSlipperyFloor 08059dd4 g 00000014 MetatileBehavior_IsWalkNorth 08059de8 g 00000014 MetatileBehavior_IsWalkSouth 08059dfc g 00000014 MetatileBehavior_IsWalkWest @@ -3203,13 +3203,13 @@ 08059ef4 g 00000014 MetatileBehavior_IsPC 08059f08 g 00000018 MetatileBehavior_HasRipples 08059f20 g 00000014 MetatileBehavior_IsPuddle -08059f34 g 00000018 MetatileBehavior_IsTallGrass_2 +08059f34 g 00000018 MetatileBehavior_IsTallGrass 08059f4c g 00000004 MetatileBehavior_IsLongGrass -08059f50 g 00000004 MetatileBehavior_ReturnFalse_4 +08059f50 g 00000004 MetatileBehavior_IsAshGrass 08059f54 g 00000004 MetatileBehavior_IsFootprints 08059f58 g 00000004 MetatileBehavior_IsBridge 08059f5c g 00000004 MetatileBehavior_GetBridgeType -08059f60 g 00000014 MetatileBehavior_UnusedIsMB_01 +08059f60 g 00000014 MetatileBehavior_IsUnused01 08059f74 g 00000014 MetatileBehavior_UnusedIsTallGrass 08059f88 g 00000014 MetatileBehavior_IsIndoorEncounter 08059f9c g 00000014 MetatileBehavior_IsMountain @@ -3219,7 +3219,7 @@ 08059ff4 g 00000014 MetatileBehavior_IsThinIce 0805a008 g 00000014 MetatileBehavior_IsCrackedIce 0805a01c g 00000020 MetatileBehavior_IsDeepSemiDeepOrSplashingWater -0805a03c g 00000014 MetatileBehavior_UnusedIsMB1A +0805a03c g 00000014 MetatileBehavior_IsUnusedWater 0805a050 g 0000002a MetatileBehavior_IsSurfableAndNotWaterfall 0805a07c g 0000001c MetatileBehavior_IsEastBlocked 0805a098 g 0000001c MetatileBehavior_IsWestBlocked @@ -3229,24 +3229,24 @@ 0805a0f0 g 00000014 MetatileBehavior_IsHotSprings 0805a104 g 00000014 MetatileBehavior_IsWaterfall 0805a118 g 00000004 MetatileBehavior_IsFortreeBridge -0805a11c g 00000004 MetatileBehavior_UnusedReturnFalse -0805a120 g 00000004 MetatileBehavior_UnusedReturnFalse_2 -0805a124 g 00000004 MetatileBehavior_UnusedReturnFalse_3 -0805a128 g 00000004 MetatileBehavior_UnusedReturnFalse_4 +0805a11c g 00000004 MetatileBehavior_IsPacifidlogVerticalLogTop +0805a120 g 00000004 MetatileBehavior_IsPacifidlogVerticalLogBottom +0805a124 g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogLeft +0805a128 g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogRight 0805a12c g 00000004 MetatileBehavior_IsPacifidlogLog -0805a130 g 00000004 MetatileBehavior_ReturnFalse_11 +0805a130 g 00000004 MetatileBehavior_IsTrickHousePuzzleDoor 0805a134 g 00000014 MetatileBehavior_IsRegionMap -0805a148 g 00000004 MetatileBehavior_UnusedReturnFalse_5 -0805a14c g 00000004 MetatileBehavior_UnusedReturnFalse_6 -0805a150 g 00000004 MetatileBehavior_UnusedReturnFalse_7 -0805a154 g 00000004 MetatileBehavior_UnusedReturnFalse_8 +0805a148 g 00000004 MetatileBehavior_IsRoulette +0805a14c g 00000004 MetatileBehavior_IsPokeblockFeeder +0805a150 g 00000004 MetatileBehavior_IsSecretBaseJumpMat +0805a154 g 00000004 MetatileBehavior_IsSecretBaseSpinMat 0805a158 g 00000004 MetatileBehavior_IsLavaridgeB1FWarp 0805a15c g 00000014 MetatileBehavior_IsLavaridge1FWarp 0805a170 g 00000014 MetatileBehavior_IsWarpPad 0805a184 g 00000014 MetatileBehavior_IsUnionRoomWarp 0805a198 g 0000002c MetatileBehavior_IsWater 0805a1c4 g 00000014 MetatileBehavior_IsFallWarp -0805a1d8 g 00000004 MetatileBehavior_ReturnFalse_13 +0805a1d8 g 00000004 MetatileBehavior_IsCrackedFloor 0805a1dc g 0000001a MetatileBehavior_IsCyclingRoadPullDownTile 0805a1f8 g 00000014 MetatileBehavior_IsCyclingRoadPullDownTileGrass 0805a20c g 00000004 MetatileBehavior_IsBumpySlope @@ -3256,15 +3256,15 @@ 0805a21c g 00000004 MetatileBehavior_IsHorizontalRail 0805a220 g 00000014 MetatileBehavior_IsSeaweed 0805a234 g 00000014 MetatileBehavior_IsRunningDisallowed -0805a248 g 00000004 MetatileBehavior_UnusedReturnFalse_9 +0805a248 g 00000004 MetatileBehavior_IsPictureBookShelf 0805a24c g 00000014 MetatileBehavior_IsBookshelf 0805a260 g 00000014 MetatileBehavior_IsPokeMartShelf 0805a274 g 0000001c MetatileBehavior_IsPlayerFacingPokemonCenterSign 0805a290 g 0000001c MetatileBehavior_IsPlayerFacingPokeMartSign -0805a2ac g 00000004 MetatileBehavior_UnusedReturnFalse_10 -0805a2b0 g 00000004 MetatileBehavior_UnusedReturnFalse_11 -0805a2b4 g 00000004 MetatileBehavior_UnusedReturnFalse_12 -0805a2b8 g 00000004 MetatileBehavior_UnusedReturnFalse_13 +0805a2ac g 00000004 MetatileBehavior_UnknownDummy1 +0805a2b0 g 00000004 MetatileBehavior_UnknownDummy2 +0805a2b4 g 00000004 MetatileBehavior_UnknownDummy3 +0805a2b8 g 00000004 MetatileBehavior_UnknownDummy4 0805a2bc g 00000022 TestMetatileAttributeBit 0805a2e0 g 00000014 MetatileBehavior_IsSpinRight 0805a2f4 g 00000014 MetatileBehavior_IsSpinLeft @@ -3281,8 +3281,8 @@ 0805a3d8 g 0000001c MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor 0805a3f4 g 0000001c MetatileBehavior_IsPlayerFacingBattleRecords 0805a410 g 00000014 MetatileBehavior_IsQuestionnaire -0805a424 g 00000014 MetatileBehavior_IsIndigoPlateauMark -0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauMark2 +0805a424 g 00000014 MetatileBehavior_IsIndigoPlateauSign1 +0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauSign2 0805a44c g 00000014 MetatileBehavior_IsFood 0805a460 g 00000014 MetatileBehavior_IsRockStairs 0805a474 g 00000014 MetatileBehavior_IsBlueprints @@ -3386,8 +3386,8 @@ 0805b8dc l 00000018 ForcedMovement_SlideNorth 0805b8f4 l 00000018 ForcedMovement_SlideWest 0805b90c l 00000018 ForcedMovement_SlideEast -0805b924 l 0000000c ForcedMovement_0xBB -0805b930 l 0000000c ForcedMovement_0xBC +0805b924 l 0000000c ForcedMovement_MatJump +0805b930 l 0000000c ForcedMovement_MatSpin 0805b93c g 00000030 MovePlayerNotOnBike 0805b96c l 00000044 CheckMovementInputNotOnBike 0805b9b0 l 00000012 PlayerNotOnBikeNotMoving @@ -29664,7 +29664,7 @@ 08352eec l 00000004 sDummyConnectionFlags 08352ef0 l 00000020 sMetatileAttrMasks 08352f10 l 00000008 sMetatileAttrShifts -08352f78 l 000000f0 sTileSurfable +08352f78 l 000000f0 sBehaviorSurfable 08353068 l 00000020 sTileBitAttributes 08353088 l 00000180 sDoorAnimTiles_General 08353208 l 00000020 sDoorNullPalette1 diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 12c9ec62d..e6a76a6f4 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -3182,10 +3182,10 @@ 08059d04 g 00000014 MetatileBehavior_IsWestArrowWarp 08059d18 g 00000014 MetatileBehavior_IsNorthArrowWarp 08059d2c g 00000014 MetatileBehavior_IsSouthArrowWarp -08059d40 g 00000042 MetatileBehavior_UnusedIsArrowWarp +08059d40 g 00000042 MetatileBehavior_IsArrowWarp 08059d84 g 0000003c MetatileBehavior_IsForcedMovementTile 08059dc0 g 00000014 MetatileBehavior_IsIce_2 -08059dd4 g 00000014 MetatileBehavior_IsUnknownMovement48 +08059dd4 g 00000014 MetatileBehavior_IsTrickHouseSlipperyFloor 08059de8 g 00000014 MetatileBehavior_IsWalkNorth 08059dfc g 00000014 MetatileBehavior_IsWalkSouth 08059e10 g 00000014 MetatileBehavior_IsWalkWest @@ -3203,13 +3203,13 @@ 08059f08 g 00000014 MetatileBehavior_IsPC 08059f1c g 00000018 MetatileBehavior_HasRipples 08059f34 g 00000014 MetatileBehavior_IsPuddle -08059f48 g 00000018 MetatileBehavior_IsTallGrass_2 +08059f48 g 00000018 MetatileBehavior_IsTallGrass 08059f60 g 00000004 MetatileBehavior_IsLongGrass -08059f64 g 00000004 MetatileBehavior_ReturnFalse_4 +08059f64 g 00000004 MetatileBehavior_IsAshGrass 08059f68 g 00000004 MetatileBehavior_IsFootprints 08059f6c g 00000004 MetatileBehavior_IsBridge 08059f70 g 00000004 MetatileBehavior_GetBridgeType -08059f74 g 00000014 MetatileBehavior_UnusedIsMB_01 +08059f74 g 00000014 MetatileBehavior_IsUnused01 08059f88 g 00000014 MetatileBehavior_UnusedIsTallGrass 08059f9c g 00000014 MetatileBehavior_IsIndoorEncounter 08059fb0 g 00000014 MetatileBehavior_IsMountain @@ -3219,7 +3219,7 @@ 0805a008 g 00000014 MetatileBehavior_IsThinIce 0805a01c g 00000014 MetatileBehavior_IsCrackedIce 0805a030 g 00000020 MetatileBehavior_IsDeepSemiDeepOrSplashingWater -0805a050 g 00000014 MetatileBehavior_UnusedIsMB1A +0805a050 g 00000014 MetatileBehavior_IsUnusedWater 0805a064 g 0000002a MetatileBehavior_IsSurfableAndNotWaterfall 0805a090 g 0000001c MetatileBehavior_IsEastBlocked 0805a0ac g 0000001c MetatileBehavior_IsWestBlocked @@ -3229,24 +3229,24 @@ 0805a104 g 00000014 MetatileBehavior_IsHotSprings 0805a118 g 00000014 MetatileBehavior_IsWaterfall 0805a12c g 00000004 MetatileBehavior_IsFortreeBridge -0805a130 g 00000004 MetatileBehavior_UnusedReturnFalse -0805a134 g 00000004 MetatileBehavior_UnusedReturnFalse_2 -0805a138 g 00000004 MetatileBehavior_UnusedReturnFalse_3 -0805a13c g 00000004 MetatileBehavior_UnusedReturnFalse_4 +0805a130 g 00000004 MetatileBehavior_IsPacifidlogVerticalLogTop +0805a134 g 00000004 MetatileBehavior_IsPacifidlogVerticalLogBottom +0805a138 g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogLeft +0805a13c g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogRight 0805a140 g 00000004 MetatileBehavior_IsPacifidlogLog -0805a144 g 00000004 MetatileBehavior_ReturnFalse_11 +0805a144 g 00000004 MetatileBehavior_IsTrickHousePuzzleDoor 0805a148 g 00000014 MetatileBehavior_IsRegionMap -0805a15c g 00000004 MetatileBehavior_UnusedReturnFalse_5 -0805a160 g 00000004 MetatileBehavior_UnusedReturnFalse_6 -0805a164 g 00000004 MetatileBehavior_UnusedReturnFalse_7 -0805a168 g 00000004 MetatileBehavior_UnusedReturnFalse_8 +0805a15c g 00000004 MetatileBehavior_IsRoulette +0805a160 g 00000004 MetatileBehavior_IsPokeblockFeeder +0805a164 g 00000004 MetatileBehavior_IsSecretBaseJumpMat +0805a168 g 00000004 MetatileBehavior_IsSecretBaseSpinMat 0805a16c g 00000004 MetatileBehavior_IsLavaridgeB1FWarp 0805a170 g 00000014 MetatileBehavior_IsLavaridge1FWarp 0805a184 g 00000014 MetatileBehavior_IsWarpPad 0805a198 g 00000014 MetatileBehavior_IsUnionRoomWarp 0805a1ac g 0000002c MetatileBehavior_IsWater 0805a1d8 g 00000014 MetatileBehavior_IsFallWarp -0805a1ec g 00000004 MetatileBehavior_ReturnFalse_13 +0805a1ec g 00000004 MetatileBehavior_IsCrackedFloor 0805a1f0 g 0000001a MetatileBehavior_IsCyclingRoadPullDownTile 0805a20c g 00000014 MetatileBehavior_IsCyclingRoadPullDownTileGrass 0805a220 g 00000004 MetatileBehavior_IsBumpySlope @@ -3256,15 +3256,15 @@ 0805a230 g 00000004 MetatileBehavior_IsHorizontalRail 0805a234 g 00000014 MetatileBehavior_IsSeaweed 0805a248 g 00000014 MetatileBehavior_IsRunningDisallowed -0805a25c g 00000004 MetatileBehavior_UnusedReturnFalse_9 +0805a25c g 00000004 MetatileBehavior_IsPictureBookShelf 0805a260 g 00000014 MetatileBehavior_IsBookshelf 0805a274 g 00000014 MetatileBehavior_IsPokeMartShelf 0805a288 g 0000001c MetatileBehavior_IsPlayerFacingPokemonCenterSign 0805a2a4 g 0000001c MetatileBehavior_IsPlayerFacingPokeMartSign -0805a2c0 g 00000004 MetatileBehavior_UnusedReturnFalse_10 -0805a2c4 g 00000004 MetatileBehavior_UnusedReturnFalse_11 -0805a2c8 g 00000004 MetatileBehavior_UnusedReturnFalse_12 -0805a2cc g 00000004 MetatileBehavior_UnusedReturnFalse_13 +0805a2c0 g 00000004 MetatileBehavior_UnknownDummy1 +0805a2c4 g 00000004 MetatileBehavior_UnknownDummy2 +0805a2c8 g 00000004 MetatileBehavior_UnknownDummy3 +0805a2cc g 00000004 MetatileBehavior_UnknownDummy4 0805a2d0 g 00000022 TestMetatileAttributeBit 0805a2f4 g 00000014 MetatileBehavior_IsSpinRight 0805a308 g 00000014 MetatileBehavior_IsSpinLeft @@ -3281,8 +3281,8 @@ 0805a3ec g 0000001c MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor 0805a408 g 0000001c MetatileBehavior_IsPlayerFacingBattleRecords 0805a424 g 00000014 MetatileBehavior_IsQuestionnaire -0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauMark -0805a44c g 00000014 MetatileBehavior_IsIndigoPlateauMark2 +0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauSign1 +0805a44c g 00000014 MetatileBehavior_IsIndigoPlateauSign2 0805a460 g 00000014 MetatileBehavior_IsFood 0805a474 g 00000014 MetatileBehavior_IsRockStairs 0805a488 g 00000014 MetatileBehavior_IsBlueprints @@ -3386,8 +3386,8 @@ 0805b8f0 l 00000018 ForcedMovement_SlideNorth 0805b908 l 00000018 ForcedMovement_SlideWest 0805b920 l 00000018 ForcedMovement_SlideEast -0805b938 l 0000000c ForcedMovement_0xBB -0805b944 l 0000000c ForcedMovement_0xBC +0805b938 l 0000000c ForcedMovement_MatJump +0805b944 l 0000000c ForcedMovement_MatSpin 0805b950 g 00000030 MovePlayerNotOnBike 0805b980 l 00000044 CheckMovementInputNotOnBike 0805b9c4 l 00000012 PlayerNotOnBikeNotMoving @@ -29665,7 +29665,7 @@ 08352f5c l 00000004 sDummyConnectionFlags 08352f60 l 00000020 sMetatileAttrMasks 08352f80 l 00000008 sMetatileAttrShifts -08352fe8 l 000000f0 sTileSurfable +08352fe8 l 000000f0 sBehaviorSurfable 083530d8 l 00000020 sTileBitAttributes 083530f8 l 00000180 sDoorAnimTiles_General 08353278 l 00000020 sDoorNullPalette1 diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index f4a81ae97..81ada4cef 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -3182,10 +3182,10 @@ 08059cf0 g 00000014 MetatileBehavior_IsWestArrowWarp 08059d04 g 00000014 MetatileBehavior_IsNorthArrowWarp 08059d18 g 00000014 MetatileBehavior_IsSouthArrowWarp -08059d2c g 00000042 MetatileBehavior_UnusedIsArrowWarp +08059d2c g 00000042 MetatileBehavior_IsArrowWarp 08059d70 g 0000003c MetatileBehavior_IsForcedMovementTile 08059dac g 00000014 MetatileBehavior_IsIce_2 -08059dc0 g 00000014 MetatileBehavior_IsUnknownMovement48 +08059dc0 g 00000014 MetatileBehavior_IsTrickHouseSlipperyFloor 08059dd4 g 00000014 MetatileBehavior_IsWalkNorth 08059de8 g 00000014 MetatileBehavior_IsWalkSouth 08059dfc g 00000014 MetatileBehavior_IsWalkWest @@ -3203,13 +3203,13 @@ 08059ef4 g 00000014 MetatileBehavior_IsPC 08059f08 g 00000018 MetatileBehavior_HasRipples 08059f20 g 00000014 MetatileBehavior_IsPuddle -08059f34 g 00000018 MetatileBehavior_IsTallGrass_2 +08059f34 g 00000018 MetatileBehavior_IsTallGrass 08059f4c g 00000004 MetatileBehavior_IsLongGrass -08059f50 g 00000004 MetatileBehavior_ReturnFalse_4 +08059f50 g 00000004 MetatileBehavior_IsAshGrass 08059f54 g 00000004 MetatileBehavior_IsFootprints 08059f58 g 00000004 MetatileBehavior_IsBridge 08059f5c g 00000004 MetatileBehavior_GetBridgeType -08059f60 g 00000014 MetatileBehavior_UnusedIsMB_01 +08059f60 g 00000014 MetatileBehavior_IsUnused01 08059f74 g 00000014 MetatileBehavior_UnusedIsTallGrass 08059f88 g 00000014 MetatileBehavior_IsIndoorEncounter 08059f9c g 00000014 MetatileBehavior_IsMountain @@ -3219,7 +3219,7 @@ 08059ff4 g 00000014 MetatileBehavior_IsThinIce 0805a008 g 00000014 MetatileBehavior_IsCrackedIce 0805a01c g 00000020 MetatileBehavior_IsDeepSemiDeepOrSplashingWater -0805a03c g 00000014 MetatileBehavior_UnusedIsMB1A +0805a03c g 00000014 MetatileBehavior_IsUnusedWater 0805a050 g 0000002a MetatileBehavior_IsSurfableAndNotWaterfall 0805a07c g 0000001c MetatileBehavior_IsEastBlocked 0805a098 g 0000001c MetatileBehavior_IsWestBlocked @@ -3229,24 +3229,24 @@ 0805a0f0 g 00000014 MetatileBehavior_IsHotSprings 0805a104 g 00000014 MetatileBehavior_IsWaterfall 0805a118 g 00000004 MetatileBehavior_IsFortreeBridge -0805a11c g 00000004 MetatileBehavior_UnusedReturnFalse -0805a120 g 00000004 MetatileBehavior_UnusedReturnFalse_2 -0805a124 g 00000004 MetatileBehavior_UnusedReturnFalse_3 -0805a128 g 00000004 MetatileBehavior_UnusedReturnFalse_4 +0805a11c g 00000004 MetatileBehavior_IsPacifidlogVerticalLogTop +0805a120 g 00000004 MetatileBehavior_IsPacifidlogVerticalLogBottom +0805a124 g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogLeft +0805a128 g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogRight 0805a12c g 00000004 MetatileBehavior_IsPacifidlogLog -0805a130 g 00000004 MetatileBehavior_ReturnFalse_11 +0805a130 g 00000004 MetatileBehavior_IsTrickHousePuzzleDoor 0805a134 g 00000014 MetatileBehavior_IsRegionMap -0805a148 g 00000004 MetatileBehavior_UnusedReturnFalse_5 -0805a14c g 00000004 MetatileBehavior_UnusedReturnFalse_6 -0805a150 g 00000004 MetatileBehavior_UnusedReturnFalse_7 -0805a154 g 00000004 MetatileBehavior_UnusedReturnFalse_8 +0805a148 g 00000004 MetatileBehavior_IsRoulette +0805a14c g 00000004 MetatileBehavior_IsPokeblockFeeder +0805a150 g 00000004 MetatileBehavior_IsSecretBaseJumpMat +0805a154 g 00000004 MetatileBehavior_IsSecretBaseSpinMat 0805a158 g 00000004 MetatileBehavior_IsLavaridgeB1FWarp 0805a15c g 00000014 MetatileBehavior_IsLavaridge1FWarp 0805a170 g 00000014 MetatileBehavior_IsWarpPad 0805a184 g 00000014 MetatileBehavior_IsUnionRoomWarp 0805a198 g 0000002c MetatileBehavior_IsWater 0805a1c4 g 00000014 MetatileBehavior_IsFallWarp -0805a1d8 g 00000004 MetatileBehavior_ReturnFalse_13 +0805a1d8 g 00000004 MetatileBehavior_IsCrackedFloor 0805a1dc g 0000001a MetatileBehavior_IsCyclingRoadPullDownTile 0805a1f8 g 00000014 MetatileBehavior_IsCyclingRoadPullDownTileGrass 0805a20c g 00000004 MetatileBehavior_IsBumpySlope @@ -3256,15 +3256,15 @@ 0805a21c g 00000004 MetatileBehavior_IsHorizontalRail 0805a220 g 00000014 MetatileBehavior_IsSeaweed 0805a234 g 00000014 MetatileBehavior_IsRunningDisallowed -0805a248 g 00000004 MetatileBehavior_UnusedReturnFalse_9 +0805a248 g 00000004 MetatileBehavior_IsPictureBookShelf 0805a24c g 00000014 MetatileBehavior_IsBookshelf 0805a260 g 00000014 MetatileBehavior_IsPokeMartShelf 0805a274 g 0000001c MetatileBehavior_IsPlayerFacingPokemonCenterSign 0805a290 g 0000001c MetatileBehavior_IsPlayerFacingPokeMartSign -0805a2ac g 00000004 MetatileBehavior_UnusedReturnFalse_10 -0805a2b0 g 00000004 MetatileBehavior_UnusedReturnFalse_11 -0805a2b4 g 00000004 MetatileBehavior_UnusedReturnFalse_12 -0805a2b8 g 00000004 MetatileBehavior_UnusedReturnFalse_13 +0805a2ac g 00000004 MetatileBehavior_UnknownDummy1 +0805a2b0 g 00000004 MetatileBehavior_UnknownDummy2 +0805a2b4 g 00000004 MetatileBehavior_UnknownDummy3 +0805a2b8 g 00000004 MetatileBehavior_UnknownDummy4 0805a2bc g 00000022 TestMetatileAttributeBit 0805a2e0 g 00000014 MetatileBehavior_IsSpinRight 0805a2f4 g 00000014 MetatileBehavior_IsSpinLeft @@ -3281,8 +3281,8 @@ 0805a3d8 g 0000001c MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor 0805a3f4 g 0000001c MetatileBehavior_IsPlayerFacingBattleRecords 0805a410 g 00000014 MetatileBehavior_IsQuestionnaire -0805a424 g 00000014 MetatileBehavior_IsIndigoPlateauMark -0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauMark2 +0805a424 g 00000014 MetatileBehavior_IsIndigoPlateauSign1 +0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauSign2 0805a44c g 00000014 MetatileBehavior_IsFood 0805a460 g 00000014 MetatileBehavior_IsRockStairs 0805a474 g 00000014 MetatileBehavior_IsBlueprints @@ -3386,8 +3386,8 @@ 0805b8dc l 00000018 ForcedMovement_SlideNorth 0805b8f4 l 00000018 ForcedMovement_SlideWest 0805b90c l 00000018 ForcedMovement_SlideEast -0805b924 l 0000000c ForcedMovement_0xBB -0805b930 l 0000000c ForcedMovement_0xBC +0805b924 l 0000000c ForcedMovement_MatJump +0805b930 l 0000000c ForcedMovement_MatSpin 0805b93c g 00000030 MovePlayerNotOnBike 0805b96c l 00000044 CheckMovementInputNotOnBike 0805b9b0 l 00000012 PlayerNotOnBikeNotMoving @@ -29666,7 +29666,7 @@ 08352ecc l 00000004 sDummyConnectionFlags 08352ed0 l 00000020 sMetatileAttrMasks 08352ef0 l 00000008 sMetatileAttrShifts -08352f58 l 000000f0 sTileSurfable +08352f58 l 000000f0 sBehaviorSurfable 08353048 l 00000020 sTileBitAttributes 08353068 l 00000180 sDoorAnimTiles_General 083531e8 l 00000020 sDoorNullPalette1 diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 97b46ae86..1798d68d2 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -3182,10 +3182,10 @@ 08059d04 g 00000014 MetatileBehavior_IsWestArrowWarp 08059d18 g 00000014 MetatileBehavior_IsNorthArrowWarp 08059d2c g 00000014 MetatileBehavior_IsSouthArrowWarp -08059d40 g 00000042 MetatileBehavior_UnusedIsArrowWarp +08059d40 g 00000042 MetatileBehavior_IsArrowWarp 08059d84 g 0000003c MetatileBehavior_IsForcedMovementTile 08059dc0 g 00000014 MetatileBehavior_IsIce_2 -08059dd4 g 00000014 MetatileBehavior_IsUnknownMovement48 +08059dd4 g 00000014 MetatileBehavior_IsTrickHouseSlipperyFloor 08059de8 g 00000014 MetatileBehavior_IsWalkNorth 08059dfc g 00000014 MetatileBehavior_IsWalkSouth 08059e10 g 00000014 MetatileBehavior_IsWalkWest @@ -3203,13 +3203,13 @@ 08059f08 g 00000014 MetatileBehavior_IsPC 08059f1c g 00000018 MetatileBehavior_HasRipples 08059f34 g 00000014 MetatileBehavior_IsPuddle -08059f48 g 00000018 MetatileBehavior_IsTallGrass_2 +08059f48 g 00000018 MetatileBehavior_IsTallGrass 08059f60 g 00000004 MetatileBehavior_IsLongGrass -08059f64 g 00000004 MetatileBehavior_ReturnFalse_4 +08059f64 g 00000004 MetatileBehavior_IsAshGrass 08059f68 g 00000004 MetatileBehavior_IsFootprints 08059f6c g 00000004 MetatileBehavior_IsBridge 08059f70 g 00000004 MetatileBehavior_GetBridgeType -08059f74 g 00000014 MetatileBehavior_UnusedIsMB_01 +08059f74 g 00000014 MetatileBehavior_IsUnused01 08059f88 g 00000014 MetatileBehavior_UnusedIsTallGrass 08059f9c g 00000014 MetatileBehavior_IsIndoorEncounter 08059fb0 g 00000014 MetatileBehavior_IsMountain @@ -3219,7 +3219,7 @@ 0805a008 g 00000014 MetatileBehavior_IsThinIce 0805a01c g 00000014 MetatileBehavior_IsCrackedIce 0805a030 g 00000020 MetatileBehavior_IsDeepSemiDeepOrSplashingWater -0805a050 g 00000014 MetatileBehavior_UnusedIsMB1A +0805a050 g 00000014 MetatileBehavior_IsUnusedWater 0805a064 g 0000002a MetatileBehavior_IsSurfableAndNotWaterfall 0805a090 g 0000001c MetatileBehavior_IsEastBlocked 0805a0ac g 0000001c MetatileBehavior_IsWestBlocked @@ -3229,24 +3229,24 @@ 0805a104 g 00000014 MetatileBehavior_IsHotSprings 0805a118 g 00000014 MetatileBehavior_IsWaterfall 0805a12c g 00000004 MetatileBehavior_IsFortreeBridge -0805a130 g 00000004 MetatileBehavior_UnusedReturnFalse -0805a134 g 00000004 MetatileBehavior_UnusedReturnFalse_2 -0805a138 g 00000004 MetatileBehavior_UnusedReturnFalse_3 -0805a13c g 00000004 MetatileBehavior_UnusedReturnFalse_4 +0805a130 g 00000004 MetatileBehavior_IsPacifidlogVerticalLogTop +0805a134 g 00000004 MetatileBehavior_IsPacifidlogVerticalLogBottom +0805a138 g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogLeft +0805a13c g 00000004 MetatileBehavior_IsPacifidlogHorizontalLogRight 0805a140 g 00000004 MetatileBehavior_IsPacifidlogLog -0805a144 g 00000004 MetatileBehavior_ReturnFalse_11 +0805a144 g 00000004 MetatileBehavior_IsTrickHousePuzzleDoor 0805a148 g 00000014 MetatileBehavior_IsRegionMap -0805a15c g 00000004 MetatileBehavior_UnusedReturnFalse_5 -0805a160 g 00000004 MetatileBehavior_UnusedReturnFalse_6 -0805a164 g 00000004 MetatileBehavior_UnusedReturnFalse_7 -0805a168 g 00000004 MetatileBehavior_UnusedReturnFalse_8 +0805a15c g 00000004 MetatileBehavior_IsRoulette +0805a160 g 00000004 MetatileBehavior_IsPokeblockFeeder +0805a164 g 00000004 MetatileBehavior_IsSecretBaseJumpMat +0805a168 g 00000004 MetatileBehavior_IsSecretBaseSpinMat 0805a16c g 00000004 MetatileBehavior_IsLavaridgeB1FWarp 0805a170 g 00000014 MetatileBehavior_IsLavaridge1FWarp 0805a184 g 00000014 MetatileBehavior_IsWarpPad 0805a198 g 00000014 MetatileBehavior_IsUnionRoomWarp 0805a1ac g 0000002c MetatileBehavior_IsWater 0805a1d8 g 00000014 MetatileBehavior_IsFallWarp -0805a1ec g 00000004 MetatileBehavior_ReturnFalse_13 +0805a1ec g 00000004 MetatileBehavior_IsCrackedFloor 0805a1f0 g 0000001a MetatileBehavior_IsCyclingRoadPullDownTile 0805a20c g 00000014 MetatileBehavior_IsCyclingRoadPullDownTileGrass 0805a220 g 00000004 MetatileBehavior_IsBumpySlope @@ -3256,15 +3256,15 @@ 0805a230 g 00000004 MetatileBehavior_IsHorizontalRail 0805a234 g 00000014 MetatileBehavior_IsSeaweed 0805a248 g 00000014 MetatileBehavior_IsRunningDisallowed -0805a25c g 00000004 MetatileBehavior_UnusedReturnFalse_9 +0805a25c g 00000004 MetatileBehavior_IsPictureBookShelf 0805a260 g 00000014 MetatileBehavior_IsBookshelf 0805a274 g 00000014 MetatileBehavior_IsPokeMartShelf 0805a288 g 0000001c MetatileBehavior_IsPlayerFacingPokemonCenterSign 0805a2a4 g 0000001c MetatileBehavior_IsPlayerFacingPokeMartSign -0805a2c0 g 00000004 MetatileBehavior_UnusedReturnFalse_10 -0805a2c4 g 00000004 MetatileBehavior_UnusedReturnFalse_11 -0805a2c8 g 00000004 MetatileBehavior_UnusedReturnFalse_12 -0805a2cc g 00000004 MetatileBehavior_UnusedReturnFalse_13 +0805a2c0 g 00000004 MetatileBehavior_UnknownDummy1 +0805a2c4 g 00000004 MetatileBehavior_UnknownDummy2 +0805a2c8 g 00000004 MetatileBehavior_UnknownDummy3 +0805a2cc g 00000004 MetatileBehavior_UnknownDummy4 0805a2d0 g 00000022 TestMetatileAttributeBit 0805a2f4 g 00000014 MetatileBehavior_IsSpinRight 0805a308 g 00000014 MetatileBehavior_IsSpinLeft @@ -3281,8 +3281,8 @@ 0805a3ec g 0000001c MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor 0805a408 g 0000001c MetatileBehavior_IsPlayerFacingBattleRecords 0805a424 g 00000014 MetatileBehavior_IsQuestionnaire -0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauMark -0805a44c g 00000014 MetatileBehavior_IsIndigoPlateauMark2 +0805a438 g 00000014 MetatileBehavior_IsIndigoPlateauSign1 +0805a44c g 00000014 MetatileBehavior_IsIndigoPlateauSign2 0805a460 g 00000014 MetatileBehavior_IsFood 0805a474 g 00000014 MetatileBehavior_IsRockStairs 0805a488 g 00000014 MetatileBehavior_IsBlueprints @@ -3386,8 +3386,8 @@ 0805b8f0 l 00000018 ForcedMovement_SlideNorth 0805b908 l 00000018 ForcedMovement_SlideWest 0805b920 l 00000018 ForcedMovement_SlideEast -0805b938 l 0000000c ForcedMovement_0xBB -0805b944 l 0000000c ForcedMovement_0xBC +0805b938 l 0000000c ForcedMovement_MatJump +0805b944 l 0000000c ForcedMovement_MatSpin 0805b950 g 00000030 MovePlayerNotOnBike 0805b980 l 00000044 CheckMovementInputNotOnBike 0805b9c4 l 00000012 PlayerNotOnBikeNotMoving @@ -29667,7 +29667,7 @@ 08352f3c l 00000004 sDummyConnectionFlags 08352f40 l 00000020 sMetatileAttrMasks 08352f60 l 00000008 sMetatileAttrShifts -08352fc8 l 000000f0 sTileSurfable +08352fc8 l 000000f0 sBehaviorSurfable 083530b8 l 00000020 sTileBitAttributes 083530d8 l 00000180 sDoorAnimTiles_General 08353258 l 00000020 sDoorNullPalette1