dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1608 from GriffinRichards/fix-fieldmap

Browse Source
This commit is contained in:
GriffinRichards
2022-01-26 22:57:24 +00:00
parent 38510b6e25
commit a8d77a46c2
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokeemerald.sym
+19 -19
View File
@@ -962,9 +962,9 @@
03005d90 g 00000004 gSaveBlock2Ptr 03005d90 g 00000004 gSaveBlock2Ptr
03005d94 g 00000004 gPokemonStoragePtr 03005d94 g 00000004 gPokemonStoragePtr
03005d98 g 00000004 gInGameOpponentsNo 03005d98 g 00000004 gInGameOpponentsNo
03005d9c g 00000004 gBGTilemapBuffers1 03005d9c g 00000004 gOverworldTilemapBuffer_Bg2
03005da0 g 00000004 gBGTilemapBuffers2 03005da0 g 00000004 gOverworldTilemapBuffer_Bg1
03005da4 g 00000004 gBGTilemapBuffers3 03005da4 g 00000004 gOverworldTilemapBuffer_Bg3
03005da8 g 00000004 gHeldKeyCodeToSend 03005da8 g 00000004 gHeldKeyCodeToSend
03005dac g 00000004 gFieldCallback 03005dac g 00000004 gFieldCallback
03005db0 g 00000004 gFieldCallback2 03005db0 g 00000004 gFieldCallback2
@@ -4600,14 +4600,14 @@
08088020 l 00000060 FillNorthConnection 08088020 l 00000060 FillNorthConnection
08088080 l 00000060 FillWestConnection 08088080 l 00000060 FillWestConnection
080880e0 l 00000064 FillEastConnection 080880e0 l 00000064 FillEastConnection
08088144 g 0000006c MapGridGetZCoordAt 08088144 g 0000006c MapGridGetElevationAt
080881b0 g 00000074 MapGridIsImpassableAt 080881b0 g 00000074 MapGridIsImpassableAt
08088224 g 00000098 MapGridGetMetatileIdAt 08088224 g 00000098 MapGridGetMetatileIdAt
080882bc g 00000018 MapGridGetMetatileBehaviorAt 080882bc g 00000018 MapGridGetMetatileBehaviorAt
080882d4 g 0000001c MapGridGetMetatileLayerTypeAt 080882d4 g 0000001c MapGridGetMetatileLayerTypeAt
080882f0 g 00000048 MapGridSetMetatileIdAt 080882f0 g 00000048 MapGridSetMetatileIdAt
08088338 g 00000038 MapGridSetMetatileEntryAt 08088338 g 00000038 MapGridSetMetatileEntryAt
08088370 g 00000054 GetBehaviorByMetatileId 08088370 g 00000054 GetMetatileAttributesById
080883c4 g 00000074 SaveMapView 080883c4 g 00000074 SaveMapView
08088438 l 0000003c SavedMapViewIsEmpty 08088438 l 0000003c SavedMapViewIsEmpty
08088474 l 00000028 ClearSavedMapView 08088474 l 00000028 ClearSavedMapView
@@ -4693,14 +4693,14 @@
08089274 g 00000014 MetatileBehavior_IsSecretBaseShrub 08089274 g 00000014 MetatileBehavior_IsSecretBaseShrub
08089288 g 00000014 MetatileBehavior_IsSecretBasePC 08089288 g 00000014 MetatileBehavior_IsSecretBasePC
0808929c g 00000014 MetatileBehavior_IsRecordMixingSecretBasePC 0808929c g 00000014 MetatileBehavior_IsRecordMixingSecretBasePC
080892b0 g 00000014 Unref_MetatileBehavior_IsSecretBaseUnused_B2 080892b0 g 00000014 MetatileBehavior_IsSecretBaseScenery1
080892c4 g 00000014 MetatileBehavior_IsBlockDecoration 080892c4 g 00000014 MetatileBehavior_IsSecretBaseTrainerSpot
080892d8 g 00000014 MetatileBehavior_IsSecretBaseImpassable 080892d8 g 00000014 MetatileBehavior_IsSecretBaseImpassable
080892ec g 00000014 MetatileBehavior_IsSecretBaseDecorationBase 080892ec g 00000014 MetatileBehavior_IsSecretBaseDecorationBase
08089300 g 00000014 MetatileBehavior_IsSecretBasePoster 08089300 g 00000014 MetatileBehavior_IsSecretBasePoster
08089314 g 00000012 MetatileBehavior_IsNormal 08089314 g 00000012 MetatileBehavior_IsNormal
08089328 g 00000014 MetatileBehavior_IsSecretBaseNorthWall 08089328 g 00000014 MetatileBehavior_IsSecretBaseNorthWall
0808933c g 00000014 Unref_MetatileBehavior_IsSecretBaseUnused_B2_2 0808933c g 00000014 MetatileBehavior_IsSecretBaseScenery2
08089350 g 00000014 MetatileBehavior_HoldsSmallDecoration 08089350 g 00000014 MetatileBehavior_HoldsSmallDecoration
08089364 g 00000014 MetatileBehavior_HoldsLargeDecoration 08089364 g 00000014 MetatileBehavior_HoldsLargeDecoration
08089378 g 00000014 MetatileBehavior_IsSecretBaseHole 08089378 g 00000014 MetatileBehavior_IsSecretBaseHole
@@ -4932,7 +4932,7 @@
0808badc g 0000015a player_get_pos_including_state_based_drift 0808badc g 0000015a player_get_pos_including_state_based_drift
0808bc38 g 00000020 GetPlayerFacingDirection 0808bc38 g 00000020 GetPlayerFacingDirection
0808bc58 g 0000001c GetPlayerMovementDirection 0808bc58 g 0000001c GetPlayerMovementDirection
0808bc74 g 0000001c PlayerGetZCoord 0808bc74 g 0000001c PlayerGetElevation
0808bc90 g 00000030 MovePlayerToMapCoords 0808bc90 g 00000030 MovePlayerToMapCoords
0808bcc0 g 00000010 TestPlayerAvatarFlags 0808bcc0 g 00000010 TestPlayerAvatarFlags
0808bcd0 g 0000000c GetPlayerAvatarFlags 0808bcd0 g 0000000c GetPlayerAvatarFlags
@@ -5072,8 +5072,8 @@
0808eba8 g 00000054 TryMoveObjectEventToMapCoords 0808eba8 g 00000054 TryMoveObjectEventToMapCoords
0808ebfc g 00000012 ShiftStillObjectEventCoords 0808ebfc g 00000012 ShiftStillObjectEventCoords
0808ec10 g 00000068 UpdateObjectEventCoordsForCameraUpdate 0808ec10 g 00000068 UpdateObjectEventCoordsForCameraUpdate
0808ec78 g 00000066 GetObjectEventIdByXYZ 0808ec78 g 00000066 GetObjectEventIdByPosition
0808ece0 l 00000026 ObjectEventDoesZCoordMatch 0808ece0 l 00000026 ObjectEventDoesElevationMatch
0808ed08 g 0000002c UpdateObjectEventsForCameraUpdate 0808ed08 g 0000002c UpdateObjectEventsForCameraUpdate
0808ed34 g 00000044 AddCameraObject 0808ed34 g 00000044 AddCameraObject
0808ed78 l 00000028 SpriteCB_CameraObject 0808ed78 l 00000028 SpriteCB_CameraObject
@@ -5761,14 +5761,14 @@
08096bdc l 0000002e GetReflectionTypeByMetatileBehavior 08096bdc l 0000002e GetReflectionTypeByMetatileBehavior
08096c0c g 0000005c GetLedgeJumpDirection 08096c0c g 0000005c GetLedgeJumpDirection
08096c68 l 0000005a SetObjectEventSpriteOamTableForLongGrass 08096c68 l 0000005a SetObjectEventSpriteOamTableForLongGrass
08096cc4 g 0000003a IsZCoordMismatchAt 08096cc4 l 0000003a IsElevationMismatchAt
08096d00 g 0000005c UpdateObjectEventZCoordAndPriority 08096d00 l 0000005c UpdateObjectEventElevationAndPriority
08096d5c l 0000004c InitObjectPriorityByZCoord 08096d5c l 0000004c InitObjectPriorityByElevation
08096da8 g 00000010 ZCoordToPriority 08096da8 g 00000010 ElevationToPriority
08096db8 g 00000054 ObjectEventUpdateZCoord 08096db8 g 00000054 ObjectEventUpdateElevation
08096e0c g 00000048 SetObjectSubpriorityByZCoord 08096e0c g 00000048 SetObjectSubpriorityByElevation
08096e54 l 0000001a ObjectEventUpdateSubpriority 08096e54 l 0000001a ObjectEventUpdateSubpriority
08096e70 g 00000020 AreZCoordsCompatible 08096e70 l 00000020 AreElevationsCompatible
08096e90 g 0000004c GroundEffect_SpawnOnTallGrass 08096e90 g 0000004c GroundEffect_SpawnOnTallGrass
08096edc g 0000004c GroundEffect_StepOnTallGrass 08096edc g 0000004c GroundEffect_StepOnTallGrass
08096f28 g 0000004c GroundEffect_SpawnOnLongGrass 08096f28 g 0000004c GroundEffect_SpawnOnLongGrass
@@ -10985,7 +10985,7 @@
0812826c l 00000150 SetUpDecorationShape 0812826c l 00000150 SetUpDecorationShape
081283bc l 00000058 AttemptPlaceDecoration 081283bc l 00000058 AttemptPlaceDecoration
08128414 l 00000070 AttemptCancelPlaceDecoration 08128414 l 00000070 AttemptCancelPlaceDecoration
08128484 l 00000026 IsNonBlockNonElevated 08128484 l 00000026 IsSecretBaseTrainerSpot
081284ac l 00000048 IsntInitialPosition 081284ac l 00000048 IsntInitialPosition
081284f4 l 00000048 IsFloorOrBoardAndHole 081284f4 l 00000048 IsFloorOrBoardAndHole
0812853c l 00000412 CanPlaceDecoration 0812853c l 00000412 CanPlaceDecoration