Font constants and slight PSS sync

include/help_system.h

@@ -85,7 +85,7 @@ void HelpSystem_SetInputDelay(u8);
 s32 HelpSystem_GetMenuInput(void);
 void HS_UpdateMenuScrollArrows(void);
 
-void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height);
+void DecompressAndRenderGlyph(u8 fontId, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height);
 void HelpSystem_PrintTextInTopLeftCorner(const u8 * str);
 void HelpSystem_FillPanel3(void);
 void PrintListMenuItems(void);
@@ -93,7 +93,7 @@ void PlaceListMenuCursor(void);
 bool8 MoveCursor(u8 by, u8 dirn);
 void BackupHelpContext(void);
 void RestoreHelpContext(void);
-void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height);
+void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height);
 void HelpSystem_DisableToggleWithRButton(void);
 
 #endif //GUARD_HELP_SYSTEM_H

include/new_menu_helpers.h

@@ -36,7 +36,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
 void sub_80F7768(u8 windowId, bool8 copyToVram);
 void Menu_LoadStdPal(void);
 void Menu_LoadStdPalAt(u16 offset);
-void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *src, TaskFunc callback);
+void DisplayItemMessageOnField(u8 taskId, u8 fontId, const u8 *src, TaskFunc callback);
 void DisplayYesNoMenuDefaultYes(void);
 void DisplayYesNoMenuDefaultNo(void);
 u8 GetTextSpeedSetting(void);

include/pokemon_storage_system_internal.h

@@ -393,7 +393,7 @@ extern struct PokemonStorageSystemData *gPSSData;
 
 void Cb2_EnterPSS(u8 a0);
 u8 GetCurrentBoxOption(void);
-struct Sprite *sub_809223C(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority);
+struct Sprite *CreateChooseBoxArrows(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority);
 void SetBoxWallpaper(u8 boxId, u8 wallpaperId);
 void SetCurrentBox(u8 boxId);
 void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon * dst);
@@ -478,7 +478,7 @@ void SetMenuText(u8 textId);
 void sub_8095C84(u8 cursorArea, u8 cursorPos);
 void sub_8095E2C(u16 itemId);
 u8 GetBoxWallpaper(u8 boxId);
-bool8 IsCursorOnBox(void);
+bool8 IsCursorOnBoxTitle(void);
 bool8 IsCursorInBox(void);
 
 void sub_808FFAC(void);
@@ -492,7 +492,7 @@ void sub_8091114(void);
 bool8 sub_8091150(void);
 void sub_80913DC(u8 box);
 bool8 sub_809140C(void);
-void sub_80920FC(bool8 species);
+void AnimateBoxScrollArrows(bool8 species);
 void CreateMovingMonIcon(void);
 void sub_8090E08(u8 boxId, u8 cursorPos);
 bool8 sub_8090E74(void);

include/shop.h

@@ -11,7 +11,7 @@ extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
 void CreatePokemartMenu(const u16 *itemsForSale);
 void CreateDecorationShop1Menu(const u16 *);
 void CreateDecorationShop2Menu(const u16 *);
-u8 GetMartUnk16_4(void);
+u8 GetMartFontId(void);
 void RecordItemPurchase(u16 a0, u16 a1, u8 a2);
 
 // buy_menu_helper

include/text.h

@@ -157,8 +157,21 @@
 #define NUM_TEXT_PRINTERS 32
 
 #define TEXT_SPEED_INSTANT 0
+
+// Given as a text speed when all the text should be
+// loaded at once but not copied to vram yet.
 #define TEXT_SKIP_DRAW 0xFF
 
+enum {
+    FONT_0,
+    FONT_1,
+    FONT_2,
+    FONT_3,
+    FONT_4,
+    FONT_5,
+    FONT_6,
+};
+
 enum
 {
     FONTATTR_MAX_LETTER_WIDTH,
@@ -302,7 +315,6 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
 bool16 TextPrinterWait(struct TextPrinter *textPrinter);
 void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex);
 u16 RenderText(struct TextPrinter *textPrinter);
-s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing);
 s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32);
 s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing);
 u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a6, int a7);