From d7ad503307cca4c773137d72c1d6e2ed01cff3b0 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 28 May 2023 22:33:11 +0000 Subject: [PATCH] Merge pull request #1890 from GriffinRichards/pal-macro --- pokeemerald.sym | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index ffe81dcc35..504c4bc2dd 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -4634,7 +4634,7 @@ 08088c78 l 00000044 CopyTilesetToVramUsingHeap 08088cbc l 00000002 ApplyGlobalTintToPaletteEntries 08088cc0 l 00000002 ApplyGlobalTintToPaletteSlot -08088cc4 g 0000008a LoadTilesetPalette +08088cc4 l 0000008a LoadTilesetPalette 08088d50 g 00000012 CopyPrimaryTilesetToVram 08088d64 g 00000012 CopySecondaryTilesetToVram 08088d78 g 00000012 CopySecondaryTilesetToVramUsingHeap @@ -7320,7 +7320,7 @@ 080b5e10 g 00000030 FieldEffectActiveListRemove 080b5e40 g 0000002c FieldEffectActiveListContains 080b5e6c g 000000a0 CreateTrainerSprite -080b5f0c g 00000038 LoadTrainerGfx_TrainerCard +080b5f0c l 00000038 LoadTrainerGfx_TrainerCard 080b5f44 g 00000040 AddNewGameBirchObject 080b5f84 g 00000062 CreateMonSprite_PicBox 080b5fe8 g 00000086 CreateMonSprite_FieldMove