Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave

2020-07-08 16:03:32 -04:00
parent 2ed1f7c6f9 ebade7affb
commit beeb673ba1
534 changed files with 9282 additions and 8186 deletions
--- a/src/menu.c
+++ b/src/menu.c
@@ -2106,7 +2106,7 @@ void sub_819A27C(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
    BlitBitmapToWindow(windowId, GetMonIconPtr(speciesId, personality, 1), x, y, 32, 32);
 }

-void sub_819A2BC(u8 palOffset, u8 palId)
+void ListMenuLoadStdPalAt(u8 palOffset, u8 palId)
 {
    const u16 *palette;