summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/global.h24
-rw-r--r--include/menu.h2
-rw-r--r--include/script_menu.h3
-rw-r--r--include/strings.h175
4 files changed, 188 insertions, 16 deletions
diff --git a/include/global.h b/include/global.h
index 7153ef260..687ee26d2 100644
--- a/include/global.h
+++ b/include/global.h
@@ -344,7 +344,8 @@ struct BattleFrontier
/*0xCA9*/ u8 field_CA9_f:1; // 0x80
/*0xCAA*/ u16 field_CAA[4];
/*0xCB2*/ u16 field_CB2;
- /*0xCB4*/ u16 field_CB4[30];
+ /*0xCB4*/ u16 field_CB4[22];
+ /*0xCE0*/ u16 field_CE0[4][2];
/*0xCF0*/ u16 field_CF0[2];
/*0xCF4*/ u16 field_CF4[2];
/*0xCF8*/ u16 field_CF8[2];
@@ -355,24 +356,21 @@ struct BattleFrontier
/*0xD09*/ u8 filler_D09;
/*0xD0A*/ u8 filler_D0A;
/*0xD0B*/ u8 filler_D0B;
- /*0xD0C*/ u8 filler_D0C;
- /*0xD0D*/ u8 filler_D0D;
- /*0xD0E*/ u8 filler_D0E;
- /*0xD0F*/ u8 filler_D0F;
+ /*0xD0C*/ u16 field_D0C[2];
/*0xD10*/ u8 filler_D10;
/*0xD11*/ u8 filler_D11;
/*0xD12*/ u8 filler_D12;
/*0xD13*/ u8 filler_D13;
/*0xD14*/ u16 field_D14[2];
- /*0xD18*/ u8 field_D18[0xB8];
+ /*0xD18*/ u8 field_D18[0xB0];
+ /*0xDC8*/ u16 field_DC8[2];
+ /*0xDCC*/ u8 filler_DCC[4];
/*0xDD0*/ u16 field_DD0[2];
/*0xDD4*/ u16 field_DD4[2];
/*0xDD8*/ u16 field_DD8;
- /*0xDDA*/ u16 field_DDA;
- /*0xDDC*/ u16 field_DDC;
+ /*0xDDA*/ u16 field_DDA[2];
/*0xDDE*/ u16 field_DDE[2];
- /*0xDE2*/ u16 field_DE2;
- /*0xDE4*/ u16 field_DE4;
+ /*0xDE2*/ u16 field_DE2[2];
/*0xDE6*/ u16 field_DE6;
/*0xDE8*/ u16 field_DE8;
/*0xDEA*/ u16 field_DEA[2];
@@ -387,11 +385,9 @@ struct BattleFrontier
/*0xDFE*/ u16 field_DFE;
/*0xE00*/ u16 field_E00;
/*0xE02*/ u16 field_E02;
- /*0xE04*/ u16 field_E04;
- /*0xE06*/ u16 field_E06;
+ /*0xE04*/ u16 field_E04[2];
/*0xE08*/ u16 field_E08[9];
- /*0xE1A*/ u16 field_E1A;
- /*0xE1C*/ u16 field_E1C;
+ /*0xE1A*/ u16 field_E1A[2];
/*0xE1E*/ u16 field_E1E[7];
/*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE58*/ u16 field_E58;
diff --git a/include/menu.h b/include/menu.h
index 888d898b6..0c191de57 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -51,7 +51,7 @@ void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
void reset_temp_tile_data_buffers(void);
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
bool8 free_temp_tile_data_buffers_if_possible(void);
-struct WindowTemplate sub_8198A50(u8, u8, u8, u8, u8, u8, u16);
+struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
s8 ProcessMenuInputNoWrap_(void);
diff --git a/include/script_menu.h b/include/script_menu.h
index 0555d0f78..c50bef00f 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -9,8 +9,9 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
-u8 convert_pixel_width_to_tile_width(s32);
+s32 convert_pixel_width_to_tile_width(s32);
u8 CreateWindowFromRect(u8, u8, u8, u8);
void sub_80E2A78(u8);
+u32 display_text_and_get_width(const u8*, u32);
#endif //GUARD_SCRIPT_MENU_H
diff --git a/include/strings.h b/include/strings.h
index 3d3741a86..14ff0048f 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -472,4 +472,179 @@ extern const u8 gText_BigGirl[];
extern const u8 gText_Son[];
extern const u8 gText_Daughter[];
+extern const u8 gText_1F[];
+extern const u8 gText_2F[];
+extern const u8 gText_3F[];
+extern const u8 gText_4F[];
+extern const u8 gText_5F[];
+extern const u8 gText_6F[];
+extern const u8 gText_7F[];
+extern const u8 gText_8F[];
+extern const u8 gText_9F[];
+extern const u8 gText_10F[];
+extern const u8 gText_11F[];
+extern const u8 gText_B1F[];
+extern const u8 gText_B2F[];
+extern const u8 gText_B3F[];
+extern const u8 gText_B4F[];
+extern const u8 gText_Rooftop[];
+extern const u8 gText_ElevatorNowOn[];
+
+extern const u8 BattleFrontier_Lounge2_Text_260971[];
+extern const u8 BattleFrontier_Lounge2_Text_260A1E[];
+extern const u8 BattleFrontier_Lounge2_Text_260AE7[];
+extern const u8 BattleFrontier_Lounge2_Text_2619AC[];
+extern const u8 BattleFrontier_Lounge2_Text_261A91[];
+extern const u8 BattleFrontier_Lounge2_Text_261B0C[];
+extern const u8 BattleFrontier_Lounge2_Text_261B95[];
+extern const u8 BattleFrontier_Lounge2_Text_261B95[];
+extern const u8 BattleFrontier_Lounge2_Text_261B95[];
+extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
+extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
+extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
+extern const u8 BattleFrontier_Lounge2_Text_260BC4[];
+extern const u8 BattleFrontier_Lounge2_Text_260C6D[];
+extern const u8 BattleFrontier_Lounge2_Text_260D3A[];
+extern const u8 BattleFrontier_Lounge2_Text_260E1E[];
+extern const u8 BattleFrontier_Lounge2_Text_260EC7[];
+extern const u8 BattleFrontier_Lounge2_Text_260F74[];
+extern const u8 BattleFrontier_Lounge2_Text_2614E6[];
+extern const u8 BattleFrontier_Lounge2_Text_261591[];
+extern const u8 BattleFrontier_Lounge2_Text_26166F[];
+extern const u8 BattleFrontier_Lounge2_Text_261282[];
+extern const u8 BattleFrontier_Lounge2_Text_261329[];
+extern const u8 BattleFrontier_Lounge2_Text_261403[];
+extern const u8 BattleFrontier_Lounge2_Text_261026[];
+extern const u8 BattleFrontier_Lounge2_Text_2610CC[];
+extern const u8 BattleFrontier_Lounge2_Text_261194[];
+extern const u8 BattleFrontier_Lounge2_Text_26174D[];
+extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
+extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
+
+extern const u8 gText_Exit[];
+
+extern const u8 gText_BlueFlute[];
+extern const u8 gText_YellowFlute[];
+extern const u8 gText_RedFlute[];
+extern const u8 gText_WhiteFlute[];
+extern const u8 gText_BlackFlute[];
+extern const u8 gText_PrettyChair[];
+extern const u8 gText_PrettyDesk[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_0Pts[];
+extern const u8 gText_10Pts[];
+extern const u8 gText_20Pts[];
+extern const u8 gText_30Pts[];
+extern const u8 gText_40Pts[];
+extern const u8 gText_50Pts[];
+extern const u8 gText_60Pts[];
+extern const u8 gText_70Pts[];
+extern const u8 gText_80Pts[];
+extern const u8 gText_90Pts[];
+extern const u8 gText_100Pts[];
+extern const u8 gText_QuestionMark[];
+
+extern const u8 gText_KissPoster16BP[];
+extern const u8 gText_KissCushion32BP[];
+extern const u8 gText_SmoochumDoll32BP[];
+extern const u8 gText_TogepiDoll48BP[];
+extern const u8 gText_MeowthDoll48BP[];
+extern const u8 gText_ClefairyDoll48BP[];
+extern const u8 gText_DittoDoll48BP[];
+extern const u8 gText_CyndaquilDoll80BP[];
+extern const u8 gText_ChikoritaDoll80BP[];
+extern const u8 gText_TotodileDoll80BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_LaprasDoll128BP[];
+extern const u8 gText_SnorlaxDoll128BP[];
+extern const u8 gText_VenusaurDoll256BP[];
+extern const u8 gText_CharizardDoll256BP[];
+extern const u8 gText_BlastoiseDoll256BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_Protein1BP[];
+extern const u8 gText_Calcium1BP[];
+extern const u8 gText_Iron1BP[];
+extern const u8 gText_Zinc1BP[];
+extern const u8 gText_Carbos1BP[];
+extern const u8 gText_HpUp1BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_Leftovers48BP[];
+extern const u8 gText_WhiteHerb48BP[];
+extern const u8 gText_QuickClaw48BP[];
+extern const u8 gText_MentalHerb48BP[];
+extern const u8 gText_BrightPowder64BP[];
+extern const u8 gText_ChoiceBand64BP[];
+extern const u8 gText_KingsRock64BP[];
+extern const u8 gText_FocusBand64BP[];
+extern const u8 gText_ScopeLens64BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_EnergyPowder50[];
+extern const u8 gText_EnergyRoot80[];
+extern const u8 gText_HealPowder50[];
+extern const u8 gText_RevivalHerb300[];
+extern const u8 gText_Protein1000[];
+extern const u8 gText_Iron1000[];
+extern const u8 gText_Carbos1000[];
+extern const u8 gText_Calcium1000[];
+extern const u8 gText_Zinc1000[];
+extern const u8 gText_HPUp1000[];
+extern const u8 gText_PPUp3000[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_BattleTower2[];
+extern const u8 gText_BattleDome[];
+extern const u8 gText_BattlePalace[];
+extern const u8 gText_BattleArena[];
+extern const u8 gText_BattleFactory[];
+extern const u8 gText_BattlePike[];
+extern const u8 gText_BattlePyramid[];
+extern const u8 gText_RankingHall[];
+extern const u8 gText_ExchangeService[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_Softboiled16BP[];
+extern const u8 gText_SeismicToss24BP[];
+extern const u8 gText_DreamEater24BP[];
+extern const u8 gText_MegaPunch24BP[];
+extern const u8 gText_MegaKick48BP[];
+extern const u8 gText_BodySlam48BP[];
+extern const u8 gText_RockSlide48BP[];
+extern const u8 gText_Counter48BP[];
+extern const u8 gText_ThunderWave48BP[];
+extern const u8 gText_SwordsDance48BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_DefenseCurl16BP[];
+extern const u8 gText_Snore24BP[];
+extern const u8 gText_MudSlap24BP[];
+extern const u8 gText_Swift24BP[];
+extern const u8 gText_IcyWind24BP[];
+extern const u8 gText_Endure48BP[];
+extern const u8 gText_PsychUp48BP[];
+extern const u8 gText_IcePunch48BP[];
+extern const u8 gText_ThunderPunch48BP[];
+extern const u8 gText_FirePunch48BP[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_SlateportCity[];
+extern const u8 gText_BattleFrontier[];
+extern const u8 gText_SouthernIsland[];
+extern const u8 gText_NavelRock[];
+extern const u8 gText_BirthIsland[];
+extern const u8 gText_FarawayIsland[];
+extern const u8 gText_Exit[];
+
+extern const u8 gText_BattleTrainers[];
+extern const u8 gText_BattleBasics[];
+extern const u8 gText_PokemonNature[];
+extern const u8 gText_PokemonMoves[];
+extern const u8 gText_Underpowered[];
+extern const u8 gText_WhenInDanger[];
+extern const u8 gText_Exit[];
+
#endif //GUARD_STRINGS_H