Merge pull request #526 from DizzyEggg/frontier_pass

Frontier Pass

7 files changed, 61 insertions, 4 deletions

diff --git a/include/bg.h b/include/bg.h
index 1366923f1..ad5acd0ae 100644
--- a/include/bg.h
+++ b/include/bg.h
@@ -61,7 +61,7 @@ s32 GetBgX(u8 bg);
 s32 ChangeBgY(u8 bg, s32 value, u8 op);
 s32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op);
 s32 GetBgY(u8 bg);
-void SetBgAffine(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle);
+void SetBgAffine(u8 bg, s32 srcCenterX, s32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle);
 u8 Unused_AdjustBgMosaic(u8 a1, u8 a2);
 void SetBgTilemapBuffer(u8 bg, void *tilemap);
 void UnsetBgTilemapBuffer(u8 bg);
diff --git a/include/frontier_pass.h b/include/frontier_pass.h
new file mode 100644
index 000000000..bdfc1996f
--- /dev/null
+++ b/include/frontier_pass.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_FRONTIER_PASS_H
+#define GUARD_FRONTIER_PASS_H
+
+void ShowFrontierPass(void (*callback)(void));
+void CB2_ReshowFrontierPass(void);
+
+#endif // GUARD_FRONTIER_PASS_H
diff --git a/include/graphics.h b/include/graphics.h
index 77390db90..cfe73c6c3 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4860,4 +4860,18 @@ extern const u32 gUnknown_08DD228C[];
 extern const u32 gUnknown_08DD2E5C[];
 extern const u32 gUnknown_08DD1F78[];
 
+// Frontier Pass
+extern const u32 gUnknown_08DE08C8[];
+extern const u32 gUnknown_08DE2084[];
+extern const u32 gUnknown_08DE3350[];
+extern const u32 gUnknown_08DE3374[];
+extern const u32 gUnknown_08DE3060[];
+extern const u32 gFrontierPassMedals_Gfx[];
+extern const u16 gUnknown_08DE07C8[][16];
+extern const u16 gFrontierPassCursor_Pal[];
+extern const u16 gFrontierPassMedalsGold_Pal[];
+extern const u16 gFrontierPassMedalsSilver_Pal[];
+extern const u16 gFrontierPassMapCursor_Pal[];
+
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/palette.h b/include/palette.h
index f51dc4b88..e24da3e00 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -63,7 +63,7 @@ void TintPlttBuffer(u32, s8, s8, s8);
 void UnfadePlttBuffer(u32);
 void BeginFastPaletteFade(u8);
 void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
-void BlendPalettes(u32, u8, u16);
+void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color);
 void BlendPalettesUnfaded(u32, u8, u16);
 void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7);
 void TintPalette_GrayScale(u16 *palette, u16 count);
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index a85ee5ff4..4c319e59d 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -25,6 +25,7 @@ struct PokemonStorage
 
 extern struct PokemonStorage *gPokemonStoragePtr;
 
+void sub_80C6D80(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 arg4);
 u8 CountMonsInBox(u8 boxId);
 s16 GetFirstFreeBoxSpot(u8 boxId);
 u8 CountPartyAliveNonEggMonsExcept(u8 slotToIgnore);
diff --git a/include/string_util.h b/include/string_util.h
index d7a005ec5..b921d2391 100644
--- a/include/string_util.h
+++ b/include/string_util.h
@@ -34,7 +34,7 @@ u8 *StringFill(u8 *dest, u8 c, u16 n);
 u8 *StringCopyPadded(u8 *dest, const u8 *src, u8 c, u16 n);
 u8 *StringFillWithTerminator(u8 *dest, u16 n);
 u8 *StringCopyN_Multibyte(u8 *dest, u8 *src, u32 n);
-u32 StringLength_Multibyte(u8 *str);
+u32 StringLength_Multibyte(const u8 *str);
 u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color);
 bool32 IsStringJapanese(u8 *str);
 bool32 sub_800924C(u8 *str, s32 n);
diff --git a/include/strings.h b/include/strings.h
index 4e9c91ff5..74f3ca727 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2248,4 +2248,39 @@ extern const u8 gText_Var1DarkLightGreyBP[];
 extern const u8 gText_BattleTower[];
 extern const u8 gText_BattlePtsWon[];
 
-#endif //GUARD_STRINGS_H
+// Frontier Pass
+extern const u8 gText_SymbolsEarned[];
+extern const u8 gText_BattleRecord[];
+extern const u8 gText_BattlePoints[];
+extern const u8 gUnknown_085EDA96[];
+extern const u8 gUnknown_085ED932[];
+extern const u8 gUnknown_085ED94D[];
+extern const u8 gUnknown_085ED961[];
+extern const u8 gUnknown_085ED977[];
+extern const u8 gUnknown_085ED993[];
+extern const u8 gUnknown_085ED9AF[];
+extern const u8 gUnknown_085ED9C7[];
+extern const u8 gUnknown_085ED9E5[];
+extern const u8 gUnknown_085EDA02[];
+extern const u8 gUnknown_085EDA21[];
+extern const u8 gUnknown_085EDA3C[];
+extern const u8 gUnknown_085EDA5E[];
+extern const u8 gUnknown_085EDA78[];
+extern const u8 gUnknown_085ED931[];
+extern const u8 gUnknown_085EDAB1[];
+extern const u8 gUnknown_085EDB0F[];
+extern const u8 gUnknown_085EDABE[];
+extern const u8 gUnknown_085EDB4E[];
+extern const u8 gUnknown_085EDACA[];
+extern const u8 gUnknown_085EDB8B[];
+extern const u8 gUnknown_085EDAD8[];
+extern const u8 gUnknown_085EDBC2[];
+extern const u8 gUnknown_085EDAE5[];
+extern const u8 gUnknown_085EDC00[];
+extern const u8 gUnknown_085EDAF4[];
+extern const u8 gUnknown_085EDC45[];
+extern const u8 gUnknown_085EDB00[];
+extern const u8 gUnknown_085EDC84[];
+
+
+#endif // GUARD_STRINGS_H