From 7622423a3bd734222035ddb8cefba2fb54cb4c09 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 12 Sep 2022 18:37:03 +0000 Subject: [PATCH] Merge pull request #1762 from GriffinRichards/sync-fieldmap --- pokeemerald.sym | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 1df637b5ad..e0aaae6339 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -4623,7 +4623,7 @@ 08088a0c l 0000002a IsCoordInIncomingConnectingMap 08088a38 l 00000014 IsCoordInConnectingMap 08088a4c l 00000040 IsPosInConnectingMap -08088a8c g 000000ae GetConnectionAtCoords +08088a8c g 000000ae GetMapConnectionAtPos 08088b3c g 0000001c SetCameraFocusCoords 08088b58 g 00000018 GetCameraFocusCoords 08088b70 l 00000010 SetCameraCoords @@ -4632,8 +4632,8 @@ 08088bf0 l 00000042 SkipCopyingMetatileFromSavedMap 08088c34 l 00000044 CopyTilesetToVram 08088c78 l 00000044 CopyTilesetToVramUsingHeap -08088cbc l 00000002 FieldmapPaletteDummy -08088cc0 l 00000002 FieldmapUnkDummy +08088cbc l 00000002 ApplyGlobalTintToPaletteEntries +08088cc0 l 00000002 ApplyGlobalTintToPaletteSlot 08088cc4 g 0000008a LoadTilesetPalette 08088d50 g 00000012 CopyPrimaryTilesetToVram 08088d64 g 00000012 CopySecondaryTilesetToVram