Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg

2022-06-03 15:43:21 -04:00
parent 34438e6bc4 78b0c20738
commit 1ca1bff81c
128 changed files with 1530 additions and 1525 deletions
@@ -2195,7 +2195,7 @@ static bool8 LoadTradeMenuSpriteSheetsAndPalettes(void)
        sTradeMenuData->timer++;
        break;
    case GFXTAG_MENU_TEXT_COUNT:
-        LoadSpritePalette(&gSpritePalette_TradeScreenText);
+        LoadSpritePalette(&sSpritePalette_TradeScreenText);
        sTradeMenuData->timer++;
        break;
    case GFXTAG_MENU_TEXT_COUNT + 1: