Merge pull request #467 from GriffinRichards/sync-fieldmap

This commit is contained in:
GriffinRichards
2021-10-01 22:36:50 +00:00
parent d52f19eb2a
commit 559a02be5d
4 changed files with 112 additions and 112 deletions
+28 -28
View File
@@ -3099,61 +3099,61 @@
080587ec l 0000008c LinkPlayerDetectCollision
08058878 l 00000094 CreateLinkPlayerSprite
0805890c l 000000b6 SpriteCB_LinkPlayer
080589c4 g 00000010 mapconnection_get_mapheader
080589c4 g 00000010 GetMapHeaderFromConnection
080589c4 l 00000000 .gcc2_compiled.
080589d4 g 00000014 InitMap
080589e8 g 00000018 InitMapFromSavedGame
08058a00 l 00000070 InitMapLayoutData
08058a70 l 00000058 map_copy_with_padding
08058ac8 l 0000008a mapheader_copy_mapdata_of_adjacent_maps
08058b54 l 00000064 sub_8058B54
08058bb8 l 00000068 fillSouthConnection
08058c20 l 00000060 fillNorthConnection
08058c80 l 00000060 fillWestConnection
08058ce0 l 00000064 fillEastConnection
08058a70 l 00000058 InitBackupMapLayoutData
08058ac8 l 0000008a InitBackupMapLayoutConnections
08058b54 l 00000064 FillConnection
08058bb8 l 00000068 FillSouthConnection
08058c20 l 00000060 FillNorthConnection
08058c80 l 00000060 FillWestConnection
08058ce0 l 00000064 FillEastConnection
08058d44 g 00000080 MapGridGetZCoordAt
08058dc4 g 00000084 MapGridIsImpassableAt
08058e48 g 000000d4 MapGridGetMetatileIdAt
08058f1c g 0000002c GetMetatileAttributeFromRawMetatileBehavior
08058f1c g 0000002c ExtractMetatileAttribute
08058f48 g 00000030 MapGridGetMetatileAttributeAt
08058f78 g 00000014 MapGridGetMetatileBehaviorAt
08058f8c g 00000018 MapGridGetMetatileLayerTypeAt
08058fa4 g 00000048 MapGridSetMetatileIdAt
08058fec g 00000038 MapGridSetMetatileEntryAt
08059024 g 0000005c MapGridSetMetatileImpassabilityAt
08059080 g 00000058 GetBehaviorByMetatileIdAndMapLayout
080590d8 g 00000080 save_serialize_map
08059080 l 00000058 GetAttributeByMetatileIdAndMapLayout
080590d8 g 00000080 SaveMapView
08059158 l 00000040 SavedMapViewIsEmpty
08059198 l 0000002c ClearSavedMapView
080591c4 l 0000008c LoadSavedMapView
08059250 l 000000e4 sub_8059250
08059250 l 000000e4 MoveMapViewToBackup
08059334 g 00000108 GetMapBorderIdAt
0805943c l 00000028 GetPostCameraMoveMapBorderId
08059464 g 00000048 CanCameraMoveInDirection
080594ac l 00000084 sub_80594AC
080594ac l 00000084 SetPositionFromConnection
08059530 g 000000d0 CameraMove
08059600 l 00000056 sub_8059600
08059658 l 00000064 sub_8059658
080596bc l 0000002a sub_80596BC
080596e8 l 00000014 sub_80596E8
080596fc l 00000040 sub_80596FC
08059600 l 00000056 GetIncomingConnection
08059658 l 00000064 IsPosInIncomingConnectingMap
080596bc l 0000002a IsCoordInIncomingConnectingMap
080596e8 l 00000014 IsCoordInConnectingMap
080596fc l 00000040 IsPosInConnectingMap
0805973c g 000000ae GetMapConnectionAtPos
080597ec g 0000001c SetCameraFocusCoords
08059808 g 00000018 GetCameraFocusCoords
08059820 l 00000010 SetCameraCoords
08059830 g 00000014 GetCameraCoords
08059844 l 00000044 copy_tileset_patterns_to_vram
08059888 l 00000044 copy_tileset_patterns_to_vram2
08059844 l 00000044 CopyTilesetToVram
08059888 l 00000044 CopyTilesetToVramUsingHeap
080598cc l 0000007c Fieldmap_ApplyGlobalTintToPaletteEntries
08059948 g 00000080 Fieldmap_ApplyGlobalTintToPaletteSlot
080599c8 l 0000008a apply_map_tileset_palette
08059a54 g 00000012 copy_map_tileset1_to_vram
08059a68 g 00000014 copy_map_tileset2_to_vram
08059a7c g 00000014 copy_map_tileset2_to_vram_2
08059a90 g 00000010 apply_map_tileset1_palette
08059aa0 g 00000010 apply_map_tileset2_palette
08059ab0 g 00000028 copy_map_tileset1_tileset2_to_vram
08059ad8 g 00000018 apply_map_tileset1_tileset2_palette
080599c8 l 0000008a LoadTilesetPalette
08059a54 g 00000012 CopyPrimaryTilesetToVram
08059a68 g 00000014 CopySecondaryTilesetToVram
08059a7c g 00000014 CopySecondaryTilesetToVramUsingHeap
08059a90 l 00000010 LoadPrimaryTilesetPalette
08059aa0 g 00000010 LoadSecondaryTilesetPalette
08059ab0 g 00000028 CopyMapTilesetsToVram
08059ad8 g 00000018 LoadMapTilesetPalettes
08059af0 g 00000004 MetatileBehavior_IsATile
08059af0 l 00000000 .gcc2_compiled.
08059af4 g 00000014 MetatileBehavior_IsJumpEast
+28 -28
View File
@@ -3099,61 +3099,61 @@
08058800 l 0000008c LinkPlayerDetectCollision
0805888c l 00000094 CreateLinkPlayerSprite
08058920 l 000000b6 SpriteCB_LinkPlayer
080589d8 g 00000010 mapconnection_get_mapheader
080589d8 g 00000010 GetMapHeaderFromConnection
080589d8 l 00000000 .gcc2_compiled.
080589e8 g 00000014 InitMap
080589fc g 00000018 InitMapFromSavedGame
08058a14 l 00000070 InitMapLayoutData
08058a84 l 00000058 map_copy_with_padding
08058adc l 0000008a mapheader_copy_mapdata_of_adjacent_maps
08058b68 l 00000064 sub_8058B54
08058bcc l 00000068 fillSouthConnection
08058c34 l 00000060 fillNorthConnection
08058c94 l 00000060 fillWestConnection
08058cf4 l 00000064 fillEastConnection
08058a84 l 00000058 InitBackupMapLayoutData
08058adc l 0000008a InitBackupMapLayoutConnections
08058b68 l 00000064 FillConnection
08058bcc l 00000068 FillSouthConnection
08058c34 l 00000060 FillNorthConnection
08058c94 l 00000060 FillWestConnection
08058cf4 l 00000064 FillEastConnection
08058d58 g 00000080 MapGridGetZCoordAt
08058dd8 g 00000084 MapGridIsImpassableAt
08058e5c g 000000d4 MapGridGetMetatileIdAt
08058f30 g 0000002c GetMetatileAttributeFromRawMetatileBehavior
08058f30 g 0000002c ExtractMetatileAttribute
08058f5c g 00000030 MapGridGetMetatileAttributeAt
08058f8c g 00000014 MapGridGetMetatileBehaviorAt
08058fa0 g 00000018 MapGridGetMetatileLayerTypeAt
08058fb8 g 00000048 MapGridSetMetatileIdAt
08059000 g 00000038 MapGridSetMetatileEntryAt
08059038 g 0000005c MapGridSetMetatileImpassabilityAt
08059094 g 00000058 GetBehaviorByMetatileIdAndMapLayout
080590ec g 00000080 save_serialize_map
08059094 l 00000058 GetAttributeByMetatileIdAndMapLayout
080590ec g 00000080 SaveMapView
0805916c l 00000040 SavedMapViewIsEmpty
080591ac l 0000002c ClearSavedMapView
080591d8 l 0000008c LoadSavedMapView
08059264 l 000000e4 sub_8059250
08059264 l 000000e4 MoveMapViewToBackup
08059348 g 00000108 GetMapBorderIdAt
08059450 l 00000028 GetPostCameraMoveMapBorderId
08059478 g 00000048 CanCameraMoveInDirection
080594c0 l 00000084 sub_80594AC
080594c0 l 00000084 SetPositionFromConnection
08059544 g 000000d0 CameraMove
08059614 l 00000056 sub_8059600
0805966c l 00000064 sub_8059658
080596d0 l 0000002a sub_80596BC
080596fc l 00000014 sub_80596E8
08059710 l 00000040 sub_80596FC
08059614 l 00000056 GetIncomingConnection
0805966c l 00000064 IsPosInIncomingConnectingMap
080596d0 l 0000002a IsCoordInIncomingConnectingMap
080596fc l 00000014 IsCoordInConnectingMap
08059710 l 00000040 IsPosInConnectingMap
08059750 g 000000ae GetMapConnectionAtPos
08059800 g 0000001c SetCameraFocusCoords
0805981c g 00000018 GetCameraFocusCoords
08059834 l 00000010 SetCameraCoords
08059844 g 00000014 GetCameraCoords
08059858 l 00000044 copy_tileset_patterns_to_vram
0805989c l 00000044 copy_tileset_patterns_to_vram2
08059858 l 00000044 CopyTilesetToVram
0805989c l 00000044 CopyTilesetToVramUsingHeap
080598e0 l 0000007c Fieldmap_ApplyGlobalTintToPaletteEntries
0805995c g 00000080 Fieldmap_ApplyGlobalTintToPaletteSlot
080599dc l 0000008a apply_map_tileset_palette
08059a68 g 00000012 copy_map_tileset1_to_vram
08059a7c g 00000014 copy_map_tileset2_to_vram
08059a90 g 00000014 copy_map_tileset2_to_vram_2
08059aa4 g 00000010 apply_map_tileset1_palette
08059ab4 g 00000010 apply_map_tileset2_palette
08059ac4 g 00000028 copy_map_tileset1_tileset2_to_vram
08059aec g 00000018 apply_map_tileset1_tileset2_palette
080599dc l 0000008a LoadTilesetPalette
08059a68 g 00000012 CopyPrimaryTilesetToVram
08059a7c g 00000014 CopySecondaryTilesetToVram
08059a90 g 00000014 CopySecondaryTilesetToVramUsingHeap
08059aa4 l 00000010 LoadPrimaryTilesetPalette
08059ab4 g 00000010 LoadSecondaryTilesetPalette
08059ac4 g 00000028 CopyMapTilesetsToVram
08059aec g 00000018 LoadMapTilesetPalettes
08059b04 g 00000004 MetatileBehavior_IsATile
08059b04 l 00000000 .gcc2_compiled.
08059b08 g 00000014 MetatileBehavior_IsJumpEast
+28 -28
View File
@@ -3099,61 +3099,61 @@
080587ec l 0000008c LinkPlayerDetectCollision
08058878 l 00000094 CreateLinkPlayerSprite
0805890c l 000000b6 SpriteCB_LinkPlayer
080589c4 g 00000010 mapconnection_get_mapheader
080589c4 g 00000010 GetMapHeaderFromConnection
080589c4 l 00000000 .gcc2_compiled.
080589d4 g 00000014 InitMap
080589e8 g 00000018 InitMapFromSavedGame
08058a00 l 00000070 InitMapLayoutData
08058a70 l 00000058 map_copy_with_padding
08058ac8 l 0000008a mapheader_copy_mapdata_of_adjacent_maps
08058b54 l 00000064 sub_8058B54
08058bb8 l 00000068 fillSouthConnection
08058c20 l 00000060 fillNorthConnection
08058c80 l 00000060 fillWestConnection
08058ce0 l 00000064 fillEastConnection
08058a70 l 00000058 InitBackupMapLayoutData
08058ac8 l 0000008a InitBackupMapLayoutConnections
08058b54 l 00000064 FillConnection
08058bb8 l 00000068 FillSouthConnection
08058c20 l 00000060 FillNorthConnection
08058c80 l 00000060 FillWestConnection
08058ce0 l 00000064 FillEastConnection
08058d44 g 00000080 MapGridGetZCoordAt
08058dc4 g 00000084 MapGridIsImpassableAt
08058e48 g 000000d4 MapGridGetMetatileIdAt
08058f1c g 0000002c GetMetatileAttributeFromRawMetatileBehavior
08058f1c g 0000002c ExtractMetatileAttribute
08058f48 g 00000030 MapGridGetMetatileAttributeAt
08058f78 g 00000014 MapGridGetMetatileBehaviorAt
08058f8c g 00000018 MapGridGetMetatileLayerTypeAt
08058fa4 g 00000048 MapGridSetMetatileIdAt
08058fec g 00000038 MapGridSetMetatileEntryAt
08059024 g 0000005c MapGridSetMetatileImpassabilityAt
08059080 g 00000058 GetBehaviorByMetatileIdAndMapLayout
080590d8 g 00000080 save_serialize_map
08059080 l 00000058 GetAttributeByMetatileIdAndMapLayout
080590d8 g 00000080 SaveMapView
08059158 l 00000040 SavedMapViewIsEmpty
08059198 l 0000002c ClearSavedMapView
080591c4 l 0000008c LoadSavedMapView
08059250 l 000000e4 sub_8059250
08059250 l 000000e4 MoveMapViewToBackup
08059334 g 00000108 GetMapBorderIdAt
0805943c l 00000028 GetPostCameraMoveMapBorderId
08059464 g 00000048 CanCameraMoveInDirection
080594ac l 00000084 sub_80594AC
080594ac l 00000084 SetPositionFromConnection
08059530 g 000000d0 CameraMove
08059600 l 00000056 sub_8059600
08059658 l 00000064 sub_8059658
080596bc l 0000002a sub_80596BC
080596e8 l 00000014 sub_80596E8
080596fc l 00000040 sub_80596FC
08059600 l 00000056 GetIncomingConnection
08059658 l 00000064 IsPosInIncomingConnectingMap
080596bc l 0000002a IsCoordInIncomingConnectingMap
080596e8 l 00000014 IsCoordInConnectingMap
080596fc l 00000040 IsPosInConnectingMap
0805973c g 000000ae GetMapConnectionAtPos
080597ec g 0000001c SetCameraFocusCoords
08059808 g 00000018 GetCameraFocusCoords
08059820 l 00000010 SetCameraCoords
08059830 g 00000014 GetCameraCoords
08059844 l 00000044 copy_tileset_patterns_to_vram
08059888 l 00000044 copy_tileset_patterns_to_vram2
08059844 l 00000044 CopyTilesetToVram
08059888 l 00000044 CopyTilesetToVramUsingHeap
080598cc l 0000007c Fieldmap_ApplyGlobalTintToPaletteEntries
08059948 g 00000080 Fieldmap_ApplyGlobalTintToPaletteSlot
080599c8 l 0000008a apply_map_tileset_palette
08059a54 g 00000012 copy_map_tileset1_to_vram
08059a68 g 00000014 copy_map_tileset2_to_vram
08059a7c g 00000014 copy_map_tileset2_to_vram_2
08059a90 g 00000010 apply_map_tileset1_palette
08059aa0 g 00000010 apply_map_tileset2_palette
08059ab0 g 00000028 copy_map_tileset1_tileset2_to_vram
08059ad8 g 00000018 apply_map_tileset1_tileset2_palette
080599c8 l 0000008a LoadTilesetPalette
08059a54 g 00000012 CopyPrimaryTilesetToVram
08059a68 g 00000014 CopySecondaryTilesetToVram
08059a7c g 00000014 CopySecondaryTilesetToVramUsingHeap
08059a90 l 00000010 LoadPrimaryTilesetPalette
08059aa0 g 00000010 LoadSecondaryTilesetPalette
08059ab0 g 00000028 CopyMapTilesetsToVram
08059ad8 g 00000018 LoadMapTilesetPalettes
08059af0 g 00000004 MetatileBehavior_IsATile
08059af0 l 00000000 .gcc2_compiled.
08059af4 g 00000014 MetatileBehavior_IsJumpEast
+28 -28
View File
@@ -3099,61 +3099,61 @@
08058800 l 0000008c LinkPlayerDetectCollision
0805888c l 00000094 CreateLinkPlayerSprite
08058920 l 000000b6 SpriteCB_LinkPlayer
080589d8 g 00000010 mapconnection_get_mapheader
080589d8 g 00000010 GetMapHeaderFromConnection
080589d8 l 00000000 .gcc2_compiled.
080589e8 g 00000014 InitMap
080589fc g 00000018 InitMapFromSavedGame
08058a14 l 00000070 InitMapLayoutData
08058a84 l 00000058 map_copy_with_padding
08058adc l 0000008a mapheader_copy_mapdata_of_adjacent_maps
08058b68 l 00000064 sub_8058B54
08058bcc l 00000068 fillSouthConnection
08058c34 l 00000060 fillNorthConnection
08058c94 l 00000060 fillWestConnection
08058cf4 l 00000064 fillEastConnection
08058a84 l 00000058 InitBackupMapLayoutData
08058adc l 0000008a InitBackupMapLayoutConnections
08058b68 l 00000064 FillConnection
08058bcc l 00000068 FillSouthConnection
08058c34 l 00000060 FillNorthConnection
08058c94 l 00000060 FillWestConnection
08058cf4 l 00000064 FillEastConnection
08058d58 g 00000080 MapGridGetZCoordAt
08058dd8 g 00000084 MapGridIsImpassableAt
08058e5c g 000000d4 MapGridGetMetatileIdAt
08058f30 g 0000002c GetMetatileAttributeFromRawMetatileBehavior
08058f30 g 0000002c ExtractMetatileAttribute
08058f5c g 00000030 MapGridGetMetatileAttributeAt
08058f8c g 00000014 MapGridGetMetatileBehaviorAt
08058fa0 g 00000018 MapGridGetMetatileLayerTypeAt
08058fb8 g 00000048 MapGridSetMetatileIdAt
08059000 g 00000038 MapGridSetMetatileEntryAt
08059038 g 0000005c MapGridSetMetatileImpassabilityAt
08059094 g 00000058 GetBehaviorByMetatileIdAndMapLayout
080590ec g 00000080 save_serialize_map
08059094 l 00000058 GetAttributeByMetatileIdAndMapLayout
080590ec g 00000080 SaveMapView
0805916c l 00000040 SavedMapViewIsEmpty
080591ac l 0000002c ClearSavedMapView
080591d8 l 0000008c LoadSavedMapView
08059264 l 000000e4 sub_8059250
08059264 l 000000e4 MoveMapViewToBackup
08059348 g 00000108 GetMapBorderIdAt
08059450 l 00000028 GetPostCameraMoveMapBorderId
08059478 g 00000048 CanCameraMoveInDirection
080594c0 l 00000084 sub_80594AC
080594c0 l 00000084 SetPositionFromConnection
08059544 g 000000d0 CameraMove
08059614 l 00000056 sub_8059600
0805966c l 00000064 sub_8059658
080596d0 l 0000002a sub_80596BC
080596fc l 00000014 sub_80596E8
08059710 l 00000040 sub_80596FC
08059614 l 00000056 GetIncomingConnection
0805966c l 00000064 IsPosInIncomingConnectingMap
080596d0 l 0000002a IsCoordInIncomingConnectingMap
080596fc l 00000014 IsCoordInConnectingMap
08059710 l 00000040 IsPosInConnectingMap
08059750 g 000000ae GetMapConnectionAtPos
08059800 g 0000001c SetCameraFocusCoords
0805981c g 00000018 GetCameraFocusCoords
08059834 l 00000010 SetCameraCoords
08059844 g 00000014 GetCameraCoords
08059858 l 00000044 copy_tileset_patterns_to_vram
0805989c l 00000044 copy_tileset_patterns_to_vram2
08059858 l 00000044 CopyTilesetToVram
0805989c l 00000044 CopyTilesetToVramUsingHeap
080598e0 l 0000007c Fieldmap_ApplyGlobalTintToPaletteEntries
0805995c g 00000080 Fieldmap_ApplyGlobalTintToPaletteSlot
080599dc l 0000008a apply_map_tileset_palette
08059a68 g 00000012 copy_map_tileset1_to_vram
08059a7c g 00000014 copy_map_tileset2_to_vram
08059a90 g 00000014 copy_map_tileset2_to_vram_2
08059aa4 g 00000010 apply_map_tileset1_palette
08059ab4 g 00000010 apply_map_tileset2_palette
08059ac4 g 00000028 copy_map_tileset1_tileset2_to_vram
08059aec g 00000018 apply_map_tileset1_tileset2_palette
080599dc l 0000008a LoadTilesetPalette
08059a68 g 00000012 CopyPrimaryTilesetToVram
08059a7c g 00000014 CopySecondaryTilesetToVram
08059a90 g 00000014 CopySecondaryTilesetToVramUsingHeap
08059aa4 l 00000010 LoadPrimaryTilesetPalette
08059ab4 g 00000010 LoadSecondaryTilesetPalette
08059ac4 g 00000028 CopyMapTilesetsToVram
08059aec g 00000018 LoadMapTilesetPalettes
08059b04 g 00000004 MetatileBehavior_IsATile
08059b04 l 00000000 .gcc2_compiled.
08059b08 g 00000014 MetatileBehavior_IsJumpEast